From patchwork Thu Mar 30 04:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48890 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E03661729C; Fri, 31 Mar 2023 22:50:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F3C416F3F for ; Fri, 31 Mar 2023 22:50:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcN-0006D8-9T; Fri, 31 Mar 2023 17:49:07 -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 1piMcM-0006CW-Kd for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -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 1piMcM-0001XR-DK for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcM-0001tm-AB for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37. 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:06 +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.16802993417205 (code B ref 62467); Fri, 31 Mar 2023 21:49:06 +0000 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:01 +0000 Received: from localhost ([127.0.0.1]:34749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcG-0001s2-M4 for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:49:01 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:45040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbv-0001pV-1D for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:39 -0400 Received: by mail-ed1-f67.google.com with SMTP id eh3so94944135edb.11 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299313; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=0kftSHt/a397Gys1SQBJJS7/U4ifOaMSO+lHNcd0RhA=; b=TttTB2AI3yKXG7voUrKUogba4KKVEcCSX0cABrguazZCvcf8+mbc/iC3/ztKQcp+uv jhC75QBTb7+Ra8pB2cT33RfLc3PolpQj8wXjklfyqDVPaYYWDzJArTpf9x98z9NdWwHt +h14AKLWjUbnodtZD17rucNjpIFva/hmx7MI9LTevNQg8COoaO8I1ttZ5vu8nOwBHLG7 bB2hK2HyHwE5fPAkGYKoKKLbmVOrWkrZrFzeGL60boaF0+b9tmwKp2N0VOAca4DDfsqM laxTPvUFmCBw7Jy3DudCRElnDeIwXeAo3YYWSzwNaDpooY+dVUQTCTzMHGT4GVT4PrW8 B1dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299313; 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=0kftSHt/a397Gys1SQBJJS7/U4ifOaMSO+lHNcd0RhA=; b=FNCMDizEoyl0ltXp2eq1HOJfuru4CyucIuY0fm3z3R8dAMUhKIAOhVuucyuNUroulW BtkCgraHp8P4XuLrwxbFv7WbzvmxAfB7pqlWAempFsY7K1o5BM7wqo3kAlS2G7xACC5+ KQ06t2WDYbpYwIUIOxkgvXeX9j3h7T1a/Q1r453GHuVIbKJklFO5qLdBi8GQGCuEQTXN HbrZYP0DUNub9Xru8fAd6xRfbk1AIgfbjbI8SDTPhWLx6DMxIJbHUevAIXohCpGSir66 og/872O0HOOd++fOYt3d0QgsqmCVsKIvSKL6gkEbLbiBxf9VUTjeMmf3J71T1uJOlc3V wauQ== X-Gm-Message-State: AAQBX9enc70DXxR8qfu17Ih87ZWevbFxtsc1e1sF8+V/P2D0fpNFo88q d70T0z3L/AIF86hhP+Ac3Z7Pft7NQKpDVw== X-Google-Smtp-Source: AKy350aB3gsqusCfQqOOUtE7GTxjcvXR5D73nBgsDbDu5Z1aQs9NS10x44OycAtnqt84YoL8uK0A9g== X-Received: by 2002:a17:907:a406:b0:947:54ae:806 with SMTP id sg6-20020a170907a40600b0094754ae0806mr8682706ejc.1.1680299313500; Fri, 31 Mar 2023 14:48:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:33 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 30 Mar 2023 06:28:00 +0200 MIME-Version: 1.0 Message-ID: <95f94cbe9b3f1cee46e75577f9aac5cb751c83a4.camel@gmail.com> 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gtk.scm (gtk+): Update to 3.24.37. [native-inputs]: Add docbook-xsl. [build-system]: Use meson-build-system. [arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly. <#:phases>: Remove ‘generate-gdk-pixbuf-loaders-cache-file’. Adjust ‘disable-failing-tests’. Rename ‘move-desktop-files’ to ‘move-files’ 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.patch")))) (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-or-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=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html") - "--enable-cloudproviders" + #:configure-flags (list "-Dcloudproviders=true" ;; The header file is required ;; by gnome-control-center - "--enable-wayland-backend" + "-Dwayland_backend=true" ;; This is necessary to build both backends. - "--enable-x11-backend" + "-Dx11_backend=true" ;; This enables the HTML5 websocket backend. - "--enable-broadway-backend") + "-Dbroadway_backend=true" + "-Dman=true") #: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-names") - "builderparser cellarea check-cursor-names") - (("notify no-gtk-init object objects-finalize papersize rbtree") - "no-gtk-init papersize rbtree") - (("stylecontext templates textbuffer textiter treemodel treepath") - "stylecontext textbuffer textiter treemodel treepath")) - (substitute* "testsuite/a11y/Makefile.in" - (("accessibility-dump tree-performance text children derive") - "tree-performance text children derive")) - (substitute* "testsuite/reftests/Makefile.in" - (("TEST_PROGS = gtk-reftest") - "TEST_PROGS = ")) - #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")