From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id wNQvIloINWQvngAASxT56A (envelope-from ) for ; Tue, 11 Apr 2023 09:12:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OPcsIVoINWQddwEAG6o9tA (envelope-from ) for ; Tue, 11 Apr 2023 09:12: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 37B47CC09 for ; Tue, 11 Apr 2023 09:12:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89n-0004Hk-PO; Tue, 11 Apr 2023 03:11:11 -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 1pm89k-0004FQ-C1 for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:08 -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 1pm89j-0000wf-Oj for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89j-0008JW-Kc for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 11/15] 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: Tue, 11 Apr 2023 07:11:07 +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.168119702931810 (code B ref 62467); Tue, 11 Apr 2023 07:11:07 +0000 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:29 +0000 Received: from localhost ([127.0.0.1]:36479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm897-0008Gt-0D for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:29 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:43939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88z-0008E6-Fo for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:22 -0400 Received: by mail-ej1-f68.google.com with SMTP id sh8so17781850ejc.10 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197016; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=KmKyheuo+WljJzomi+AFHXKDZEYe72cFaM4ASHYZgBE=; b=YRx037c7coA4SixAD7n97JAtM3SioXvcR/vGOpHTX2q0tPQneG7j8m7eoq0QzVX+Z9 XczdTq0BJ7AZmNjM+chG6RIq7DKNKtOtM24D20S1Zep+8Y+3wa8AJ3UHf8KmDuJZmaV8 engVhDlDt4+1elOE/osziryz4Y+qQc8LUu3khw/o6vLlyYYRKYXYleNgWMuW1cfuwCLv m0q2VmObbJ5un6P6rB8vM5uXI4oOVqgeN/LAUu7Eiv54Zc2Ft8hIJVtZ6PfkChvqVumZ Y6+JYJBz5q+WJQI31DRHEHAqf8VJc+9Uk+UGek0My0FnxAdQ87aGPkqPP9GnPArwM5/+ UYdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197016; 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=KmKyheuo+WljJzomi+AFHXKDZEYe72cFaM4ASHYZgBE=; b=ZpKc5jNhbjzceqx3GvX99Sb61AhaVdJhH5xBMQAD4p1/SmJZxFe5Y7Su6fLvX3ppYC /jOGso2xABOgRZmq9fsPcKywkQ6yhSmBDaxNOWxnDpC8QN/AUemFzGARfgyLDxxrSKI9 IUn5b/JnmG0brSp3pvCizcegUIOmL7YpQgEv/OYruR4RYEQ0CGqJ+Fswh0fwDa+O9FT5 79gneM7ILYKMUpv6egRpWfw3g3B6d4g9uEtfXDN58YmLIq1d5UG/Wgdctzn31evpHSKG urLm4GUQ0HxR0twYDVK2q72BGxN1pjWRg3xAf4AAKLdMZb9t2v1tHbMe4zaHRgU6K/FO F3LQ== X-Gm-Message-State: AAQBX9e58UvRQjkBuKkeR9A81Cz9Rrv4XgvCl2DiW5jlsNr2pfKGXWXp R0C/9SyT/xAZPLHprY59gnb70fV9WCGubw== X-Google-Smtp-Source: AKy350Z6o7vJsBRsEqGsgbjm7aIc2ruKMrFtTfy+lsXXNL+gPsN0w1wWtCCE7Brm5Ah0ubbywCmxEA== X-Received: by 2002:a17:906:70cf:b0:939:e870:2b37 with SMTP id g15-20020a17090670cf00b00939e8702b37mr11257502ejk.70.1681197015720; Tue, 11 Apr 2023 00:10:15 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:15 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 30 Mar 2023 06:28:00 +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=1681197146; a=rsa-sha256; cv=none; b=epPCqFnWYIv2NB0HwqGkOtS7PUX7ZNTWUp9u6HQXdOxV6SiT1m62ALA/s6FpzpVMi9hFo6 1QjXerMnd/gwWKeF1/yzDEaPiFMXv8vvErIpw8C/33pZQ9uWpSe5k8RnUrZtYcuziWqdC5 GO2X2aeumrdQkfqggfKThogK2p0LckopxMaIIMcQUsXI9RRwoFcxRSKRufhEsDPmVKorO+ xurtJdoT6djVz9RqOyVLHnpq1lMQ0EFHFWpaq8jc9gKodgp7+PYb+FgcVM+6fEBBFHUYpb TdDiXyRNadZTj9fINq4ptEq0DX8UBy/VwLg2Wo2eQKCyq3fdKTqF6R/RyQA7Bg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=YRx037c7; 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=1681197146; 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=KmKyheuo+WljJzomi+AFHXKDZEYe72cFaM4ASHYZgBE=; b=IwH1lWg3DbcSZ4QDY4EEMeVCteeonnqVbbJwDbU5wew2rGyCLeDw1nvXelUHOQpcsYT5vc 8Ckp3J0LzPq4BFEIpoOk0yiJKTQPUCt3poMTKl1wKtkx63qqV2/74IvLFke5K+QbPSridU r8CIrVTtNCH/RnRt7WQd+fBr+MvG9XVMw0DqzBJhN2jsUru1pN9stlQS+sOtaEhxYRj5Um f2q9IKWRfB+OsNlM9X3dTGFbhDqy5NOsB33GzPBdI3XSqks7sNgUYxwFAX0OWw4owGQYnI h12+ub+MFtrTeBUR2vsuyqODNpSfMJg5j2F9bMsWHRwybxxqNKEHq3X50K6TnA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=YRx037c7; 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.42 X-Spam-Score: -2.42 X-Migadu-Queue-Id: 37B47CC09 X-TUID: GaLGE3Ul+mt9 * 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 6d3bbb42be..e49115ad0e 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") -- 2.39.2