From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id +HGXEh4INWR5vgAASxT56A (envelope-from ) for ; Tue, 11 Apr 2023 09:11:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id gJh/Eh4INWTGPQAA9RJhRA (envelope-from ) for ; Tue, 11 Apr 2023 09:11:26 +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 B299F2402B for ; Tue, 11 Apr 2023 09:11:25 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89h-0004AR-Ih; Tue, 11 Apr 2023 03:11: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 1pm89f-00049v-Qg for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11: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 1pm89f-0000uz-I3 for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89f-0008IK-DD for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 02/15] 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: Tue, 11 Apr 2023 07:11:03 +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.168119702131710 (code B ref 62467); Tue, 11 Apr 2023 07:11:03 +0000 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:21 +0000 Received: from localhost ([127.0.0.1]:36452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88x-0008En-Aj for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:21 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:36795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88t-0008Dj-MN for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:16 -0400 Received: by mail-ej1-f67.google.com with SMTP id q23so8375772ejz.3 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197010; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=qDpfvPEl74Z2k0DbB37YNZp4yILSm+7qaUe0dKztgRM=; b=caaGuehp49kc72MkEPlEzwix2Yp8O+lEMur4gnRP1Y1mY1qJnzseik2gJ/PNXYgsC9 ee0A74ZdhRgAs/Hd6WFiF9b9rByxlXL9wjKVKaaeXV9kRXaY8HmLxfvC22fdQ854lSgq 1t5rk2D0y0iG02NxM/mKxDZI/nLl44UNiGGmjifiT6H0AYZnzuwtV0Rq1GE8nsZFkWeK +YqU4G0gKXMOGP9gIZZ1TyFtaPpZDVZhHK3WeGAON+DO+ElvzS+1QQ/1H/vlhsiNJ46N tJ4JccIrUTGzq+Ye6+/LZrxky4frspXR/662RuFYooB03BSzo7C1/4SnFJ+IaOyG4gEn /DwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197010; 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=qDpfvPEl74Z2k0DbB37YNZp4yILSm+7qaUe0dKztgRM=; b=6ipadfcphqt6VFrYttL2pRRH1e5nxaFighjlaLgy2abZRQfBilmFQVm0nYaP2Re73Z m09vym/IN6d6ShM8vHWiIASx9HOHHWNn7dve8wLsqf3vV6PacTeSH1sq5EBQPyp2zlDl v0mpQm/OqeGjLAtyVP4eXrwJxCCC/M4Do9/xUPhd66kkAGVvmuA9eLo/sbZegeIv41M7 Mso+Ef9bUFZRApMXf2JXTug6sdYixCDcV5607U2g5J3c0ekiksbbdyCWXWDfWL/mH3sw NA8NC8E9+0ttC1hImRo+PkMFVf9+MQik97mM6d7Hbm2DfI1aGgVpu2gNOop7gggL0L8Z MxEw== X-Gm-Message-State: AAQBX9f08ZRPok+V1r8YX5MdXsKthN4HrYJ85nmcjdDap+jeP9yLT+il Ni6EQvl4mjtfHN4FJ2fTLWcRQb2h4KCiGg== X-Google-Smtp-Source: AKy350Z4TwieACwXFGPvzB8yT/2Dq6BJWSM5XjJ7bN4a8xkpouG0+6lELIF/5MeSPCzKvW6gbx//fA== X-Received: by 2002:a17:907:2105:b0:94a:7d5b:2a7 with SMTP id qn5-20020a170907210500b0094a7d5b02a7mr5957765ejb.47.1681197009707; Tue, 11 Apr 2023 00:10:09 -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 md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:09 -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=1681197086; a=rsa-sha256; cv=none; b=mHHeGzu+h2Ms/vjLCVUkI5bZRp3UiiKTRm6tvZMjz7JQc0879wNcHsPvPvUD9zNyugGMK/ Mn4ZQXYU8xL2jzxbimPGCAQgmty1V1DcpmKr/kN+N8zTvT2ubwo7iW0/TjntV53nehkQYP uhSL42xZWyB/jwRITbXlYrcYVyj/4eDMUhH+LbyGE85EPml/o6RtgmNkKcOMgcrag1Iysm pEaPAipckZ18LVfXNRNpRS0DctKL+pLg95YYMQIePkoQhGJ6UoN9Wi+vtYxRA9D1ffgN25 q4rubqSl4oQ1KxMa5+vAN5ytreKkjVXDf1bbw7N47rzBBEVZYOe3adyBhYTVRw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=caaGuehp; 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=1681197086; 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=qDpfvPEl74Z2k0DbB37YNZp4yILSm+7qaUe0dKztgRM=; b=I9lO2pAsPfDKP1IDnX4ITW8RbcPpsHDirg5x+rMDjjjZzJCUVbOBX7YrgJz86dCBYBbJTl ryJ/vk+Me2vUJN6E9BWbXV56f871f8o0Zl2sj+CfJYnRmRIhe6RA5vRA2WM4nONE2Hysej T+iX1w3LseMpxL47VCkxN4zccOXGoZ6GWH1YAdPyHwBydDO8Ku2nCHx+9ELop1mMCRZrRX i8NhyGibe7v5ooxWiN8zHwn5ptJz/ziGW5Q4tsv/q0VwtMZMiwUUqkzvHQIbZPdcf8hdWB QW1nayGB/+EmhAkajDz1F9icwqfZg5Z7M+LIsQDi1paoHcdvrVdQV40lCNeMPQ== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=caaGuehp; 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: -1.92 X-Spam-Score: -1.92 X-Migadu-Queue-Id: B299F2402B X-TUID: EEltLRn5coyZ * 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, libpanel): Use glib. * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. * gnu/packages/music.scm (zrythm): 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 | 6 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/music.scm | 4 +- .../patches/glib-skip-failing-test.patch | 3 +- 6 files changed, 34 insertions(+), 81 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f85d5e3225..d9a9c58fbb 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 6db6004356..99ca0fef88 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13174,7 +13174,7 @@ (define-public sysprof (propagated-inputs (list polkit)) (inputs - (list glib-next + (list glib gtk json-glib libadwaita @@ -13183,7 +13183,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)) @@ -13452,7 +13452,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)) @@ -13460,7 +13460,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 e4026c601f..89ce459e4c 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 @@ -3063,11 +3063,11 @@ (define-public libpanel (substitute* "meson.build" (("gtk_update_icon_cache: true") "gtk_update_icon_cache: false"))))))) - (native-inputs (list `(,glib-next "bin") + (native-inputs (list `(,glib "bin") gobject-introspection pkg-config vala)) - (inputs (list glib-next gtk libadwaita)) + (inputs (list glib gtk libadwaita)) (home-page "https://gitlab.gnome.org/GNOME/libpanel") (synopsis "Dock and panel library for GTK 4") (description "Libpanel provides a library to create IDE-like applications diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fd8fb25da1..e6cef165ea 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2327,7 +2327,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/music.scm b/gnu/packages/music.scm index 69fe7009be..5a28e1321f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6481,7 +6481,7 @@ (define-public zrythm flex font-dseg gettext-minimal - glib-next + glib glibc graphviz gtk @@ -6519,7 +6519,7 @@ (define-public zrythm ;; XDG_DATA_DIRS. (list breeze-icons ;native because not executable help2man - `(,glib-next "bin") ;for 'glib-compile-resources' + `(,glib "bin") ;for 'glib-compile-resources' pkg-config python-sphinx python-sphinx-intl 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