From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id WEW2H15VJ2RoMwEASxT56A (envelope-from ) for ; Fri, 31 Mar 2023 23:49:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oJbrHl5VJ2Rz0QAAG6o9tA (envelope-from ) for ; Fri, 31 Mar 2023 23:49:18 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1E2BA2C773 for ; Fri, 31 Mar 2023 23:49:18 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcL-0006BJ-3E; Fri, 31 Mar 2023 17:49:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1piMcJ-0006A8-29 for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcI-0001WA-QW for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcI-0001si-Nd for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993207116 (code B ref 62467); Fri, 31 Mar 2023 21:49:02 +0000 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:40 +0000 Received: from localhost ([127.0.0.1]:34729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbv-0001qV-D9 for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:40 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:37630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbp-0001ou-7n for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:34 -0400 Received: by mail-ed1-f65.google.com with SMTP id cn12so95067525edb.4 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299307; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=kF06JrO7W+0A3P2cIrct5uXI2puw2L/Ue4VSR923cik=; b=mklP5Qw/T2FcYXivQB0GcxmeMDqriTLKyQSJpO1EUUjuW7ViTF5XnuAJKcKfmLjM/F Dzk4YhnGjs4rlB8SJtubUF+oq4KEp+6cLtHyesnRb+2JkGLfalymqqEn4PfphRGoDxHr cNUg2ds7I3c3dW9WGVJgi82zcrOxg64VNbsZQ/FaSa2yLQ/7lLmrYEw6A4tQw0uhwLhQ SW0rLtjOXVFcvhEneHtdITkjpgZ3qcuQ0KxTiFGCYigG1wnKV5S5KWLh/1chAoOM3Y4S n1Uv0cgc/pvGlTF90WIu9zZSEP3yhqAPIlu44JInd6tCs8N+wh7g9chM7JtIrOCAUbc3 VYog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299307; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kF06JrO7W+0A3P2cIrct5uXI2puw2L/Ue4VSR923cik=; b=hHKDgjO7XI1ZbhPSOVkRUV8TxpHkaWI4hUA5UR4oPAsnbO5CUrSZKar5X6jeW7fHSH vwK8ih2Rb29Ok4szDMO1jW9uUyGcViUHMMC7MVQ+92NaMhEdbpXPwvfHr8UNopGgUFnt Dn14MG6RMaaAmaSHQODt6ZsARar22CIf4FMdM06j9qRmIT6K/V3/5tXPswJ1oBfoX7iC pTjZ4P0lsNvYjXtbMnX/7dL++i9EYgdfXF0+x3mSW0uY6cJGYPKyiQGpZIOZYkoUfNoP AYQoqGPlIXxLDsVcVNaWxIP59kiHb/w9lh+9Tk+JGMKbGuFOLFmLeCr8FjkVuNCzYHy7 qfKQ== X-Gm-Message-State: AAQBX9eG4CTa2bXWSE1RW3ZpXCrYXs+FDEkiQHNcWUwycCvsPjVUB9nT qfmBc5nA2p7YboDXBCGlfqtF5lOQaBYdSg== X-Google-Smtp-Source: AKy350aelEFTvOyUTvggMRl9K9L/8yU/0GnfWjoCvhbmHZNkXw+AUPCwNjCBMjQxQNSGQbYrBgFNKw== X-Received: by 2002:a17:906:2990:b0:92f:a6d3:b941 with SMTP id x16-20020a170906299000b0092fa6d3b941mr30651498eje.30.1680299307387; Fri, 31 Mar 2023 14:48:27 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:27 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:39:11 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680299358; a=rsa-sha256; cv=none; b=APpBe1q28a0YSDzDNCEwWwToz2u3L0/YeL1oG6sAqRWT3mSbXtx/O3x+YuR6G1DlP/387t eZvXtiu2sZrxOa1hFitstre2ZUpdUBFhe95AXu25sQd1/RjBqDIFJAY4B9W5mu5RZXpzxA +1L8Yj/QEPmOygZG7Qfl2CKtlPI4swHfvKVDJMD4GxcOwqhMftvAWtvZEo91dchU59VNiX p+fkXfaEk44/AWOdYidJgFXCrZVpzZWTc+lAsMegp98VfsrdYB3nL94e4WRRNQpcy9MPWT niQDRhuIJloPJ6M3y6NEeTdo+XyhOBkRLTFAdzUWLLSE4kUC0S/JeAjuCmirAg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="mklP5Qw/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680299358; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=kF06JrO7W+0A3P2cIrct5uXI2puw2L/Ue4VSR923cik=; b=YDGgHKaSlMDWURgijJb/nEwtDnbQcFDfvpKKsgFDcR/rfIlMo7oj9Sw+Mn8T7TNVJS2cRs 5UTVc5SBmctVOOhrhehHSFsG8/7tl/tbm+iIJXMRgH7G3yCEZkM1ITytY+WWOkLpY8ZnPN iHsTWkfgusrm+ZmnjO76MK1M2NGhaqO+gcM0mxewATSVCodYDMJTWUbhP73BYIYgpYULRr YsArRgUyhcSCCd+DFKiYq0TGVp+g/lSAPAnPJ7w3ruvVA5UmGehY60yVwIIu86WsaWTWA9 gEG7FfZwIFdl7l3aB6eaManBs2h4q5cRD/TXUxX1XaNc1ZjeTbxXw3O8cMN9+w== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="mklP5Qw/"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.72 X-Spam-Score: -2.72 X-Migadu-Queue-Id: 1E2BA2C773 X-TUID: lUna0xjcxcmo * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Replace pcre with pcre2. (glib-with-documentation): Inherit from glib. * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib. * gnu/packages/gtk.scm (gtksourceview): Use glib. * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly. --- gnu/packages/glib.scm | 92 +++++-------------- gnu/packages/gnome.scm | 8 +- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- .../patches/glib-skip-failing-test.patch | 3 +- 5 files changed, 30 insertions(+), 77 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f85d5e3225..ecf5cb491f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -215,7 +215,7 @@ (define-public dbus-verbose (define glib (package (name "glib") - (version "2.70.2") + (version "2.76.1") (source (origin (method url-fetch) @@ -224,14 +224,14 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85")) + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) (modules '((guix build utils))) (snippet '(begin - (substitute* "tests/spawn-test.c" + (substitute* "glib/tests/spawn-test.c" (("/bin/sh") "sh")))))) (build-system meson-build-system) (outputs '("out" ;libraries, locales, etc @@ -256,6 +256,9 @@ (define glib #:phases (modify-phases %standard-phases ;; Needed to pass the test phase on slower ARM and i686 machines. + (add-after 'unpack 'set-G_TEST_SRCDIR + (lambda _ + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests")))) (add-after 'unpack 'increase-test-timeout (lambda _ (substitute* "meson.build" @@ -270,9 +273,19 @@ (define glib (substitute* '("unix.c" "utils.c") (("[ \t]*g_test_add_func.*;") ""))) (with-directory-excursion "gio/tests" - (substitute* '("contenttype.c" "gdbus-address-get-session.c" - "gdbus-peer.c" "appinfo.c" "desktop-app-info.c") - (("[ \t]*g_test_add_func.*;") ""))) + (substitute* '("contenttype.c" + "gdbus-address-get-session.c" + "gdbus-server-auth.c" + "gdbus-peer.c" + "appinfo.c" + "desktop-app-info.c") + (("[ \t]*g_test_add_func.*;") "")) + (unless (which "update-desktop-database") + (substitute* '("file.c") + (("[ \t]*g_test_add_func.*query-default-handler.*;") ""))) + (substitute* '("portal-support-snap.c") + (("g_test_init .*") + "return EXIT_SUCCESS;"))) ,@(if (target-x86-32?) ;; Comment out parts of timer.c that fail on i686 due to @@ -357,7 +370,7 @@ (define glib libelf)) (propagated-inputs (list libffi ; in the Requires.private field of gobject-2.0.pc - pcre ; in the Requires.private field of glib-2.0.pc + pcre2 ; in the Requires.private field of glib-2.0.pc `(,util-linux "lib") ;for libmount zlib)) ; in the Requires.private field of glib-2.0.pc (native-search-paths @@ -383,68 +396,10 @@ (define glib (license license:lgpl2.1+) (properties '((hidden? . #t))))) -(define-public glib-next - (package - (inherit glib) - (name "glib") - (version "2.73.3") - (source - (origin - (inherit (package-source glib)) - (uri - (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (snippet - '(substitute* "glib/tests/spawn-test.c" - (("/bin/sh") "sh"))) - (sha256 - (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz")))) - (arguments - (substitute-keyword-arguments (package-arguments glib) - ((#:test-options test-options ''()) - ;; Skip flaky or slow tests. - `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options)) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (replace 'disable-failing-tests - (lambda _ - (with-directory-excursion "glib/tests" - (substitute* '("unix.c" "utils.c") - (("[ \t]*g_test_add_func.*;") ""))) - ;; The "glib:gio / file" test fails with the error "No - ;; application is registered as handling this file" (see: - ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). - (with-directory-excursion "gio/tests" - (substitute* '("appinfo.c" - "contenttype.c" - "desktop-app-info.c" - "file.c" - "gdbus-address-get-session.c" - "gdbus-peer.c") - (("[ \t]*g_test_add_func.*;") ""))) - - ,@(if (target-x86-32?) - ;; Comment out parts of timer.c that fail on i686 due to - ;; excess precision when building with GCC 10: - ;; . - '((substitute* "glib/tests/timer.c" - (("^ g_assert_cmpuint \\(micros.*" all) - (string-append "//" all "\n")) - (("^ g_assert_cmpfloat \\(elapsed, ==.*" all) - (string-append "//" all "\n")))) - '()))))))) - (native-inputs - (modify-inputs (package-native-inputs glib) - (append desktop-file-utils))) - (propagated-inputs - (modify-inputs (package-propagated-inputs glib) - (replace "pcre" pcre2))))) - (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. - (let ((base glib-next)) + (let ((base glib)) (package/inherit base (properties (alist-delete 'hidden? (package-properties base))) (outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference @@ -624,10 +579,7 @@ (define-public gobject-introspection-next (patches (search-patches "gobject-introspection-cc-1.72.patch" "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs gobject-introspection) - (replace "glib" glib-next))))) + "gobject-introspection-absolute-shlib-path-1.72.patch")))))) (define intltool (package diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0efb98b97c..4a7e188048 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13167,7 +13167,7 @@ (define-public sysprof (propagated-inputs (list polkit)) (inputs - (list glib-next + (list glib gtk json-glib libadwaita @@ -13176,7 +13176,7 @@ (define-public sysprof polkit)) (native-inputs (list gettext-minimal - `(,glib-next "bin") ;for gdbus-codegen, etc. + `(,glib "bin") ;for gdbus-codegen, etc. itstool libxml2 pkg-config)) @@ -13445,7 +13445,7 @@ (define-public gtranslator (substitute* "build-aux/meson/meson_post_install.py" (("gtk-update-icon-cache") (which "true")))))))) (native-inputs - (list `(,glib-next "bin") + (list `(,glib "bin") gettext-minimal itstool pkg-config)) @@ -13453,7 +13453,7 @@ (define-public gtranslator (list json-glib jsonrpc-glib gettext-minimal - glib-next + glib gsettings-desktop-schemas gspell libgda diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b9ef660a80..1911ed7774 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -710,7 +710,7 @@ (define-public gtksourceview ;; gtksourceview-5.pc refers to all these. (list fontconfig fribidi - glib-next + glib gtk libxml2 pcre2 diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 315c9a7554..5d861c5c82 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2290,7 +2290,7 @@ (define (get lib) (setenv "DISPLAY" ":1") #t))))) (inputs - (list guile-3.0 guile-lib glib-next)) + (list guile-3.0 guile-lib glib)) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch index c7706aaa74..3fde5cb1e2 100644 --- a/gnu/packages/patches/glib-skip-failing-test.patch +++ b/gnu/packages/patches/glib-skip-failing-test.patch @@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build index a926ae0..4fdbe7a 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -317,10 +317,6 @@ if host_machine.system() != 'windows' +@@ -317,11 +317,6 @@ if host_machine.system() != 'windows' 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'], }, - 'gdbus-threading' : { - 'extra_sources' : extra_sources, +- 'extra_programs': extra_programs, - 'suite' : ['slow'], - }, 'gmenumodel' : { -- 2.39.2