From patchwork Sat Apr 2 03:41:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 1349 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 19D9F27BBEA; Sat, 2 Apr 2022 04:47:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 02DA727BBE9 for ; Sat, 2 Apr 2022 04:47:16 +0100 (BST) Received: from localhost ([::1]:57370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naUjL-0001En-51 for patchwork@mira.cbaines.net; Fri, 01 Apr 2022 23:47:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naUj9-0001Ee-BB for guix-patches@gnu.org; Fri, 01 Apr 2022 23:47:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naUj7-0002JI-TD for guix-patches@gnu.org; Fri, 01 Apr 2022 23:47:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naUj7-0002Dc-Oe for guix-patches@gnu.org; Fri, 01 Apr 2022 23:47:01 -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: Sat, 02 Apr 2022 03:47:01 +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.16488712018499 (code B ref 54261); Sat, 02 Apr 2022 03:47:01 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès 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 ‘fcitx5-gtk4’ depends on ‘fcitx5-gtk’; > 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. 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