From patchwork Wed Mar 30 03:45:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 38212 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 8179127BBEA; Wed, 30 Mar 2022 04:50:20 +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 6EC0627BBE9 for ; Wed, 30 Mar 2022 04:50:19 +0100 (BST) Received: from localhost ([::1]:36180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZPLe-0002Cz-GK for patchwork@mira.cbaines.net; Tue, 29 Mar 2022 23:50:18 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Ludovic Courtès 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. 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