From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 uBhBG/PBMWSWmQAASxT56A (envelope-from ) for ; Sat, 08 Apr 2023 21:35:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 2CYiG/PBMWSLYgAAauVa8A (envelope-from ) for ; Sat, 08 Apr 2023 21:35:15 +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 EBD102F325 for ; Sat, 8 Apr 2023 21:35:14 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1plEL2-0004uY-Rj; Sat, 08 Apr 2023 15:35:04 -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 1plEL0-0004uB-JE for guix-patches@gnu.org; Sat, 08 Apr 2023 15:35:02 -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 1plEL0-0000sT-8u for guix-patches@gnu.org; Sat, 08 Apr 2023 15:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1plEL0-00087r-4j for guix-patches@gnu.org; Sat, 08 Apr 2023 15:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Apr 2023 19:35: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: Liliana Marie Prikler Cc: rg@raghavgururajan.name, 62467@debbugs.gnu.org Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168098249731219 (code B ref 62467); Sat, 08 Apr 2023 19:35:02 +0000 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:34:57 +0000 Received: from localhost ([127.0.0.1]:59576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEKu-00087T-Lk for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:34:57 -0400 Received: from mail-qv1-f49.google.com ([209.85.219.49]:37719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEKs-000879-9q for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:34:54 -0400 Received: by mail-qv1-f49.google.com with SMTP id l1so4383647qvv.4 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982488; x=1683574488; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=vwRkXbWGLA3Xo/Ul11QiEGNCPfLBrfl3ZbJ26XiSKrs=; b=hBNr0/IK4GhP4JX0gs1Dd1sRngZ9Z2netCEn6CAQfMFs1jUpatxtE/mHOGl7J8IKzw 6a8iwp5/Ckl5fATqrdzitAebfX+uoi31y25uRTFyOI4YKorA6m4eDlrMYOwVs1qbQo5T T7zaNfbIkwnb3R2jBUG46EYqe3JOZIilyFOePfOSYw9JkJcBVzBfNAi6db5GfMnltn6d kqnY6TuwXdb8JHf0LQHNYvoHeupUxnFsyST2IBfLK1cL2+8QnHHXW8DMlqAPY/ydCaYB gBJIYfxR3D5TyZwYuxippMGoASW9l34qFHFs5P8wSRYZZ3lzJBk5kyMIs6dr2JALbOrA /b4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982488; x=1683574488; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vwRkXbWGLA3Xo/Ul11QiEGNCPfLBrfl3ZbJ26XiSKrs=; b=HTyhFBZl7vxCD5aM8LBtQh9WSaidr7MLpXe+QFV0Xg5UYBRJF2lJjMh5zTfHFGt12m zMMuvKmpRQ1vKCNHwwG0QxPlE3+O1pM6Iv4WdAPw9NeDnV6CFnLlThQWzcEOTerFd/xO j5aFqC2t++9hNXBLlvL1J6IH8cU6aS3CjlV9Yy3fF1pouHFQQh99AgFUjLEELns91j85 hM6dwv9oRp3Mg38eOMVin/5NnbA4hCu8slgcAUkBApXsZ5hcnsXG8bZHoJOqmKOy5WyJ 2/wOZwdwgmDjJ1Hiwwtpk2RnZ1P6t+4+BZviWy1ShqcMoUzvX2MHKYTt1U/r5g1+mLqv /u5A== X-Gm-Message-State: AAQBX9d1i73C7KvJ/LwyfV/XSyoK9mwXhX5TC+zHQ1E+pJeDUShydq6I B4RW8oHJT8jzdJb45XPhUSE= X-Google-Smtp-Source: AKy350Ytjw28B0Nqg9bC7X8/+uqa+lSLVxAFBJV8hITr5uFQqF/ZuvxhnwYwad/j3XFeONKF7D/IEw== X-Received: by 2002:a05:6214:c2f:b0:5a2:e3e4:59b0 with SMTP id a15-20020a0562140c2f00b005a2e3e459b0mr10715342qvd.44.1680982488247; Sat, 08 Apr 2023 12:34:48 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id w2-20020a0562140b2200b005ea9156e72bsm104737qvj.33.2023.04.08.12.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:34:47 -0700 (PDT) From: Maxim Cournoyer References: <95f94cbe9b3f1cee46e75577f9aac5cb751c83a4.camel@gmail.com> Date: Sat, 08 Apr 2023 15:34:46 -0400 In-Reply-To: <95f94cbe9b3f1cee46e75577f9aac5cb751c83a4.camel@gmail.com> (Liliana Marie Prikler's message of "Thu, 30 Mar 2023 06:28:00 +0200") Message-ID: <87ile6rwvd.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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=1680982515; a=rsa-sha256; cv=none; b=djGMbWQ/iIRPj5fvqCOkUds64RE3C+Ox3pZTuCFT8RCfX8vrwVuDQw/jYX2nreQ6fxDH7N DUXzJ2g216tEj9BlzPwA+ipWCI4FWQ5Z0Nys4Qm5NW8mkQE8NAW8hFiBV9wCXddsYjDNA5 ycH+KgBriPkQl5YMtlXyhgTU86FhJFTNZ5NJWi7qB1DBk90pQV9wqNDdxLsJJ43tUW32wx mkbHnRU3O0iz7bVDULEVAQ+L3AvQ6ALmin3/+p43vpzOYWDNa9wUNEKLuZOoaUWMNkdIvh 3svx+CJBlfO/Zs/YZLYsHzwvVNeF9GZxw0EDFFzq+9CIokTfSFOINoyvnS9bPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="hBNr0/IK"; 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=1680982515; 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=vwRkXbWGLA3Xo/Ul11QiEGNCPfLBrfl3ZbJ26XiSKrs=; b=T8df/isO2+FEi2/OcQDreG7K4UiODFCpH8/bOx+RyvxJE6jbID+1XfWIQHN7FS00/xl7Mv gjYajNi6ZBZDTb0YNN+/Ywe18YVHq3TD282rjUZoaUXrWcOAXucn0zllpMkQV037bWa8AX JCzI0uV7S4w8BubaQHs1yj+Fpg/hkCfO3NigQSey1q0MyTXiCRHRM/EjDUPAaWGK/8hQSv KITdD6XVonDjmWApWR+TZs/ui+FEnSE1JkS7JiFJve5IOuTlJTVLBi4quA4BSuYmzcxYuA 6ld1Z4uix2BJoK81dJeV4xr9LTNE9XKIG3/gX4V3Jo1VA5LPIVgGxB3frrLyng== X-Migadu-Spam-Score: 7.28 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="hBNr0/IK"; 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-Spam-Score: 7.28 X-Migadu-Queue-Id: EBD102F325 X-TUID: noX213c8sR+K Hi, Liliana Marie Prikler writes: > * gnu/packages/gtk.scm (gtk+): Update to 3.24.37. > [native-inputs]: Add docbook-xsl. > [build-system]: Use meson-build-system. > [arguments]: Add =E2=80=98glib-or-gtk?=E2=80=99. Adjust configure-flags = accordingly. > <#:phases>: Remove =E2=80=98generate-gdk-pixbuf-loaders-cache-file=E2=80= =99. > Adjust =E2=80=98disable-failing-tests=E2=80=99. > Rename =E2=80=98move-desktop-files=E2=80=99 to =E2=80=98move-files=E2=80= =99 and move documentation as well. > --- > gnu/packages/gtk.scm | 85 +++++++++++++++++++++++--------------------- > 1 file changed, 44 insertions(+), 41 deletions(-) > > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm > index 196d767160..75e56d4166 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -1101,7 +1101,7 @@ (define-public gtk+ > (package > (inherit gtk+-2) > (name "gtk+") > - (version "3.24.30") > + (version "3.24.37") > (source > (origin > (method url-fetch) > @@ -1110,7 +1110,7 @@ (define-public gtk+ > name "-" version ".tar.xz")) > (sha256 > (base32 > - "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds")) > + "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7")) > (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" > "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) > (propagated-inputs > @@ -1152,6 +1152,7 @@ (define-public gtk+ > rest)) > (native-inputs > (list docbook-xml-4.1.2 > + docbook-xsl > gettext-minimal > `(,glib "bin") > gobject-introspection > @@ -1164,47 +1165,29 @@ (define-public gtk+ > ;; of updating xorg-server directly on the master branch. > xorg-server-for-tests > libxslt)) > + (build-system meson-build-system) > (arguments > - `(#:imported-modules ((guix build glib-or-gtk-build-system) > - ,@%gnu-build-system-modules) > - #:modules ((guix build utils) > - (guix build gnu-build-system) > - ((guix build glib-or-gtk-build-system) #:prefix glib-o= r-gtk:)) > + `(#:glib-or-gtk? #t > #:disallowed-references (,xorg-server-for-tests) > - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB= goes > - ;; to "doc". > - #:configure-flags (list (string-append "--with-html-dir=3D" > - (assoc-ref %outputs "doc") > - "/share/gtk-doc/html") > - "--enable-cloudproviders" > + #:configure-flags (list "-Dcloudproviders=3Dtrue" > ;; The header file is = required > ;; by gnome-control-center > - "--enable-wayland-backend" > + "-Dwayland_backend=3Dtrue" > ;; This is necessary to build both backen= ds. > - "--enable-x11-backend" > + "-Dx11_backend=3Dtrue" > ;; This enables the HTML5 websocket backe= nd. > - "--enable-broadway-backend") > + "-Dbroadway_backend=3Dtrue" > + "-Dman=3Dtrue") > #:phases > (modify-phases %standard-phases > - (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file > - (assoc-ref glib-or-gtk:%standard-phases > - 'generate-gdk-pixbuf-loaders-cache-file)) > (add-after 'unpack 'disable-failing-tests > (lambda _ > - (substitute* "testsuite/gtk/Makefile.in" > - (("builderparser cellarea check-icon-names check-cursor-n= ames") > - "builderparser cellarea check-cursor-names") > - (("notify no-gtk-init object objects-finalize papersize r= btree") > - "no-gtk-init papersize rbtree") > - (("stylecontext templates textbuffer textiter treemodel t= reepath") > - "stylecontext textbuffer textiter treemodel treepath")) > - (substitute* "testsuite/a11y/Makefile.in" > - (("accessibility-dump tree-performance text children deri= ve") > - "tree-performance text children derive")) > - (substitute* "testsuite/reftests/Makefile.in" > - (("TEST_PROGS =3D gtk-reftest") > - "TEST_PROGS =3D ")) > - #t)) > + (substitute* "testsuite/gtk/meson.build" > + (("\\['defaultvalue'\\],") "") > + (("\\['objects-finalize', .*\\],") "")) > + (substitute* "testsuite/reftests/meson.build" > + (("'flipping-icons(\\.[^.]*)?\\.ui',") "") > + (("'gtk-icontheme-sizing(\\.[^.]*)?\\.ui',") "")))) > (add-before 'check 'pre-check > (lambda _ > ;; Tests require a running X server. > @@ -1217,15 +1200,35 @@ (define-public gtk+ > ;; For missing '/etc/machine-id'. > (setenv "DBUS_FATAL_WARNINGS" "0") > #t)) > - (add-after 'install 'move-desktop-files > - ;; Move desktop files into 'bin' to avoid cycle references. > + (add-after 'install 'move-files > (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out")) > - (bin (assoc-ref outputs "bin"))) > - (mkdir-p (string-append bin "/share")) > - (rename-file (string-append out "/share/applications") > - (string-append bin "/share/applications")) > - #t)))))) > + (define-values (out bin doc) > + (values (assoc-ref outputs "out") > + (assoc-ref outputs "bin") > + (assoc-ref outputs "doc"))) > + (for-each mkdir-p > + (list > + (string-append bin "/bin") > + (string-append bin "/share/applications") > + (string-append bin "/share/icons") > + (string-append bin "/share/man") > + (string-append bin "/share/metainfo") > + (string-append doc "/share/doc"))) > + ;; Move programs and related files to output 'bin'. > + (for-each (lambda (dir) > + (rename-file > + (string-append out dir) > + (string-append bin dir))) > + (list > + "/bin" > + "/share/applications" > + "/share/icons" > + "/share/man")) > + ;; Move HTML documentation to output 'doc'. > + (when (file-exists? (string-append out "/share/doc")) > + (rename-file > + (string-append out "/share/doc") > + (string-append doc "/share/doc")))))))) > (native-search-paths > (list (search-path-specification > (variable "GUIX_GTK3_PATH") Sorry for not noticing about this earlier; I pushed a change to core-updates already with the update, but failed to manually moved the binaries to the "bin" output, expecting the meson build system to do that for us (it didn't). I'm not testing a change to the meson-build-system; will push if it fixes this as I expect and doesn't seem to introduce new issues. --=20 Thanks, Maxim