From patchwork Sun Feb 18 20:30:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 60881 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 4978527BBE2; Wed, 21 Feb 2024 22:51:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 372EA27BBE9 for ; Wed, 21 Feb 2024 22:51:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rcvQM-0002SC-UZ; Wed, 21 Feb 2024 17:50:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rcvQK-0002PQ-Oq for guix-patches@gnu.org; Wed, 21 Feb 2024 17:50:44 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rcvQF-000235-Td for guix-patches@gnu.org; Wed, 21 Feb 2024 17:50:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rcvQc-0005Gr-0c for guix-patches@gnu.org; Wed, 21 Feb 2024 17:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69256] [PATCH gnome-team v2 1/2] gnu: glibmm-2.64: Rename and update to 2.66.6. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Feb 2024 22:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69256 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69256@debbugs.gnu.org,John Kehayias Cc: rg@raghavgururajan.name, vivien@planete-kraus.eu, liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 69256-submit@debbugs.gnu.org id=B69256.170855582420152 (code B ref 69256); Wed, 21 Feb 2024 22:51:01 +0000 Received: (at 69256) by debbugs.gnu.org; 21 Feb 2024 22:50:24 +0000 Received: from localhost ([127.0.0.1]:49546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcvPy-0005Ep-0m for submit@debbugs.gnu.org; Wed, 21 Feb 2024 17:50:24 -0500 Received: from planete-kraus.eu ([89.234.140.182]:52344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rcvPr-0005Do-Mp for 69256@debbugs.gnu.org; Wed, 21 Feb 2024 17:50:20 -0500 Received: from planete-kraus.eu (localhost [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id e7a5f42a; Wed, 21 Feb 2024 22:49:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=aEBKrJqC6jYE7h3hnx1SXLGMqfM=; b=Z iXY1wWu9o5XWvNLUfVVKp6f+XG/7Ikb+7hMM5LQ+/0P9kUYaAXrUh8vTtN07CTvg +0xLuCwJYLokuivHvnr86mGUvjHjTh77tNgRO9LCxQW88zCwqQEyKEG/CWrTNnbZ jrEkZ9v5/mlFDsM/B+Uqr7fYXvBPZN1X+q6/+k5HuC+ZckKWMIBDSyPeu+kWhM7c GVsIDIvYJYbqy6uOK9oIF9zDpCVt6XTkkY//nmNN1MBtTTgkw4nZsR7HcazDwS1+ L8oJoVukxFz62q5AyI2+6FuXBHXaXK5m+tuMtPrCctN/agg4RixhUgEBxDjgFyMA ShamsrA04b/BZaHoqnBkQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 27420302 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Wed, 21 Feb 2024 22:49:48 +0000 (UTC) Message-ID: <9d825c63775a2a8e15778b1dcf116f1544885cea.1708553063.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sun, 18 Feb 2024 20:30:31 +0000 MIME-Version: 1.0 User-Agent: Evolution 3.48.4 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: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello, In brief, this patch updates glibmm@2.6 to the latest 2.6 version, which is tagged 2.66.6. I did not see this in the NEWS of glibmm but noticed from Arch's packages when trying to investigate something (details below). I'm not sure exactly the number of rebuilds since there is a newer version of glibmm already, but I would guess this touches a lot (via gtkmm-3, e.g. inkscape). Inkscape did build successfully locally, as well as some later packages, like the one that started this for me, waybar. Updating waybar hit some errors in glibmm-2.64, which is not included directly but via gtkmm-3. The reason is that waybar now uses c++20 which had errors in older glibmm versions. The NEWS file of the project notes this is fixed in 2.68.1, see . I'm confused over all the versions and ABI versions, but I believe this is a different ABI and it is not clear that it was fixed in other, earlier versions as the 2.6x changes don't seem to be all listed. In noticing the Arch version I found that 2.66.6 is the latest tag for a 2.6x version and made this patch. Everything up to and including a new waybar version built now and works. I can't speak for other dependents but can try locally. So, it would be great to push this patch on gnome-team if that make sense, or else I could do it on mesa-updates if that is better timing. I'll be updating libdrm, cairo (unless that should go here or core-updates?), mesa, vulkan, etc. with a first pass in the next few days. I'll have some info on guix-devel as well. Hope this patch looks good, let me know! John * gnu/packages/glib.scm (glibmm-2.64): Rename to ... (glibmm-2.66): ... this. Update to 2.66.6. * gnu/packages/animation.scm (etl)[inputs]: Adjust accordingly. (synfig)[propagated-inputs]: Likewise. * gnu/packages/electronics.scm (libsigrok)[propagated-inputs]: Likewise. * gnu/packages/gnome-xyz.scm (eiciel)[inputs]: Likewise. * gnu/packages/gnome.scm (libxml++-3, libxml++-2)[propagated-inputs]: Likewise. * gnu/packages/gtk.scm (pangomm-2.46, atkmm-2.28, gtkmm-2)[propagated-inputs]: Likewise. Change-Id: I878e740e085a483970a4ef6e0fa7dd19000863eb --- gnu/packages/animation.scm | 4 ++-- gnu/packages/electronics.scm | 2 +- gnu/packages/glib.scm | 6 +++--- gnu/packages/gnome-xyz.scm | 2 +- gnu/packages/gnome.scm | 4 ++-- gnu/packages/gtk.scm | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index d6bd3fd03d..3bcf1cc8f0 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -109,7 +109,7 @@ (define-public etl (base32 "1jnahpxvrdxrll7b7av3zxabm5j3nlz6m3vg4sib2278v1wf91yc")))) (build-system gnu-build-system) - (inputs (list glibmm-2.64)) + (inputs (list glibmm-2.66)) (native-inputs (list pkg-config)) (home-page "https://www.synfig.org") (synopsis "Extended C++ template library") @@ -149,7 +149,7 @@ (define-public synfig fftw fontconfig freetype - glibmm-2.64 + glibmm-2.66 imagemagick libxml++-2 libsigc++ diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 83a92abc4e..aaf762b02b 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -210,7 +210,7 @@ (define-public libsigrok ;; and "glib" in Requires (propagated-inputs (list glib - glibmm-2.64 + glibmm-2.66 libserialport libusb libftdi diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eee5251d03..aef2b7a941 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -995,11 +995,11 @@ (define glibmm useful for C++.") (license license:lgpl2.1+))) - (define-public glibmm-2.64 + (define-public glibmm-2.66 (package (inherit glibmm) (name "glibmm") - (version "2.64.5") + (version "2.66.6") (source (origin (method url-fetch) @@ -1008,7 +1008,7 @@ (define glibmm (version-major+minor version) "/glibmm-" version ".tar.xz")) (sha256 - (base32 "11m37sbx0i18cl17d0fkq0bik4bbzlb5n8kcl651jhci5ipci3sh")))) + (base32 "0bqm9vqwhas69q6n89wd2xgxvrlkpxra13dzsx8m67hqk0jp8n2k")))) (propagated-inputs (modify-inputs (package-propagated-inputs glibmm) (replace "libsigc++" libsigc++-2))))) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 72f1ffe5ab..0784937c63 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1560,7 +1560,7 @@ (define-public eiciel (native-inputs (list gettext-minimal pkg-config)) (inputs - (list acl attr glibmm-2.64 gtkmm-3 nautilus)) + (list acl attr glibmm-2.66 gtkmm-3 nautilus)) (home-page "https://rofi.roger-ferrer.org/eiciel") (synopsis "Manage extended file attributes") (description "Eiciel is a plugin for nautilus to graphically edit ACL and diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7397148c2b..24cedaa161 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8831,7 +8831,7 @@ (define-public libxml++-3 (sha256 (base32 "07f6l9ka63dnc85npxq5g7bn1ja7lad0w2wixqdlyabdvc4l2hp5")))) (propagated-inputs (modify-inputs (package-propagated-inputs libxml++) - (append glibmm-2.64))))) + (append glibmm-2.66))))) ;; This is the last release providing the 2.6 API, hence the name. (define-public libxml++-2 @@ -8849,7 +8849,7 @@ (define-public libxml++-2 (sha256 (base32 "05slsbhc25z7kwlc28ydl3dfyp7rgbmz1fxj9z6gcvpg3hkghj2m")))) (propagated-inputs (modify-inputs (package-propagated-inputs libxml++) - (append glibmm-2.64))))) + (append glibmm-2.66))))) (define-public gdm (package diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index eacc7fc5ed..bdce1bc493 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1736,7 +1736,7 @@ (define-public pangomm-2.46 (sha256 (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1")))) (propagated-inputs - (list cairomm-1.14 glibmm-2.64 pango)))) + (list cairomm-1.14 glibmm-2.66 pango)))) (define-public atkmm (package @@ -1804,7 +1804,7 @@ (define-public atkmm-2.28 (base32 "1b8vycqzr3lfvk2l73f4kk74hj48081zbh9r1r2ilr3h8xh7cs0i")))) (propagated-inputs (modify-inputs (package-propagated-inputs atkmm) - (replace "glibmm" glibmm-2.64))))) + (replace "glibmm" glibmm-2.66))))) (define-public gtkmm (package @@ -1914,7 +1914,7 @@ (define-public gtkmm-2 (strip-keyword-arguments '(#:configure-flags) (package-arguments gtkmm))) (propagated-inputs - (list atkmm-2.28 cairomm-1.14 glibmm-2.64 gtk+-2 pangomm-2.46)))) + (list atkmm-2.28 cairomm-1.14 glibmm-2.66 gtk+-2 pangomm-2.46)))) (define-public gtksourceviewmm (package