From patchwork Sat Mar 5 15:00:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 37619 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 8DD8927BBEB; Sat, 5 Mar 2022 15:18:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,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 5DD0727BBEA for ; Sat, 5 Mar 2022 15:18:14 +0000 (GMT) Received: from localhost ([::1]:37352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQWAf-0000Ql-Ei for patchwork@mira.cbaines.net; Sat, 05 Mar 2022 10:18:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQWAU-0000K3-9a for guix-patches@gnu.org; Sat, 05 Mar 2022 10:18:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54953) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQWAU-0007sX-0X for guix-patches@gnu.org; Sat, 05 Mar 2022 10:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQWAT-0006SJ-Ss for guix-patches@gnu.org; Sat, 05 Mar 2022 10:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54261] [PATCH]: Update GTK to 4.6.1. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Mar 2022 15:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54261@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164649346324787 (code B ref -1); Sat, 05 Mar 2022 15:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Mar 2022 15:17:43 +0000 Received: from localhost ([127.0.0.1]:48848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQWA6-0006Rd-RX for submit@debbugs.gnu.org; Sat, 05 Mar 2022 10:17:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:53726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQWA4-0006RV-7u for submit@debbugs.gnu.org; Sat, 05 Mar 2022 10:17:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQWA4-00072e-2Y for guix-patches@gnu.org; Sat, 05 Mar 2022 10:17:36 -0500 Received: from m12-18.163.com ([220.181.12.18]:28631) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQW9v-0007qe-RM for guix-patches@gnu.org; Sat, 05 Mar 2022 10:17:31 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=nbEd0 MNoY5eM05+EwfhJSp6iUEHuBxCgr7+wA5IqCZw=; b=E+pC7naFNN+OAZW8BP1t2 +q1iz59mKyt+aTqSlbAKTPd3/e0MUaOBcDMvNMCxwBRE2weqH5fIE1vsCf7q5HAp t3BBy+r99qlKHZJ/TQFMzwMH+ndEeYiJy3qsF30XVQq6TW6aIyPODWHhRUaj/cmf rubvYNIhTmItrl8wx5y0W8= Received: from asus-laptop (unknown [14.150.111.161]) by smtp14 (Coremail) with SMTP id EsCowABnvIxoeyNi8Zr1Fg--.437S2; Sat, 05 Mar 2022 23:02:04 +0800 (CST) User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Sat, 05 Mar 2022 23:00:13 +0800 Message-ID: <86pmn04f4s.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: EsCowABnvIxoeyNi8Zr1Fg--.437S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU5dgCUUUUU X-Originating-IP: [14.150.111.161] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPQy6r2AY-CrUUwAAsN Received-SPF: pass client-ip=220.181.12.18; envelope-from=all_but_last@163.com; helo=m12-18.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches These patches add pango 1.50.4 and update GTK to 4.6.1. I've test the celluloid and gnome-todo and they builts successfully(depends on GTK4). I also want to update libadwaita to 1.0.2, but it breaks gnome-todo. From b542dce1f2a7b7eea7a254d1f1a05df26367b5ac Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 22:40:46 +0800 Subject: [PATCH 2/2] gnu: gtk: Update to 4.6.1. * gnu/local.mk (dist_patch_DATA): Remove gtk-introspection-test.patch. * gnu/packages/patches/gtk-introspection-test.patch: Remove. * gnu/packages/gtk.scm (gtk): Update to 4.6.1. [source]: Remove stale patch. [arguments]: Add 'patch-rst2man' phase, correct the binary name of rst2man to 'rst2man.py' [inputs]: Add libjpeg-turbo, libpng, libtiff. [native-inputs]: Add python-docutils. [propagated-inputs]: Use pango-1.50. --- gnu/local.mk | 1 - gnu/packages/gtk.scm | 17 +++++++++----- .../patches/gtk-introspection-test.patch | 22 ------------------- 3 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/gtk-introspection-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index c8026a1ec1..1e0bb0c00c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1244,7 +1244,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk-doc-respect-xml-catalog.patch \ - %D%/packages/patches/gtk-introspection-test.patch \ %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b9f8bc324f..11c99fb71b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1076,7 +1076,7 @@ (define-public gtk+ (define-public gtk (package (name "gtk") - (version "4.4.1") + (version "4.6.1") (source (origin (method url-fetch) @@ -1084,10 +1084,9 @@ (define-public gtk (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1x6xlc063nqp7cg6py4kq1kpw9pkq49ifk5kki0brc667ncdmahg")) + (base32 "0pzcs24j67f90kjcp6apgn6rffynxksjm1m7d3an7kdv3k90hmfq")) (patches - (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch" - "gtk-introspection-test.patch")))) + (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")))) (build-system meson-build-system) (outputs '("out" "bin" "doc")) (arguments @@ -1117,6 +1116,10 @@ (define-public gtk (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 'patch-rst2man + (lambda _ + (substitute* "docs/reference/gtk/meson.build" + (("find_program\\('rst2man'") "find_program('rst2man.py'")))) (add-after 'unpack 'patch (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) ;; Correct DTD resources of docbook. @@ -1194,6 +1197,7 @@ (define-public gtk ("pkg-config" ,pkg-config) ("python-pygobject" ,python-pygobject) ;; These python modules are required for building documentation. + ("python-docutils" ,python-docutils) ("python-jinja2" ,python-jinja2) ("python-markdown" ,python-markdown) ("python-markupsafe" ,python-markupsafe) @@ -1216,7 +1220,10 @@ (define-public gtk iso-codes json-glib libcloudproviders ;for cloud-providers support + libjpeg-turbo + libpng librsvg + libtiff python rest tracker)) ;for filechooser search support @@ -1239,7 +1246,7 @@ (define-public gtk ("libxkbcommon" ,libxkbcommon) ("libxrandr" ,libxrandr) ("libxrender" ,libxrender) - ("pango" ,pango) + ("pango" ,pango-1.50) ("vulkan-headers" ,vulkan-headers) ("vulkan-loader" ,vulkan-loader) ;for vulkan graphics API support ("wayland" ,wayland) ;for wayland display-backend diff --git a/gnu/packages/patches/gtk-introspection-test.patch b/gnu/packages/patches/gtk-introspection-test.patch deleted file mode 100644 index 570ea806a9..0000000000 --- a/gnu/packages/patches/gtk-introspection-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -# Extend rather than stomp environment variables. -# Upstream status: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4268 -diff --git a/testsuite/introspection/meson.build b/testsuite/introspection/meson.build -index 6202fb7446..b59191eb0f 100644 ---- a/testsuite/introspection/meson.build -+++ b/testsuite/introspection/meson.build -@@ -1,9 +1,10 @@ -+env = environment() -+env.prepend('GI_TYPELIB_PATH', -+ join_paths(project_build_root, 'gtk'), -+ gi_dep.get_pkgconfig_variable('typelibdir')) -+env.prepend('LD_PRELOAD', join_paths(project_build_root, 'gtk', 'libgtk-4.so')) - - test('api', - find_program('api.py', dirs: meson.current_source_dir()), - suite: ['introspection'], -- env: [ -- 'GI_TYPELIB_PATH=@0@/gtk:@1@'.format(project_build_root, -- gi_dep.get_pkgconfig_variable('typelibdir')), -- 'LD_PRELOAD=@0@/gtk/libgtk-4.so'.format(project_build_root), -- ]) -+ env: env) -- 2.34.0