From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WCEPJ37TQ2K8EgAAgWs5BA (envelope-from ) for ; Wed, 30 Mar 2022 05:50:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eOalI37TQ2IpJwEAauVa8A (envelope-from ) for ; Wed, 30 Mar 2022 05:50:22 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1AF7945382 for ; Wed, 30 Mar 2022 05:50:21 +0200 (CEST) Received: from localhost ([::1]:36180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZPLf-0002Cz-V1 for larch@yhetil.org; Tue, 29 Mar 2022 23:50:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZPLP-0002Cq-3n for guix-patches@gnu.org; Tue, 29 Mar 2022 23:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40213) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZPLO-0006ha-R6 for guix-patches@gnu.org; Tue, 29 Mar 2022 23:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZPLO-0000iW-Jh for guix-patches@gnu.org; Tue, 29 Mar 2022 23:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54261] [PATCH]: Update GTK to 4.6.1. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 30 Mar 2022 03:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 54261@debbugs.gnu.org, Maxime Devos , Liliana Marie Prikler Received: via spool by 54261-submit@debbugs.gnu.org id=B54261.16486121762714 (code B ref 54261); Wed, 30 Mar 2022 03:50:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1648612221; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=hI2MEqoxoF0jEBNRp+0uhm2RnZg5M7m+TncbRkVr/lk=; b=e0jsPcrOxzvNbb7blB9XWPAK7kj331ebM3kqF1T4lBEFnjO9xQHsQkaKQ32oBdb8dL9G/C JpEKlyuL6tSGpBwJJu8Aq4MMaOd7caDs/LFtPoI1MlvR+qFQWz3vFLsoHH51X4Xo1P8jCk 8Ug1cntvwQWMG1UI54yysu7ISQUcVQdmQUmcH2M41dFPkxUIQ5vQ1a5+SkgjALmMTg53e5 oADR0N2Ola13p3d4tx+369PzWUb9qT0KJHow+iA7u5kYdr3nLYyo2uebFYmUMkr7VAdTFI yP1C49+7mkpD530+Ef9IBtsjyxjcmgk3VkRSYs6MhIrnhzo1Psqa07bZeloDeQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1648612221; a=rsa-sha256; cv=none; b=aAGHHKPHDFUXbrBFaQ95GDgr21znrNFgIYuw2TZSg/XaAE9WEV0KPI1TuU59780BapJfNV 6Am3/ehhhSDWdFtbZqjkYGCUmUVVaS9mczgH9TMDDJncXrnNMlU1VNHWYp3TJb1CNcL5qd ftLjkeoU/gJWhmBGtdJV8iT5oQv+E6sTakUTfKJOxZ8y9yivK9w2biQNS/KS9a6NeBc4qb PRKfzQFLrm6O7asdODdmL5Sx27SZ5Wt5J8Ftdc2r16DeBMjsHTr7QMqjENE/fejhhLXNZ5 va3rp2QOYnawpMuKiWUqY8Sa23ilKRALkHmgC2IsomUzJJKAAOfzxHAAM2d02g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=pm5jmNqx; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 4.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=163.com header.s=s110527 header.b=pm5jmNqx; dmarc=fail reason="SPF not aligned (relaxed)" header.from=163.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1AF7945382 X-Spam-Score: 4.53 X-Migadu-Scanner: scn0.migadu.com X-TUID: Mxe99Mbd3azu --=-=-= 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 --=-=-=--