From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 05 10:17:43 2022 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 To: guix-patches@gnu.org Subject: [PATCH]: Update GTK to 4.6.1. Date: Sat, 05 Mar 2022 23:00:13 +0800 Message-ID: <86pmn04f4s.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain 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. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYiN7YxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/l5/wD+MRikt5Mum9cdF/gW1J7z+WR5jW9W wpHffHeuhjnoemQBAMuUI0JPUIpRwlUAcM0oD157iO1VWo6Y3dxOksNGtJgM =7BFZ -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-pango-Add-version-1.50.4.patch Content-Transfer-Encoding: quoted-printable >From cdad10dfd07b2007d5b2d76098a4a36ab62ce3ec Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 21:36:25 +0800 Subject: [PATCH 1/2] gnu: pango: Add version 1.50.4. * gnu/packages/gtk.scm(pango-1.50): New variable. --- gnu/packages/gtk.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 29302051c1..b9f8bc324f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2021 Simon Streit ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 Wamm K. D. +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,6 +410,22 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) =20 +;; TODO: Make this the default package next in release cycle. +(define-public pango-1.50 + (package + (inherit pango) + (name "pango") + (version "1.50.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) + (sha256 + (base32 + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))= )) + (define-public pango-1.42 (package (inherit pango) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-gtk-Update-to-4.6.1.patch >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 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 05 10:56:11 2022 Received: (at 54261) by debbugs.gnu.org; 5 Mar 2022 15:56:11 +0000 Received: from localhost ([127.0.0.1]:48885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQWlP-0007Rb-Kv for submit@debbugs.gnu.org; Sat, 05 Mar 2022 10:56:11 -0500 Received: from m12-12.163.com ([220.181.12.12]:12149) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQWlK-0007Qz-KE for 54261@debbugs.gnu.org; Sat, 05 Mar 2022 10:56:09 -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=OHHkN bUWcXXmNtl+Wha/yWDSHCEcr8elhifTe9v7eV8=; b=U1VAvxJaFkwZu0SoT3qaQ ZiibXmU/qMZVjIOc3f0p9tTjYlI/37XNq8l8CVAvn3W7tKKFt2gZSIy1QiZ5OVo5 qrUJr7+2pcTpgM/uXdPIFvCcswuJFxQcDOrVTKOOHQZAzGnYFnMn9cpFzAM2KpoR RocxoaHfzP5s7HX2IEARFQ= Received: from asus-laptop (unknown [14.150.111.161]) by smtp8 (Coremail) with SMTP id DMCowAC3sroJiCNiTOH8Fw--.349S2; Sat, 05 Mar 2022 23:55:55 +0800 (CST) References: <86pmn04f4s.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: 54261@debbugs.gnu.org Subject: Re: bug#54261: Acknowledgement ([PATCH]: Update GTK to 4.6.1.) Date: Sat, 05 Mar 2022 23:55:18 +0800 In-reply-to: Message-ID: <864k4c4cmv.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: DMCowAC3sroJiCNiTOH8Fw--.349S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RAL05UUUUU X-Originating-IP: [14.150.111.161] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbByQO6r11vn58fKgABsZ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Typo: next in release cycle -> in next release cyle. Maybe call pango-1.50 'pango-next'?=20 =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYiOICBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kIWgD/X6RVNC8r9+N/qadzLUplvdxzSVHc Ge6nqJp4IBHdf1oA/i1KTbemIJCR/8bBs2+YZ2CFPT1rRJGoRDjzor10KOYA =Dewq -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 11 10:16:52 2022 Received: (at 54261) by debbugs.gnu.org; 11 Mar 2022 15:16:53 +0000 Received: from localhost ([127.0.0.1]:38167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSh0a-0002IF-M8 for submit@debbugs.gnu.org; Fri, 11 Mar 2022 10:16:52 -0500 Received: from m12-16.163.com ([220.181.12.16]:44746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSh0X-0002Hv-Q5 for 54261@debbugs.gnu.org; Fri, 11 Mar 2022 10:16:48 -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=co5y+ 6YX8IqIw/ZnBz09AsIfPtJbf6gkbEchZz8T7No=; b=bFJwAKWxcESQ4SJJI1Tui dq84a4z4G1vAaRR8cURqEYz7ZQ4Ef4XoSM/cO70ghGJBzcghBQsgdYZzR93cRLPu aewFg5c0nBnqHr92mDquucMlG522bV0CPcrBPy8vHfo24FW6XwzeH8uV8yrXJT7f 9cFxDeytZdpUMv4SZBqqGM= Received: from asus-laptop (unknown [14.150.111.161]) by smtp12 (Coremail) with SMTP id EMCowAAXHzPQZytidVHGAA--.16143S2; Fri, 11 Mar 2022 23:16:34 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: 54261@debbugs.gnu.org Subject: Re: bug#54261: Acknowledgement ([PATCH]: Update GTK to 4.6.1.) Date: Fri, 11 Mar 2022 23:15:20 +0800 In-reply-to: <864k4c4cmv.fsf@163.com> Message-ID: <86ilsky0xb.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: EMCowAAXHzPQZytidVHGAA--.16143S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RA9N3DUUUU X-Originating-IP: [14.150.111.161] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxLAr1et3a4SWQAAsU X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain ping. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYitn0BUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/nXigEAtZ+m/6thyiUCSGon+vQ4xvBxdVf4 8sHlEHpApb4nTDYBALbnmYNaFL/O6Jf309umQbsSs6spcTKUymosNx9ywwYM =ig8G -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-pango-Add-version-1.50.4.patch Content-Transfer-Encoding: quoted-printable >From bd53ac3a162c1f5b53363126c125d826a5cb6a6e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 21:36:25 +0800 Subject: [PATCH 1/2] gnu: pango: Add version 1.50.4. * gnu/packages/gtk.scm(pango-next): New variable. --- gnu/packages/gtk.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 29302051c1..bc7b388a88 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2021 Simon Streit ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 Wamm K. D. +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,6 +410,22 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) =20 +;; TODO: Make this the default package in next release cycle. +(define-public pango-next + (package + (inherit pango) + (name "pango") + (version "1.50.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) + (sha256 + (base32 + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))= )) + (define-public pango-1.42 (package (inherit pango) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-gtk-Update-to-4.6.1.patch >From 0c22cbd070d47b8c3b534caceb3eb05c8f7f6d41 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-next. --- 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 bc7b388a88..3d7706b9ee 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-next) ("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 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 11 10:59:32 2022 Received: (at 54261) by debbugs.gnu.org; 11 Mar 2022 15:59:32 +0000 Received: from localhost ([127.0.0.1]:38195 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nShfw-0003R7-6J for submit@debbugs.gnu.org; Fri, 11 Mar 2022 10:59:32 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:51116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nShft-0003Qy-NC for 54261@debbugs.gnu.org; Fri, 11 Mar 2022 10:59:31 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id 53zR2700a4UW6Th063zSTf; Fri, 11 Mar 2022 16:59:28 +0100 Message-ID: <8ff719da21c68f30093d4825d8491f0a6f9b92ba.camel@telenet.be> Subject: Re: [bug#54261] Acknowledgement ([PATCH]: Update GTK to 4.6.1.) From: Maxime Devos To: Zhu Zihao , 54261@debbugs.gnu.org Date: Fri, 11 Mar 2022 16:59:21 +0100 In-Reply-To: <86ilsky0xb.fsf@163.com> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-W2qGqJ05LFyI5bv5lnJH" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647014368; bh=SHLFb0dbbiaRRA6SK42HGhu84jDztiFuR/xFijwiDxM=; h=Subject:From:To:Date:In-Reply-To:References; b=ALx2fcU/7FUBgh+9RuZ5ilavbG31YtlLllho1tG/20ItHrbK7qJFT+0Hv75ZfQEpV fVCqRtc/TsOEPrul+VpBoNlDML3mPG+OGHtPlq/0rySFdzkpX58W4wEyWbZUkVjRDm 3epGmlfk29c5i9uy+uCEuTJOZuRTLTF4kl0sulvVEcE8+fPvNLsstDrDnBW3ze5hD/ 0r9VEurbQw/X6XPTfLHaVYX5r/EgpUcQSfw4VBUdvfx5GZ/I1mmTBtIqndmTHeWTzR iCps80J7qlE7Re3w7Ng6T2LnTHT4YqgwOvQ5fQbue1FEINlFLHlm7XA648kcIR3v64 IDU7VGePegTnA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54261 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-W2qGqJ05LFyI5bv5lnJH Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op vr 11-03-2022 om 23:15 [+0800]: > +;; TODO: Make this the default package in next release cycle. > +(define-public pango-next Did you mean core-updates cycle here? Greetings, Maxime --=-W2qGqJ05LFyI5bv5lnJH Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYitx2RccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jk/AP4t35kEi861T6xaG1oucPn5cxuj 2acqhEvV/DcO8rNWqwEA1mWPObweY7YVet63PgXlt0GwJw3NTY0tvJyeIesIZAY= =Ob3T -----END PGP SIGNATURE----- --=-W2qGqJ05LFyI5bv5lnJH-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 11 11:01:19 2022 Received: (at 54261) by debbugs.gnu.org; 11 Mar 2022 16:01:20 +0000 Received: from localhost ([127.0.0.1]:38204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nShhf-0003WK-OD for submit@debbugs.gnu.org; Fri, 11 Mar 2022 11:01:19 -0500 Received: from laurent.telenet-ops.be ([195.130.137.89]:60100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nShhe-0003WC-5h for 54261@debbugs.gnu.org; Fri, 11 Mar 2022 11:01:18 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by laurent.telenet-ops.be with bizsmtp id 541G270054UW6Th0141GEp; Fri, 11 Mar 2022 17:01:16 +0100 Message-ID: <149614fb88e1afab846783a5d3b1bbe0bde640f0.camel@telenet.be> Subject: Re: [bug#54261] Acknowledgement ([PATCH]: Update GTK to 4.6.1.) From: Maxime Devos To: Zhu Zihao , 54261@debbugs.gnu.org Date: Fri, 11 Mar 2022 17:01:16 +0100 In-Reply-To: <86ilsky0xb.fsf@163.com> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-tYd0hFljjt0sP2q6hxNd" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647014476; bh=dlmdAkbppIfa4ibJdgpLhO8Dks336GlnBKS18+VnwAI=; h=Subject:From:To:Date:In-Reply-To:References; b=JrHIAKH+tBXxB0cVhu0Hv6w1LqKOTW6lDzIDFjR3dGfsoCIeofMYm0Sk4wAGNIYor HKckCmQCqbn10bwU70dywb3DfnRKRFIH7ZBQHc6sJj/y3HZxOPLL64NpqTeJHrrwn/ wLmJEqBx76i3nkgCqj3wmZjN5EiCBcuZn9oPP7amKtTo29nEAsS8IoIaDC1Tf2TSH0 RXtip7l5JqueVCeX2ACThW1MIur5LSrpKavy99PAB42TsqpeLPyXVPxdoOkRKT8vRe tQDbOm5dYtLPgGx5kGvK2OGqRDvI5KJXgnZZAeZfzkJx0T5ihLor6e+3w4BXUKkqcd KFPi7Hsmho71Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54261 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-tYd0hFljjt0sP2q6hxNd Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op vr 11-03-2022 om 23:15 [+0800]: > +(define-public pango-next > +=C2=A0 (package > +=C2=A0=C2=A0=C2=A0 (inherit pango) > +=C2=A0=C2=A0=C2=A0 (name "pango") > +=C2=A0=C2=A0=C2=A0 (version "1.50.4") Due to pkg-config requiring propagation (*), this can probably unfortunately often cause profile collisions. Greetings, Maxime (*) Could be avoided by symlinking pkg-config files into the pkg-config directories of their dependent libraries, as suggested by lilyp. --=-tYd0hFljjt0sP2q6hxNd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYityTBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7kepAP0bLDtRo+8qvQZmr9y85JGUjbyx CZq0CxTlDLKRHLSBiQD+Iah4LiiZfhNJ0+w6uIqhFritsjdLWgCKDWtiWa/fWAE= =cDCS -----END PGP SIGNATURE----- --=-tYd0hFljjt0sP2q6hxNd-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 11 11:03:29 2022 Received: (at 54261) by debbugs.gnu.org; 11 Mar 2022 16:03:29 +0000 Received: from localhost ([127.0.0.1]:38221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nShjl-0003ah-8w for submit@debbugs.gnu.org; Fri, 11 Mar 2022 11:03:29 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:60602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nShji-0003aW-KQ for 54261@debbugs.gnu.org; Fri, 11 Mar 2022 11:03:27 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id 543R270064UW6Th0643RnW; Fri, 11 Mar 2022 17:03:25 +0100 Message-ID: <908be0498b9d2aa2d76f897c5f5f45ffe5261a71.camel@telenet.be> Subject: Re: [bug#54261] Acknowledgement ([PATCH]: Update GTK to 4.6.1.) From: Maxime Devos To: Zhu Zihao , 54261@debbugs.gnu.org Date: Fri, 11 Mar 2022 17:03:24 +0100 In-Reply-To: <86ilsky0xb.fsf@163.com> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-HJd02Hp0qPhZKAuJIx9j" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647014605; bh=XZdXZI5vMN1eSevPnGfvKGdcUtcEeOEiCdmz4cha/e8=; h=Subject:From:To:Date:In-Reply-To:References; b=oG3dGmHeYM6QMPo7MfcOEiw0519gvS0B0sBoDv4k6QjDthbopJPhpoUuVzARtY3ul CqMHPEo0/Z1eed4+r4EboK8OutCaHHkjVDu92kW5xz+w67djroIiIFYak6EMcWxH5E xy7zAfOz/w/Q2ANvkMdPq5higbs4bix8hUJic3GbB0FHusIUkl254E+Hy91BUll4bU rYOZ7ziXFiQ27lBPMaawrF6A4FL8JQdgGCbkV0QAbXjXsqe++C0zYPbpBjF/gwPJnz Dkoevzu+V+ULi+pGD0eNMIoJINkjiYaWPc7Zw/bXwpCGRYH1Bmtzrlb1Xsq1cDrrku iq+AaxeqxW8HA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54261 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-HJd02Hp0qPhZKAuJIx9j Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op vr 11-03-2022 om 23:15 [+0800]: > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("pango" ,pango) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ("pango" ,pango-next) What if a program uses both 'pango' and gtk? Then IIUC, it would simultanuously use pango and pango-next in the same process, which can easily cause problems (see e.g. the bug report about segfaults involving multiple libcairos). Greetings, Maxime --=-HJd02Hp0qPhZKAuJIx9j Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYityzBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7iBKAQCjSbS2ZjuJ7wXruK9bR6WR+rqG yO5AX0Wx2TciNVb8hgEAtMOQX5wt1z3hYo9d9mmIyAbaVV/e5ba1Ca0Q/ne1nAQ= =qejG -----END PGP SIGNATURE----- --=-HJd02Hp0qPhZKAuJIx9j-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 11 21:45:59 2022 Received: (at 54261) by debbugs.gnu.org; 12 Mar 2022 02:45:59 +0000 Received: from localhost ([127.0.0.1]:38890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSrlW-0005e6-Tp for submit@debbugs.gnu.org; Fri, 11 Mar 2022 21:45:59 -0500 Received: from m12-18.163.com ([220.181.12.18]:40807) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSrlT-0005dj-46 for 54261@debbugs.gnu.org; Fri, 11 Mar 2022 21:45:57 -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=JGxg7 jg9N1l1Hozu6B3ZHCOiGLq3iYOHy5a1bBZjN24=; b=YfQj5yVKk90cK91j4Epgy iR617iWQUFcY6T67UF0vpLje52C2hj5XMr4Mo54eASY4zVXspJkx0kf61HSt/vkc lO2pFO+2Z6T6ndTre0O6eDfNEsgjx/n7WBJtGun3ERb5T2xMcCpBV0oRQBNhhrQ9 wMaWFCig8/XfHxPf6qqZ6c= Received: from asus-laptop (unknown [14.150.111.161]) by smtp14 (Coremail) with SMTP id EsCowADn0hBVCSxiPKaAAA--.13486S2; Sat, 12 Mar 2022 10:45:42 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <149614fb88e1afab846783a5d3b1bbe0bde640f0.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#54261] Acknowledgement ([PATCH]: Update GTK to 4.6.1.) Date: Sat, 12 Mar 2022 10:38:57 +0800 In-reply-to: <149614fb88e1afab846783a5d3b1bbe0bde640f0.camel@telenet.be> Message-ID: <865yojnb25.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: EsCowADn0hBVCSxiPKaAAA--.13486S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kr4rXF4kJr47ZFW8tryUtrb_yoW8XrWkpF WSyr18Kr1jgr4rAr4kC3WfZr1xAr98uF4rWF43JryUKFsxXw1kA3sak398GayxZrsayw40 v3yFvF1kuw15uaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UjtCcUUUUU= X-Originating-IP: [14.150.111.161] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZhjBr1aD-aUivgAAsB X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Yes, so many packages depend on pango, we'd better to update it in 'core-up= dates'. Maxime Devos writes: > [[PGP Signed Part:Undecided]] > Zhu Zihao schreef op vr 11-03-2022 om 23:15 [+0800]: >> +(define-public pango-next >> +=C2=A0 (package >> +=C2=A0=C2=A0=C2=A0 (inherit pango) >> +=C2=A0=C2=A0=C2=A0 (name "pango") >> +=C2=A0=C2=A0=C2=A0 (version "1.50.4") > > Due to pkg-config requiring propagation (*), this can probably > unfortunately often cause profile collisions. > > Greetings, > Maxime > > (*) Could be avoided by symlinking pkg-config files into the pkg-config > directories of their dependent libraries, as suggested by lilyp. > > [[End of PGP Signed Part]] Not only for pkg-config files, but also for headers. For example, the header of gtk4 may have following lines #include > What if a program uses both 'pango' and gtk? Then IIUC, it would > simultanuously use pango and pango-next in the same process, which can > easily cause problems (see e.g. the bug report about segfaults > involving multiple libcairos). If package A propagates C@1.0 and package B propagates C@2.0. Guix will raise an error. However, it doesn't care about something like guix shell gtk pango@1.48 IDK which pango will win the game. I've asked in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44327 and suggest to introduce priority mechanism like Nix. But Ludovic Court=C3=A8s doesn't accept my suggestion. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYiwJQhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/mxBQEAqTbEzBsxLhuFSOOESbsrZjz71M0K ecp9PlXDsKMNc78BAL2b28c88aZZw5PQpcvXJjCPFqSv2bP5dkjywxpyGiMK =wEmu -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 12 04:18:04 2022 Received: (at 54261) by debbugs.gnu.org; 12 Mar 2022 09:18:05 +0000 Received: from localhost ([127.0.0.1]:39061 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSxsy-00016X-KY for submit@debbugs.gnu.org; Sat, 12 Mar 2022 04:18:04 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:36360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSxsw-000164-Og for 54261@debbugs.gnu.org; Sat, 12 Mar 2022 04:18:03 -0500 Received: from [172.20.10.9] ([188.189.198.37]) by michel.telenet-ops.be with bizsmtp id 5MJ02700A0ouAUC06MJ0zd; Sat, 12 Mar 2022 10:18:00 +0100 Message-ID: <92b1ba8ff3cb574dae5e642186b25bf204829b2d.camel@telenet.be> Subject: Re: [bug#54261] Acknowledgement ([PATCH]: Update GTK to 4.6.1.) From: Maxime Devos To: Zhu Zihao Date: Sat, 12 Mar 2022 10:17:55 +0100 In-Reply-To: <865yojnb25.fsf@163.com> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <149614fb88e1afab846783a5d3b1bbe0bde640f0.camel@telenet.be> <865yojnb25.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-+GUNbcLDTycRflzMPCAy" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647076681; bh=um8ziWet1FVnE59r+SWk/GqMt3xiCEVCjZXbx6llX/w=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=D8uP11aZIACWx791s0QWvziSEpjHdqQDEx77lch85nstSv1vttI6Fc3H5Xw6tpWzW tZ3/ICYRjOKnNMewsMiKQJ0tL9GvwGaoRVLda5V/DvLbMy9rW9d41HVtkGmRDxgwsi jLYfHDEqbjgE2oVeUQ9CtsRKDVjhFiyET4f5jEWk/kSZfH4J15VvbCfaa2kGYp2T1t ivHrAhBzpyJbKYqp78LECcAScpvL6rl/WbPn8ew1CXEkldiZZSKeKdnJmsv8fmNrpg NN443kMiop4XEw2fbv8SyYY224tvx56zNBxIweybTzCmHsIuy7ponyRZvD94F1XQQC mINhoyFBINp8A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-+GUNbcLDTycRflzMPCAy Content-Type: multipart/mixed; boundary="=-9/oG3Z32sN3JoSlBxR+r" --=-9/oG3Z32sN3JoSlBxR+r Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op za 12-03-2022 om 10:38 [+0800]: > > (*) Could be avoided by symlinking pkg-config files into the pkg- > config > > directories of their dependent libraries, as suggested by lilyp. > >=20 > > [[End of PGP Signed Part]] >=20 > Not only for pkg-config files, but also for headers. >=20 > For example, the header of gtk4 may have following lines >=20 > #include This is getting a little off-topic, but for headers, symlinking is not necessary, pango.h could be automatically replaced by the absolute file name /gnu/store/.../include/pango.h in gtk4's header, see attachement. (Idea suggested by lilyp on IRC). It needs some more work though, see TODO's and lack of documentation. Greetings, Maxime. --=-9/oG3Z32sN3JoSlBxR+r Content-Disposition: attachment; filename="absolute-inclusions.scm" Content-Type: text/x-scheme; name="absolute-inclusions.scm"; charset="UTF-8" Content-Transfer-Encoding: base64 Ozs7IEdOVSBHdWl4IC0tLSBGdW5jdGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCjs7 OyBDb3B5cmlnaHQgwqkgMjAyMiBMdWRvdmljIENvdXJ0w6hzIDxsdWRvQGdudS5vcmc+Cjs7Owo7 OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCjs7Owo7OzsgR05VIEd1aXggaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeSBpdAo7Ozsg dW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJs aXNoZWQgYnkKOzs7IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9u IDMgb2YgdGhlIExpY2Vuc2UsIG9yIChhdAo7OzsgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJz aW9uLgo7OzsKOzs7IEdOVSBHdWl4IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQg d2lsbCBiZSB1c2VmdWwsIGJ1dAo7OzsgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZl biB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgo7OzsgTUVSQ0hBTlRBQklMSVRZIG9yIEZJVE5FU1Mg Rk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZQo7OzsgR05VIEdlbmVyYWwgUHVibGlj IExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KOzs7Cjs7OyBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2 ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQo7OzsgYWxvbmcgd2l0 aCBHTlUgR3VpeC4gIElmIG5vdCwgc2VlIDxodHRwOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4K CihkZWZpbmUtbW9kdWxlIChndWl4IGJ1aWxkIGFic29sdXRlLWluY2x1c2lvbnMpCiAgIzpleHBv cnQgKGFic29sdXRlLWluY2x1c2lvbnMgcGF0Y2gtaGVhZGVyLWluY2x1c2lvbnMpCiAgIzp1c2Ut bW9kdWxlIChndWl4IGJ1aWxkIHV0aWxzKQogICM6dXNlLW1vZHVsZSAoaWNlLTkgbWF0Y2gpCiAg Izp1c2UtbW9kdWxlIChybnJzIGV4Y2VwdGlvbnMpKQoKKGRlZmluZSAoYWJzb2x1dGUtaW5jbHVz aW9ucyBmaWxlcyBoZWFkZXItbG9jYXRpb25zKQogIChzdWJzdGl0dXRlKiBmaWxlcwogICAgKCgi I2luY2x1ZGUgPCguKik+IiBvcmlnaW5hbCBoZWFkZXItbmFtZSkKICAgICAoZ3VhcmQgKGMgKChz ZWFyY2gtZXJyb3I/IGMpIG9yaWdpbmFsKSkKICAgICAgIDs7IFRPRE86IGxpYmdjYyAmIGV0Yywg bWF5YmUgYXZvaWQgaW5jcmVhc2luZyB0aGUgY2xvc3VyZSBzaXplCiAgICAgICA7OyBieSBza2lw cGluZyBnbGliYyBoZWFkZXJzIC4uLgogICAgICAgKGZvcm1hdCAjZiAiI2luY2x1ZGUgPH5hPiIK ICAgICAgICAgICAgICAgKHNlYXJjaC1pbnB1dC1maWxlIGhlYWRlci1sb2NhdGlvbnMKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJpbmNsdWRlLyIgaGVh ZGVyLW5hbWUpKSkpKSkpCgooZGVmaW5lKiAocGF0Y2gtaGVhZGVyLWluY2x1c2lvbnMgIzprZXkg aW5wdXRzIG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQogICJQYXRjaCBpbmNsdXNpb25zIGlu IEMgaGVhZGVycyBpbiBPVVRQVVRTIHRvIHVzZSBhYnNvbHV0ZSBmaWxlIG5hbWVzLiIKICAoZGVm aW5lIGhlYWRlci1sb2NhdGlvbnMgKGFwcGVuZCBvdXRwdXRzIGlucHV0cykpCiAgKGRlZmluZSBo ZWFkZXItZmlsZT8gKGZpbGUtbmFtZS1wcmVkaWNhdGUgIlxcLihofGhwcCkkIikpCiAgKGZvci1l YWNoIChtYXRjaC1sYW1iZGEKICAgICAgICAgICAgICAoKF8gLiBvdXRwdXQpCiAgICAgICAgICAg ICAgIChhYnNvbHV0ZS1pbmNsdXNpb25zCiAgICAgICAgICAgICAgICAoZmluZC1maWxlcyAoc3Ry aW5nLWFwcGVuZCBvdXRwdXQgIi9pbmNsdWRlIikgaGVhZGVyLWZpbGU/KQogICAgICAgICAgICAg ICAgaGVhZGVyLWxvY2F0aW9ucykpKQogICAgICAgICAgICBvdXRwdXRzKSkK --=-9/oG3Z32sN3JoSlBxR+r-- --=-+GUNbcLDTycRflzMPCAy Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYixlQxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7juOAP9NmvNFb2BQ+r8H69ZVHQHn6yNz 8i9B9fuOZlhI5ETIEgEA+BARbLfDPTpW8na8nNqUHxpu+wlC+vN/ucH9LMkmZw4= =Bpl6 -----END PGP SIGNATURE----- --=-+GUNbcLDTycRflzMPCAy-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 12 04:33:01 2022 Received: (at 54261) by debbugs.gnu.org; 12 Mar 2022 09:33:01 +0000 Received: from localhost ([127.0.0.1]:39072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSy7R-0001Tl-DT for submit@debbugs.gnu.org; Sat, 12 Mar 2022 04:33:01 -0500 Received: from laurent.telenet-ops.be ([195.130.137.89]:58808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSy7P-0001Tc-A5 for 54261@debbugs.gnu.org; Sat, 12 Mar 2022 04:33:00 -0500 Received: from [172.20.10.9] ([188.189.198.37]) by laurent.telenet-ops.be with bizsmtp id 5MYx270010ouAUC01MYxLy; Sat, 12 Mar 2022 10:32:57 +0100 Message-ID: <1d1cc9a4a82aec7dd23e954fa0a68167c5806a07.camel@telenet.be> Subject: Re: [bug#54261] Acknowledgement ([PATCH]: Update GTK to 4.6.1.) From: Maxime Devos To: Zhu Zihao Date: Sat, 12 Mar 2022 10:32:53 +0100 In-Reply-To: <865yojnb25.fsf@163.com> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <149614fb88e1afab846783a5d3b1bbe0bde640f0.camel@telenet.be> <865yojnb25.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-7oOgNYMkXdzmX09829N6" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647077577; bh=FIgOxIUFlGJ4VmzkybHlJo6F26KU4QaQqDFSqVhZvXc=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=U7bqA9PsG1KSPknNgpHOGUj2xZ2PqyLMlU5mUMY5n3AiXYlrfSps8Wr0MHsAsSVMK NRAk3j7pmuYdSbjK1G634lIPSWI9pALTAO0TRlwwuU9pUj9zR0itnQi69XGcJaMHpv +M0tozAHf25vguzHexwDWZulhSGgGKb3TWyuqVEEF1wyQUU/vFjm7o0xN6ef+GQFZM RlAkSKZgbrqpxa/56JTE6xtZyVI1yX+OejCsxpB/zySlBu0yvOIhSiShvJR03LMYcy Qu9P5hBLLeTKOh4KILLM7jtXZ1c/cQbWxVxwSDHrR45zcJJJ6nsEqDdm9uoSR4ta2G dx9SykZ29gbyQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-7oOgNYMkXdzmX09829N6 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op za 12-03-2022 om 10:38 [+0800]: > > What if a program uses both 'pango' and gtk?=C2=A0 Then IIUC, it would > > simultanuously use pango and pango-next in the same process, which > can > > easily cause problems (see e.g. the bug report about segfaults > > involving multiple libcairos). >=20 > If package A propagates C@1.0=C2=A0and package B propagates C@2.0. Guix > will > raise an error. However, it doesn't care about something like >=20 > guix shell gtk pango@1.48 >=20 > IDK which pango will win the game. 'guix install' and 'guix shell' might not care, but how would this stop the segfaults caused by multiple versions of the same library in the same process? Also, gtk currently propagates pango@1.48.0, the same pango as pango@1.48, so this doesn't seem a good test to me. Instead: $ guix shell gtk pango@1.42.4 Looks like $GUIX_ENVIRONMENT/share/doc/ only contains pango-1.42.4 and not pango-1.48. Looks like a bug? Next I tried: $ guix shell pango@1.42.4 pango@1.48 this also does not complain and the share/doc only contains pango@42.4. Also looks buggy? I'll send a bug report. >=20 > I've asked in https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D44327=C2=A0= and > suggest to introduce priority mechanism like Nix. But Ludovic Court=C3=A8= s > doesn't accept my suggestion How could a priority mechanism solve the segfaults? Greetings, Maxime. --=-7oOgNYMkXdzmX09829N6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYixoxRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7mUUAQD4sW8h+W3/LevS01QAQQu2zriY U8NfbyfOpegIHLeuWwEA/4lNpMVM176dtVbQiorlO43HstE8gKlBIywUyZdnhwI= =75VT -----END PGP SIGNATURE----- --=-7oOgNYMkXdzmX09829N6-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 12 04:40:05 2022 Received: (at 54261) by debbugs.gnu.org; 12 Mar 2022 09:40:05 +0000 Received: from localhost ([127.0.0.1]:39084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSyEG-0001ef-Tx for submit@debbugs.gnu.org; Sat, 12 Mar 2022 04:40:05 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:36810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSyEE-0001eG-HL for 54261@debbugs.gnu.org; Sat, 12 Mar 2022 04:40:03 -0500 Received: from [172.20.10.9] ([188.189.198.37]) by michel.telenet-ops.be with bizsmtp id 5Mg02700H0ouAUC06Mg07m; Sat, 12 Mar 2022 10:40:01 +0100 Message-ID: Subject: Re: [bug#54261] Acknowledgement ([PATCH]: Update GTK to 4.6.1.) From: Maxime Devos To: Zhu Zihao Date: Sat, 12 Mar 2022 10:40:00 +0100 In-Reply-To: <1d1cc9a4a82aec7dd23e954fa0a68167c5806a07.camel@telenet.be> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <149614fb88e1afab846783a5d3b1bbe0bde640f0.camel@telenet.be> <865yojnb25.fsf@163.com> <1d1cc9a4a82aec7dd23e954fa0a68167c5806a07.camel@telenet.be> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-w9l53jsm8tGYqlbaaww5" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1647078001; bh=SeX/2J51m2nkYhVXCiTuvfRVMkiAHx3zS7g0XbHy1U0=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=TOetEgjP9BsD2gzlcGer5pewo0M0btR6lxYghthw7l6ojqhVTsqq9XGsX7gAu/0Tf hVkkwJ3iNNNONc2oVOQhNxt+pPWNEqg0igy8BHtEbhwTWCMeNbXMUPRI2P7TUcnFZE Mio6Ic9Jbdu46Sc/20sAa/o3LkQNWimNcVSliGn6Iu+Bzfn6/COsC2ifiOGZU81iN7 glhN7ihJ1j+zz6UQPkeViQE1XUILxNhG4GcdDPmA1kO4rlflXfuN06WQo2MOgZVH8W kDBJZ+T1vMiEkehTGPNttJVZZDXkSbMtsHsYaza5+KHO4ysSZ7H64uQd5y6hAP2adM dJCH9Us5u6fwQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-w9l53jsm8tGYqlbaaww5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Maxime Devos schreef op za 12-03-2022 om 10:32 [+0100]: > this also does not complain and the share/doc only contains > pango@42.4. > Also looks buggy?=C2=A0 I'll send a bug report. Nevermind about the second part, looks like pango does not have a share/doc directory. Greetings, Maxime. --=-w9l53jsm8tGYqlbaaww5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYixqcBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tczAQDWFrV2D0mlDPev6IY3tbvbfnW7 SNue/zmxZP7iczbH0wD+N0oBD0/BShgptSSYZZpeDxNNpM8jNI7yOUddijDzzgA= =15R7 -----END PGP SIGNATURE----- --=-w9l53jsm8tGYqlbaaww5-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 15 11:43:58 2022 Received: (at 54261) by debbugs.gnu.org; 15 Mar 2022 15:43:58 +0000 Received: from localhost ([127.0.0.1]:49381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nU9Kz-0000E5-Tc for submit@debbugs.gnu.org; Tue, 15 Mar 2022 11:43:58 -0400 Received: from mail-m971.mail.163.com ([123.126.97.1]:26451) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nU9Kt-0000DC-Vl for 54261@debbugs.gnu.org; Tue, 15 Mar 2022 11:43:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=NmkPV fPBCQVCMcNdxuyoa086G1Iv41yPhYSeEIgNiyI=; b=K3u40w0ossfua9AyKJcCK Ugq6XMGcJ4Q+WO6xIeuAhCWgf4f1iCf3LYj71dtvMzWM4DC5EQugb0pC76i5OEh7 u6dMMNgbEKQk2S2LXotiCELEek+qMJ5pRWK6eGkOKR2LyzJ9DhjIZtKDdpOkzxab lkBQpSHqZtw+yYiQpfmQb4= Received: from asus-laptop (unknown [112.95.115.161]) by smtp1 (Coremail) with SMTP id GdxpCgD31fIitDBipFxsDg--.17700S2; Tue, 15 Mar 2022 23:43:31 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: 54261@debbugs.gnu.org Subject: Re: bug#54261: Acknowledgement ([PATCH]: Update GTK to 4.6.1.) Date: Tue, 15 Mar 2022 23:42:37 +0800 In-reply-to: <86ilsky0xb.fsf@163.com> Message-ID: <8635jjfcgz.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GdxpCgD31fIitDBipFxsDg--.17700S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RtrcSUUUUU X-Originating-IP: [112.95.115.161] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZgPEr1aD-eSddgAAsp X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Also update gtkmm and pangomm. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYjC0HBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/n4HwD/UT/TzpMMLXuanDSgrPILNKqKU2Ip eCy8Hcwe494e1NoA+gMRKLIdAZt12+fvZmzbZYmA/+YJp2caENhl+JWuF10G =K6bl -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-pango-Add-version-1.50.4.patch Content-Transfer-Encoding: quoted-printable >From bd53ac3a162c1f5b53363126c125d826a5cb6a6e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 21:36:25 +0800 Subject: [PATCH 1/4] gnu: pango: Add version 1.50.4. * gnu/packages/gtk.scm(pango-next): New variable. --- gnu/packages/gtk.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 29302051c1..bc7b388a88 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2021 Simon Streit ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 Wamm K. D. +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,6 +410,22 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) =20 +;; TODO: Make this the default package in next release cycle. +(define-public pango-next + (package + (inherit pango) + (name "pango") + (version "1.50.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) + (sha256 + (base32 + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))= )) + (define-public pango-1.42 (package (inherit pango) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-gtk-Update-to-4.6.1.patch >From 0c22cbd070d47b8c3b534caceb3eb05c8f7f6d41 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 22:40:46 +0800 Subject: [PATCH 2/4] 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-next. --- 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 bc7b388a88..3d7706b9ee 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-next) ("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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-pangomm-Update-to-2.50.0.patch >From 216abd161ce06d49f7586203281dcf1ba523a8af Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 15 Mar 2022 22:39:43 +0800 Subject: [PATCH 3/4] gnu: pangomm: Update to 2.50.0. * gnu/packages/gtk.scm (pangomm): Update to 2.50.0. [propagated-inputs]: Replace 'pango' with 'pango-next'. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3d7706b9ee..2ee273229f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1627,7 +1627,7 @@ (define-public cairomm-1.14 (define-public pangomm (package (name "pangomm") - (version "2.48.0") + (version "2.50.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1635,7 +1635,7 @@ (define-public pangomm name "-" version ".tar.xz")) (sha256 (base32 - "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly")))) + "0nrvvf1fyzlimh7rvxcblnrvn2l9rz8mpn2iwzlzr6kv05zafym2")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -1664,7 +1664,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango)) + (list cairo cairomm glibmm pango-next)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-gtkmm-Update-to-4.6.0.patch >From dc4aabc7831c00526f0b2b2c3e69cab4aa5f3459 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 15 Mar 2022 22:40:27 +0800 Subject: [PATCH 4/4] gnu: gtkmm: Update to 4.6.0. * gnu/packages/gtk.scm (gtkmm): Update to 4.6.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2ee273229f..75d4120e7e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1760,7 +1760,7 @@ (define-public atkmm-2.28 (define-public gtkmm (package (name "gtkmm") - (version "4.4.0") + (version "4.6.0") (source (origin (method url-fetch) @@ -1769,7 +1769,7 @@ (define-public gtkmm (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1nhdf1s437k41af6frbqw2sky46qci0hgkg9h86a9rlnc0r69d1f")))) + (base32 "07sch42iavk5fw3r9x5m0kb2l4xg1ch3vn85mksiwmybjf8a0lqk")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 18:48:17 2022 Received: (at 54261) by debbugs.gnu.org; 18 Mar 2022 22:48:17 +0000 Received: from localhost ([127.0.0.1]:58616 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVLOL-0008Ip-6X for submit@debbugs.gnu.org; Fri, 18 Mar 2022 18:48:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVLOJ-0008Ia-HD for 54261@debbugs.gnu.org; Fri, 18 Mar 2022 18:48:15 -0400 Received: from [2001:470:142:3::e] (port=39974 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVLOC-0008W7-Jq; Fri, 18 Mar 2022 18:48:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=pF8ZC/IOWs83qJNnfU9z8wmLlkUzZCAJ47+9+iRIdv4=; b=K/gBbxx1QzQpQuZ9/mRx Nay+fJnRCXynWA6wnht16W7VbrW3aPifIcpX8ved7v+2HT8V6AYpHfSnG9fvkRBoxB9XDFwyPeHrB dm+YMlM8jfDE/BY3zDepjCJ7mHolhtDG9MFpoBBlwmi1qi9Dbluke2YgoST5RyD/qRMKQdP/NtR94 7cgKHIB5etMoytm4gPXjOKoKEx+4uhWW0NKxOwITY7GEVlxwPqA1CpyBd+F91KeiOfP/6bSz1dooz o0Fgqmyi66Nuj+NtF2Z5MY8vYZWB9Mx1/TcYip+nmHDV5R5K59rLekD2zEl3o90xLqUZxUcSaJ/r7 uKj7ViKzsg9YpQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:56092 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVLOC-00087G-70; Fri, 18 Mar 2022 18:48:08 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> Date: Fri, 18 Mar 2022 23:48:05 +0100 In-Reply-To: <8635jjfcgz.fsf@163.com> (Zhu Zihao's message of "Tue, 15 Mar 2022 23:42:37 +0800") Message-ID: <87y216op22.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, The patches all LGTM, but unfortunately they break fcitx5-gtk, which pulls in both =E2=80=98pango=E2=80=99 and =E2=80=98pango-next=E2=80=99, lea= ding to: --8<---------------cut here---------------start------------->8--- -- Checking for module 'gtk+-3.0' -- Found gtk+-3.0, version 3.24.30 -- Checking for module 'gdk-3.0' -- Found gdk-3.0, version 3.24.30 -- Checking for module 'gdk-x11-3.0' -- Found gdk-x11-3.0, version 3.24.30 -- Checking for module 'gtk4>=3D4.2' -- Package 'gtk4' requires 'pango >=3D 1.50.0' but version of pango is 1.= 48.10 CMake Error at /gnu/store/zga679c4nldah9l8dhd5a4hdy820hcyf-cmake-minimal-3.= 21.4/share/cmake-3.21/Modules/FindPkgConfig.cmake:562 (message): A required package was not found Call Stack (most recent call first): /gnu/store/zga679c4nldah9l8dhd5a4hdy820hcyf-cmake-minimal-3.21.4/share/cm= ake-3.21/Modules/FindPkgConfig.cmake:784 (_pkg_check_modules_internal) gtk4/CMakeLists.txt:10 (pkg_check_modules) --8<---------------cut here---------------end--------------->8--- Solutions that come to mind: 1. Disable the GTK=C2=A04 backend of =E2=80=98fcitx5-gtk=E2=80=99. 2. Add =E2=80=98pango-next=E2=80=99 as an input of =E2=80=98fcitx5-gtk=E2= =80=99, taking precedence over =E2=80=98pango=E2=80=99, at the risk of breaking the GTK+2 and GT= K+3 backends. 3. There is no 3rd idea. Thoughts? Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 18 23:02:50 2022 Received: (at 54261) by debbugs.gnu.org; 19 Mar 2022 03:02:50 +0000 Received: from localhost ([127.0.0.1]:58800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVPMg-0007B4-2Q for submit@debbugs.gnu.org; Fri, 18 Mar 2022 23:02:50 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:43330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nVPMc-0007Ah-UA for 54261@debbugs.gnu.org; Fri, 18 Mar 2022 23:02:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=yeg8s gZJIYUO19ChnraPCN7Y/8t/C0dkehOttjUEskQ=; b=R1IVa8Wv6gV4W3453lVVk 6Ch5T0EMS9N6PzOV+p8wKhanrM4hYA52TJWEqFHWBMZFOqANv/l7DcIaIJg/PQ2v yH9vFHMy8RC7lT02+Z3oFvjvN9lc6XkPe7Wn5GP+4pO97ARL6dwLNv1GPVRlbZEY h9Yp9x0TxFohtsvsK68t88= Received: from asus-laptop (unknown [27.38.119.187]) by smtp5 (Coremail) with SMTP id HdxpCgAHBLDKRzVii4GNHA--.12557S2; Sat, 19 Mar 2022 11:02:35 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Sat, 19 Mar 2022 11:00:48 +0800 In-reply-to: <87y216op22.fsf_-_@gnu.org> Message-ID: <86mthmtzk5.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HdxpCgAHBLDKRzVii4GNHA--.12557S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4ROeOCUUUUU X-Originating-IP: [27.38.119.187] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbByRHIr11voIrksAAAsz X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > 3. There is no 3rd idea. > > Thoughts? > > Ludo=E2=80=99. 3. I'll reconsider your proposal in recent fcitx5-gtk update that split the gtk4 backend into a separated package. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYjVHuhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/ls+AEAwyrms2le2VUe2oGEFomvHRG4j2c+ HoQhUtLusxBEBYEBANRTWdSv9OiTasWSXqOj0RCpJBr7/hr67+4z7Yx6BsoI =h0Xa -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 20 21:20:06 2022 Received: (at 54261) by debbugs.gnu.org; 21 Mar 2022 01:20:06 +0000 Received: from localhost ([127.0.0.1]:35332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nW6iG-0004yl-57 for submit@debbugs.gnu.org; Sun, 20 Mar 2022 21:20:06 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:54651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nW6iB-0004yR-1O for 54261@debbugs.gnu.org; Sun, 20 Mar 2022 21:19:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=KFLcZ YKvOmVzo9Ijyk/w+hJzrrRcnmNnzpBwxM+qWZc=; b=LCQccBe7DulfptBu7rAhy FHj4PTtstKnZZw9d1ZhaBJMfteazwKQgD0xD5Tf2wy/HSuS+GVBha035ACatynP4 bciegPUOjReK1R8uGUlCO7zvHOorjm2Ppd/OU4SmSRyqLjrhiDQX6UjrGx81T0cg 3x88TVm8iBHDqQkvC0pKF0= Received: from asus-laptop (unknown [112.95.115.46]) by smtp5 (Coremail) with SMTP id HdxpCgDXorOx0jdioQ+bHQ--.48243S2; Mon, 21 Mar 2022 09:19:45 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Mon, 21 Mar 2022 09:17:47 +0800 In-reply-to: <87y216op22.fsf_-_@gnu.org> Message-ID: <864k3syudv.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HdxpCgDXorOx0jdioQ+bHQ--.48243S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUbrcfUUUUU X-Originating-IP: [112.95.115.46] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPRLKr2AY-TTKhAAAs1 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Here is a draft patch, it now works. But some part may need polish. Can you give me some suggestions? Thanks. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYjfSrBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/lx/wD8DvgXDksIy0tL82MRF/kAd/9RmGCn bTyqCJs0TAfQ/PcBAJW9E61s/piI46aPYzpJWBRWnQTpiIX9WNuifNSKPaQB =vxy4 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-pango-Add-version-1.50.4.patch Content-Transfer-Encoding: quoted-printable >From bd53ac3a162c1f5b53363126c125d826a5cb6a6e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 21:36:25 +0800 Subject: [PATCH 1/6] gnu: pango: Add version 1.50.4. * gnu/packages/gtk.scm(pango-next): New variable. --- gnu/packages/gtk.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 29302051c1..bc7b388a88 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2021 Simon Streit ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 Wamm K. D. +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,6 +410,22 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) =20 +;; TODO: Make this the default package in next release cycle. +(define-public pango-next + (package + (inherit pango) + (name "pango") + (version "1.50.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) + (sha256 + (base32 + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))= )) + (define-public pango-1.42 (package (inherit pango) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-gtk-Update-to-4.6.1.patch >From 0c22cbd070d47b8c3b534caceb3eb05c8f7f6d41 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 22:40:46 +0800 Subject: [PATCH 2/6] 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-next. --- 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 bc7b388a88..3d7706b9ee 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-next) ("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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-pangomm-Update-to-2.50.0.patch >From 216abd161ce06d49f7586203281dcf1ba523a8af Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 15 Mar 2022 22:39:43 +0800 Subject: [PATCH 3/6] gnu: pangomm: Update to 2.50.0. * gnu/packages/gtk.scm (pangomm): Update to 2.50.0. [propagated-inputs]: Replace 'pango' with 'pango-next'. --- gnu/packages/gtk.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3d7706b9ee..2ee273229f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1627,7 +1627,7 @@ (define-public cairomm-1.14 (define-public pangomm (package (name "pangomm") - (version "2.48.0") + (version "2.50.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1635,7 +1635,7 @@ (define-public pangomm name "-" version ".tar.xz")) (sha256 (base32 - "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly")))) + "0nrvvf1fyzlimh7rvxcblnrvn2l9rz8mpn2iwzlzr6kv05zafym2")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -1664,7 +1664,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango)) + (list cairo cairomm glibmm pango-next)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-gtkmm-Update-to-4.6.0.patch >From dc4aabc7831c00526f0b2b2c3e69cab4aa5f3459 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 15 Mar 2022 22:40:27 +0800 Subject: [PATCH 4/6] gnu: gtkmm: Update to 4.6.0. * gnu/packages/gtk.scm (gtkmm): Update to 4.6.0. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2ee273229f..75d4120e7e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1760,7 +1760,7 @@ (define-public atkmm-2.28 (define-public gtkmm (package (name "gtkmm") - (version "4.4.0") + (version "4.6.0") (source (origin (method url-fetch) @@ -1769,7 +1769,7 @@ (define-public gtkmm (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1nhdf1s437k41af6frbqw2sky46qci0hgkg9h86a9rlnc0r69d1f")))) + (base32 "07sch42iavk5fw3r9x5m0kb2l4xg1ch3vn85mksiwmybjf8a0lqk")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0005-gnu-fcitx5-gtk-Remove-GTK4-support.patch >From e1cc0e4054cc34320ed1ff8d35c64bc5db6b0e28 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 21 Mar 2022 09:11:10 +0800 Subject: [PATCH 5/6] gnu: fcitx5-gtk: Remove GTK4 support. The GTK4 support will be separated and placed in a dedicated package. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Disable GTK4 build. : Add "-DENABLE_GTK_IM_MODULE=OFF". : In phase "patch-install-prefix", Remove GTK4 code. [inputs]: Remove package gtk. [outputs]: Remove output "gtk4". --- gnu/packages/fcitx5.scm | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 0be5e53863..2d5917f3c0 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -203,7 +203,8 @@ (define-public fcitx5-gtk #~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" #$output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - #$output "/lib/girepository-1.0")) + #$output "/lib/girepository-1.0") + "-DENABLE_GTK4_IM_MODULE=OFF") #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-install-prefix @@ -216,11 +217,10 @@ (define (split-immodule gtk-version output) (string-append output "/lib")))) (let ((gtk2 #$output:gtk2) - (gtk3 #$output:gtk3) - (gtk4 #$output:gtk4)) + (gtk3 #$output:gtk3)) (for-each split-immodule - '("gtk2" "gtk3" "gtk4") - (list gtk2 gtk3 gtk4)))))))) + '("gtk2" "gtk3") + (list gtk2 gtk3)))))))) (inputs (list fcitx5 fmt @@ -230,12 +230,11 @@ (define (split-immodule gtk-version output) gobject-introspection gtk+-2 gtk+ - gtk glib)) (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - (outputs '("out" "gtk2" "gtk3" "gtk4")) + (outputs '("out" "gtk2" "gtk3")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides the following functionality in the @@ -248,8 +247,6 @@ (define (split-immodule gtk-version output) IM module for GTK+2 applications. @item gtk3 IM module for GTK+3 applications. -@item gtk4 -IM module for GTK4 applications. @end table") (license license:lgpl2.1+))) -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0006-gnu-Add-fcitx5-gtk4.patch >From 84da7d385c7759fbf9defdfa5e573bfe57c00c4b Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 21 Mar 2022 09:16:38 +0800 Subject: [PATCH 6/6] gnu: Add fcitx5-gtk4. * gnu/packages/fcitx5.scm (fcitx5-gtk4): New variable. --- gnu/packages/fcitx5.scm | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 2d5917f3c0..be46a5036c 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -250,6 +250,48 @@ (define (split-immodule gtk-version output) @end table") (license license:lgpl2.1+))) +;; XXX: This package is separated from fcitx5-gtk for following reasons. +;; 1. GTK4 has a lot more dependencies, some of which maybe unavailable on +;; platforms other than x86_64. See . +;; 2. GTK4 now propagates pango@1.50, it will conflict with GTK3 and GTK2 +;; (propagates pango@1.48) if they're all in the inputs of same package. +;; See . +(define-public fcitx5-gtk4 + (package + (inherit fcitx5-gtk) + (name "fcitx5-gtk4") + (arguments + (list + #:tests? #f ;No test + #:configure-flags + #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input "fcitx5-gtk") + "/include/Fcitx5/GClient")) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-gclient + (lambda* (#:key inputs #:allow-other-keys) + (define gclient + (search-input-file inputs "lib/libFcitx5GClient.so")) + ;; Force cmake search libFcitx5GClient.so in library search + ;; path instead of compiling again. + (substitute* "gtk4/CMakeLists.txt" + (("Fcitx5::GClient") + gclient)))) + (add-before 'build 'enter-gtk4-subdirectory + (lambda _ + (chdir "gtk4"))) + (add-after 'install 'leave-gtk4-subdirectory + (lambda _ + (chdir "..")))))) + (inputs + (modify-inputs (package-inputs fcitx5-gtk) + (delete "gtk+") + (prepend fcitx5-gtk gtk))) + (outputs '("out")) + (synopsis "GTK4 IM module for Fcitx 5") + (description "Fcitx5-gtk4 provides IM module for GTK4 applications."))) + (define-public fcitx5-qt (package (name "fcitx5-qt") -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 26 23:05:39 2022 Received: (at 54261) by debbugs.gnu.org; 27 Mar 2022 03:05:39 +0000 Received: from localhost ([127.0.0.1]:54995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYJDn-00059X-Bn for submit@debbugs.gnu.org; Sat, 26 Mar 2022 23:05:39 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:26644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYJDi-00059F-Dd for 54261@debbugs.gnu.org; Sat, 26 Mar 2022 23:05:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=ogbPy uqw28uP6nKOgEdsufw8EmQI5qNSb7Y2PVBoDY8=; b=UAB1FJbe46xTEjN+QbyeH I+ZiPhFoTKlZ/YV3Zcwd4TkIRMcyN8u0GuxrKjziFgVOzgHiO0pT2C8f9fjReZhx V0mwRqFyDK4qmKDx1mHVd+DjbZU/wp02izP5EqzsMw2P6ktQTrKiKAxAHBjOO7+4 BjOYEQCGtcAV8R0E9Me1j0= Received: from asus-laptop (unknown [112.95.108.56]) by smtp4 (Coremail) with SMTP id HNxpCgCH87t01D9ingh2IQ--.86S2; Sun, 27 Mar 2022 11:05:25 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Sun, 27 Mar 2022 11:04:59 +0800 In-reply-to: <864k3syudv.fsf@163.com> Message-ID: <86bkxsjdso.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HNxpCgCH87t01D9ingh2IQ--.86S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUUQ6JUUUUU X-Originating-IP: [112.95.108.56] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxXQr1et3t0OrAAAsa X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable ping. Any thoughts? =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYj/UZxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/ksbgD/VcG/3beP8oO4pt0ewVpXHWJFRbRE HxJOI610iN3pNYoA/R2Is4Hn8MxUIS2JxBEZbjzloaubcWoS1TVTHwgPUkYP =/2af -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 27 03:38:34 2022 Received: (at 54261) by debbugs.gnu.org; 27 Mar 2022 07:38:34 +0000 Received: from localhost ([127.0.0.1]:55168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYNTt-0003zZ-SA for submit@debbugs.gnu.org; Sun, 27 Mar 2022 03:38:34 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:35696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYNTs-0003zM-3A for 54261@debbugs.gnu.org; Sun, 27 Mar 2022 03:38:32 -0400 Received: by mail-ej1-f65.google.com with SMTP id yy13so22864857ejb.2 for <54261@debbugs.gnu.org>; Sun, 27 Mar 2022 00:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=bj10CZ4dcaR/zIUNeTdJHcxBkotih4O+8jl21sQkOo8=; b=MPeoNMhj3vadDbseiYzwWNT1uH9TcQHuk0Pg9xPvzKmp+WGpk0EvZC17pytL7lZI+a I2ZHRqoyPykU7S3uwe1sGu0dmCBn2hgFjxB8BIoPlMpd3E2y1oeLfbb8QHhdMYKHFgDV iYVjA76/3lNmvLLkngaPxKB61p8iH17/vE96CtLnEKUBiwNuDyQTgCx9NY8CR8jvVllB r0CReVSe1pBVAch07IDBHJCulsz9hc3hNj2e8M5r+eWIA/MZnXBzA3D8jw19y42C8e1I YJfHFwovggIogKjUW02ICuQXHHXcBWXQ0hcxRv8YhrANNe8m3sbA5mduRw3OvDGjJkvd vpLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=bj10CZ4dcaR/zIUNeTdJHcxBkotih4O+8jl21sQkOo8=; b=pGJT/o7eqk0jWIL1U13cWFukDkBr96hSxFLGnMr/HXLF9UQsY572WJrYzquxD57rqQ 57m7Rs4o22fs0g5XH5YpeeY/EVfVtgYrzqFHPaX87t26XhbYix/G4zDCAoXaKZz0pnbd ckDq6oIBzfwVqi4w+fYQSc95JDYY4a/u1IhzGrwfkzd+aRwHGi5ThlCHAglx/PhgVA7D 6O2/xdt+P/EmYADN4wCZcb8+nJomvhSRMTK0l1v2VKXsswd0GLEAHHFoC5QPu/6L8OZg /L3+TEKEuhPcEEtyp2/O/jKHV1hCHImQBE6TMbLyXxbo3nNq4FBDd7XD7yapxsJ5Ix49 BEKw== X-Gm-Message-State: AOAM532hEAyzJcZDJYDtTd9QvAV6tZGvDjXpur8nLx+AbfZJvqYtKKcM 6p/WUtqWUZCXWnHbiizFKJQ= X-Google-Smtp-Source: ABdhPJwYqIIwZMP12CrSnB+MD74fj3IDKoPllwJxJN2/TUIaTyVMvniEUyTjNz1738O6YkgAoJcriQ== X-Received: by 2002:a17:907:a41f:b0:6d6:f925:1696 with SMTP id sg31-20020a170907a41f00b006d6f9251696mr21459212ejc.62.1648366706151; Sun, 27 Mar 2022 00:38:26 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e3-20020a170906748300b006df6a2816e9sm4273552ejl.138.2022.03.27.00.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 00:38:25 -0700 (PDT) Message-ID: Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. From: Liliana Marie Prikler To: Zhu Zihao , Ludovic =?ISO-8859-1?Q?Court=E8s?= Date: Sun, 27 Mar 2022 09:38:24 +0200 In-Reply-To: <86bkxsjdso.fsf@163.com> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <86bkxsjdso.fsf@163.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 27.03.2022 um 11:04 +0800 schrieb Zhu Zihao: > > ping. Any thoughts? > As far as I can see, the main issue (GTK propagating pango-next) has not been addressed, we're just piling on workarounds. This is not the way to go, as it will inevitably lead to more conflicts later on. If possible, I'd suggest trying to build GTK against the old pango, perhaps with a patch that can be removed on core-updates. WDYT? From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 28 11:45:13 2022 Received: (at 54261) by debbugs.gnu.org; 28 Mar 2022 15:45:13 +0000 Received: from localhost ([127.0.0.1]:58993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYrYP-0005HC-Ki for submit@debbugs.gnu.org; Mon, 28 Mar 2022 11:45:13 -0400 Received: from mail-m975.mail.163.com ([123.126.97.5]:52258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYrYK-0005G5-Sc for 54261@debbugs.gnu.org; Mon, 28 Mar 2022 11:45:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=P8Sv9 UOIteWhTg1O27oAO9q4VVxZKi8cesAVaKtE3yQ=; b=jOKHIQ9CZ/yn/e7TKryxN 88S0wjA8WEYSJWoT9fUZioKGtOlUmssl++LE9lzOjgY10U+jzmq5KXRShQ0ufwxg JFbgY/vSoXrwwSxjgLms7kLJnO+oUAGdNPaJz1z03kJEXa4zr6SCrwvgOxBGdPoH I3lfdn0enbQYQo9DSRu4lY= Received: from asus-laptop (unknown [112.95.114.251]) by smtp5 (Coremail) with SMTP id HdxpCgA3A7T310FieE5tIg--.6519S2; Mon, 28 Mar 2022 23:44:56 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <86bkxsjdso.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Liliana Marie Prikler Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Mon, 28 Mar 2022 23:37:20 +0800 In-reply-to: Message-ID: <86zglajd3u.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HdxpCgA3A7T310FieE5tIg--.6519S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU7HUqUUUUU X-Originating-IP: [112.95.114.251] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxjRr1et3vnkoAAAsU X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYkHX5RUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kFugD/RMNlMI/Sd2b1Aw7PKCJNBudwJGIr mL/+48yZ1UpEOWkBAMNq/HEFhik4TUpM/EiFE7RcpFtcgBfFFKH6PNVKGBYO =d/Bm -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: multipart/signed; boundary="===-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --===-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Liliana Marie Prikler writes: > Am Sonntag, dem 27.03.2022 um 11:04 +0800 schrieb Zhu Zihao: >>=20 >> ping. Any thoughts? >>=20 > As far as I can see, the main issue (GTK propagating pango-next) has > not been addressed, we're just piling on workarounds. This is not the > way to go, as it will inevitably lead to more conflicts later on. > > If possible, I'd suggest trying to build GTK against the old pango, > perhaps with a patch that can be removed on core-updates. WDYT? Try build GTK 4.6.1 with Pango 1.48 is so tricky IMO. GTK 4.6.1 may use the API introduced in pango 1.50 series. Currently my idea's make GTK+ 2 & 3 use Pango 1.50. It'll triggeer 3000+ builds, and we can put it to stage branch (if we update pango, it will trigger 7000+ builds) =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --===-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYkHX8hUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kq9gD/fIwTDU04PyAF2yC+LDGBeS8/+Gor 0oHP4hTqKsDZ90ABAN4QPi+vwG9RzkaqOU7noUl2k8gQTYMQVtE4GL7nIqAD =GjVR -----END PGP SIGNATURE----- --===-=-=-- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Mar 28 14:19:22 2022 Received: (at 54261) by debbugs.gnu.org; 28 Mar 2022 18:19:22 +0000 Received: from localhost ([127.0.0.1]:59170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYtxa-0000sk-2H for submit@debbugs.gnu.org; Mon, 28 Mar 2022 14:19:22 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:33766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nYtxY-0000sY-52 for 54261@debbugs.gnu.org; Mon, 28 Mar 2022 14:19:20 -0400 Received: by mail-ej1-f68.google.com with SMTP id pv16so30482410ejb.0 for <54261@debbugs.gnu.org>; Mon, 28 Mar 2022 11:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=hJlMWZ8DMw/iDRcmx9ZFqBdPhoowojzBTfiG7e5MvxA=; b=UZ7oIGz2hIEES7psp/XeaC4ZWICz3EPs1ZvE1oCj+gcfCB2geBMNVnKQuyFbDSvrRU KPW2/QKxTlYI1Tl+nbuf+whUEXVHuFygsVC8eZDQGrWEhn8aMFlvKqb1sVyxrHeF0Imu UYlQ9k4FaV8hGzv+lG11PB00HRmbMl3LsHZwzJZcXPm1K9NaMW9mqtMsuhHIRe1tsB9G 3FrWfG/nSWrVt4AuF9c+U+IltQIop+TN1EuqhVwIqanowNvnSpDzXjIMpozlFh2MSede 7obwF01AeMMK1n37f26s8UvZ2Kp2k+sAdwAaoR7pVW4XWuu7RIjbev7sQW90rxhyuVFU h4+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=hJlMWZ8DMw/iDRcmx9ZFqBdPhoowojzBTfiG7e5MvxA=; b=pA3pZkRwFV2WjuWXacFQWsA6Ne0WPHoQ2B+kQ9R5OzLG9tiuTPL0Ewts12+qheV0RX zB6T/HfvtbYolZZ+xc0OlizTZHnuNRwbzpz5X1/i0Y5dKJT+4rHd6UyJIbVjIEQqwyVo j6nIjaSvsjQ7elS+PUzIwtWrJU5zbT0nM/DskLRkOW5rFocwFRF9gXCwFv044XN75213 0gjyfAY4Tk1La4DVUmd/P0jxv68uHZfgzF7tbyfI9vFcNYzYYmppfBA9mOFioazsQ9uK tMIZ2/6H6g/53m8y3mtcYDFWK7niIILEFT1SnVX7A0CLGZrKIO3LPyKqkBkgxfewJ7z6 aaDA== X-Gm-Message-State: AOAM531yBhgREItcvaEtIDDt1I4SkW/3I8e4vVhn6wMNqQnJjd6E8Ngi 1jNwJXDUCO5YuMNMX2kRRmI= X-Google-Smtp-Source: ABdhPJw975N6Evmd502ri+SAD+01QGTWm8iuTQS+HR2F/KMCCpvcy2LjEqNyU2GA1qMW7VJB/ewYzA== X-Received: by 2002:a17:907:9703:b0:6da:6412:508a with SMTP id jg3-20020a170907970300b006da6412508amr29558034ejc.77.1648491554322; Mon, 28 Mar 2022 11:19:14 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q11-20020a170906144b00b006cf61dfb03esm6129282ejc.62.2022.03.28.11.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 11:19:13 -0700 (PDT) Message-ID: Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. From: Liliana Marie Prikler To: Zhu Zihao Date: Mon, 28 Mar 2022 20:19:12 +0200 In-Reply-To: <86zglajd3u.fsf@163.com> References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <86bkxsjdso.fsf@163.com> <86zglajd3u.fsf@163.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: Ludovic =?ISO-8859-1?Q?Court=E8s?= , 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Montag, dem 28.03.2022 um 23:37 +0800 schrieb Zhu Zihao: > > Liliana Marie Prikler writes: > > > Am Sonntag, dem 27.03.2022 um 11:04 +0800 schrieb Zhu Zihao: > > > ping. Any thoughts? > > As far as I can see, the main issue (GTK propagating pango-next) > > has not been addressed, we're just piling on workarounds.  This is > > not the way to go, as it will inevitably lead to more conflicts > > later on. > > > > If possible, I'd suggest trying to build GTK against the old pango, > > perhaps with a patch that can be removed on core-updates.  WDYT? > > > Try build GTK 4.6.1 with Pango 1.48 is so tricky IMO. GTK 4.6.1 may > use the API introduced in pango 1.50 series. Currently my idea's make > GTK+ 2 & 3 use Pango 1.50. It'll triggeer 3000+ builds, and we can > put it to stage branch (if we update pango, it will trigger 7000+ > builds) 3k rebuilds is still beyond the limit of 1.5k and doesn't address the main issue (that being propagation). From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 29 02:00:05 2022 Received: (at 54261) by debbugs.gnu.org; 29 Mar 2022 06:00:05 +0000 Received: from localhost ([127.0.0.1]:59583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ4tg-0001m1-Ot for submit@debbugs.gnu.org; Tue, 29 Mar 2022 02:00:05 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:36009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ4tb-0001kt-Vn for 54261@debbugs.gnu.org; Tue, 29 Mar 2022 02:00:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=Wbhkm vEdsp8xkfHNcLw51JLvrgPQ/PJsSrHNOYqmQ6g=; b=Bk50fNK/N3m1oSHJjwAJn sgTUYmp3re4kODVLrGUswovP/qMxpKfV2UnYsRzVmOp8gBW5QxaILekByJGQW7Z5 SUQKXSpHy3spRruQsuKUoqe4A5EGU2Ih/EVieOUAIfjR3TIfWMZ2L/dcd0N08lU3 LV9HpUS1QInQI0w/NK+r0M= Received: from asus-laptop (unknown [112.95.114.251]) by smtp2 (Coremail) with SMTP id GtxpCgC3jWBVoEJiKQxfEA--.5368S2; Tue, 29 Mar 2022 13:59:50 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <86bkxsjdso.fsf@163.com> <86zglajd3u.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Liliana Marie Prikler Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Tue, 29 Mar 2022 13:56:46 +0800 In-reply-to: Message-ID: <865ynxjo3h.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GtxpCgC3jWBVoEJiKQxfEA--.5368S2 X-Coremail-Antispam: 1Uf129KBjvJXoWrtr1DCFyDJFW5ZryfCryxGrg_yoW8Jr47pF W3KFn5G3WkWry3ArnxtF10vFWSkr9xCFyfKas8JrW0qr90yrs7WrW2yw1UurWjyrWxAw45 Cr4Utas7J3WFkFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Uvg4hUUUUU= X-Originating-IP: [112.95.114.251] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxbSr1et3wdTEwAAsi X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 54261@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ok, just update pango and queue these commits into the core-updates branch :(=20 Liliana Marie Prikler writes: > Am Montag, dem 28.03.2022 um 23:37 +0800 schrieb Zhu Zihao: >>=20 >> Liliana Marie Prikler writes: >>=20 >> > Am Sonntag, dem 27.03.2022 um 11:04 +0800 schrieb Zhu Zihao: >> > > ping. Any thoughts? >> > As far as I can see, the main issue (GTK propagating pango-next) >> > has not been addressed, we're just piling on workarounds.=C2=A0 This is >> > not the way to go, as it will inevitably lead to more conflicts >> > later on. >> >=20 >> > If possible, I'd suggest trying to build GTK against the old pango, >> > perhaps with a patch that can be removed on core-updates.=C2=A0 WDYT? >>=20 >>=20 >> Try build GTK 4.6.1 with Pango 1.48 is so tricky IMO. GTK 4.6.1 may >> use the API introduced in pango 1.50 series. Currently my idea's make >> GTK+ 2 & 3 use Pango 1.50. It'll triggeer 3000+ builds, and we can >> put it to stage branch (if we update pango, it will trigger 7000+ >> builds) > 3k rebuilds is still beyond the limit of 1.5k and doesn't address the > main issue (that being propagation). =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYkKgQhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/k8OAEAgjCy1w5b38gXJazqsY130D6ZNUBf xL/teVh6WIAUv08A/jvDU1dsLd+oQCuWR5tBTeFkfRT757q+PZpPMpTeAvsJ =qvwk -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 29 02:04:16 2022 Received: (at 54261) by debbugs.gnu.org; 29 Mar 2022 06:04:16 +0000 Received: from localhost ([127.0.0.1]:59592 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ4xk-0001u0-IA for submit@debbugs.gnu.org; Tue, 29 Mar 2022 02:04:16 -0400 Received: from mail-m972.mail.163.com ([123.126.97.2]:44401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZ4xi-0001tg-91 for 54261@debbugs.gnu.org; Tue, 29 Mar 2022 02:04:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=4k4Rb ebYxFb/27lRgpcuyYOd3pSmZM+YYyEZ/tvj/Yo=; b=cL3uymEf54uoLVshklm+A XYV2h87LFIO2xgeVA1oKpb9HZa/jyBK+x47zcCsNeiZKyEsTqtKdnmF9uogmocrI zXoq5x9Ao9C+LmK6C9cyJ65eClCJ438x5V7pdawuH+Y4ARTied8Oy8OTJfYeezdB Y2+BGxUqpLZPdtlSI204tA= Received: from asus-laptop (unknown [112.95.114.251]) by smtp2 (Coremail) with SMTP id GtxpCgBXFIhUoUJiYYJfEA--.5625S2; Tue, 29 Mar 2022 14:04:05 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <86bkxsjdso.fsf@163.com> <86zglajd3u.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Liliana Marie Prikler Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Tue, 29 Mar 2022 14:01:02 +0800 In-reply-to: Message-ID: <864k3hgur1.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GtxpCgBXFIhUoUJiYYJfEA--.5625S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxU1ku4UUUUU X-Originating-IP: [112.95.114.251] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFBbSr1aD-39HtQAAsY X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 54261@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable To Ludovic Court=C3=A8s:=20 If you think this hack to fcitx5-gtk is bad, I'd like to update to pango and make these changes on core-updates. Please tell me your ideas on it. Thanks a lot! =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYkKhUhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/mnvgEAz0aXCm6yo4uf8fDVxUs+uas1c0v0 wL1squqxyXPcjcsBALfXSlG0bp1md+Ffkhnlkry/WIvBcgKmTd/GaKKAsasP =6EWC -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 29 09:34:54 2022 Received: (at 54261) by debbugs.gnu.org; 29 Mar 2022 13:34:54 +0000 Received: from localhost ([127.0.0.1]:60253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZBzq-00081G-7A for submit@debbugs.gnu.org; Tue, 29 Mar 2022 09:34:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZBzo-000813-Mo for 54261@debbugs.gnu.org; Tue, 29 Mar 2022 09:34:53 -0400 Received: from [2001:470:142:3::e] (port=35802 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZBzj-000592-2R; Tue, 29 Mar 2022 09:34:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=s7sgG3/UOwJ9H6qmM/yWiKaHQow/TfwPnXPbTbgyotM=; b=EGnopQGTiA98qMzL2q5z j9fUapQjiZ/HjnQyXxPhC8sO33Die3TliWMngu/tVaYJZqWd0jfFzOPfd8n5egAtInQlfTGtYLNh2 gvRAyodW3/2WXayN/vM5yh24z3wB2XgIGjW6M21c59S5qkHotAOrkJ+l9bXEkLJFe2KMZJ6G3wxX2 W95/Rw70hM5yFPk0tYxyyzN1o6xzsojeGW/EAxlApv/OTSLzNIQTVeAMkxryJpOf/ZyuQGw+D8HaC k1tF9jRoJgPEQfsqJ23pKAIzeBbZUX2vPADsduKY0htvw7MWppmOJrRAjPbP9v0ieq7jj7siTZbhj JyHseyn3tBBFGQ==; Received: from [193.50.110.177] (port=51534 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZBzi-0000rQ-FW; Tue, 29 Mar 2022 09:34:46 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 9 Germinal an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Tue, 29 Mar 2022 15:34:43 +0200 In-Reply-To: <864k3syudv.fsf@163.com> (Zhu Zihao's message of "Mon, 21 Mar 2022 09:17:47 +0800") Message-ID: <87o81oyj9o.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Sorry for the delay. Zhu Zihao skribis: > From bd53ac3a162c1f5b53363126c125d826a5cb6a6e Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Sat, 5 Mar 2022 21:36:25 +0800 > Subject: [PATCH 1/6] gnu: pango: Add version 1.50.4. > > * gnu/packages/gtk.scm(pango-next): New variable. [...] > From 0c22cbd070d47b8c3b534caceb3eb05c8f7f6d41 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Sat, 5 Mar 2022 22:40:46 +0800 > Subject: [PATCH 2/6] 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-next. [...] > From 216abd161ce06d49f7586203281dcf1ba523a8af Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Tue, 15 Mar 2022 22:39:43 +0800 > Subject: [PATCH 3/6] gnu: pangomm: Update to 2.50.0. > > * gnu/packages/gtk.scm (pangomm): Update to 2.50.0. > > [propagated-inputs]: Replace 'pango' with 'pango-next'. Only Ardour and gtkmm depend on it; are they find after this change? > From dc4aabc7831c00526f0b2b2c3e69cab4aa5f3459 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Tue, 15 Mar 2022 22:40:27 +0800 > Subject: [PATCH 4/6] gnu: gtkmm: Update to 4.6.0. > > * gnu/packages/gtk.scm (gtkmm): Update to 4.6.0. If pangomm and gtkmm are meant to be updated in lockstep, you can merge patches #3 and #4. > From e1cc0e4054cc34320ed1ff8d35c64bc5db6b0e28 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Mon, 21 Mar 2022 09:11:10 +0800 > Subject: [PATCH 5/6] gnu: fcitx5-gtk: Remove GTK4 support. > > The GTK4 support will be separated and placed in a dedicated package. > > * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Disable GTK4 build. > > : Add "-DENABLE_GTK_IM_MODULE=3DOFF". > > : In phase "patch-install-prefix", Remove GTK4 code. > > [inputs]: Remove package gtk. > > [outputs]: Remove output "gtk4". Likewise, this one can be merged with the =E2=80=9Cgtk=E2=80=9D package upd= ate since otherwise it would be left temporarily broken. (Nitpick: no need to leave empty lines like this in the commit log.) > From 84da7d385c7759fbf9defdfa5e573bfe57c00c4b Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Mon, 21 Mar 2022 09:16:38 +0800 > Subject: [PATCH 6/6] gnu: Add fcitx5-gtk4. > > * gnu/packages/fcitx5.scm (fcitx5-gtk4): New variable. Sounds good to me. Liliana suggests using the =E2=80=9Cold=E2=80=9D Pango version, but my unde= rstanding is that it=E2=80=99s not really feasible. Thus, I think the approach above is= the way to go. Could you send an updated patch taking the cosmetic suggestions above into account? Thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 29 23:49:36 2022 Received: (at 54261) by debbugs.gnu.org; 30 Mar 2022 03:49:36 +0000 Received: from localhost ([127.0.0.1]:34110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZPKr-0000hc-Hq for submit@debbugs.gnu.org; Tue, 29 Mar 2022 23:49:36 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:50683) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZPKn-0000hE-Os for 54261@debbugs.gnu.org; Tue, 29 Mar 2022 23:49:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=hI2ME qoxoF0jEBNRp+0uhm2RnZg5M7m+TncbRkVr/lk=; b=pm5jmNqxShrB2rc0HLJ3I 8jEKViM8NYmdPFWyXp9dJUX95hPek1w2yPzVM+Q0juSQgZ8AundwxQW7dRffSFpy i396FvR3U30pFpEVNOM6Z0ZLegxRJZBpxuaHn/z1U9T88fQc1nyMqcSOtK3y5qQ7 XOWbj8xd0F2glyJQMON6qo= Received: from asus-laptop (unknown [163.125.202.48]) by smtp4 (Coremail) with SMTP id HNxpCgDn3mA600NigF2GAA--.12112S2; Wed, 30 Mar 2022 11:49:15 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <87o81oyj9o.fsf@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Wed, 30 Mar 2022 11:45:49 +0800 In-reply-to: <87o81oyj9o.fsf@gnu.org> Message-ID: <86czi4rtfu.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HNxpCgDn3mA600NigF2GAA--.12112S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RABMKDUUUU X-Originating-IP: [163.125.202.48] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxvTr1et3xrvjQAAsR X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > > Only Ardour and gtkmm depend on it; are they find after this change? I've tested ardour, it builds and runs successfully. Ardour depends on gtkmm-2 (propagates pangomm-2.46) but also add pangomm to the inputs. I don't know we need pangomm or not. I also make some minor changes in these patches, Update gtkmm to 4.6.1 and remove atkmm from its propagated-inputs. GTK4 no longer use ATK. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYkPTNRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/m34QEAkACbCCUhZd6fo7/64FqleQNN62ny hg2cDiz7UxKn3IwA/2wiSdl4RGs5vY1JWr/nRi6tIt7kzI2fdVCHNzUvdkAI =jtGo -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-pango-1.50-Add-version-1.50.4.patch Content-Transfer-Encoding: quoted-printable >From a9be73a1723810dbcec0c4caa3a9d6669494f6d9 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 21:36:25 +0800 Subject: [PATCH 1/4] gnu: pango 1.50: Add version 1.50.4. * gnu/packages/gtk.scm(pango-next): New variable. --- gnu/packages/gtk.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 29302051c1..bc7b388a88 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2021 Simon Streit ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 Wamm K. D. +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,6 +410,22 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) =20 +;; TODO: Make this the default package in next release cycle. +(define-public pango-next + (package + (inherit pango) + (name "pango") + (version "1.50.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) + (sha256 + (base32 + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))= )) + (define-public pango-1.42 (package (inherit pango) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-gtk-Update-to-4.6.1.patch >From 823fb5ae1d0cff0247baf6c4847555648c710e55 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 22:40:46 +0800 Subject: [PATCH 2/4] 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-next. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Disable GTK4 build. : Add "-DENABLE_GTK_IM_MODULE=OFF". : In phase "patch-install-prefix", Remove GTK4 code. [inputs]: Remove package gtk. [outputs]: Remove output "gtk4". --- gnu/local.mk | 1 - gnu/packages/fcitx5.scm | 15 +++++-------- gnu/packages/gtk.scm | 17 +++++++++----- .../patches/gtk-introspection-test.patch | 22 ------------------- 4 files changed, 18 insertions(+), 37 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/fcitx5.scm b/gnu/packages/fcitx5.scm index 0be5e53863..2d5917f3c0 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -203,7 +203,8 @@ (define-public fcitx5-gtk #~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" #$output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - #$output "/lib/girepository-1.0")) + #$output "/lib/girepository-1.0") + "-DENABLE_GTK4_IM_MODULE=OFF") #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-install-prefix @@ -216,11 +217,10 @@ (define (split-immodule gtk-version output) (string-append output "/lib")))) (let ((gtk2 #$output:gtk2) - (gtk3 #$output:gtk3) - (gtk4 #$output:gtk4)) + (gtk3 #$output:gtk3)) (for-each split-immodule - '("gtk2" "gtk3" "gtk4") - (list gtk2 gtk3 gtk4)))))))) + '("gtk2" "gtk3") + (list gtk2 gtk3)))))))) (inputs (list fcitx5 fmt @@ -230,12 +230,11 @@ (define (split-immodule gtk-version output) gobject-introspection gtk+-2 gtk+ - gtk glib)) (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - (outputs '("out" "gtk2" "gtk3" "gtk4")) + (outputs '("out" "gtk2" "gtk3")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides the following functionality in the @@ -248,8 +247,6 @@ (define (split-immodule gtk-version output) IM module for GTK+2 applications. @item gtk3 IM module for GTK+3 applications. -@item gtk4 -IM module for GTK4 applications. @end table") (license license:lgpl2.1+))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bc7b388a88..3d7706b9ee 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-next) ("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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-Add-fcitx5-gtk4.patch >From 62a640576ae1de9523fba593219fb50ac97b44c6 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 21 Mar 2022 09:16:38 +0800 Subject: [PATCH 3/4] gnu: Add fcitx5-gtk4. * gnu/packages/fcitx5.scm (fcitx5-gtk4): New variable. --- gnu/packages/fcitx5.scm | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 2d5917f3c0..be46a5036c 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -250,6 +250,48 @@ (define (split-immodule gtk-version output) @end table") (license license:lgpl2.1+))) +;; XXX: This package is separated from fcitx5-gtk for following reasons. +;; 1. GTK4 has a lot more dependencies, some of which maybe unavailable on +;; platforms other than x86_64. See . +;; 2. GTK4 now propagates pango@1.50, it will conflict with GTK3 and GTK2 +;; (propagates pango@1.48) if they're all in the inputs of same package. +;; See . +(define-public fcitx5-gtk4 + (package + (inherit fcitx5-gtk) + (name "fcitx5-gtk4") + (arguments + (list + #:tests? #f ;No test + #:configure-flags + #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input "fcitx5-gtk") + "/include/Fcitx5/GClient")) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-gclient + (lambda* (#:key inputs #:allow-other-keys) + (define gclient + (search-input-file inputs "lib/libFcitx5GClient.so")) + ;; Force cmake search libFcitx5GClient.so in library search + ;; path instead of compiling again. + (substitute* "gtk4/CMakeLists.txt" + (("Fcitx5::GClient") + gclient)))) + (add-before 'build 'enter-gtk4-subdirectory + (lambda _ + (chdir "gtk4"))) + (add-after 'install 'leave-gtk4-subdirectory + (lambda _ + (chdir "..")))))) + (inputs + (modify-inputs (package-inputs fcitx5-gtk) + (delete "gtk+") + (prepend fcitx5-gtk gtk))) + (outputs '("out")) + (synopsis "GTK4 IM module for Fcitx 5") + (description "Fcitx5-gtk4 provides IM module for GTK4 applications."))) + (define-public fcitx5-qt (package (name "fcitx5-qt") -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-gtkmm-Update-to-4.6.1.patch >From 78044067d76596736eba95a49cb9ebc8aa6d5424 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 15 Mar 2022 22:40:27 +0800 Subject: [PATCH 4/4] gnu: gtkmm: Update to 4.6.1. * gnu/packages/gtk.scm (gtkmm): Update to 4.6.1. [propagated-inputs]: Remove atkmm because it's no longer needed. * gnu/packages/gtk.scm (pangomm): Update to 2.50.0. [propagated-inputs]: Replace 'pango' with 'pango-next'. --- gnu/packages/gtk.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3d7706b9ee..8ec14e7bff 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1627,7 +1627,7 @@ (define-public cairomm-1.14 (define-public pangomm (package (name "pangomm") - (version "2.48.0") + (version "2.50.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1635,7 +1635,7 @@ (define-public pangomm name "-" version ".tar.xz")) (sha256 (base32 - "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly")))) + "0nrvvf1fyzlimh7rvxcblnrvn2l9rz8mpn2iwzlzr6kv05zafym2")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -1664,7 +1664,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango)) + (list cairo cairomm glibmm pango-next)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description @@ -1760,7 +1760,7 @@ (define-public atkmm-2.28 (define-public gtkmm (package (name "gtkmm") - (version "4.4.0") + (version "4.6.1") (source (origin (method url-fetch) @@ -1769,7 +1769,7 @@ (define-public gtkmm (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1nhdf1s437k41af6frbqw2sky46qci0hgkg9h86a9rlnc0r69d1f")))) + (base32 "1q6iycd7jfbn6rp4sq6r7ndm96dc21inq8mq1d9xsky6kv5gwphd")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -1809,7 +1809,7 @@ (define-public gtkmm ("xsltproc" ,libxslt) ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs - (list atkmm cairomm glibmm gtk pangomm)) + (list cairomm glibmm gtk pangomm)) (synopsis "C++ Interfaces for GTK+ and GNOME") (description "GTKmm is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks, and a comprehensive set -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 30 15:56:21 2022 Received: (at 54261) by debbugs.gnu.org; 30 Mar 2022 19:56:21 +0000 Received: from localhost ([127.0.0.1]:37086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZeQW-0001EV-UJ for submit@debbugs.gnu.org; Wed, 30 Mar 2022 15:56:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZeQV-0001EJ-SV for 54261@debbugs.gnu.org; Wed, 30 Mar 2022 15:56:20 -0400 Received: from [2001:470:142:3::e] (port=42976 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZeQQ-0008H0-A3; Wed, 30 Mar 2022 15:56:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=/7TpCk/czopwdh545EicBa/xX3WBB2euuYw36fOzJVM=; b=RlPCEGPEAvb0WTsdvOCb PLyIXLP1+5WEpZH/TvPl44rIcP8ygNlhnHAD7oVMl25MmOKzxgPFWJ60giM/Haj4dhrhMml4atPyU otewXWj4BPLhy6W/eo8sqUwOFIzyFwRe90BrPMMzg3jMGA1vSk1NQnlInSgqVe22N5EZmJjJETRVk yhulR5S1OM30U7wYrfamKf0i3Q2tlBBrhsTU5cHwMsbsxiR1M7e8ldW3+8EhHypSSH27O/1ZYzEbl glU4ASRK6FuruhHa7LwUat2utrjs5ryy0Ay5W83cfo0GlpC+UgrOCcs0ERZc4YNAtccbSgt6MxDzc jHO4gC6SeqGfRQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:49650 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZeQM-0006qb-TD; Wed, 30 Mar 2022 15:56:14 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <86bkxsjdso.fsf@163.com> <86zglajd3u.fsf@163.com> <864k3hgur1.fsf@163.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 10 Germinal an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 30 Mar 2022 21:56:08 +0200 In-Reply-To: <864k3hgur1.fsf@163.com> (Zhu Zihao's message of "Tue, 29 Mar 2022 14:01:02 +0800") Message-ID: <87h77ftdt3.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Zhu Zihao skribis: > To Ludovic Court=C3=A8s:=20 > > If you think this hack to fcitx5-gtk is bad, I'd like to update to pango > and make these changes on core-updates. I think the fcitx5-gtk split is good; maybe it=E2=80=99s not idea, but it= =E2=80=99s a good middleground IMO. Like I wrote, the patches LGTM for master, except that I=E2=80=99d suggest merging the bits that go together: https://issues.guix.gnu.org/54261#20 Liliana suggests =E2=80=9Cdoing the right thing=E2=80=9D, which is to updat= e the default pango, but that would require delaying to =E2=80=98core-updates=E2=80=99. = Instead, I think it=E2=80=99s okay to have it the way you propose in =E2=80=98master= =E2=80=99. I hope this clarifies my view! Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 31 01:14:07 2022 Received: (at 54261) by debbugs.gnu.org; 31 Mar 2022 05:14:07 +0000 Received: from localhost ([127.0.0.1]:37434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZn8J-0000s3-M0 for submit@debbugs.gnu.org; Thu, 31 Mar 2022 01:14:07 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:41356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZn8F-0000rI-3k for 54261@debbugs.gnu.org; Thu, 31 Mar 2022 01:14:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=lEIis F0DO8/LzaJEZ+TGMClPRBfrxbUdEYQbh806y/E=; b=Sw6lEmcliWJkJMQ8y2wV2 H3QUlIZvKLcwVgahiiPiw+GG1SJIOZQLUel6ElxvLnp6pM1/8iGx0E7NkRwCe1Tu g3TJH2yNxK7V0dvcKUMhWiuH1+oR+X09YTCitbeCJhuIUbz/8TLVCyi8kgxvNPW0 wbmOxvafD5gRGIxhylwgk0= Received: from asus-laptop (unknown [27.38.118.97]) by smtp4 (Coremail) with SMTP id HNxpCgC3qVuROEVi+Z4kAQ--.30742S2; Thu, 31 Mar 2022 13:13:53 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <86bkxsjdso.fsf@163.com> <86zglajd3u.fsf@163.com> <864k3hgur1.fsf@163.com> <87h77ftdt3.fsf@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Thu, 31 Mar 2022 13:13:22 +0800 In-reply-to: <87h77ftdt3.fsf@gnu.org> Message-ID: <86zgl6k8li.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HNxpCgC3qVuROEVi+Z4kAQ--.30742S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrtF1rAr1kKFy7CFW7XFy3twb_yoWfCFg_uF 95Ars2gws0gF4fKFZrWrnxurn7Cr9YqF1kur4UWF43ZF4Yqa1Ygr4kWrW8Kw45G3s7Jrn0 934qqws5Cr1SgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRXqXl7UUUUU== X-Originating-IP: [27.38.118.97] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZhLUr1aD-x8EDQAAsz X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Done in https://issues.guix.gnu.org/54261#21. Ludovic Court=C3=A8s writes: > Hi, > > Zhu Zihao skribis: > >> To Ludovic Court=C3=A8s:=20 >> >> If you think this hack to fcitx5-gtk is bad, I'd like to update to pango >> and make these changes on core-updates. > > I think the fcitx5-gtk split is good; maybe it=E2=80=99s not idea, but it= =E2=80=99s a > good middleground IMO. > > Like I wrote, the patches LGTM for master, except that I=E2=80=99d suggest > merging the bits that go together: > > https://issues.guix.gnu.org/54261#20 > > Liliana suggests =E2=80=9Cdoing the right thing=E2=80=9D, which is to upd= ate the default > pango, but that would require delaying to =E2=80=98core-updates=E2=80=99.= Instead, I > think it=E2=80=99s okay to have it the way you propose in =E2=80=98master= =E2=80=99. > > I hope this clarifies my view! > > Thanks, > Ludo=E2=80=99. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYkU4eRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/lMRgEApbZ3rTjKgECiqMXSjY8Q4NY1IJnR IklL7C0L9kBE8/YA/jU5DuIle3haKmvVFuN57bH60+5u77zk3VGIfWetS1kG =V2rx -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 01 11:54:57 2022 Received: (at 54261) by debbugs.gnu.org; 1 Apr 2022 15:54:57 +0000 Received: from localhost ([127.0.0.1]:43209 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naJc0-0004Ex-Rb for submit@debbugs.gnu.org; Fri, 01 Apr 2022 11:54:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naJbz-0004Ek-Fy for 54261@debbugs.gnu.org; Fri, 01 Apr 2022 11:54:55 -0400 Received: from [2001:470:142:3::e] (port=55852 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naJbt-00068P-Ie; Fri, 01 Apr 2022 11:54:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=WW94ddfYJUrpoD7wffesz+ORxlKIpzbv49asrfI1yT8=; b=ABUilpCFXrUTlqyXnTJv vVL/FjKRfNzjNzD6BeE9Vr5XxYRcuHMdG2hrjwjMadwoZx1Zs1eQr8t6acWurKPtHPy1HFu4o6x/J Bl3NnekC1J+YerVqSkdY+3rRlUIXCsaPeSChISCKd5fuWevGYUKISAvkkkTfDtwoh2dnVrhEZtw7q 55pKAQ/LvGUDP2BTzPZpzYGVxH8c9gzzHH8cJjnBM8v2BobMut1LuuseEX+yDo//dV8B+kak6DFIq m/5oZTAbfps3lsuftVzyLe3AaibCoiGqZilJNVI9XJJOdKbl1DwP92a2czFXkhv+85ffjdN7liuJD ErKKwpprW/8UAQ==; Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=38746 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naJbt-0005wP-1Q; Fri, 01 Apr 2022 11:54:49 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <87o81oyj9o.fsf@gnu.org> <86czi4rtfu.fsf@163.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 12 Germinal an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 01 Apr 2022 17:54:46 +0200 In-Reply-To: <86czi4rtfu.fsf@163.com> (Zhu Zihao's message of "Wed, 30 Mar 2022 11:45:49 +0800") Message-ID: <87tubcn6ih.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Zhu Zihao skribis: > From 62a640576ae1de9523fba593219fb50ac97b44c6 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Mon, 21 Mar 2022 09:16:38 +0800 > Subject: [PATCH 3/4] gnu: Add fcitx5-gtk4. > > * gnu/packages/fcitx5.scm (fcitx5-gtk4): New variable. > --- > gnu/packages/fcitx5.scm | 42 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm > index 2d5917f3c0..be46a5036c 100644 > --- a/gnu/packages/fcitx5.scm > +++ b/gnu/packages/fcitx5.scm > @@ -250,6 +250,48 @@ (define (split-immodule gtk-version output) > @end table") > (license license:lgpl2.1+))) >=20=20 > +;; XXX: This package is separated from fcitx5-gtk for following reasons. > +;; 1. GTK4 has a lot more dependencies, some of which maybe unavailable = on > +;; platforms other than x86_64. See . > +;; 2. GTK4 now propagates pango@1.50, it will conflict with GTK3 and GTK2 > +;; (propagates pango@1.48) if they're all in the inputs of same packa= ge. > +;; See . > +(define-public fcitx5-gtk4 > + (package > + (inherit fcitx5-gtk) > + (name "fcitx5-gtk4") > + (arguments > + (list > + #:tests? #f ;No test > + #:configure-flags > + #~(list (string-append "-DCMAKE_CXX_FLAGS=3D-I" > + #$(this-package-input "fcitx5-gtk") > + "/include/Fcitx5/GClient")) This one fails to build for me: --8<---------------cut here---------------start------------->8--- -- Looking for shmat - found -- Checking for module 'gtk+-2.0' -- No package 'gtk+-2.0' found CMake Error at /gnu/store/zga679c4nldah9l8dhd5a4hdy820hcyf-cmake-minimal-3.= 21.4/share/cmake-3.21/Modules/FindPkgConfig.cmake:562 (message): A required package was not found Call Stack (most recent call first): /gnu/store/zga679c4nldah9l8dhd5a4hdy820hcyf-cmake-minimal-3.21.4/share/cm= ake-3.21/Modules/FindPkgConfig.cmake:784 (_pkg_check_modules_internal) gtk2/CMakeLists.txt:6 (pkg_check_modules) -- Configuring incomplete, errors occurred! See also "/tmp/guix-build-fcitx5-gtk4-5.0.9.drv-0/build/CMakeFiles/CMakeOut= put.log". error: in phase 'configure': uncaught exception: %exception #<&invoke-error program: "cmake" arguments: ("../fcitx5-gtk-5.0.= 9" "-DCMAKE_BUILD_TYPE=3DRelWithDebInfo" "-DCMAKE_INSTALL_PREFIX=3D/gnu/sto= re/5z0a2zrr19pmg4swzsb0jm5fwqh03x0y-fcitx5-gtk4-5.0.9" "-DCMAKE_INSTALL_LIB= DIR=3Dlib" "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=3DTRUE" "-DCMAKE_INSTALL_RP= ATH=3D/gnu/store/5z0a2zrr19pmg4swzsb0jm5fwqh03x0y-fcitx5-gtk4-5.0.9/lib" "-= DCMAKE_VERBOSE_MAKEFILE=3DON" "-DCMAKE_CXX_FLAGS=3D-I/gnu/store/fkq1pgfp1r4= 3f2131f8yvx543n7gb7ww-fcitx5-gtk-5.0.9/include/Fcitx5/GClient") exit-status= : 1 term-signal: #f stop-signal: #f>=20 phase `configure' failed after 2.9 seconds command "cmake" "../fcitx5-gtk-5.0.9" "-DCMAKE_BUILD_TYPE=3DRelWithDebInfo"= "-DCMAKE_INSTALL_PREFIX=3D/gnu/store/5z0a2zrr19pmg4swzsb0jm5fwqh03x0y-fcit= x5-gtk4-5.0.9" "-DCMAKE_INSTALL_LIBDIR=3Dlib" "-DCMAKE_INSTALL_RPATH_USE_LI= NK_PATH=3DTRUE" "-DCMAKE_INSTALL_RPATH=3D/gnu/store/5z0a2zrr19pmg4swzsb0jm5= fwqh03x0y-fcitx5-gtk4-5.0.9/lib" "-DCMAKE_VERBOSE_MAKEFILE=3DON" "-DCMAKE_C= XX_FLAGS=3D-I/gnu/store/fkq1pgfp1r43f2131f8yvx543n7gb7ww-fcitx5-gtk-5.0.9/i= nclude/Fcitx5/GClient" failed with status 1 builder for `/gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.9.= drv' failed with exit code 1 @ build-failed /gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.= 9.drv - 1 builder for `/gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-g= tk4-5.0.9.drv' failed with exit code 1 derivation '/gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.9.d= rv' offloaded to 'localhost' failed: build of `/gnu/store/p9611ymj4mav45wi9= 2fdyslb2p7854hl-fcitx5-gtk4-5.0.9.drv' failed build of /gnu/store/p9611ymj4mav45wi92fdyslb2p7854hl-fcitx5-gtk4-5.0.9.drv = failed --8<---------------cut here---------------end--------------->8--- Could you take a look and send an updated patch? Also, I find it surprising that =E2=80=98fcitx5-gtk4=E2=80=99 depends on = =E2=80=98fcitx5-gtk=E2=80=99; is it avoidable? The rest LGTM, thanks! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 01 23:46:40 2022 Received: (at 54261) by debbugs.gnu.org; 2 Apr 2022 03:46:41 +0000 Received: from localhost ([127.0.0.1]:44292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naUig-0002Cu-74 for submit@debbugs.gnu.org; Fri, 01 Apr 2022 23:46:40 -0400 Received: from mail-m974.mail.163.com ([123.126.97.4]:20016) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naUib-0002CZ-4t for 54261@debbugs.gnu.org; Fri, 01 Apr 2022 23:46:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=QwZAl /nZvgSYyft65aGnSGof0etP33onO3qUBHOPcy0=; b=V+nv72o6jXdntculyMwXW OUVmUFzaTi3D8p+/dw7cznpZrhoeXLR5qZ7ho5j+K6dRNwIUe6E4rw8Epf4yBltJ zbHxaxCrz5Db08CJfqTwEf4vLkWRJDmVz2mCbT7b/x0kQlnUQtoa7xLeidkn05w1 ipVqfQKorm8VaJpnD3SwZA= Received: from asus-laptop (unknown [163.125.202.235]) by smtp4 (Coremail) with SMTP id HNxpCgDHE7UKx0diO8gGAA--.1441S2; Sat, 02 Apr 2022 11:46:19 +0800 (CST) References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <87o81oyj9o.fsf@gnu.org> <86czi4rtfu.fsf@163.com> <87tubcn6ih.fsf@gnu.org> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. Date: Sat, 02 Apr 2022 11:41:08 +0800 In-reply-to: <87tubcn6ih.fsf@gnu.org> Message-ID: <86r16gjgft.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HNxpCgDHE7UKx0diO8gGAA--.1441S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7XrWkuw17JF18Wr17Kw1UAwb_yoWxCwcE9a 4kWrnrXF1qqw4qvFs7Jrn3Ar97G34xtr98tFy7XFna9348Jr47WF1DZr9xK3WfAF13trs2 9a4rCa1Y9w10gjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRiCD73UUUUU== X-Originating-IP: [163.125.202.235] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPQzWr2AY-jLVsQAAsY X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 54261 Cc: 54261@debbugs.gnu.org, Maxime Devos , Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > This one fails to build for me: > > -- Looking for shmat - found > -- Checking for module 'gtk+-2.0' > -- No package 'gtk+-2.0' found I forget to disable GTK2 & GTK3 for this package. Now add it. > Also, I find it surprising that =E2=80=98fcitx5-gtk4=E2=80=99 depends on = =E2=80=98fcitx5-gtk=E2=80=99; > is it avoidable? Because fcitx5-gtk4 use the Glib based D-Bus client. I'd prefer to reuse existing one instead of build it again for fcitx5-gtk4. BTW, How to remove gtk+ and gtk+-2 in same inputs via modify-inputs? Do we need repeat (delete "gtk+") clause in the modify-inputs? If we can't handle it without trick, IMO this is a fail of label-less style input. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYkfHBhUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/n0KgEAihaNnVv9qmgLRVBvW3BGDkbD+NNR 0PBjpaXelicTLzsA/2ics0kbdicIDPr0KL11pHOaDADpm9w2Hj9eM6rE6ZoB =Q7w8 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-pango-1.50-Add-version-1.50.4.patch Content-Transfer-Encoding: quoted-printable >From a9be73a1723810dbcec0c4caa3a9d6669494f6d9 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 21:36:25 +0800 Subject: [PATCH 1/4] gnu: pango 1.50: Add version 1.50.4. * gnu/packages/gtk.scm(pango-next): New variable. --- gnu/packages/gtk.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 29302051c1..bc7b388a88 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -29,6 +29,7 @@ ;;; Copyright =C2=A9 2021 Simon Streit ;;; Copyright =C2=A9 2021 Maxime Devos ;;; Copyright =C2=A9 2021 Wamm K. D. +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -409,6 +410,22 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) =20 +;; TODO: Make this the default package in next release cycle. +(define-public pango-next + (package + (inherit pango) + (name "pango") + (version "1.50.4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/pango/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (patches (search-patches "pango-skip-libthai-test.patch")) + (sha256 + (base32 + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))= )) + (define-public pango-1.42 (package (inherit pango) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-gtk-Update-to-4.6.1.patch >From 823fb5ae1d0cff0247baf6c4847555648c710e55 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Sat, 5 Mar 2022 22:40:46 +0800 Subject: [PATCH 2/4] 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-next. * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Disable GTK4 build. : Add "-DENABLE_GTK_IM_MODULE=OFF". : In phase "patch-install-prefix", Remove GTK4 code. [inputs]: Remove package gtk. [outputs]: Remove output "gtk4". --- gnu/local.mk | 1 - gnu/packages/fcitx5.scm | 15 +++++-------- gnu/packages/gtk.scm | 17 +++++++++----- .../patches/gtk-introspection-test.patch | 22 ------------------- 4 files changed, 18 insertions(+), 37 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/fcitx5.scm b/gnu/packages/fcitx5.scm index 0be5e53863..2d5917f3c0 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -203,7 +203,8 @@ (define-public fcitx5-gtk #~(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" #$output "/share/gir-1.0") (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" - #$output "/lib/girepository-1.0")) + #$output "/lib/girepository-1.0") + "-DENABLE_GTK4_IM_MODULE=OFF") #:phases #~(modify-phases %standard-phases (add-before 'configure 'patch-install-prefix @@ -216,11 +217,10 @@ (define (split-immodule gtk-version output) (string-append output "/lib")))) (let ((gtk2 #$output:gtk2) - (gtk3 #$output:gtk3) - (gtk4 #$output:gtk4)) + (gtk3 #$output:gtk3)) (for-each split-immodule - '("gtk2" "gtk3" "gtk4") - (list gtk2 gtk3 gtk4)))))))) + '("gtk2" "gtk3") + (list gtk2 gtk3)))))))) (inputs (list fcitx5 fmt @@ -230,12 +230,11 @@ (define (split-immodule gtk-version output) gobject-introspection gtk+-2 gtk+ - gtk glib)) (native-inputs (list extra-cmake-modules pkg-config `(,glib "bin"))) ;for glib-genmarshal - (outputs '("out" "gtk2" "gtk3" "gtk4")) + (outputs '("out" "gtk2" "gtk3")) (home-page "https://github.com/fcitx/fcitx5-gtk") (synopsis "GLib-based D-Bus client and GTK IM module for Fcitx 5") (description "Fcitx5-gtk provides the following functionality in the @@ -248,8 +247,6 @@ (define (split-immodule gtk-version output) IM module for GTK+2 applications. @item gtk3 IM module for GTK+3 applications. -@item gtk4 -IM module for GTK4 applications. @end table") (license license:lgpl2.1+))) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bc7b388a88..3d7706b9ee 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-next) ("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 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-Add-fcitx5-gtk4.patch >From b4318c10146a72d33dab4d6f9f49846a371a1745 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 21 Mar 2022 09:16:38 +0800 Subject: [PATCH 3/4] gnu: Add fcitx5-gtk4. * gnu/packages/fcitx5.scm (fcitx5-gtk4): New variable. --- gnu/packages/fcitx5.scm | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 2d5917f3c0..46b9936e67 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -250,6 +250,50 @@ (define (split-immodule gtk-version output) @end table") (license license:lgpl2.1+))) +;; XXX: This package is separated from fcitx5-gtk for following reasons. +;; 1. GTK4 has a lot more dependencies, some of which maybe unavailable on +;; platforms other than x86_64. See . +;; 2. GTK4 now propagates pango@1.50, it will conflict with GTK3 and GTK2 +;; (propagates pango@1.48) if they're all in the inputs of same package. +;; See . +(define-public fcitx5-gtk4 + (package + (inherit fcitx5-gtk) + (name "fcitx5-gtk4") + (arguments + (list + #:tests? #f ;No test + #:configure-flags + #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input "fcitx5-gtk") + "/include/Fcitx5/GClient") + "-DENABLE_GTK2_IM_MODULE=OFF" + "-DENABLE_GTK3_IM_MODULE=OFF") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'fix-gclient + (lambda* (#:key inputs #:allow-other-keys) + (define gclient + (search-input-file inputs "lib/libFcitx5GClient.so")) + ;; Force cmake search libFcitx5GClient.so in library search + ;; path instead of compiling again. + (substitute* "gtk4/CMakeLists.txt" + (("Fcitx5::GClient") + gclient)))) + (add-before 'build 'enter-gtk4-subdirectory + (lambda _ + (chdir "gtk4"))) + (add-after 'install 'leave-gtk4-subdirectory + (lambda _ + (chdir "..")))))) + (inputs + (modify-inputs (package-inputs fcitx5-gtk) + (delete "gtk+") + (prepend fcitx5-gtk gtk))) + (outputs '("out")) + (synopsis "GTK4 IM module for Fcitx 5") + (description "Fcitx5-gtk4 provides IM module for GTK4 applications."))) + (define-public fcitx5-qt (package (name "fcitx5-qt") -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-gtkmm-Update-to-4.6.1.patch >From 81ae5b2620d56d24ad1f38bd96d34b22407eb994 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 15 Mar 2022 22:40:27 +0800 Subject: [PATCH 4/4] gnu: gtkmm: Update to 4.6.1. * gnu/packages/gtk.scm (gtkmm): Update to 4.6.1. [propagated-inputs]: Remove atkmm because it's no longer needed. * gnu/packages/gtk.scm (pangomm): Update to 2.50.0. [propagated-inputs]: Replace 'pango' with 'pango-next'. --- gnu/packages/gtk.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3d7706b9ee..8ec14e7bff 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1627,7 +1627,7 @@ (define-public cairomm-1.14 (define-public pangomm (package (name "pangomm") - (version "2.48.0") + (version "2.50.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1635,7 +1635,7 @@ (define-public pangomm name "-" version ".tar.xz")) (sha256 (base32 - "0y2vyp6azvhrii6rzs89kr08wg8z1p562awyr812131zqdsd83ly")))) + "0nrvvf1fyzlimh7rvxcblnrvn2l9rz8mpn2iwzlzr6kv05zafym2")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -1664,7 +1664,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango)) + (list cairo cairomm glibmm pango-next)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description @@ -1760,7 +1760,7 @@ (define-public atkmm-2.28 (define-public gtkmm (package (name "gtkmm") - (version "4.4.0") + (version "4.6.1") (source (origin (method url-fetch) @@ -1769,7 +1769,7 @@ (define-public gtkmm (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1nhdf1s437k41af6frbqw2sky46qci0hgkg9h86a9rlnc0r69d1f")))) + (base32 "1q6iycd7jfbn6rp4sq6r7ndm96dc21inq8mq1d9xsky6kv5gwphd")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -1809,7 +1809,7 @@ (define-public gtkmm ("xsltproc" ,libxslt) ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs - (list atkmm cairomm glibmm gtk pangomm)) + (list cairomm glibmm gtk pangomm)) (synopsis "C++ Interfaces for GTK+ and GNOME") (description "GTKmm is the official C++ interface for the popular GUI library GTK+. Highlights include typesafe callbacks, and a comprehensive set -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 04 16:12:34 2022 Received: (at 54261-done) by debbugs.gnu.org; 4 Apr 2022 20:12:34 +0000 Received: from localhost ([127.0.0.1]:53141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbT3y-0007qQ-5x for submit@debbugs.gnu.org; Mon, 04 Apr 2022 16:12:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50928) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nbT3w-0007q8-JX for 54261-done@debbugs.gnu.org; Mon, 04 Apr 2022 16:12:33 -0400 Received: from [2001:470:142:3::e] (port=41608 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbT3q-0000Ir-Nj; Mon, 04 Apr 2022 16:12:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=4qvRw/4wdh5XyxNw/6zU4SdI/BSR4sY0SMceqKTZ5po=; b=n6NhswK6LuEyD/9a51Bn h4pCQFlfN3BAUR2yDniXmPt1zQ3ECgjIzx7S3tX2Wjnasp+1+noLqmXsvzbGXH7PriCjas305LJBn 3usqF5u+/s0ClmCx5q9pXNuRrSWzlxInlamw6q4VmsGoUTN37Z0temMNz8tRVR59AwYQHMDlB3tDc 8DCjIGrYwzS8N6adv05pJmTUueDvTmTOOqpdGGr85yAoTUrRUqqZauPYuuN5HiKq6/EDwE0sGCV1V qMt7lUbMtqElT34j51t43UnMBcQcyZ3QZOlkJj6FqJ/kBAqOe3iSL4gH4OnPoe685sxS3o4N4BJsl 3EA06ZNSDvfH3A==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201]:56323 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nbT3q-0006Zp-AZ; Mon, 04 Apr 2022 16:12:26 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Zhu Zihao Subject: Re: bug#54261: [PATCH]: Update GTK to 4.6.1. References: <86pmn04f4s.fsf@163.com> <864k4c4cmv.fsf@163.com> <86ilsky0xb.fsf@163.com> <8635jjfcgz.fsf@163.com> <87y216op22.fsf_-_@gnu.org> <864k3syudv.fsf@163.com> <87o81oyj9o.fsf@gnu.org> <86czi4rtfu.fsf@163.com> <87tubcn6ih.fsf@gnu.org> <86r16gjgft.fsf@163.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 15 Germinal an 230 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 04 Apr 2022 22:12:23 +0200 In-Reply-To: <86r16gjgft.fsf@163.com> (Zhu Zihao's message of "Sat, 02 Apr 2022 11:41:08 +0800") Message-ID: <87a6d0txp4.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 54261-done Cc: Maxime Devos , 54261-done@debbugs.gnu.org, Liliana Marie Prikler X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Zhu Zihao skribis: [...] >> Also, I find it surprising that =E2=80=98fcitx5-gtk4=E2=80=99 depends on= =E2=80=98fcitx5-gtk=E2=80=99; >> is it avoidable? > > Because fcitx5-gtk4 use the Glib based D-Bus client. I'd prefer to reuse > existing one instead of build it again for fcitx5-gtk4. OK. > > BTW, How to remove gtk+ and gtk+-2 in same inputs via modify-inputs? The (delete "gtk+") clause removes all the inputs whose label is =E2=80=9Cgtk+=E2=80=9D=E2=80=94both GTK+ 3.x and 2.x in this case. > Do we need repeat (delete "gtk+") clause in the modify-inputs? No. > If we can't handle it without trick, IMO this is a fail of label-less > style input. I must say I hadn=E2=80=99t thought about this situation, which is hopefully quite rare (and questionable, even), but we can deal with it. > From a9be73a1723810dbcec0c4caa3a9d6669494f6d9 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Sat, 5 Mar 2022 21:36:25 +0800 > Subject: [PATCH 1/4] gnu: pango 1.50: Add version 1.50.4. > > * gnu/packages/gtk.scm(pango-next): New variable. [...] > From 823fb5ae1d0cff0247baf6c4847555648c710e55 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Sat, 5 Mar 2022 22:40:46 +0800 > Subject: [PATCH 2/4] 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-next. > * gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]: Disable GTK4 build. > : Add "-DENABLE_GTK_IM_MODULE=3DOFF". > : In phase "patch-install-prefix", Remove GTK4 code. > [inputs]: Remove package gtk. > [outputs]: Remove output "gtk4". [...] > From b4318c10146a72d33dab4d6f9f49846a371a1745 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Mon, 21 Mar 2022 09:16:38 +0800 > Subject: [PATCH 3/4] gnu: Add fcitx5-gtk4. > > * gnu/packages/fcitx5.scm (fcitx5-gtk4): New variable. [...] > From 81ae5b2620d56d24ad1f38bd96d34b22407eb994 Mon Sep 17 00:00:00 2001 > From: Zhu Zihao > Date: Tue, 15 Mar 2022 22:40:27 +0800 > Subject: [PATCH 4/4] gnu: gtkmm: Update to 4.6.1. > > * gnu/packages/gtk.scm (gtkmm): Update to 4.6.1. > [propagated-inputs]: Remove atkmm because it's no longer needed. > * gnu/packages/gtk.scm (pangomm): Update to 2.50.0. > [propagated-inputs]: Replace 'pango' with 'pango-next'. Finally applied, thank you! Ludo=E2=80=99. From unknown Fri Aug 15 18:14:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 03 May 2022 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator