From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 26 15:21:52 2023 Received: (at submit) by debbugs.gnu.org; 26 Mar 2023 19:21:53 +0000 Received: from localhost ([127.0.0.1]:45841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVw8-00049t-I5 for submit@debbugs.gnu.org; Sun, 26 Mar 2023 15:21:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:36660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVw6-00049h-K3 for submit@debbugs.gnu.org; Sun, 26 Mar 2023 15:21:51 -0400 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 1pgVw1-0007OZ-Ry for guix-patches@gnu.org; Sun, 26 Mar 2023 15:21:45 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgVw0-0006ZE-4Q for guix-patches@gnu.org; Sun, 26 Mar 2023 15:21:45 -0400 Received: by mail-wm1-x342.google.com with SMTP id n10-20020a05600c4f8a00b003ee93d2c914so5699883wmq.2 for ; Sun, 26 Mar 2023 12:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679858502; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=LxOitFywkAX0e/UTjvJR0EArz/wcyRWcVB/0FT5ERTg=; b=cl4pjKOh/mB1Hb4VpLKYYA3wKCwgb3M0v9SBlR0z8HZqobYT0bP2YcOpq4rWyqzPJQ xj3iMN2SIy5EwogC69dleQ2K3XiiYQGpJh4Fad8MK5lZpfefADdwcnT+CfbNtV0xmEPE nxbh0NRg3L+f6sdlLPge/z2avbG7p3SLX9NQTM0Kdng6GxwLx4h1BTA4tuJgK3uRwgMn NhJcOCTy9aQoZ+Bba61LEOV/iJpdJeAe8+RZ1YW5jS/zX3/jic7BD0Cq4VHKTEMrSoh0 fiGw4Y/o3Vk6d8jtgInqdMJP4EuskwggTmVx+GluP7p2d6tNNpfn2LWHV0mzgY+o7g9W RPQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679858502; h=message-id:to:content-transfer-encoding:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LxOitFywkAX0e/UTjvJR0EArz/wcyRWcVB/0FT5ERTg=; b=IFYlNF2n9mV+VrPpLzz8nr8jnlRtrB3NTwZfqT/ipqhzGwIqy3uJ2pT9svHwy6xlbU T1UpAPzwZIjZxtqIyuM4Hh/7kwrgXGpQKNlLlMIgySWh5GGLXA/9bXY3dpV6Nw+4j8Lj N/TviE6rx0YBKFoBOZWtc1paYJn4k9YIA3QyXCoO+MaoZvvkDCkWs2kHVk+iTYotfhVt IwCEn+NUQv+KWB2eolXHORTKloCq7TUkfjCBWoZNyGDl50aiJ7wPJK3DrzIKkwK/4pvT ZRhLUtkPQoWWjJVOGeA/bqxVzWFIo3aqsYSiBUyWCi+bCU1XHCe7+Cni+9m4J/qenpc1 1NVg== X-Gm-Message-State: AO0yUKXWue5uoOKhEQKD5mZswlPSqTc/YsAcIn+Cn//hthYnWXyxAoXb 6ceC7qx2flCjlh515GZmILKa8a8KeWJpag== X-Google-Smtp-Source: AK7set+BZszqtJCcF7BrUVgM0G5yEPsjN8KLvXD/j30+VP0GZNIA/zcv+HI9xdtBnepzVX9K9Z7WKw== X-Received: by 2002:a05:600c:2214:b0:3ee:289a:43a7 with SMTP id z20-20020a05600c221400b003ee289a43a7mr8922285wml.22.1679858501813; Sun, 26 Mar 2023 12:21:41 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s17-20020a7bc391000000b003ed2987690dsm11292121wmj.26.2023.03.26.12.21.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 12:21:41 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:20:14 +0200 Subject: [PATCH gnome-team 0/5] Update fundamental packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: rg@raghavgururajan.name to: guix-patches@gnu.org Message-ID: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=liliana.prikler@gmail.com; helo=mail-wm1-x342.google.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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.3 (--) Hi Guix, to start off work in gnome-team, let's tackle the biggies. Originally, I had planned to also do gtk 4.10, but that package requires too much of our rebuilt world and I'd rather have a solid foundation first. Cheers Liliana Marie Prikler (5): gnu: glib: Update to 2.76.1. gnu: Make pango-next the new pango. gnu: pango: Update to 1.50.14. gnu: Make gobject-introspection-next the new gobject-introspection. gnu: gobject-introspection: Update to 1.76.1. gnu/local.mk | 2 - gnu/packages/freedesktop.scm | 4 +- gnu/packages/geo.scm | 1 - gnu/packages/glib.scm | 111 +++-------- gnu/packages/gnome.scm | 33 +--- gnu/packages/gtk.scm | 32 +--- gnu/packages/guile-xyz.scm | 4 +- gnu/packages/ibus.scm | 2 +- gnu/packages/messaging.scm | 1 - .../patches/glib-skip-failing-test.patch | 3 +- ...trospection-absolute-shlib-path-1.72.patch | 173 ------------------ ...ct-introspection-absolute-shlib-path.patch | 51 +++--- .../gobject-introspection-cc-1.72.patch | 15 -- .../patches/gobject-introspection-cc.patch | 11 +- gnu/packages/webkit.scm | 3 +- 15 files changed, 82 insertions(+), 364 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch base-commit: 42fbe62d52a82d1003c3d7039d3c4a46806c5cee -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 26 15:24:36 2023 Received: (at 62467) by debbugs.gnu.org; 26 Mar 2023 19:24:37 +0000 Received: from localhost ([127.0.0.1]:45851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVym-0004FW-8G for submit@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:36 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyj-0004F2-QZ for 62467@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:34 -0400 Received: by mail-wm1-f68.google.com with SMTP id o32so3848624wms.1 for <62467@debbugs.gnu.org>; Sun, 26 Mar 2023 12:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679858668; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=F+WV+EUMFRddsrBYpzawKca+AsbbEq/l+ScKvUC3PXI=; b=YUhruLcuSzUwCu//W1AnraWruE3I+X7d0oDMSYvTK51n8KqC5oQdbFlx4oFcxFB4Ss tmegjD55iabpRStC8n5ugE1lhaO8WpsfmUSUkkvm76AvK4/XxoR39rqV7vWp1lfCiGT/ 39Qhy+UHJXLZQOuhNAKeuYAClfuCifnzUyuw3za3tAJj4jyA7gKxBJvS8HHBfnvMFh4/ e7sW8/NN1X6+9WP8VBC7ClI84NmqPzjSGgTchTFErHizJvPB7cRpOt3MLe5tXrzeuTz5 bW4SiHSz2uSmCGAy9Xdz0mGbRrpnOuP1SMyjbzaG5x4QSRFylBvTGcFl3/ib5P9y1LXj h6ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679858668; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=F+WV+EUMFRddsrBYpzawKca+AsbbEq/l+ScKvUC3PXI=; b=TmpfYHxvuNYv0hMRtX1k04LjpQ9U8bXuyTY3JwJHVt5Q+yVsaOHUSopXDMtGFEYQeM bA4b2Fj5RwgX+gov8Kqs0+rVD7Par8nOXf0kKqouSj4Tqwd3gk7vrRlQLM7UmJVeoIYf aJBRgg0DEUSwM3Zd4kYJ93+K6BsbVv5jJmGaBfbahuZHJ2v0rzIesXui6ETKxYLr4fnB 0RBXNb6F8i1JL7tu9aQYjCJuoFHzG/Kua+aTTqhH2kfB0aFd8bi5LvYI1gOVQ5J8jFbj +UmDK5hpgkOE0Hqdf529PoLa0TD2k67hY+BU4y7F08OyH7hXPbW0l+V9bOQboQh9DlDb C53w== X-Gm-Message-State: AO0yUKWnykX5bHd8eLhZHQyHrgjXoj4nmbb6MgJ3yVG1RC182xtbQAt8 hZph+POhyCRmvZOkUni9Vb7L3jbpz+sinQ== X-Google-Smtp-Source: AK7set9FT9kspCxHb2lBMss6dHHMyZOmakSjx1dtCWMhcKA8mEsJsXbosIZ830H6AkaG9me0as+z+A== X-Received: by 2002:a7b:ca4a:0:b0:3ee:555:ea60 with SMTP id m10-20020a7bca4a000000b003ee0555ea60mr8756626wml.8.1679858667630; Sun, 26 Mar 2023 12:24:27 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x4-20020a1c7c04000000b003ee0d191539sm11337911wmc.10.2023.03.26.12.24.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 12:24:27 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:39:11 +0200 Subject: [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Rep [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.68 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.68 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name 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: 0.1 (/) * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Replace pcre with pcre2. (glib-with-documentation): Inherit from glib. * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib. * gnu/packages/gtk.scm (gtksourceview): Use glib. * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly. --- gnu/packages/glib.scm | 92 +++++-------------- gnu/packages/gnome.scm | 8 +- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- .../patches/glib-skip-failing-test.patch | 3 +- 5 files changed, 30 insertions(+), 77 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f85d5e3225..ecf5cb491f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -215,7 +215,7 @@ (define-public dbus-verbose (define glib (package (name "glib") - (version "2.70.2") + (version "2.76.1") (source (origin (method url-fetch) @@ -224,14 +224,14 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85")) + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) (modules '((guix build utils))) (snippet '(begin - (substitute* "tests/spawn-test.c" + (substitute* "glib/tests/spawn-test.c" (("/bin/sh") "sh")))))) (build-system meson-build-system) (outputs '("out" ;libraries, locales, etc @@ -256,6 +256,9 @@ (define glib #:phases (modify-phases %standard-phases ;; Needed to pass the test phase on slower ARM and i686 machines. + (add-after 'unpack 'set-G_TEST_SRCDIR + (lambda _ + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests")))) (add-after 'unpack 'increase-test-timeout (lambda _ (substitute* "meson.build" @@ -270,9 +273,19 @@ (define glib (substitute* '("unix.c" "utils.c") (("[ \t]*g_test_add_func.*;") ""))) (with-directory-excursion "gio/tests" - (substitute* '("contenttype.c" "gdbus-address-get-session.c" - "gdbus-peer.c" "appinfo.c" "desktop-app-info.c") - (("[ \t]*g_test_add_func.*;") ""))) + (substitute* '("contenttype.c" + "gdbus-address-get-session.c" + "gdbus-server-auth.c" + "gdbus-peer.c" + "appinfo.c" + "desktop-app-info.c") + (("[ \t]*g_test_add_func.*;") "")) + (unless (which "update-desktop-database") + (substitute* '("file.c") + (("[ \t]*g_test_add_func.*query-default-handler.*;") ""))) + (substitute* '("portal-support-snap.c") + (("g_test_init .*") + "return EXIT_SUCCESS;"))) ,@(if (target-x86-32?) ;; Comment out parts of timer.c that fail on i686 due to @@ -357,7 +370,7 @@ (define glib libelf)) (propagated-inputs (list libffi ; in the Requires.private field of gobject-2.0.pc - pcre ; in the Requires.private field of glib-2.0.pc + pcre2 ; in the Requires.private field of glib-2.0.pc `(,util-linux "lib") ;for libmount zlib)) ; in the Requires.private field of glib-2.0.pc (native-search-paths @@ -383,68 +396,10 @@ (define glib (license license:lgpl2.1+) (properties '((hidden? . #t))))) -(define-public glib-next - (package - (inherit glib) - (name "glib") - (version "2.73.3") - (source - (origin - (inherit (package-source glib)) - (uri - (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (snippet - '(substitute* "glib/tests/spawn-test.c" - (("/bin/sh") "sh"))) - (sha256 - (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz")))) - (arguments - (substitute-keyword-arguments (package-arguments glib) - ((#:test-options test-options ''()) - ;; Skip flaky or slow tests. - `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options)) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (replace 'disable-failing-tests - (lambda _ - (with-directory-excursion "glib/tests" - (substitute* '("unix.c" "utils.c") - (("[ \t]*g_test_add_func.*;") ""))) - ;; The "glib:gio / file" test fails with the error "No - ;; application is registered as handling this file" (see: - ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). - (with-directory-excursion "gio/tests" - (substitute* '("appinfo.c" - "contenttype.c" - "desktop-app-info.c" - "file.c" - "gdbus-address-get-session.c" - "gdbus-peer.c") - (("[ \t]*g_test_add_func.*;") ""))) - - ,@(if (target-x86-32?) - ;; Comment out parts of timer.c that fail on i686 due to - ;; excess precision when building with GCC 10: - ;; . - '((substitute* "glib/tests/timer.c" - (("^ g_assert_cmpuint \\(micros.*" all) - (string-append "//" all "\n")) - (("^ g_assert_cmpfloat \\(elapsed, ==.*" all) - (string-append "//" all "\n")))) - '()))))))) - (native-inputs - (modify-inputs (package-native-inputs glib) - (append desktop-file-utils))) - (propagated-inputs - (modify-inputs (package-propagated-inputs glib) - (replace "pcre" pcre2))))) - (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. - (let ((base glib-next)) + (let ((base glib)) (package/inherit base (properties (alist-delete 'hidden? (package-properties base))) (outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference @@ -624,10 +579,7 @@ (define-public gobject-introspection-next (patches (search-patches "gobject-introspection-cc-1.72.patch" "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs gobject-introspection) - (replace "glib" glib-next))))) + "gobject-introspection-absolute-shlib-path-1.72.patch")))))) (define intltool (package diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0efb98b97c..4a7e188048 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13167,7 +13167,7 @@ (define-public sysprof (propagated-inputs (list polkit)) (inputs - (list glib-next + (list glib gtk json-glib libadwaita @@ -13176,7 +13176,7 @@ (define-public sysprof polkit)) (native-inputs (list gettext-minimal - `(,glib-next "bin") ;for gdbus-codegen, etc. + `(,glib "bin") ;for gdbus-codegen, etc. itstool libxml2 pkg-config)) @@ -13445,7 +13445,7 @@ (define-public gtranslator (substitute* "build-aux/meson/meson_post_install.py" (("gtk-update-icon-cache") (which "true")))))))) (native-inputs - (list `(,glib-next "bin") + (list `(,glib "bin") gettext-minimal itstool pkg-config)) @@ -13453,7 +13453,7 @@ (define-public gtranslator (list json-glib jsonrpc-glib gettext-minimal - glib-next + glib gsettings-desktop-schemas gspell libgda diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b9ef660a80..1911ed7774 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -710,7 +710,7 @@ (define-public gtksourceview ;; gtksourceview-5.pc refers to all these. (list fontconfig fribidi - glib-next + glib gtk libxml2 pcre2 diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 315c9a7554..5d861c5c82 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2290,7 +2290,7 @@ (define (get lib) (setenv "DISPLAY" ":1") #t))))) (inputs - (list guile-3.0 guile-lib glib-next)) + (list guile-3.0 guile-lib glib)) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch index c7706aaa74..3fde5cb1e2 100644 --- a/gnu/packages/patches/glib-skip-failing-test.patch +++ b/gnu/packages/patches/glib-skip-failing-test.patch @@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build index a926ae0..4fdbe7a 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -317,10 +317,6 @@ if host_machine.system() != 'windows' +@@ -317,11 +317,6 @@ if host_machine.system() != 'windows' 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'], }, - 'gdbus-threading' : { - 'extra_sources' : extra_sources, +- 'extra_programs': extra_programs, - 'suite' : ['slow'], - }, 'gmenumodel' : { base-commit: 42fbe62d52a82d1003c3d7039d3c4a46806c5cee -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 26 15:24:37 2023 Received: (at 62467) by debbugs.gnu.org; 26 Mar 2023 19:24:37 +0000 Received: from localhost ([127.0.0.1]:45853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVym-0004Fi-VJ for submit@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:37 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:43938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyk-0004F5-Du for 62467@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:34 -0400 Received: by mail-wm1-f67.google.com with SMTP id o24-20020a05600c511800b003ef59905f26so3868557wms.2 for <62467@debbugs.gnu.org>; Sun, 26 Mar 2023 12:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679858669; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=wUarcr2JGnavA93c9ORJU+xGbGWz/CrheZvuZtgcYXU=; b=Y6dfe1U9qO52S93weyYe6Yi/pq5HrS2FoPmLvWT9WiL5zihCgUVrqA+ghOnSHdn1ZI 1s0I+shVFaBHfWPXI+TR72WcYuoswYYZPAwsing9E2nZ2ouXLPamnpmH1DYMOIinrmBe DKke0ogZp5DabffBKoo2NwQYYn8VkbDzLeXdQFH/fDp9bjX9LqIqMpMb6IlXIHXamhc7 PtO8Bmj9ZNjXItSTkfJJeyP6zB5vhtxKVpVhD1yGKhK5tvnymK+hYyQ2Bhm9N8maQ7Jy SZafC+DQVSoY5lSXKvfdeQ18ekTBWPDQlwxo/PsLNtoGJiuMt+tWgEX5eeyWDGQco19X dqMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679858669; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wUarcr2JGnavA93c9ORJU+xGbGWz/CrheZvuZtgcYXU=; b=SSkQlOVzTjtxApSQ0ThYcMu1ZuULNhTwIqozSRD09deG3is9Y53wAVaHJBecUYMRlX WMq6z741BwhZpzg3cngFITzh81K9Y8enoeMMtktNxt0v7A0ja6k3T70oBILTGtH9b3mY E0jdwZV7S8zAq/o4vor1JvPGhu21TphRb52la70somvj0+OnNGFk1ueeMhTRTRxxVQQN hweiq+yF2rAAfk8/q8D7VY9v6ROOzcZAcPcELNHJbu94pFpXORulD+dH72qMcMFxAgl4 RU6T1wYsWP4euapQj3HON/Xkv1vEWxYv9H5knPq7NMT3eAiZz1Q2MSyuC099yDmlCgLa Wsjg== X-Gm-Message-State: AAQBX9cN/IxOPM2OPYq7Mx+YTMel8Pg1GbKWtAHUueiGvW38V4Ug9ESg VXNrzLqZWCO1oE8e5fshkqNNe/DVD3j8lw== X-Google-Smtp-Source: AKy350bgJQVrzdu8mC+dlTujh9cjCfF1ZEpZkYC3Qa5cGjGNFb6/2Z6W+F7oBuHP+5VIUpok0abCNA== X-Received: by 2002:a05:600c:2144:b0:3ef:6396:d9b3 with SMTP id v4-20020a05600c214400b003ef6396d9b3mr3949131wml.18.1679858668952; Sun, 26 Mar 2023 12:24:28 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x4-20020a1c7c04000000b003ee0d191539sm11337911wmc.10.2023.03.26.12.24.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 12:24:28 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 20:53:15 +0200 Subject: [PATCH gnome-team 3/5] gnu: pango: Update to 1.50.14. to: 62467@debbugs.gnu.org Message-ID: <5c3d13f2dca82ffcf8234257a4a53dd0bac9afa4.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name 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 (-) * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- 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 ee9311ee79..75cf9004b4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.50.4") + (version "1.50.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -436,7 +436,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) + "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 26 15:24:37 2023 Received: (at 62467) by debbugs.gnu.org; 26 Mar 2023 19:24:38 +0000 Received: from localhost ([127.0.0.1]:45855 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyn-0004Ft-8y for submit@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:37 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:35655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyk-0004F4-8O for 62467@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:35 -0400 Received: by mail-wm1-f66.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso6061749wmb.0 for <62467@debbugs.gnu.org>; Sun, 26 Mar 2023 12:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679858668; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=0ghBYttuFFAhaAZWA6xXVPXcRREd2FWJ+sb1htUi4fo=; b=mwYj8cdtm8uFJvk1s/x3SCOrcXAbVBFYbjuOm+7gwVdFS0W+1FgG86gcJl0ryJe3wB pV9DC+yKgpfIaZvctBQnW2S/EXLZUi2eOu0I48SCsMUn+StyJoRIEH5zr1IcwGxwCPbu cT6eEBa3iy/ej1R4US8QmY6JJQE0raBul8gDo4MeDgwTHJrjvKWQWRrzB/KduL4w1aug bQMdaoTfUe1VNs2qNmM2I5rp5Lwmy4mCKP8qPBY3UZiVgGNBmP8TGLAf7j3KhRCS5hJM ab9sK0yRWbbWU9z/ixInzCy6BrpzvQ1rdLWdUzkHVAquQSSiXVooZUp0F5nzhmCPKzcW mPKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679858668; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0ghBYttuFFAhaAZWA6xXVPXcRREd2FWJ+sb1htUi4fo=; b=O+HMzk7HbBpLq+N7sNQMm8uH+H6fNzrAsLsz0A2ppdKaL+IjI3o6hN1aBCasxfdqM5 NbnA6daJoJMcrHiFFvuacBNsU3+5GNypOnrsfVaqkdIQUz/Dh2+F2TZO8sm82cFq1Vim mZCckHc3wlAmvq7Fekv0yGbPDKoUsw4IH8zNY8ePCj79+BtcjI7VngkiO6CIPry0l3VT Huc/IFdCFVhbEisjymuTab19KYljqkgU89fSUdUb8d+j9RiQ92me0d0ytcs4EsCKolQI Ax5FZwuuSSu+9xVMYkpGAJNghthBcluGs0rLRwSrzql98UmTRjU7J/Maue0JwXhNuupW 4K+w== X-Gm-Message-State: AO0yUKXDNLn1MPf27bLelISx5G0Qgrx1E/hwW21csU8roDTLgINoWDsd +JtH5RG1i7ww4sfCNYMU+ArCa8pGeF9IMQ== X-Google-Smtp-Source: AK7set8EPKF9AF1nepPfEkfgCAtwyfaOB0odw+Bvhki2DRqTv2zXqGWP3ulOYUuDQo1Ll6d4zc5iEg== X-Received: by 2002:a05:600c:225a:b0:3eb:3843:9f31 with SMTP id a26-20020a05600c225a00b003eb38439f31mr7338024wmm.10.1679858668285; Sun, 26 Mar 2023 12:24:28 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x4-20020a1c7c04000000b003ee0d191539sm11337911wmc.10.2023.03.26.12.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 12:24:28 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:53:13 +0200 Subject: [PATCH gnome-team 2/5] gnu: Make pango-next the new pango. to: 62467@debbugs.gnu.org Message-ID: <642173f1a695e2c2bef270e178af7dec0c165220.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (gtk)[propagated-inputs]: Use pango instead of pango-next. (pangomm)[propagated-inputs]: Likewise. (gtksourceview, gtk, [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 1.1 DATE_IN_PAST_03_06 Date: is 3 to 6 hours before Received: date -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.66 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.66 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name 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: 0.1 (/) * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (gtk)[propagated-inputs]: Use pango instead of pango-next. (pangomm)[propagated-inputs]: Likewise. (gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next. * gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next. * gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise. * gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise. (network-manager-openvpn)[inputs]: Likewise. (network-manager-vpnc)[inputs]: Likewise. (network-manager-openconnect)[inputs]: Likewise. (network-manager-fortisslvpn)[inputs]: Likewise. (gnome-bluetooth)[inputs]: Likewise. (baobab)[inputs]: Likewise. (gnome-calendar)[inputs]: Likewise. (gtranslator)[inputs]: Likewise. * gnu/packages/ibus.scm (ibus)[inputs]: Likewise. * gnu/packages/messaging.scm (dino)[inputs]: Likewise. * gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise. --- gnu/packages/freedesktop.scm | 4 +--- gnu/packages/geo.scm | 1 - gnu/packages/gnome.scm | 25 ++++++------------------- gnu/packages/gtk.scm | 28 +++++----------------------- gnu/packages/ibus.scm | 2 +- gnu/packages/messaging.scm | 1 - gnu/packages/webkit.scm | 3 +-- 7 files changed, 14 insertions(+), 50 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 40edcfdab4..20b2f5a87b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2113,9 +2113,7 @@ (define-public colord-gtk pkg-config vala)) (inputs - ;; TODO: remove pango-next after it's the default. - (list gtk+ - pango-next)) + (list gtk+)) (propagated-inputs ;; colord-gtk.pc refers to all these. (list colord gtk)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 753ab558ad..9465c0eda7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -388,7 +388,6 @@ (define-public gnome-maps libshumate libsoup libxml2 - pango-next ;TODO: remove when it's the default rest-next webkitgtk)) (synopsis "Graphical map viewer and wayfinding program") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a7e188048..90e33d72b6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8399,7 +8399,6 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - pango-next ;remove after it's the default webkitgtk)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") @@ -8707,8 +8706,7 @@ (define-public network-manager-openvpn libnma libsecret network-manager - openvpn - pango-next)) ;remove after it's the default + openvpn)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenVPN plug-in for NetworkManager") (description @@ -8758,8 +8756,7 @@ (define-public network-manager-vpnc vpnc network-manager libnma - libsecret - pango-next)) ;TODO: remove after it's the default + libsecret)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "VPNC plug-in for NetworkManager") (description @@ -8811,8 +8808,7 @@ (define-public network-manager-openconnect libxml2 lz4 network-manager - openconnect - pango-next)) ;TODO: remove after it's the default + openconnect)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenConnect plug-in for NetworkManager") (description @@ -8875,7 +8871,6 @@ (define-public network-manager-fortisslvpn libsecret network-manager openfortivpn - pango-next ;TODO: remove after it's the default ppp)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "Fortinet SSLVPN plug-in for NetworkManager") @@ -9302,8 +9297,6 @@ (define-public gnome-bluetooth (list eudev gsound libnotify - ;; TODO: Delete pango-next after it's the default. - pango-next python-dbus upower)) (synopsis "GNOME Bluetooth subsystem") @@ -10016,10 +10009,7 @@ (define-public baobab python vala)) (inputs - (list gtk libadwaita libhandy - ;; XXX: Ensure pango-next is used instead of the equally propagated - ;; 'pango'. - pango-next)) + (list gtk libadwaita libhandy)) (synopsis "Disk usage analyzer for GNOME") (description "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk @@ -10617,9 +10607,7 @@ (define-public gnome-calendar gsettings-desktop-schemas libadwaita libdazzle - libgweather4-with-libsoup2 - ;; Remove pango-next when it's the default. - pango-next)) + libgweather4-with-libsoup2)) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") (description @@ -13458,8 +13446,7 @@ (define-public gtranslator gspell libgda libhandy - libsoup - pango-next)) + libsoup)) (propagated-inputs (list gtksourceview-4)) ; required for source view (home-page "https://wiki.gnome.org/Apps/Gtranslator") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1911ed7774..ee9311ee79 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.48.10") + (version "1.50.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -436,7 +436,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))) + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas @@ -481,22 +481,6 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) -;; TODO: Make this the default package in next release cycle. -(define-public pango-next - (package - (inherit pango) - (name "pango-next") ;to avoid profile conflicts - (version "1.50.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) - "/pango-" version ".tar.xz")) - (patches (search-patches "pango-skip-libthai-test.patch")) - (sha256 - (base32 - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))))) - (define-public pango-1.42 (package (inherit pango) @@ -713,8 +697,7 @@ (define-public gtksourceview glib gtk libxml2 - pcre2 - pango-next)) + pcre2)) (home-page "https://wiki.gnome.org/Projects/GtkSourceView") (synopsis "GNOME source code widget") (description "GtkSourceView is a text widget that extends the standard @@ -741,7 +724,6 @@ (define-public gtksourceview-4 (propagated-inputs (modify-inputs (package-propagated-inputs gtksourceview) (replace "gtk" gtk+) - (replace "pango-next" pango) (replace "glib" glib))))) (define-public gtksourceview-3 @@ -1413,7 +1395,7 @@ (define-public gtk libxkbcommon libxrandr libxrender - pango-next + pango vulkan-headers vulkan-loader ;for vulkan graphics API support wayland ;for wayland display-backend @@ -1830,7 +1812,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango-next)) + (list cairo cairomm glibmm pango)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 7d52c5889e..2bcad54656 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -248,7 +248,7 @@ (define-public ibus ((#:configure-flags flags) #~(cons* "--enable-gtk4" #$flags)))) (inputs (modify-inputs (package-inputs ibus-minimal) - (prepend gtk pango-next))) + (prepend gtk))) (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (define-public ibus-libpinyin diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4b8071e728..66875a2136 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1395,7 +1395,6 @@ (define-public dino libsignal-protocol-c libsoup libsrtp ;for calls support - pango-next ;gtk4 wants pango 1.50+ qrencode sqlite webrtc-audio-processing)) ;for A/V support diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0a51479985..8ef95ce518 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -290,8 +290,7 @@ (define-public webkitgtk-next (replace "gtk+" gtk))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "gtk+-2" "libnotify") - (append pango-next))))) ;TODO: remove after it's the default + (delete "gtk+-2" "libnotify"))))) ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3: -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 26 15:24:38 2023 Received: (at 62467) by debbugs.gnu.org; 26 Mar 2023 19:24:38 +0000 Received: from localhost ([127.0.0.1]:45857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyo-0004G1-0T for submit@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:38 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:40722) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyl-0004F8-Ml for 62467@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:36 -0400 Received: by mail-wm1-f67.google.com with SMTP id d11-20020a05600c3acb00b003ef6e6754c5so593800wms.5 for <62467@debbugs.gnu.org>; Sun, 26 Mar 2023 12:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679858670; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=7u6zMtqNLjZwn/s9XH44B9Um62SD6KUkQNZ9IAt/ZEk=; b=cXm+48doZKx/rhxOwzc3bS3zulVvFhR6KAU6dakfvSpA9YRGr/jM1iNNCX5Trmwtoc r2DPj1Fo+WudrkkXWeAB3Dvmi4zkr6uBN6dnzIFYQA+8UupOycZRs2Le+/5GYBIeeEl6 vGD4I/UT/1zfEHNxwkF3LR3fT8LuaZK+hBAf49pehbBzxPugd04OGVRH/4Tve5cj41Ue +vY+2X8YRkGR72JIUsP1QZ3rttOKghc64SPdXeDdLNCx6V3P6xf5DNtSbIMfn7EEjjSJ 8b1X9w8HkCPyXXJW+xEbv67XAgmHOOzxTn80xN+zlw7RWZoLPsnYh8pAZine97WMx5vd aIiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679858670; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7u6zMtqNLjZwn/s9XH44B9Um62SD6KUkQNZ9IAt/ZEk=; b=FDX+ZYqt0w1+g5pJh+1UiehGLum5OxuadaKK9T/1dsy10K7T5KbXGT0lXeY2Cxm0Nq yw9zWhUH8BrkiTaJQcSePvpYAdz5BtAKvrfqLngptCdmbKTjTEeHR47ZZPbVywKUOLu+ MAfpKdDeCPmGUMIz33trsC7HlB+nK9MpPSmchzw7PrJ4mILsWzomi7rt6jKCBoyRZjvf 7mxLlLbqga90wuZrOtl6Qe6wrss16sYPLrniggSyq6WpsBls2po3q5/ARWkrNew06/5U u0gychYVB+/SX/Q2brkYphsXKv4bnavjo/y0YJO1GAk6YKWMCDkBEZ06o/it/nVuHY8N dPRg== X-Gm-Message-State: AO0yUKViZI2DWapoRQ5MN5Zdpfj6ixWND6FIJC+hUNLbWrKJ2Z872Dn8 K+MXCdEQReRx7086VTV0j42EOQ4Hg5Fk2w== X-Google-Smtp-Source: AK7set/T+u8hH/HhmkNdCwtRJOSxB9n12asIIxxsLb5TxDiF5se295vBrEjaWBl1ce0KHqHyWILLeQ== X-Received: by 2002:a7b:ce0a:0:b0:3ed:237f:3da with SMTP id m10-20020a7bce0a000000b003ed237f03damr8202174wmc.22.1679858670237; Sun, 26 Mar 2023 12:24:30 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x4-20020a1c7c04000000b003ee0d191539sm11337911wmc.10.2023.03.26.12.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 12:24:29 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:19:11 +0200 Subject: [PATCH gnome-team 5/5] gnu: gobject-introspection: Update to 1.76.1. to: 62467@debbugs.gnu.org Message-ID: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name 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 (-) * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 09386d1652..4115e54782 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.73.1") + (version "1.76.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) + (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 26 15:24:39 2023 Received: (at 62467) by debbugs.gnu.org; 26 Mar 2023 19:24:39 +0000 Received: from localhost ([127.0.0.1]:45859 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyo-0004G6-A0 for submit@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:39 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgVyl-0004F7-Ci for 62467@debbugs.gnu.org; Sun, 26 Mar 2023 15:24:36 -0400 Received: by mail-wm1-f67.google.com with SMTP id n10-20020a05600c4f8a00b003ee93d2c914so5702413wmq.2 for <62467@debbugs.gnu.org>; Sun, 26 Mar 2023 12:24:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679858670; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=x9YwLQMUZdSP3BSG9I74Of+DDLHXwVzlcA4btZLXj0c=; b=Ag1pq6OXmkN5ppGVTtY9aLzZR097LQpIourWfxAA8jOGGj8aO9eUsTeeP+kw3uBwxt NtAeZpHNlxeXOe0b5hRITqEkuYI4HJG0u4Oa4Ibvp8Sw59v2KL2xhJJjAppi6Z9eWxkP 4fT68oggFR8qdjUV736tsfc7SGBWh0V0F3epFjdf2Q1iAYLi0wUJuWY7kcRXwTzWFWTl H+PuB+PpQ87ZYac5jswrFVKbgJrAVW4dCTtvjOzOXkyh5m2PvRzGJxWeaqbYICzSTqgV wZkh3LyT7Z8Hd/tSiOUmmcs4p4XJUogCsWwfJvG2psfQPoa3EofSgmyRqNMCmSu2PbON fPYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679858670; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x9YwLQMUZdSP3BSG9I74Of+DDLHXwVzlcA4btZLXj0c=; b=NKDX6D1b4Tbt3hm34aBlEfuAE0eDXaEl7iGCDOfLYbNM7xyl9XLmzsAf20yB2JxRNe 056jqzCMVwRflJjV3xy0eFoGv+THhiIRF45HCn5a7Vi7DPOyoyr/oxqXnzI1WTskHfVt 5gYvLFrXQKucVxLcLOcUBkY9/tjuDKAQorNCvfL1SRRuWQ9soJB/N1mic3RvA3TJLF+B XIgeNAIuXwMho/h/SN2dvh8A7LWjGJ/6aFvO2n4hfbbhpwzs189/rtMp1T1xcv6fH31x EZq7FY5A7xLiXJqWAhhcrg3jyaj9vd8EfoJd9gvemkTvrX4iEnA535vSwRfhKlyMbjdv DiMQ== X-Gm-Message-State: AO0yUKWp2nk81UEMCpSwJmCww8G2srjEtixFa8/EGs9Yn2gCD/F5qhqr J78RZW9lcGDL0KOPBafzITI5f+39brHuyA== X-Google-Smtp-Source: AK7set+0ExHFIRR2A5OGFE/Qm1MhyeNYLOBT+bk7svTud6D7/WQQw2vrqisbGh1Z2f98+R9ENbaePQ== X-Received: by 2002:a05:600c:ad5:b0:3ee:5519:fae1 with SMTP id c21-20020a05600c0ad500b003ee5519fae1mr7847655wmr.12.1679858669565; Sun, 26 Mar 2023 12:24:29 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x4-20020a1c7c04000000b003ee0d191539sm11337911wmc.10.2023.03.26.12.24.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Mar 2023 12:24:29 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:14:47 +0200 Subject: [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: <53cc392242bc66f39be8e2b0c6d694600ed57825.camel@gmail.com> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name 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 (-) * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. (gobject-introspection-next): Delete variable. * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: Replace gobject-introspection-next with gobject-introspection. * gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]: Replace gobject-introspection-next with gobject-introspection. * gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch: Rename to… * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: … this. * gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to… * gnu/packages/patches/gobject-introspection-cc.patch: … this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 - gnu/packages/glib.scm | 21 +-- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- ...trospection-absolute-shlib-path-1.72.patch | 173 ------------------ ...ct-introspection-absolute-shlib-path.patch | 51 +++--- .../gobject-introspection-cc-1.72.patch | 15 -- .../patches/gobject-introspection-cc.patch | 11 +- 8 files changed, 39 insertions(+), 238 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch diff --git a/gnu/local.mk b/gnu/local.mk index 64a1268fbe..3e94281ccf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1264,9 +1264,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnutls-cross.patch \ %D%/packages/patches/gnutls-guile-eintr-eagain.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ - %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ - %D%/packages/patches/gobject-introspection-cc-1.72.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ecf5cb491f..09386d1652 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.66.1") + (version "1.73.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x")) + (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" @@ -564,23 +564,6 @@ (define gobject-introspection ;; For tools. license:gpl2+)))) -(define-public gobject-introspection-next - (package - (inherit gobject-introspection) - (name "gobject-introspection") - (version "1.73.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) - (patches (search-patches - "gobject-introspection-cc-1.72.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))))) - (define intltool (package (name "intltool") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 75cf9004b4..f89b0dc199 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -684,7 +684,7 @@ (define-public gtksourceview (list `(,glib "bin") ; for glib-genmarshal, etc. gettext-minimal gi-docgen - gobject-introspection-next + gobject-introspection pkg-config vala ;; For testing. diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5d861c5c82..5c7c880b0e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2303,7 +2303,7 @@ (define (get lib) clutter xorg-server-for-tests)) (propagated-inputs - (list gobject-introspection-next)) + (list gobject-introspection)) (home-page "https://www.gnu.org/software/g-golf/") (synopsis "Guile bindings for GObject Introspection") (description diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch deleted file mode 100644 index 8bb86467c0..0000000000 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch +++ /dev/null @@ -1,173 +0,0 @@ -Names of libraries included in typelib files are opened by dlopen. -Here we add the full path. - -This patch was provided by Luca Bruno , -for 'gobject-introspection' 1.40.0 in Nix. - -It has since been updated to work with newer versions of -gobject-introspection. - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 1d39ab84..e12ed24e 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -95,6 +95,39 @@ def get_windows_option_group(parser): - return group - - -+def _get_default_fallback_libpath(): -+ # Newer multiple-output-optimized stdenv has an environment variable -+ # $outputLib which in turn specifies another variable which then is used as -+ # the destination for the library contents (${!outputLib}/lib). -+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None -+ if store_path is None: -+ outputs = os.environ.get("outputs", "out").split() -+ if "lib" in outputs: -+ # For multiple output derivations let's try whether there is a $lib -+ # environment variable and use that as the base store path. -+ store_path = os.environ.get("lib") -+ elif "out" in outputs: -+ # Otherwise we have a single output derivation, so the libraries -+ # most certainly will end up in "$out/lib". -+ store_path = os.environ.get("out") -+ -+ if store_path is not None: -+ # Even if we have a $lib as output, there still should be a $lib/lib -+ # directory. -+ return os.path.join(store_path, 'lib') -+ else: -+ # If we haven't found a possible scenario, let's return an empty string -+ # so that the shared library won't be prepended with a path. -+ # -+ # Note that this doesn't mean that all hope is lost, because after all -+ # we can still use --fallback-library-path to set one. -+ # -+ # Also, we're not returning None, because that would make it very -+ # difficult to disable adding fallback paths altogether using something -+ # like: --fallback-library-path="" -+ return "" -+ -+ - def _get_option_parser(): - parser = optparse.OptionParser('%prog [options] sources', - version='%prog ' + giscanner.__version__) -@@ -220,6 +253,10 @@ match the namespace prefix.""") - parser.add_option("", "--compiler", - action="store", dest="compiler", default=None, - help="the C compiler to use internally") -+ parser.add_option("", "--fallback-library-path", -+ action="store", dest="fallback_libpath", -+ default=_get_default_fallback_libpath(), -+ help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 9f8ab5df..8aa37c99 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): - $""" % re.escape(library_name), re.VERBOSE) - - -+def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape( -+ os.environ.get("NIX_STORE", default="/gnu/store") -+ ) -+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' -+ return re.compile(pattern % (store_dir, re.escape(library_name))) -+ -+ - # This is a what we do for non-la files. We assume that we are on an - # ELF-like system where ldd exists and the soname extracted with ldd is - # a filename that can be opened with dlopen(). -@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): - output = output.decode("utf-8", "replace") - - shlibs = resolve_from_ldd_output(libraries, output) -- return list(map(sanitize_shlib_path, shlibs)) -+ fallback_libpath = options.fallback_libpath or ""; -+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) - - - def sanitize_shlib_path(lib): -@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib): - # In case we get relative paths on macOS (like @rpath) then we fall - # back to the basename as well: - # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 -- if sys.platform == "darwin": -- if not os.path.isabs(lib): -- return os.path.basename(lib) -- return lib -- else: -+ -+ # Always use absolute paths if available -+ if not os.path.isabs(lib): - return os.path.basename(lib) -+ return lib - - - def resolve_from_ldd_output(libraries, output): - patterns = {} - for library in libraries: - if not os.path.isfile(library): -- patterns[library] = _ldd_library_pattern(library) -+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) - if len(patterns) == 0: - return [] - -@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): - if line.endswith(':'): - continue - for word in line.split(): -- for library, pattern in patterns.items(): -- m = pattern.match(word) -+ for library, (pattern, guix_pattern) in patterns.items(): -+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") -+ if line.find(store_dir) != -1: -+ m = guix_pattern.match(word) -+ else: -+ m = pattern.match(word) - if m: - del patterns[library] - shlibs.append(m.group()) -diff --git a/giscanner/utils.py b/giscanner/utils.py -index 31c7ea48..630002a8 100644 ---- a/giscanner/utils.py -+++ b/giscanner/utils.py -@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): - if dlname is None: - return None - -- # Darwin uses absolute paths where possible; since the libtool files never -- # contain absolute paths, use the libdir field -- if platform.system() == 'Darwin': -- dlbasename = os.path.basename(dlname) -- libdir = _extract_libdir_field(la_file) -- if libdir is None: -- return dlbasename -- return libdir + '/' + dlbasename -- # Older libtools had a path rather than the raw dlname -- return os.path.basename(dlname) -+ dlbasename = os.path.basename(dlname) -+ libdir = _extract_libdir_field(la_file) -+ if libdir is None: -+ return dlbasename -+ return libdir + '/' + dlbasename - - - # Returns arguments for invoking libtool, if applicable, otherwise None -diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py -index a8337c60..7f123103 100644 ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py -@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): - - self.assertEqual( - sanitize_shlib_path('/foo/bar'), -- '/foo/bar' if sys.platform == 'darwin' else 'bar') -+ # Always use an absolute filename for Guix -+ '/foo/bar') - - def test_unresolved_library(self): - output = '' diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index 956fa617c3..8bb86467c0 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -1,11 +1,14 @@ -# Names of libraries included in typelib files are opened by dlopen. Here we -# add the full path. -# -# This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. -# -# It has since been updated to work with newer versions of -# gobject-introspection. +Names of libraries included in typelib files are opened by dlopen. +Here we add the full path. + +This patch was provided by Luca Bruno , +for 'gobject-introspection' 1.40.0 in Nix. + +It has since been updated to work with newer versions of +gobject-introspection. + +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index 1d39ab84..e12ed24e 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -95,6 +95,39 @@ def get_windows_option_group(parser): @@ -48,10 +51,10 @@ def _get_option_parser(): parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__) -@@ -205,6 +238,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") +@@ -220,6 +253,10 @@ match the namespace prefix.""") + parser.add_option("", "--compiler", + action="store", dest="compiler", default=None, + help="the C compiler to use internally") + parser.add_option("", "--fallback-library-path", + action="store", dest="fallback_libpath", + default=_get_default_fallback_libpath(), @@ -59,6 +62,8 @@ group = get_preprocessor_option_group(parser) parser.add_option_group(group) +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 9f8ab5df..8aa37c99 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): @@ -76,7 +81,7 @@ # This is a what we do for non-la files. We assume that we are on an # ELF-like system where ldd exists and the soname extracted with ldd is # a filename that can be opened with dlopen(). -@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): +@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): output = output.decode("utf-8", "replace") shlibs = resolve_from_ldd_output(libraries, output) @@ -86,7 +91,7 @@ def sanitize_shlib_path(lib): -@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): +@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib): # In case we get relative paths on macOS (like @rpath) then we fall # back to the basename as well: # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 @@ -111,7 +116,7 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): +@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): @@ -126,10 +131,11 @@ if m: del patterns[library] shlibs.append(m.group()) - +diff --git a/giscanner/utils.py b/giscanner/utils.py +index 31c7ea48..630002a8 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py -@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): +@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -141,8 +147,7 @@ - if libdir is None: - return dlbasename - return libdir + '/' + dlbasename -- # From the comments in extract_libtool(), older libtools had -- # a path rather than the raw dlname +- # Older libtools had a path rather than the raw dlname - return os.path.basename(dlname) + dlbasename = os.path.basename(dlname) + libdir = _extract_libdir_field(la_file) @@ -151,10 +156,12 @@ + return libdir + '/' + dlbasename - def extract_libtool(la_file): + # Returns arguments for invoking libtool, if applicable, otherwise None +diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py +index a8337c60..7f123103 100644 --- a/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py -@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): +@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): self.assertEqual( sanitize_shlib_path('/foo/bar'), @@ -163,4 +170,4 @@ + '/foo/bar') def test_unresolved_library(self): -output = '' + output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch deleted file mode 100644 index d3b1df82af..0000000000 --- a/gnu/packages/patches/gobject-introspection-cc-1.72.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use gcc as the default C compiler if CC is not set. - -diff --git a/giscanner/__init__.py b/giscanner/__init__.py -index 7c2f365a..607fe341 100644 ---- a/giscanner/__init__.py -+++ b/giscanner/__init__.py -@@ -21,6 +21,8 @@ import os - builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') - if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422 -+if not 'CC' in os.environ: -+ os.environ['CC'] = 'gcc' - try: - from ._version import __version__ - except ImportError: diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch index 6a86b56b44..d3b1df82af 100644 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ b/gnu/packages/patches/gobject-introspection-cc.patch @@ -1,12 +1,13 @@ Use gcc as the default C compiler if CC is not set. -diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py ---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 -+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 -@@ -22,6 +22,8 @@ +diff --git a/giscanner/__init__.py b/giscanner/__init__.py +index 7c2f365a..607fe341 100644 +--- a/giscanner/__init__.py ++++ b/giscanner/__init__.py +@@ -21,6 +21,8 @@ import os builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) + __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422 +if not 'CC' in os.environ: + os.environ['CC'] = 'gcc' try: -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:48:37 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:37 +0000 Received: from localhost ([127.0.0.1]:34718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbp-0001pU-QH for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:37 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:35773) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbo-0001or-In for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:32 -0400 Received: by mail-ed1-f66.google.com with SMTP id y4so95108481edo.2 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299307; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=3PiiW6p6/DPrTRTggJqsVMQNFVI9AUkbd5nsxq/wHtU=; b=BjYJUHlpYQp2UlX+MUFBAge+yihxpQ4xT9db8zOJZQvMEqQdoODYbzzFg56ngs17My lJRWzw/5EFHfulJSxvj8T9Hzd6FEolYYTVQbbQUd8d09RLV4a7ywu0lA3s8nB48Tpa17 iAjgWVaQ/XsUca0IfRSBVV3A7uq0HwHyr/UZbz0A00famZV/mXI4HctqX/0+aPUcsLj3 JZ5uhActHSoo93b2FAkWEWnnjrHOCuBDe7evgupHPGgLipS0FnqjNu13ia1KvAbv1haF HPiU7xcJp3jLFipiDvj9w+Dw8p6UfXUj4lI7Halu8IjsPBVlTPE8YJcHSGGqJlnvC/WY BqSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299307; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3PiiW6p6/DPrTRTggJqsVMQNFVI9AUkbd5nsxq/wHtU=; b=PqaWLFNWuldoCql6ghES9oCcAahojbzGdGjGwXPeZvA3Fd0vCJu3H7XwBzPa+oH9wy hJ7xrIVCYBQek2J4YpujEfNXi3oQTgPsjfNE4/EGaPiFfP9WJQfOIvjNl8SOZl27gWmm ISkoKwwrIrfV2L2mSVoLc3/+T2tB1+IMKW4In4C7DORv7mYuHWIGNoX17UIoU2GlFwjQ f1/KCR+MbiPUz72UR/05ZkghOJrtVKeS6H/7pY6mGjPGiUd+7tgnVidwnyuK6mLCNPIO L7+Ilt6Sj2LzbduxU9YlxA/YJuoqr0I6n9I/tEyNzK8hvUCYeFpkgDgcixpyYfquQ4sY bm7Q== X-Gm-Message-State: AAQBX9cREotNgftMe9oZwTGNka7yUxtIxGrB5kISHUMDpShXtbInyUvF MxFC26aGKH+fAsAmaDrDr+/YR47sv0x+Uw== X-Google-Smtp-Source: AKy350Z51jZP5+z8HRyvvJP32vppuyfqsqXhydllNYFzHT5JViiQhyu2wgQrqo5QD1NP9O4lhIcOkA== X-Received: by 2002:a17:906:144a:b0:944:394:93f7 with SMTP id q10-20020a170906144a00b00944039493f7mr21621066ejc.61.1680299306649; Fri, 31 Mar 2023 14:48:26 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:26 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 31 Mar 2023 23:43:28 +0200 Subject: [PATCH gnome-team v2 00/12] Update fundamental packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: <0ed14785943a6e49788a2168c1fb4d6bbd82ef5c.camel@gmail.com> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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 (-) With this series, everything up to inkscape builds. The next big step is building GStreamer. For this, I'd like to bump Meson to 1.0, but even then, there are some difficulties. (I'm currently struggling with an EBADF in gst-plugins-base.) Cheers Liliana Marie Prikler (12): gnu: glib: Update to 2.76.1. gnu: Make pango-next the new pango. gnu: pango: Update to 1.50.14. gnu: Make gobject-introspection-next the new gobject-introspection. gnu: gobject-introspection: Update to 1.76.1. gnu: libsoup-minimal@2: Update to 2.74.3. gnu: python-pygobject: Set upstream-name. gnu: python-pygobject: Update to 3.44.1. gnu: gtk+-2: Fix build by hardening list store. gnu: gtk+: Update to 3.24.37. gnu: librsvg: Fix build. gnu: inkscape: Update stable version to 1.2.1. gnu/local.mk | 3 +- gnu/packages/freedesktop.scm | 4 +- gnu/packages/geo.scm | 1 - gnu/packages/glib.scm | 118 +++--------- gnu/packages/gnome.scm | 44 ++--- gnu/packages/gtk.scm | 116 ++++++------ gnu/packages/guile-xyz.scm | 4 +- gnu/packages/ibus.scm | 2 +- gnu/packages/inkscape.scm | 36 ++-- gnu/packages/messaging.scm | 1 - .../patches/glib-skip-failing-test.patch | 3 +- ...trospection-absolute-shlib-path-1.72.patch | 173 ------------------ ...ct-introspection-absolute-shlib-path.patch | 51 +++--- .../gobject-introspection-cc-1.72.patch | 15 -- .../patches/gobject-introspection-cc.patch | 11 +- .../patches/gtk2-harden-list-store.patch | 42 +++++ gnu/packages/webkit.scm | 3 +- 17 files changed, 199 insertions(+), 428 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch base-commit: 42fbe62d52a82d1003c3d7039d3c4a46806c5cee -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:48:40 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:40 +0000 Received: from localhost ([127.0.0.1]:34729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbv-0001qV-D9 for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:40 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:37630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbp-0001ou-7n for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:34 -0400 Received: by mail-ed1-f65.google.com with SMTP id cn12so95067525edb.4 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299307; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=kF06JrO7W+0A3P2cIrct5uXI2puw2L/Ue4VSR923cik=; b=mklP5Qw/T2FcYXivQB0GcxmeMDqriTLKyQSJpO1EUUjuW7ViTF5XnuAJKcKfmLjM/F Dzk4YhnGjs4rlB8SJtubUF+oq4KEp+6cLtHyesnRb+2JkGLfalymqqEn4PfphRGoDxHr cNUg2ds7I3c3dW9WGVJgi82zcrOxg64VNbsZQ/FaSa2yLQ/7lLmrYEw6A4tQw0uhwLhQ SW0rLtjOXVFcvhEneHtdITkjpgZ3qcuQ0KxTiFGCYigG1wnKV5S5KWLh/1chAoOM3Y4S n1Uv0cgc/pvGlTF90WIu9zZSEP3yhqAPIlu44JInd6tCs8N+wh7g9chM7JtIrOCAUbc3 VYog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299307; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kF06JrO7W+0A3P2cIrct5uXI2puw2L/Ue4VSR923cik=; b=hHKDgjO7XI1ZbhPSOVkRUV8TxpHkaWI4hUA5UR4oPAsnbO5CUrSZKar5X6jeW7fHSH vwK8ih2Rb29Ok4szDMO1jW9uUyGcViUHMMC7MVQ+92NaMhEdbpXPwvfHr8UNopGgUFnt Dn14MG6RMaaAmaSHQODt6ZsARar22CIf4FMdM06j9qRmIT6K/V3/5tXPswJ1oBfoX7iC pTjZ4P0lsNvYjXtbMnX/7dL++i9EYgdfXF0+x3mSW0uY6cJGYPKyiQGpZIOZYkoUfNoP AYQoqGPlIXxLDsVcVNaWxIP59kiHb/w9lh+9Tk+JGMKbGuFOLFmLeCr8FjkVuNCzYHy7 qfKQ== X-Gm-Message-State: AAQBX9eG4CTa2bXWSE1RW3ZpXCrYXs+FDEkiQHNcWUwycCvsPjVUB9nT qfmBc5nA2p7YboDXBCGlfqtF5lOQaBYdSg== X-Google-Smtp-Source: AKy350aelEFTvOyUTvggMRl9K9L/8yU/0GnfWjoCvhbmHZNkXw+AUPCwNjCBMjQxQNSGQbYrBgFNKw== X-Received: by 2002:a17:906:2990:b0:92f:a6d3:b941 with SMTP id x16-20020a170906299000b0092fa6d3b941mr30651498eje.30.1680299307387; Fri, 31 Mar 2023 14:48:27 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:27 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:39:11 +0200 Subject: [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Rep [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Rep [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Replace pcre with pcre2. (glib-with-documentation): Inherit from glib. * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib. * gnu/packages/gtk.scm (gtksourceview): Use glib. * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly. --- gnu/packages/glib.scm | 92 +++++-------------- gnu/packages/gnome.scm | 8 +- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- .../patches/glib-skip-failing-test.patch | 3 +- 5 files changed, 30 insertions(+), 77 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f85d5e3225..ecf5cb491f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -215,7 +215,7 @@ (define-public dbus-verbose (define glib (package (name "glib") - (version "2.70.2") + (version "2.76.1") (source (origin (method url-fetch) @@ -224,14 +224,14 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85")) + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) (modules '((guix build utils))) (snippet '(begin - (substitute* "tests/spawn-test.c" + (substitute* "glib/tests/spawn-test.c" (("/bin/sh") "sh")))))) (build-system meson-build-system) (outputs '("out" ;libraries, locales, etc @@ -256,6 +256,9 @@ (define glib #:phases (modify-phases %standard-phases ;; Needed to pass the test phase on slower ARM and i686 machines. + (add-after 'unpack 'set-G_TEST_SRCDIR + (lambda _ + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests")))) (add-after 'unpack 'increase-test-timeout (lambda _ (substitute* "meson.build" @@ -270,9 +273,19 @@ (define glib (substitute* '("unix.c" "utils.c") (("[ \t]*g_test_add_func.*;") ""))) (with-directory-excursion "gio/tests" - (substitute* '("contenttype.c" "gdbus-address-get-session.c" - "gdbus-peer.c" "appinfo.c" "desktop-app-info.c") - (("[ \t]*g_test_add_func.*;") ""))) + (substitute* '("contenttype.c" + "gdbus-address-get-session.c" + "gdbus-server-auth.c" + "gdbus-peer.c" + "appinfo.c" + "desktop-app-info.c") + (("[ \t]*g_test_add_func.*;") "")) + (unless (which "update-desktop-database") + (substitute* '("file.c") + (("[ \t]*g_test_add_func.*query-default-handler.*;") ""))) + (substitute* '("portal-support-snap.c") + (("g_test_init .*") + "return EXIT_SUCCESS;"))) ,@(if (target-x86-32?) ;; Comment out parts of timer.c that fail on i686 due to @@ -357,7 +370,7 @@ (define glib libelf)) (propagated-inputs (list libffi ; in the Requires.private field of gobject-2.0.pc - pcre ; in the Requires.private field of glib-2.0.pc + pcre2 ; in the Requires.private field of glib-2.0.pc `(,util-linux "lib") ;for libmount zlib)) ; in the Requires.private field of glib-2.0.pc (native-search-paths @@ -383,68 +396,10 @@ (define glib (license license:lgpl2.1+) (properties '((hidden? . #t))))) -(define-public glib-next - (package - (inherit glib) - (name "glib") - (version "2.73.3") - (source - (origin - (inherit (package-source glib)) - (uri - (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (snippet - '(substitute* "glib/tests/spawn-test.c" - (("/bin/sh") "sh"))) - (sha256 - (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz")))) - (arguments - (substitute-keyword-arguments (package-arguments glib) - ((#:test-options test-options ''()) - ;; Skip flaky or slow tests. - `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options)) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (replace 'disable-failing-tests - (lambda _ - (with-directory-excursion "glib/tests" - (substitute* '("unix.c" "utils.c") - (("[ \t]*g_test_add_func.*;") ""))) - ;; The "glib:gio / file" test fails with the error "No - ;; application is registered as handling this file" (see: - ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). - (with-directory-excursion "gio/tests" - (substitute* '("appinfo.c" - "contenttype.c" - "desktop-app-info.c" - "file.c" - "gdbus-address-get-session.c" - "gdbus-peer.c") - (("[ \t]*g_test_add_func.*;") ""))) - - ,@(if (target-x86-32?) - ;; Comment out parts of timer.c that fail on i686 due to - ;; excess precision when building with GCC 10: - ;; . - '((substitute* "glib/tests/timer.c" - (("^ g_assert_cmpuint \\(micros.*" all) - (string-append "//" all "\n")) - (("^ g_assert_cmpfloat \\(elapsed, ==.*" all) - (string-append "//" all "\n")))) - '()))))))) - (native-inputs - (modify-inputs (package-native-inputs glib) - (append desktop-file-utils))) - (propagated-inputs - (modify-inputs (package-propagated-inputs glib) - (replace "pcre" pcre2))))) - (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. - (let ((base glib-next)) + (let ((base glib)) (package/inherit base (properties (alist-delete 'hidden? (package-properties base))) (outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference @@ -624,10 +579,7 @@ (define-public gobject-introspection-next (patches (search-patches "gobject-introspection-cc-1.72.patch" "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs gobject-introspection) - (replace "glib" glib-next))))) + "gobject-introspection-absolute-shlib-path-1.72.patch")))))) (define intltool (package diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0efb98b97c..4a7e188048 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13167,7 +13167,7 @@ (define-public sysprof (propagated-inputs (list polkit)) (inputs - (list glib-next + (list glib gtk json-glib libadwaita @@ -13176,7 +13176,7 @@ (define-public sysprof polkit)) (native-inputs (list gettext-minimal - `(,glib-next "bin") ;for gdbus-codegen, etc. + `(,glib "bin") ;for gdbus-codegen, etc. itstool libxml2 pkg-config)) @@ -13445,7 +13445,7 @@ (define-public gtranslator (substitute* "build-aux/meson/meson_post_install.py" (("gtk-update-icon-cache") (which "true")))))))) (native-inputs - (list `(,glib-next "bin") + (list `(,glib "bin") gettext-minimal itstool pkg-config)) @@ -13453,7 +13453,7 @@ (define-public gtranslator (list json-glib jsonrpc-glib gettext-minimal - glib-next + glib gsettings-desktop-schemas gspell libgda diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b9ef660a80..1911ed7774 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -710,7 +710,7 @@ (define-public gtksourceview ;; gtksourceview-5.pc refers to all these. (list fontconfig fribidi - glib-next + glib gtk libxml2 pcre2 diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 315c9a7554..5d861c5c82 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2290,7 +2290,7 @@ (define (get lib) (setenv "DISPLAY" ":1") #t))))) (inputs - (list guile-3.0 guile-lib glib-next)) + (list guile-3.0 guile-lib glib)) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch index c7706aaa74..3fde5cb1e2 100644 --- a/gnu/packages/patches/glib-skip-failing-test.patch +++ b/gnu/packages/patches/glib-skip-failing-test.patch @@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build index a926ae0..4fdbe7a 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -317,10 +317,6 @@ if host_machine.system() != 'windows' +@@ -317,11 +317,6 @@ if host_machine.system() != 'windows' 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'], }, - 'gdbus-threading' : { - 'extra_sources' : extra_sources, +- 'extra_programs': extra_programs, - 'suite' : ['slow'], - }, 'gmenumodel' : { -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:48:41 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:41 +0000 Received: from localhost ([127.0.0.1]:34732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbw-0001qj-HE for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:41 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:45961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbp-0001ox-W4 for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:34 -0400 Received: by mail-ed1-f67.google.com with SMTP id t10so94868498edd.12 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299308; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=GTw0dSyn0DfAsn8tYnHdTPyStVGsrgv9tKlFGysQRFk=; b=q3Q9eqwdT0L5daQTvPS1uzAXijzbeK+4a5RBN2v03KC2CSqCxqw56TQ/x9R8m+j4UZ uQoxAOdimhLsUgXLCNiy36+7qwuFTeX3f/FtazLc/vEKMaeGh8xGuDJP3x8JW6QQIaek Szw/dqRqDxGXjiN83hksWAGXbqy7hejFxrvDrPOX0KXDbFO0dW1FAqJiPk+Lhtw7/viK iaRza1/HSJJN4fPhmS8VJhLdxu6vfpvx/PMOIUXplVH1LOGuw8FA1D3OeWjaYgnoEL7M hY+4HMg2kAJhTeHQZBI2PeCX+Iu9nP/kqmZzobF/kySVg/LmDyMDc2m1+uTFx9xu958n loLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299308; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=GTw0dSyn0DfAsn8tYnHdTPyStVGsrgv9tKlFGysQRFk=; b=KGKJYcRIx0be56XdMRlQWJMwribO2XYpOLQ0EEDKGc3mC6msPBRNCNqAZB7nUTOSIC HBY1mAl5a25SePcVt9GcDfhEzZItlzfWaySjzRfYagqG1io2kfxja5fRRug0DhrH47Uu w1laI1NEiDBoC0ivFDWaMJ2DDkA8dtZK/J2+8ciR58ZwlRP0O/pVMLyt2LaOPNFY0eXT RdNnZtMLlcQoRNd5AlZjnwy26mrdcgNNB7CRu6wB6QflO7InVKSagM3p1FxVu0U0uXla OppPyjadNVvXbJdu6KyxB6gsL0Ti/NfVkLYN8GMSHdDlaAjkAyPejhU7HxyAZFmuWLFU XdCg== X-Gm-Message-State: AAQBX9cMjcght4Ime5ThGEWfT+CoV/3XuOo6S2OWKJa3THIuXBI2r85N 1nQmwPXA0SYZVW53zKvkYrIy3j8MtjmyYA== X-Google-Smtp-Source: AKy350ZvdHh7ydRlelXk2QvpYF/v5j6b9p2wWXpE2iTxpIzXsDUA41WTM14YSAeJ49o/N81J/0kF+A== X-Received: by 2002:a17:906:1cc5:b0:931:42d2:a77f with SMTP id i5-20020a1709061cc500b0093142d2a77fmr27893558ejh.15.1680299308081; Fri, 31 Mar 2023 14:48:28 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:27 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:53:13 +0200 Subject: [PATCH gnome-team v2 02/12] gnu: Make pango-next the new pango. to: 62467@debbugs.gnu.org Message-ID: <37c811a577c518a4d8de4e46c20121366fae4c82.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (pango-1.48): New variable, defining old pango with inheritance. (gtk)[propagated-inputs]: Use pango instead of pango-n [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.67 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.67 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (pango-1.48): New variable, defining old pango with inheritance. (gtk)[propagated-inputs]: Use pango instead of pango-n [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.67 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (pango-1.48): New variable, defining old pango with inheritance. (gtk)[propagated-inputs]: Use pango instead of pango-next. (pangomm)[propagated-inputs]: Likewise. (gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next. (pangomm-2.46)[inputs]: Use pango-1.48. * gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next. * gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise. * gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise. (network-manager-openvpn)[inputs]: Likewise. (network-manager-vpnc)[inputs]: Likewise. (network-manager-openconnect)[inputs]: Likewise. (network-manager-fortisslvpn)[inputs]: Likewise. (gnome-bluetooth)[inputs]: Likewise. (baobab)[inputs]: Likewise. (gnome-calendar)[inputs]: Likewise. (gtranslator)[inputs]: Likewise. * gnu/packages/ibus.scm (ibus)[inputs]: Likewise. * gnu/packages/messaging.scm (dino)[inputs]: Likewise. * gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise. --- gnu/packages/freedesktop.scm | 4 +--- gnu/packages/geo.scm | 1 - gnu/packages/gnome.scm | 25 ++++++------------------- gnu/packages/gtk.scm | 26 +++++++++++--------------- gnu/packages/ibus.scm | 2 +- gnu/packages/messaging.scm | 1 - gnu/packages/webkit.scm | 3 +-- 7 files changed, 20 insertions(+), 42 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 40edcfdab4..20b2f5a87b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2113,9 +2113,7 @@ (define-public colord-gtk pkg-config vala)) (inputs - ;; TODO: remove pango-next after it's the default. - (list gtk+ - pango-next)) + (list gtk+)) (propagated-inputs ;; colord-gtk.pc refers to all these. (list colord gtk)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 753ab558ad..9465c0eda7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -388,7 +388,6 @@ (define-public gnome-maps libshumate libsoup libxml2 - pango-next ;TODO: remove when it's the default rest-next webkitgtk)) (synopsis "Graphical map viewer and wayfinding program") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a7e188048..90e33d72b6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8399,7 +8399,6 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - pango-next ;remove after it's the default webkitgtk)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") @@ -8707,8 +8706,7 @@ (define-public network-manager-openvpn libnma libsecret network-manager - openvpn - pango-next)) ;remove after it's the default + openvpn)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenVPN plug-in for NetworkManager") (description @@ -8758,8 +8756,7 @@ (define-public network-manager-vpnc vpnc network-manager libnma - libsecret - pango-next)) ;TODO: remove after it's the default + libsecret)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "VPNC plug-in for NetworkManager") (description @@ -8811,8 +8808,7 @@ (define-public network-manager-openconnect libxml2 lz4 network-manager - openconnect - pango-next)) ;TODO: remove after it's the default + openconnect)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenConnect plug-in for NetworkManager") (description @@ -8875,7 +8871,6 @@ (define-public network-manager-fortisslvpn libsecret network-manager openfortivpn - pango-next ;TODO: remove after it's the default ppp)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "Fortinet SSLVPN plug-in for NetworkManager") @@ -9302,8 +9297,6 @@ (define-public gnome-bluetooth (list eudev gsound libnotify - ;; TODO: Delete pango-next after it's the default. - pango-next python-dbus upower)) (synopsis "GNOME Bluetooth subsystem") @@ -10016,10 +10009,7 @@ (define-public baobab python vala)) (inputs - (list gtk libadwaita libhandy - ;; XXX: Ensure pango-next is used instead of the equally propagated - ;; 'pango'. - pango-next)) + (list gtk libadwaita libhandy)) (synopsis "Disk usage analyzer for GNOME") (description "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk @@ -10617,9 +10607,7 @@ (define-public gnome-calendar gsettings-desktop-schemas libadwaita libdazzle - libgweather4-with-libsoup2 - ;; Remove pango-next when it's the default. - pango-next)) + libgweather4-with-libsoup2)) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") (description @@ -13458,8 +13446,7 @@ (define-public gtranslator gspell libgda libhandy - libsoup - pango-next)) + libsoup)) (propagated-inputs (list gtksourceview-4)) ; required for source view (home-page "https://wiki.gnome.org/Apps/Gtranslator") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1911ed7774..29494c36b1 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.48.10") + (version "1.50.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -436,7 +436,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))) + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas @@ -481,21 +481,19 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) -;; TODO: Make this the default package in next release cycle. -(define-public pango-next +(define-public pango-1.48 (package (inherit pango) - (name "pango-next") ;to avoid profile conflicts - (version "1.50.4") + (version "1.48.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) - "/pango-" version ".tar.xz")) + (version-major+minor version) "/" + "pango-" version ".tar.xz")) (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))))) + "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))))) (define-public pango-1.42 (package @@ -713,8 +711,7 @@ (define-public gtksourceview glib gtk libxml2 - pcre2 - pango-next)) + pcre2)) (home-page "https://wiki.gnome.org/Projects/GtkSourceView") (synopsis "GNOME source code widget") (description "GtkSourceView is a text widget that extends the standard @@ -741,7 +738,6 @@ (define-public gtksourceview-4 (propagated-inputs (modify-inputs (package-propagated-inputs gtksourceview) (replace "gtk" gtk+) - (replace "pango-next" pango) (replace "glib" glib))))) (define-public gtksourceview-3 @@ -1413,7 +1409,7 @@ (define-public gtk libxkbcommon libxrandr libxrender - pango-next + pango vulkan-headers vulkan-loader ;for vulkan graphics API support wayland ;for wayland display-backend @@ -1830,7 +1826,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango-next)) + (list cairo cairomm glibmm pango)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description @@ -1853,7 +1849,7 @@ (define-public pangomm-2.46 (sha256 (base32 "06zczkaxf5p5kjgnzrfylzi40w9a8lxpndgs7rpn12qrsq27sy6k")))) (propagated-inputs - (list cairomm-1.14 glibmm-2.64 pango)))) + (list cairomm-1.14 glibmm-2.64 pango-1.48)))) (define-public atkmm (package diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 7d52c5889e..2bcad54656 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -248,7 +248,7 @@ (define-public ibus ((#:configure-flags flags) #~(cons* "--enable-gtk4" #$flags)))) (inputs (modify-inputs (package-inputs ibus-minimal) - (prepend gtk pango-next))) + (prepend gtk))) (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (define-public ibus-libpinyin diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4b8071e728..66875a2136 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1395,7 +1395,6 @@ (define-public dino libsignal-protocol-c libsoup libsrtp ;for calls support - pango-next ;gtk4 wants pango 1.50+ qrencode sqlite webrtc-audio-processing)) ;for A/V support diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0a51479985..8ef95ce518 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -290,8 +290,7 @@ (define-public webkitgtk-next (replace "gtk+" gtk))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "gtk+-2" "libnotify") - (append pango-next))))) ;TODO: remove after it's the default + (delete "gtk+-2" "libnotify"))))) ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3: -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:48:41 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:42 +0000 Received: from localhost ([127.0.0.1]:34735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbx-0001qr-BL for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:41 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:39911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbq-0001oz-IU for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:35 -0400 Received: by mail-ed1-f66.google.com with SMTP id ek18so95072280edb.6 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299309; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=6c1vA0OpZVfYOxlL302UzzLuyyJPvk24Kdc5M74hObY=; b=hdGmNjkEtkOMptxTxstMTRgX3eXUaChvkxhTj2IEXC6CBY78mBDg2rphQNOpOVXBJA 9vPukboLGz1CVGPe1CsOFS/2d9OKa4ESZ7f8QG33dz9g3dO+pjomEkyDjzvlCbWsjU4J N3r0DSv/kqMu0Dm3U1HgsiIJcJyhugmTYgnH0Xf3WMLO2f8ZK8E28uwXFg0DnEs9Iyej uoSf2QsmmN8Wmt7evmbw/tbamS5fE1VZUOvyl3DCyORayVthuf5b64bwDtmP/rIQ4zHk FQAJfWFJSJf9VmcWDMUpeLp0jfpbZdOp1xaZLytVxFn5DPQOwWzlP7igZ0wamneejXe5 /zKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299309; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=6c1vA0OpZVfYOxlL302UzzLuyyJPvk24Kdc5M74hObY=; b=r7QWK7YZAJFGkET7q7yl+zUehFhDaBGNk2rOalAFDd0TilCLIJCeSQj8XgErWfNPQZ MFAX6fxqSNaX65NiE3JwXqW7nhRb8tmT/ma2U2YRNt+a7dgkOxGZrIYXf80BEpIhrXGv zyMR4hLYZixci59NTG5JQMv4K/iF2Mr9BlfIOnDytlHYs+c+uQRyayrOsCd5TzTvGyQG dQGhpM0uHUkN95cdvJP1UcQbQFiTCyVd4VVmyMI3nA1M1eSvD511Z9LVl1hf3pCu/xDA DOoib5gck5r0akFdeVUhrhG4kOIAiNjTlkpVXBHCvVHIjvYyXbmZBDjpa064K6mOcpr/ jUaw== X-Gm-Message-State: AAQBX9dtNfmeEqHVXQ5pxF39GvYZxFjNcryQ4bd9fpMbL/+2Z6UJNDU4 aMRUUyo9NNmnAzDlPsHhSMZRiRpt3sObBA== X-Google-Smtp-Source: AKy350ZreFKD3VB6wjCcLgpr+VfZDSwngXi2kCA8ou6bvW4BmM1e2CW4Pj8Kpv04NA4M7xo3QN4mqA== X-Received: by 2002:a17:907:1dee:b0:931:d350:9aef with SMTP id og46-20020a1709071dee00b00931d3509aefmr25440169ejc.25.1680299308804; Fri, 31 Mar 2023 14:48:28 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:28 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 20:53:15 +0200 Subject: [PATCH gnome-team v2 03/12] gnu: pango: Update to 1.50.14. to: 62467@debbugs.gnu.org Message-ID: <391ba920371bd54d8f6d74a2b2443c61b9592390.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- 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 29494c36b1..6d5e7f56bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427, 7 +427, 7 @@ (define-public libthai (define-pu [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- 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 29494c36b1..6d5e7f56bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-pu [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- 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 29494c36b1..6d5e7f56bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.50.4") + (version "1.50.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -436,7 +436,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) + "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:48:42 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:42 +0000 Received: from localhost ([127.0.0.1]:34737 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbx-0001r8-S5 for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:42 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:38897) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbr-0001p7-Nb for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:36 -0400 Received: by mail-ed1-f65.google.com with SMTP id r11so95042414edd.5 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299310; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=7u6zMtqNLjZwn/s9XH44B9Um62SD6KUkQNZ9IAt/ZEk=; b=WwBpGpo4vyObWSWBh7qkbGcX2onS7WOOGisOfFmeKRJUaUvq23VAb/3Xhozhdc2u9u JXuiLnly7xZcCUPvR9Dq8DGk1XrycD69ydQ0IlCL40l4/NlHwekoYoDhCRF1CK9jJq28 ru1lADJo7HmJbees6vZ1NjSZvfD8Qc1XaBc0uitvXkiQx792LzPygnzdtXRoaTn+7BGS o+HMvhKNbj2OaNTguPxrs+C8syCMQVOuti4eLAZHeAt7umCqoRw9fwJnpPG7S0uR5HA8 qyKvko5Wuf9zr+O4tiW+z3QgBVO3/ik8R+jf3HP9cscM+bANe3ZRvH8Dns7gBW341HmH WivA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299310; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=7u6zMtqNLjZwn/s9XH44B9Um62SD6KUkQNZ9IAt/ZEk=; b=CNIGSfHRm44N5FG2CtcBytwzZmyvyyJLy4DmLZJSrv8B+Yw84TabYDEof48eawOZGI RsCiMkcJRsQIrz9v2eY3hyvhEw9ltQrLIWoaGK1TEYtkVh6vYL07GASDJJxFOLjjm5Pl f7BZa0R7WP6ddBDrnXBTLmqAwkywH7PyvK9FUf9uNCO1sFpCEXDmEipYwJXCNN8NDvjh jzYnMWEAScMDKDym89z+0vjUoyOjjKT+zjSTpJw5Wts2b0mx+i/Le9GZZ9t/DBFKuqAZ jDUQ97j1XfQX9dq0YNW+CbRPAHDZnuzn4b4LiN+sslLWNnqr5wvfl9p7Eql7qzd1/5g0 Tszw== X-Gm-Message-State: AAQBX9cLQl0cxFyG6THKu/B1vDsNO7kXq+dDCk3xhaHI2ce1G3IYNp41 DIbqdwrdn3Hm+mH4CuwOcix1YUZRt7p4Og== X-Google-Smtp-Source: AKy350YRy8hPZFVcWj/5UFTw3UfBtAxwtCf1fdOnpPSyWW0qwrs4luZJqaaGWJykKigo9MskIjw5HQ== X-Received: by 2002:a17:907:8694:b0:947:c221:eb38 with SMTP id qa20-20020a170907869400b00947c221eb38mr3359074ejc.13.1680299310197; Fri, 31 Mar 2023 14:48:30 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:29 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:19:11 +0200 Subject: [PATCH gnome-team v2 05/12] gnu: gobject-introspection: Update to 1.76.1. to: 62467@debbugs.gnu.org Message-ID: <643edface1af07593df5ddd170f479c8d77eecee.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 09386d1652..4115e54782 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 09386d1652..4115e54782 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 09386d1652..4115e54782 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.73.1") + (version "1.76.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) + (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:48:59 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:59 +0000 Received: from localhost ([127.0.0.1]:34739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcE-0001rV-8i for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:59 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:35781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbr-0001p4-E6 for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:37 -0400 Received: by mail-ed1-f66.google.com with SMTP id y4so95108967edo.2 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299310; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=ejB6yr+LtyQYXy9lTKaomDaDvxGRhsVK6xEeaXAz6hc=; b=cpyGm4pWwRUAQn+Ybpe1QanFujY6wQgXWdNy8yW5rulfrE0R8/IGBCMtFGmJUUIVqW XimLwkKK4sOJ+/7HNNe5usa1Lqr1VpeTBWcLtPoN66HryLHg0tchcMpduZZ9/ecI7qWv zd2BQZ0dYQwBr9DwY04p85LSVy+tnRC9LWjoeEXsadAMrsh4ol52azpxbFN/BDRu8eq1 iRZHl8ySOPEsNe2eZtn00QIv9IT3OllTxBZklYaZGP4G9tkXsC9kwiCf7m1L/hTpZnO9 Qv7Qz7jN1hIEz7IusGCoxGOP8ERp/YrsLf+QQmdwOsaWAeh6jZtpdW1WNu5YcaEWo7t3 AMTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299310; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ejB6yr+LtyQYXy9lTKaomDaDvxGRhsVK6xEeaXAz6hc=; b=Ax3+KK4GV2fZ5r9QkOUhkmW3I0Sllgsh11+GUvALQeTc3ID3myOXrfZiRN3BOKwo3G mslerxvDEArFmogtO5HQ8HNklI4NJeXkcHVuBA+MPX8s5VVix0k0JHh3X/zTRfQ9gKYV THRF3RnWOnsaQuAYOLsCF83a0XLLHf/wrAgAI8Lm/zeXpTcXKEgGT/Yf2e2MrPdNuCg3 VfXFAFDA2PGm6HAQL/I1ee21dRti8XRppe1/fSeyCa2Wamm5oYKVvJPEc0ZPG9Tdeuwd LsQDnox07so0IJA3EZB6A2uXtRcDqHCdvOtJDH4rf2FpmrdzfPP4J2UhxAdhEFesjvJx iJww== X-Gm-Message-State: AAQBX9e8fR8c/DPDcHfhIWOM28nigd1aJBjxfaogo5yhSofgI+fAWNiW 2g+mdKur5KX8ZiC/qkFbx/KVKLGMauItgg== X-Google-Smtp-Source: AKy350a48rnG8CaoE9+qwqZpOse8jy09+xutJ9DO4Ub9d8dLFiDXvwm+BN+9DL2Dqz2U/4cOEwhFkg== X-Received: by 2002:a17:907:b0f:b0:92f:fc08:bb0a with SMTP id h15-20020a1709070b0f00b0092ffc08bb0amr26399249ejl.37.1680299309505; Fri, 31 Mar 2023 14:48:29 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:29 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:14:47 +0200 Subject: [PATCH gnome-team v2 04/12] gnu: Make gobject-introspection-next the new gobject-introspection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. (gobject-introspection-next): Delete variable. * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: Replace gobject-introspecti [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. (gobject-introspection-next): Delete variable. * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: Replace gobject-introspecti [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.208.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. (gobject-introspection-next): Delete variable. * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: Replace gobject-introspection-next with gobject-introspection. * gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]: Replace gobject-introspection-next with gobject-introspection. * gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch: Rename to… * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: … this. * gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to… * gnu/packages/patches/gobject-introspection-cc.patch: … this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 - gnu/packages/glib.scm | 21 +-- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- ...trospection-absolute-shlib-path-1.72.patch | 173 ------------------ ...ct-introspection-absolute-shlib-path.patch | 51 +++--- .../gobject-introspection-cc-1.72.patch | 15 -- .../patches/gobject-introspection-cc.patch | 11 +- 8 files changed, 39 insertions(+), 238 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch diff --git a/gnu/local.mk b/gnu/local.mk index 64a1268fbe..3e94281ccf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1264,9 +1264,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnutls-cross.patch \ %D%/packages/patches/gnutls-guile-eintr-eagain.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ - %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ - %D%/packages/patches/gobject-introspection-cc-1.72.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ecf5cb491f..09386d1652 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.66.1") + (version "1.73.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x")) + (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" @@ -564,23 +564,6 @@ (define gobject-introspection ;; For tools. license:gpl2+)))) -(define-public gobject-introspection-next - (package - (inherit gobject-introspection) - (name "gobject-introspection") - (version "1.73.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) - (patches (search-patches - "gobject-introspection-cc-1.72.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))))) - (define intltool (package (name "intltool") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6d5e7f56bc..c756f39e24 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -698,7 +698,7 @@ (define-public gtksourceview (list `(,glib "bin") ; for glib-genmarshal, etc. gettext-minimal gi-docgen - gobject-introspection-next + gobject-introspection pkg-config vala ;; For testing. diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5d861c5c82..5c7c880b0e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2303,7 +2303,7 @@ (define (get lib) clutter xorg-server-for-tests)) (propagated-inputs - (list gobject-introspection-next)) + (list gobject-introspection)) (home-page "https://www.gnu.org/software/g-golf/") (synopsis "Guile bindings for GObject Introspection") (description diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch deleted file mode 100644 index 8bb86467c0..0000000000 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch +++ /dev/null @@ -1,173 +0,0 @@ -Names of libraries included in typelib files are opened by dlopen. -Here we add the full path. - -This patch was provided by Luca Bruno , -for 'gobject-introspection' 1.40.0 in Nix. - -It has since been updated to work with newer versions of -gobject-introspection. - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 1d39ab84..e12ed24e 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -95,6 +95,39 @@ def get_windows_option_group(parser): - return group - - -+def _get_default_fallback_libpath(): -+ # Newer multiple-output-optimized stdenv has an environment variable -+ # $outputLib which in turn specifies another variable which then is used as -+ # the destination for the library contents (${!outputLib}/lib). -+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None -+ if store_path is None: -+ outputs = os.environ.get("outputs", "out").split() -+ if "lib" in outputs: -+ # For multiple output derivations let's try whether there is a $lib -+ # environment variable and use that as the base store path. -+ store_path = os.environ.get("lib") -+ elif "out" in outputs: -+ # Otherwise we have a single output derivation, so the libraries -+ # most certainly will end up in "$out/lib". -+ store_path = os.environ.get("out") -+ -+ if store_path is not None: -+ # Even if we have a $lib as output, there still should be a $lib/lib -+ # directory. -+ return os.path.join(store_path, 'lib') -+ else: -+ # If we haven't found a possible scenario, let's return an empty string -+ # so that the shared library won't be prepended with a path. -+ # -+ # Note that this doesn't mean that all hope is lost, because after all -+ # we can still use --fallback-library-path to set one. -+ # -+ # Also, we're not returning None, because that would make it very -+ # difficult to disable adding fallback paths altogether using something -+ # like: --fallback-library-path="" -+ return "" -+ -+ - def _get_option_parser(): - parser = optparse.OptionParser('%prog [options] sources', - version='%prog ' + giscanner.__version__) -@@ -220,6 +253,10 @@ match the namespace prefix.""") - parser.add_option("", "--compiler", - action="store", dest="compiler", default=None, - help="the C compiler to use internally") -+ parser.add_option("", "--fallback-library-path", -+ action="store", dest="fallback_libpath", -+ default=_get_default_fallback_libpath(), -+ help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 9f8ab5df..8aa37c99 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): - $""" % re.escape(library_name), re.VERBOSE) - - -+def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape( -+ os.environ.get("NIX_STORE", default="/gnu/store") -+ ) -+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' -+ return re.compile(pattern % (store_dir, re.escape(library_name))) -+ -+ - # This is a what we do for non-la files. We assume that we are on an - # ELF-like system where ldd exists and the soname extracted with ldd is - # a filename that can be opened with dlopen(). -@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): - output = output.decode("utf-8", "replace") - - shlibs = resolve_from_ldd_output(libraries, output) -- return list(map(sanitize_shlib_path, shlibs)) -+ fallback_libpath = options.fallback_libpath or ""; -+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) - - - def sanitize_shlib_path(lib): -@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib): - # In case we get relative paths on macOS (like @rpath) then we fall - # back to the basename as well: - # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 -- if sys.platform == "darwin": -- if not os.path.isabs(lib): -- return os.path.basename(lib) -- return lib -- else: -+ -+ # Always use absolute paths if available -+ if not os.path.isabs(lib): - return os.path.basename(lib) -+ return lib - - - def resolve_from_ldd_output(libraries, output): - patterns = {} - for library in libraries: - if not os.path.isfile(library): -- patterns[library] = _ldd_library_pattern(library) -+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) - if len(patterns) == 0: - return [] - -@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): - if line.endswith(':'): - continue - for word in line.split(): -- for library, pattern in patterns.items(): -- m = pattern.match(word) -+ for library, (pattern, guix_pattern) in patterns.items(): -+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") -+ if line.find(store_dir) != -1: -+ m = guix_pattern.match(word) -+ else: -+ m = pattern.match(word) - if m: - del patterns[library] - shlibs.append(m.group()) -diff --git a/giscanner/utils.py b/giscanner/utils.py -index 31c7ea48..630002a8 100644 ---- a/giscanner/utils.py -+++ b/giscanner/utils.py -@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): - if dlname is None: - return None - -- # Darwin uses absolute paths where possible; since the libtool files never -- # contain absolute paths, use the libdir field -- if platform.system() == 'Darwin': -- dlbasename = os.path.basename(dlname) -- libdir = _extract_libdir_field(la_file) -- if libdir is None: -- return dlbasename -- return libdir + '/' + dlbasename -- # Older libtools had a path rather than the raw dlname -- return os.path.basename(dlname) -+ dlbasename = os.path.basename(dlname) -+ libdir = _extract_libdir_field(la_file) -+ if libdir is None: -+ return dlbasename -+ return libdir + '/' + dlbasename - - - # Returns arguments for invoking libtool, if applicable, otherwise None -diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py -index a8337c60..7f123103 100644 ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py -@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): - - self.assertEqual( - sanitize_shlib_path('/foo/bar'), -- '/foo/bar' if sys.platform == 'darwin' else 'bar') -+ # Always use an absolute filename for Guix -+ '/foo/bar') - - def test_unresolved_library(self): - output = '' diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index 956fa617c3..8bb86467c0 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -1,11 +1,14 @@ -# Names of libraries included in typelib files are opened by dlopen. Here we -# add the full path. -# -# This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. -# -# It has since been updated to work with newer versions of -# gobject-introspection. +Names of libraries included in typelib files are opened by dlopen. +Here we add the full path. + +This patch was provided by Luca Bruno , +for 'gobject-introspection' 1.40.0 in Nix. + +It has since been updated to work with newer versions of +gobject-introspection. + +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index 1d39ab84..e12ed24e 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -95,6 +95,39 @@ def get_windows_option_group(parser): @@ -48,10 +51,10 @@ def _get_option_parser(): parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__) -@@ -205,6 +238,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") +@@ -220,6 +253,10 @@ match the namespace prefix.""") + parser.add_option("", "--compiler", + action="store", dest="compiler", default=None, + help="the C compiler to use internally") + parser.add_option("", "--fallback-library-path", + action="store", dest="fallback_libpath", + default=_get_default_fallback_libpath(), @@ -59,6 +62,8 @@ group = get_preprocessor_option_group(parser) parser.add_option_group(group) +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 9f8ab5df..8aa37c99 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): @@ -76,7 +81,7 @@ # This is a what we do for non-la files. We assume that we are on an # ELF-like system where ldd exists and the soname extracted with ldd is # a filename that can be opened with dlopen(). -@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): +@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): output = output.decode("utf-8", "replace") shlibs = resolve_from_ldd_output(libraries, output) @@ -86,7 +91,7 @@ def sanitize_shlib_path(lib): -@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): +@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib): # In case we get relative paths on macOS (like @rpath) then we fall # back to the basename as well: # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 @@ -111,7 +116,7 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): +@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): @@ -126,10 +131,11 @@ if m: del patterns[library] shlibs.append(m.group()) - +diff --git a/giscanner/utils.py b/giscanner/utils.py +index 31c7ea48..630002a8 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py -@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): +@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -141,8 +147,7 @@ - if libdir is None: - return dlbasename - return libdir + '/' + dlbasename -- # From the comments in extract_libtool(), older libtools had -- # a path rather than the raw dlname +- # Older libtools had a path rather than the raw dlname - return os.path.basename(dlname) + dlbasename = os.path.basename(dlname) + libdir = _extract_libdir_field(la_file) @@ -151,10 +156,12 @@ + return libdir + '/' + dlbasename - def extract_libtool(la_file): + # Returns arguments for invoking libtool, if applicable, otherwise None +diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py +index a8337c60..7f123103 100644 --- a/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py -@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): +@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): self.assertEqual( sanitize_shlib_path('/foo/bar'), @@ -163,4 +170,4 @@ + '/foo/bar') def test_unresolved_library(self): -output = '' + output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch deleted file mode 100644 index d3b1df82af..0000000000 --- a/gnu/packages/patches/gobject-introspection-cc-1.72.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use gcc as the default C compiler if CC is not set. - -diff --git a/giscanner/__init__.py b/giscanner/__init__.py -index 7c2f365a..607fe341 100644 ---- a/giscanner/__init__.py -+++ b/giscanner/__init__.py -@@ -21,6 +21,8 @@ import os - builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') - if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422 -+if not 'CC' in os.environ: -+ os.environ['CC'] = 'gcc' - try: - from ._version import __version__ - except ImportError: diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch index 6a86b56b44..d3b1df82af 100644 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ b/gnu/packages/patches/gobject-introspection-cc.patch @@ -1,12 +1,13 @@ Use gcc as the default C compiler if CC is not set. -diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py ---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 -+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 -@@ -22,6 +22,8 @@ +diff --git a/giscanner/__init__.py b/giscanner/__init__.py +index 7c2f365a..607fe341 100644 +--- a/giscanner/__init__.py ++++ b/giscanner/__init__.py +@@ -21,6 +21,8 @@ import os builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) + __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422 +if not 'CC' in os.environ: + os.environ['CC'] = 'gcc' try: -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:48:59 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:48:59 +0000 Received: from localhost ([127.0.0.1]:34741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcF-0001rY-BH for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:59 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:46969) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbt-0001pH-4V for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:37 -0400 Received: by mail-ed1-f66.google.com with SMTP id eg48so94924069edb.13 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299311; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=C4wY9r5vuKP7EXP2xQ+D4bEUSxumjeYxxnUbve4Qzb8=; b=av7O7cEigx1kalwF1H6ZL+CGEoCy1elq8DplKXYwgLqKYoeitwDScYLaMxrgfyaM9z E9oukVERS6p/x6aPeycKKTTDwxhnkkZzkUqBI39XrxJVLE7prFoTHxoaeaPCnQxyuiKX n46e7aKkzOBZg6pnBMwDUJd+PSnGOhCNTFNCs6MiG5oCrytJlXKmS5m54j5Rt537K9Yg 8cYPjUzROOqzeHhpyxWaoBHL5TcLqFacwBvMfG4y+7LOlrtQw//9ILDYLjuu4W4mxQhl NZHLVC2E1OtEwPpQmNqjWGHH+hm2DSDXHx6uhnVYrKC4mpFGVrdk8w7nTzgVHxQlSwRn sc9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299311; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=C4wY9r5vuKP7EXP2xQ+D4bEUSxumjeYxxnUbve4Qzb8=; b=YsVLFo3EjeV/rSxKTd0qhddo0mGOhykCY+h8dSUezqQTzBkk2pi65iAQvqPfkm9XH7 COa6Ol6n3APBBo/h5IYGCXy5f/58zrN/9yvDxysBOv+51RRtS0BeGn87bbmrCJMiNxmC 5sxZ/Rgvv3W3qo5fLrQ2yD7L2J//S1luhybfZlkwrUbosLkE0+b7su6mMQrLr+ngYss0 lhDBi0Qnu4UOAFf8OS8KvDfCuAZz7xyPXvLX1vuX9ap9+XM73Q0uPvcqUoj1FqH4DGpM ndKaSTFO7dXJlHpbkJ6y0o55PU0j1axiV0ufvM3BmvxLkut7qfu9FGvzJ8sgVGs+7G5C GwPA== X-Gm-Message-State: AAQBX9c7IdbKqy9r7nqy4jbE1wmGCwfOm7V2hYflVBXYTA+tiubFk81o Kh0gIl6JwQTj4xdU+CT6Ge+uf70iJMjb+Q== X-Google-Smtp-Source: AKy350ZUo2EyXA7KYnbcc9GczDdEu08C9mhqR6desN9X0kR++Epq/wBoiCR+beD8vHZuhbtK3TmKjQ== X-Received: by 2002:a17:906:4b51:b0:92f:3e2b:fbb7 with SMTP id j17-20020a1709064b5100b0092f3e2bfbb7mr27474021ejv.14.1680299311532; Fri, 31 Mar 2023 14:48:31 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:31 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 18:50:30 +0200 Subject: [PATCH gnome-team v2 07/12] gnu: python-pygobject: Set upstream-name. to: 62467@debbugs.gnu.org Message-ID: <79a1a16f7acdf5079456c84949c8ae7789a5bb4a.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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 (-) * gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name. --- gnu/packages/glib.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4115e54782..40d6dd3c86 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -967,7 +967,8 @@ (define-public python-pygobject (synopsis "Python bindings for GObject") (description "Python bindings for GLib, GObject, and GIO.") - (license license:lgpl2.1+))) + (license license:lgpl2.1+) + (properties '((upstream-name . "pygobject"))))) (define-public perl-glib (package -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:49:00 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:00 +0000 Received: from localhost ([127.0.0.1]:34743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcF-0001rg-LP for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:59 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:34445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbs-0001pC-Ex for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:36 -0400 Received: by mail-ed1-f65.google.com with SMTP id b20so95041869edd.1 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299311; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=gDuX8HBStTv4JlmhaTmJkSkB5d1O/RpTTEbPJ8A0nrU=; b=fUfjQI/YomBSSuOdSffO/pJZTDRgQKfLIGiBTW8VaiU5dCRGfMDUd47thk53Y927c3 SZ8Lnm7PXEgJuQZjuSXjJkUke0urimhel/ULNedNjrWzIbV4HOnShsrvFOWpNSu+WYve 3LMQBffpsOPIDS7ZVCRclFyjdknyUNQuMPf4IHWNcgczG6jW1vK6ZDCqTZh8C6ZJw143 aNY36dZSab7ovA7bTHYxGV4UOXBBg1obOuEPUOwqjTqde5y62LzSX2QZ8w8uj67tKo/E 2Wyq3OGOGbrNjfLfU5EwVHx6y0UWkmaMns9jpBSHr6Y1RAbK4CL0Zix/Vx/gnhsqiO2B cW4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299311; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=gDuX8HBStTv4JlmhaTmJkSkB5d1O/RpTTEbPJ8A0nrU=; b=OloB54Kluz0uP4hHxE4tS+BEIQ4PCNDj6jv1Ulu+U0ZHwIIHX+QSr46llOnLLzMNG3 dvb4cUPxInIvI1N7CiKQuU8dzR4X9CQhTkEXRpZK0SfB0yCddQsdi6OC8iox696n2CCq WgoG7lesseQtgYdJCQLSTuk6qOfIAqJaKzzKbnECFU0YqZOBZkbJkUFMM4lTGlIb/TXQ pqswU/NDx2vGpeKcQHgk+P6yBRiZzclcevGx36yCfiOBtU5oXr/yK7PxG5BJWueYp1/k nJxTKZuC/qsWqvrg4JlhxdRufDTPuJyGrVQY+nnbf+Jo5z22hTBsbdJ+XV22Sc/4IZyl YgoA== X-Gm-Message-State: AAQBX9d/TEv2XZPm7FXnNmVUf3JTyJTWZ4LOig6CLRVpaCo2heuOF0+N 9WgoaIVpZtO2WFnKzIqYAbaj3+5AxGixCQ== X-Google-Smtp-Source: AKy350YDWcX5jrJW5iQCKxLEqVqLCqvRsHn8JVRMk1dEvodUCfZv6iaiZaBQsCQJXZogcQ0m5luGRw== X-Received: by 2002:a17:907:1c09:b0:930:f953:9608 with SMTP id nc9-20020a1709071c0900b00930f9539608mr39967325ejc.0.1680299310875; Fri, 31 Mar 2023 14:48:30 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:30 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 06:26:28 +0200 Subject: [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3. to: 62467@debbugs.gnu.org Message-ID: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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 (-) * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 90e33d72b6..4f47e60505 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5263,7 +5263,7 @@ (define-public libsoup-minimal ;;; An older variant kept to build the 'rest' package. (define-public libsoup-minimal-2 (package/inherit libsoup-minimal - (version "2.72.0") + (version "2.74.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2 "libsoup-" version ".tar.xz")) (sha256 (base32 - "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p")))) + "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) ((#:phases phases) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:49:00 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:00 +0000 Received: from localhost ([127.0.0.1]:34745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcF-0001ro-Uv for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:49:00 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:46973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbt-0001pL-PE for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:38 -0400 Received: by mail-ed1-f68.google.com with SMTP id eg48so94924159edb.13 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299312; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=3z+5zk9jIYcdRioJ6j9VOLChdlcXyG5DDe6rkhhUtic=; b=Q49+QdH1WxxdUj1kAVh2eSp0g2fv92uV2b71+U/xIJKL8Iqog29YxUWuPKp08RGq+n 19KiWB/Fxbv60GRHl70LEXDiuc/yfNXidN9YpNussVOIIs0dV4nStjyk/D7fxwoq1l70 BPo2hjuu1CP9qxw41vdrVEwqDbJUwPplWAsvxwtntDAq6qm/WsIzNsaTpMem59xzX6FA z7lSw9o6mt/dfVVdj1QMqwC8N9L/cOeuly4O7OZRwYzvkdnQG1dI4NF+taz4RrCCHRBG TiccH8D88IyHhlrbU6QaD3TKu0LL3mS/8vtpwmgKot3KGQtI85wGZZenvNfZctkUQOLz quUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299312; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=3z+5zk9jIYcdRioJ6j9VOLChdlcXyG5DDe6rkhhUtic=; b=3rqPZwJ5leyb48m8GryVg6+C2zEncBk7oI89gt/wWQuh+x8exlM+BC2YEZkYJn6gzt hmvUGBQGjEnq5L3HqpWjCQbYirpNqfM+0FBdr/zqK0nTJ8aRQ+eelmHIWG6mJDTUuSvR 0OVAugYSAR/bh4CrO5BCBGlONK5066Sl3y4mqmHdEARqyRG2zLRWpfU5dZVUyTeMfnGr diNanS2u+uyIMGBfevPFLeOOnlSWB/JbEfl90ctkfBk1hD+uhzN09pvBZDglsJMP5UW4 MLtY+O/b9mKXXWILIvpad65tc1DmQOmLwZtyg9Y7NO0EB1EafHWXDxTSr6zsuaqi2+5Z RIFw== X-Gm-Message-State: AAQBX9d3Q8ix7bVVETaKcdspefluRz2KlnRdkYSYEXbuvUpG+xrA4+78 1Imbf54vLZfZYoqwuWDpgPhUlgfD8kPlYQ== X-Google-Smtp-Source: AKy350bMSrp0v1pVq+yTabHvBeyIVdhHGy4E1n7CqT0jUWzy5i5+ls76X5ozuzGRWRaihKIwMXwM5g== X-Received: by 2002:a17:906:9717:b0:930:57e5:d9a8 with SMTP id k23-20020a170906971700b0093057e5d9a8mr26793289ejx.68.1680299312169; Fri, 31 Mar 2023 14:48:32 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:31 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 18:51:06 +0200 Subject: [PATCH gnome-team v2 08/12] gnu: python-pygobject: Update to 3.44.1. to: 62467@debbugs.gnu.org Message-ID: <7b3c644c0441aae15695aa0e26faccd3c947e1a1.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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 (-) * gnu/packages/glib.scm (python-pygobject): Update to 3.44.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 40d6dd3c86..24f66f133c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -922,7 +922,7 @@ (define-public glibmm-2.64 (define-public python-pygobject (package (name "python-pygobject") - (version "3.40.1") + (version "3.44.1") (source (origin (method url-fetch) @@ -931,7 +931,7 @@ (define-public python-pygobject "/pygobject-" version ".tar.xz")) (sha256 (base32 - "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0")) + "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w")) (modules '((guix build utils))) (snippet '(begin -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:49:00 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:00 +0000 Received: from localhost ([127.0.0.1]:34747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcG-0001rv-8C for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:49:00 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:41733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbu-0001pT-Ak for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:38 -0400 Received: by mail-ed1-f68.google.com with SMTP id h8so95044627ede.8 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299313; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=aPYJYw1MMPu4yVOKLcLUBGTGZkkfeSyaHWpyUQB+z1A=; b=osaFGSpdp8s9eejl6P/s6fvU8Xm6oiHr+BtW7969z3YoLqp5NlCX/WYj62vz4B00By 6rNYLUELPKnYtFDFbHxhSEKP2z2rNdmzCQbHbfPg4eYUQWlO3Eq5moqvCPTI0E5+d7rI Tk2aY16Lw8AVkD+dw3r95/Eokg0rWd65swaPHYRDJscbsqi1KAzn+7akvnl6s149kRSC st8095HSWvIIBVJdIZSC5q0RvIzqCzHcMqpfan/q3ZSd74bRs/FhPMQ9Hy1mGzlZNSFT ta6IxKbEsGcQBReskixjpO/+kktxBYYtMxXMXakNfbgOkriuduNlFvsh0GYS5qg0fXiS bJMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299313; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aPYJYw1MMPu4yVOKLcLUBGTGZkkfeSyaHWpyUQB+z1A=; b=KSxGc9FAbfZoC8NGemX+orjqjxnOpWXwzXucGuU/AdlfMuMkxIFcBM6ZZjVzAr5lic blcGWfz+aDqzib4NJ9FOzxi+fc/PdYCMoxZvAMWWx6bShRbEhmhBB3TQ3C0+Jx0jFNwp aabGi6PLVJHlcb18g7Ev+00whKzkX6BUnYNqHoVK787HV4XG8TI4+H94Ke+7GuZ/Kw5l uvkZ46QzmvsOS9tefne35ot2Mw7KV0eQIoAgRkcaskyXU6Rp73u3t2ZjV960wNWT6p7x 6PRBiYjHx08gg2iKMX5Y4t2qIEqBuVrdDutXwEwoMoUQk0s60PAzWsPPefXDLJKcgsfq DSew== X-Gm-Message-State: AAQBX9emHkqrD7dK4NiwOI+w77xVw/O1WG7QdXngFR59DIAavGLqA1vR xC46yoVleP28LGcVFBRc6ubOGd1e3rdtDA== X-Google-Smtp-Source: AKy350aFrnE+QL5+DxX/ByEoh/WQs847k1WDtl2US6eXkWtex1y2xmRppL1V84PpUgmSHyn3rpwfsw== X-Received: by 2002:a17:906:fe49:b0:947:5698:c9f6 with SMTP id wz9-20020a170906fe4900b009475698c9f6mr8266222ejb.35.1680299312862; Fri, 31 Mar 2023 14:48:32 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:32 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 30 Mar 2023 20:41:59 +0200 Subject: [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store. to: 62467@debbugs.gnu.org Message-ID: <09b3598cb0fb0acd211dd59fc10686188b941d8e.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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: -0.5 (/) * gnu/packages/patches/gtk2-harden-list-store.patch: New file. * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 1 + .../patches/gtk2-harden-list-store.patch | 42 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3e94281ccf..31456c5be8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1303,6 +1303,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ + %D%/packages/patches/gtk2-harden-list-store.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c756f39e24..196d767160 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1014,6 +1014,7 @@ (define-public gtk+-2 "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" + "gtk2-harden-list-store.patch" "gtk2-theme-paths.patch" "gtk2-fix-builder-test.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch b/gnu/packages/patches/gtk2-harden-list-store.patch new file mode 100644 index 0000000000..b107ba2bcc --- /dev/null +++ b/gnu/packages/patches/gtk2-harden-list-store.patch @@ -0,0 +1,42 @@ +Mimic the implemenetation in gtk+-3. + +Index: gtk+-2.24.33/gtk/gtkliststore.c +=================================================================== +--- gtk+-2.24.33.orig/gtk/gtkliststore.c ++++ gtk+-2.24.33/gtk/gtkliststore.c +@@ -1195,16 +1195,31 @@ gboolean + gtk_list_store_iter_is_valid (GtkListStore *list_store, + GtkTreeIter *iter) + { ++ GSequenceIter *seq_iter; ++ + g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE); + g_return_val_if_fail (iter != NULL, FALSE); + +- if (!VALID_ITER (iter, list_store)) +- return FALSE; ++ /* can't use VALID_ITER() here, because iter might point ++ * to random memory. ++ * ++ * We MUST NOT dereference it. ++ */ + +- if (g_sequence_iter_get_sequence (iter->user_data) != list_store->seq) ++ if (iter == NULL || ++ iter->user_data == NULL || ++ list_store->stamp != iter->stamp) + return FALSE; + +- return TRUE; ++ for (seq_iter = g_sequence_get_begin_iter (list_store->seq); ++ !g_sequence_iter_is_end (seq_iter); ++ seq_iter = g_sequence_iter_next (seq_iter)) ++ { ++ if (seq_iter == iter->user_data) ++ return TRUE; ++ } ++ ++ return FALSE; + } + + static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source, -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:49:01 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:01 +0000 Received: from localhost ([127.0.0.1]:34749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcG-0001s2-M4 for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:49:01 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:45040) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbv-0001pV-1D for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:39 -0400 Received: by mail-ed1-f67.google.com with SMTP id eh3so94944135edb.11 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299313; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=0kftSHt/a397Gys1SQBJJS7/U4ifOaMSO+lHNcd0RhA=; b=TttTB2AI3yKXG7voUrKUogba4KKVEcCSX0cABrguazZCvcf8+mbc/iC3/ztKQcp+uv jhC75QBTb7+Ra8pB2cT33RfLc3PolpQj8wXjklfyqDVPaYYWDzJArTpf9x98z9NdWwHt +h14AKLWjUbnodtZD17rucNjpIFva/hmx7MI9LTevNQg8COoaO8I1ttZ5vu8nOwBHLG7 bB2hK2HyHwE5fPAkGYKoKKLbmVOrWkrZrFzeGL60boaF0+b9tmwKp2N0VOAca4DDfsqM laxTPvUFmCBw7Jy3DudCRElnDeIwXeAo3YYWSzwNaDpooY+dVUQTCTzMHGT4GVT4PrW8 B1dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299313; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0kftSHt/a397Gys1SQBJJS7/U4ifOaMSO+lHNcd0RhA=; b=FNCMDizEoyl0ltXp2eq1HOJfuru4CyucIuY0fm3z3R8dAMUhKIAOhVuucyuNUroulW BtkCgraHp8P4XuLrwxbFv7WbzvmxAfB7pqlWAempFsY7K1o5BM7wqo3kAlS2G7xACC5+ KQ06t2WDYbpYwIUIOxkgvXeX9j3h7T1a/Q1r453GHuVIbKJklFO5qLdBi8GQGCuEQTXN HbrZYP0DUNub9Xru8fAd6xRfbk1AIgfbjbI8SDTPhWLx6DMxIJbHUevAIXohCpGSir66 og/872O0HOOd++fOYt3d0QgsqmCVsKIvSKL6gkEbLbiBxf9VUTjeMmf3J71T1uJOlc3V wauQ== X-Gm-Message-State: AAQBX9enc70DXxR8qfu17Ih87ZWevbFxtsc1e1sF8+V/P2D0fpNFo88q d70T0z3L/AIF86hhP+Ac3Z7Pft7NQKpDVw== X-Google-Smtp-Source: AKy350aB3gsqusCfQqOOUtE7GTxjcvXR5D73nBgsDbDu5Z1aQs9NS10x44OycAtnqt84YoL8uK0A9g== X-Received: by 2002:a17:907:a406:b0:947:54ae:806 with SMTP id sg6-20020a170907a40600b0094754ae0806mr8682706ejc.1.1680299313500; Fri, 31 Mar 2023 14:48:33 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:33 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 30 Mar 2023 06:28:00 +0200 Subject: [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: <95f94cbe9b3f1cee46e75577f9aac5cb751c83a4.camel@gmail.com> X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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: -0.5 (/) * gnu/packages/gtk.scm (gtk+): Update to 3.24.37. [native-inputs]: Add docbook-xsl. [build-system]: Use meson-build-system. [arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly. <#:phases>: Remove ‘generate-gdk-pixbuf-loaders-cache-file’. Adjust ‘disable-failing-tests’. Rename ‘move-desktop-files’ to ‘move-files’ and move documentation as well. --- gnu/packages/gtk.scm | 85 +++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 196d767160..75e56d4166 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1101,7 +1101,7 @@ (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.30") + (version "3.24.37") (source (origin (method url-fetch) @@ -1110,7 +1110,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds")) + "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (propagated-inputs @@ -1152,6 +1152,7 @@ (define-public gtk+ rest)) (native-inputs (list docbook-xml-4.1.2 + docbook-xsl gettext-minimal `(,glib "bin") gobject-introspection @@ -1164,47 +1165,29 @@ (define-public gtk+ ;; of updating xorg-server directly on the master branch. xorg-server-for-tests libxslt)) + (build-system meson-build-system) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) - #:modules ((guix build utils) - (guix build gnu-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) + `(#:glib-or-gtk? #t #:disallowed-references (,xorg-server-for-tests) - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes - ;; to "doc". - #:configure-flags (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html") - "--enable-cloudproviders" + #:configure-flags (list "-Dcloudproviders=true" ;; The header file is required ;; by gnome-control-center - "--enable-wayland-backend" + "-Dwayland_backend=true" ;; This is necessary to build both backends. - "--enable-x11-backend" + "-Dx11_backend=true" ;; This enables the HTML5 websocket backend. - "--enable-broadway-backend") + "-Dbroadway_backend=true" + "-Dman=true") #:phases (modify-phases %standard-phases - (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 'disable-failing-tests (lambda _ - (substitute* "testsuite/gtk/Makefile.in" - (("builderparser cellarea check-icon-names check-cursor-names") - "builderparser cellarea check-cursor-names") - (("notify no-gtk-init object objects-finalize papersize rbtree") - "no-gtk-init papersize rbtree") - (("stylecontext templates textbuffer textiter treemodel treepath") - "stylecontext textbuffer textiter treemodel treepath")) - (substitute* "testsuite/a11y/Makefile.in" - (("accessibility-dump tree-performance text children derive") - "tree-performance text children derive")) - (substitute* "testsuite/reftests/Makefile.in" - (("TEST_PROGS = gtk-reftest") - "TEST_PROGS = ")) - #t)) + (substitute* "testsuite/gtk/meson.build" + (("\\['defaultvalue'\\],") "") + (("\\['objects-finalize', .*\\],") "")) + (substitute* "testsuite/reftests/meson.build" + (("'flipping-icons(\\.[^.]*)?\\.ui',") "") + (("'gtk-icontheme-sizing(\\.[^.]*)?\\.ui',") "")))) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. @@ -1217,15 +1200,35 @@ (define-public gtk+ ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") #t)) - (add-after 'install 'move-desktop-files - ;; Move desktop files into 'bin' to avoid cycle references. + (add-after 'install 'move-files (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p (string-append bin "/share")) - (rename-file (string-append out "/share/applications") - (string-append bin "/share/applications")) - #t)))))) + (define-values (out bin doc) + (values (assoc-ref outputs "out") + (assoc-ref outputs "bin") + (assoc-ref outputs "doc"))) + (for-each mkdir-p + (list + (string-append bin "/bin") + (string-append bin "/share/applications") + (string-append bin "/share/icons") + (string-append bin "/share/man") + (string-append bin "/share/metainfo") + (string-append doc "/share/doc"))) + ;; Move programs and related files to output 'bin'. + (for-each (lambda (dir) + (rename-file + (string-append out dir) + (string-append bin dir))) + (list + "/bin" + "/share/applications" + "/share/icons" + "/share/man")) + ;; Move HTML documentation to output 'doc'. + (when (file-exists? (string-append out "/share/doc")) + (rename-file + (string-append out "/share/doc") + (string-append doc "/share/doc")))))))) (native-search-paths (list (search-path-specification (variable "GUIX_GTK3_PATH") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:49:01 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:01 +0000 Received: from localhost ([127.0.0.1]:34751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcH-0001sA-7t for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:49:01 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:45984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbv-0001pd-KI for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:40 -0400 Received: by mail-ed1-f68.google.com with SMTP id t10so94869337edd.12 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299314; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=1KNtXqP2Fu27IRyurMHHLC7nRy8ujemVheWZ/REeF6k=; b=JxkUIN479A4IQvTbKceAXJ9l1qrwa5m6B9CC7KZwvrFS8HieonkraXT0txOPpPi59s oUs5XODmTGRS4ZI2jSE5UMlUYRbsWWahohMaITnpurFDNZlJyH6XC6UR9dPoTH2nbBv/ ULc7rI/lbFTsWc6b2jP/gyN3d4bsE3Psk2IjVR22qH8/0xyamXY3pPcsI/86auKMDq9o bVSzow1g7UYgMy9a5HsYXgwS5sBco3C0a4WIF0XhtIXTfxZVxQTB+CNfayq4WB42ydk6 zRjmjJA9g/agMIPhwgLjMm3AUAHmNFVb+8dkX5YWWqeyJNXRQ5yY35oXXgtwEJacaM0O 248A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299314; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1KNtXqP2Fu27IRyurMHHLC7nRy8ujemVheWZ/REeF6k=; b=YHNiZBhzMXghzG/f5MCIYeH/ABo+jLDI9pg/UrqZswU/W88e0jbrGrpW6whuAvMLe7 oWy46V+AXxhfRmMilkDcK0p2Tms0MrRBUHxWMzFhIgHEx39BauIXH7gRAzfFQirJBdgN IqRuZB8lKOEC8bmZ/MozqLBt17f2d0bTphYBNIrwkS47v53xkgHIKQkoUbEaSBohBKqX XtjugEc8BvknLwkcjpVF6XSGU10o1JJHwKWaYL9tFbbLdpl9pYYZKrGAgAyongk+Jptj 7t53VeDkDiyVkJzvWnxe5dD7BxJHe7chbyXK4Z9dAeAjsSgqzWSLv1P//DGB80vSh4Yv acIg== X-Gm-Message-State: AAQBX9ejy1EiS3bo8cjYCGt9qOUXLHD7UrbRzw1Vf7GFqiXZGdU9uC9a tL2cLPmi7RXQUWMLnTRDwHhNYutPkW9aDw== X-Google-Smtp-Source: AKy350aoQrxOfyzf7IZwXs1v9flSCFOuyOIkZiqXuMANuQjJxh8Y7CoZtcBvWITE/zaXyynTgHtgXg== X-Received: by 2002:a17:907:25c8:b0:947:4828:4399 with SMTP id ae8-20020a17090725c800b0094748284399mr9512313ejc.12.1680299314163; Fri, 31 Mar 2023 14:48:34 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:33 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 21:34:04 +0200 Subject: [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build. to: 62467@debbugs.gnu.org Message-ID: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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 (-) * gnu/packages/gnome.scm (librsvg)[#:phases]: Also delete SVG files that have been broken by the recent updates. --- gnu/packages/gnome.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4f47e60505..e43e24dd94 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3696,7 +3696,12 @@ (define-public librsvg (("fn multiple_input_files_not_allowed_for_png_output" all) (string-append "#[ignore] " all)) (("fn stylesheet_option_error" all) - (string-append "#[ignore] " all))))) + (string-append "#[ignore] " all))) + ;; XXX: re-enable when updating this package + (with-directory-excursion "tests/fixtures/reftests/" + (delete-file "filter-component-transfer-from-reference-page.svg") + (delete-file "filter-morphology-from-reference-page.svg") + (delete-file "svg1.1/text-text-03-b.svg")))) (replace 'check (lambda* args ((assoc-ref gnu:%standard-phases 'check) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 31 17:49:02 2023 Received: (at 62467) by debbugs.gnu.org; 31 Mar 2023 21:49:02 +0000 Received: from localhost ([127.0.0.1]:34753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMcH-0001sK-Hn for submit@debbugs.gnu.org; Fri, 31 Mar 2023 17:49:01 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:42733) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piMbw-0001pq-QF for 62467@debbugs.gnu.org; Fri, 31 Mar 2023 17:48:41 -0400 Received: by mail-ed1-f65.google.com with SMTP id er13so54032287edb.9 for <62467@debbugs.gnu.org>; Fri, 31 Mar 2023 14:48:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680299315; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=e7RBfkGSTKZmkOrAFuoCajc3oUpaPvH4bkChZk/uN24=; b=WCbRRSNbDbmN3lB6M2kic/yuh8xDB5YcMjP5gzNXCURmUpvOruNFNkNln9EfMUxRiC q3nTwRk7mERjFONrifoxjfaLs/mBHb2YBb5t+1GLw7Ke0TrXuUGcRQzGthdZEZrcTMXb Lirpj14gTLmbCPtrbkubMxx+XF6EQh25ulojTj1HfHQ7vYx6OOMHe3bTIAfpmhAMxU8+ vtUfwZ3fqR++6a9WHHHsb+IHamYqs2Bf8DIFun0eH2rUlivZUk5mj0EWZQH/fW+22n2k j/1Hz8n+1+UVPh8/3O+1nyJ1sdPOGGg9AvFp3ibQGGlx559DCVuAbdhNOiFW1KYO5IQZ tPsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680299315; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=e7RBfkGSTKZmkOrAFuoCajc3oUpaPvH4bkChZk/uN24=; b=qfqxK4wWuvrB5XRINYJmQgzOo3qvvh7T/aLuOTNY/zrzpm9jfohIqVO9Agv/hQ065+ zJKkjM/1W3pSM1hS0g50SG2eK2Ok6U2FphOnAVQlIXudm4zm4rE2T2GeO65KOUXdSWi2 Pvg0ZmCv0vfWMvr5shzkz7WkiLLz5SalxYEJZrHrKZ0axgZhGtqGLOlhdbrzYpGThhrN kQvBwTF/2FGLZ8gXpmpFnNTh4tckeCHVadUoKekT58EyEXd3BWz68xxy7VtPKstZyrz0 004Fuen/Vz+f+4NsX/L7ntpf+FivB3HlovA/nUZjPZP3gji17fQWu5uqKEkQDjn7aM1C KimA== X-Gm-Message-State: AAQBX9e5AWQ0sU3ezHWUdeQ9Jp0NU/bCXBKJfEC1rvPKxUvSylaUEZLz VI2ERH158kzYL8Ixs4cBNdgalojRHMtidA== X-Google-Smtp-Source: AKy350a2kx0pIZnLgBOQNchZ4kSUPzZIn1AMKJ8iAbrbV5Z0Q2d52rAGKoDlbzeOaMiboTSm0M0UqA== X-Received: by 2002:a17:906:3149:b0:8ab:b03d:a34f with SMTP id e9-20020a170906314900b008abb03da34fmr10480731eje.12.1680299315212; Fri, 31 Mar 2023 14:48:35 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id pg1-20020a170907204100b0092b546b57casm1363553ejb.195.2023.03.31.14.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 14:48:34 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 31 Mar 2023 20:54:00 +0200 Subject: [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1. to: 62467@debbugs.gnu.org Message-ID: MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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 (-) * gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1. [inputs]: Add bash-minimal, librsvg and python-cssselect. Use lib2geom-1.2 rather than lib2geom. (inkscape): Inherit build-system, arguments and inputs. --- gnu/packages/inkscape.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index d1ac5e7312..b8e78c2b11 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -61,7 +61,7 @@ (define-public inkscape/stable (hidden-package (package (name "inkscape") - (version "1.1.1") + (version "1.2.1") (source (origin (method url-fetch) @@ -69,7 +69,7 @@ (define-public inkscape/stable "resources/file/" "inkscape-" version ".tar.xz")) (sha256 - (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf")) + (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")) (modules '((guix build utils) (ice-9 format))) (snippet @@ -196,9 +196,14 @@ (define-public inkscape/stable (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/inkscape") `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH")))))))))) + (,(getenv "GUIX_PYTHONPATH"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load + ;; its own icons in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (inputs `(("aspell" ,aspell) + ("bash-minimal" ,bash-minimal) ("autotrace" ,autotrace) ("gdl" ,gdl-minimal) ("gtkmm" ,gtkmm-3) @@ -206,12 +211,13 @@ (define-public inkscape/stable ("gtkspell3" ,gtkspell3) ("gsl" ,gsl) ("poppler" ,poppler) - ("lib2geom" ,lib2geom) + ("lib2geom" ,lib2geom-1.2) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libgc" ,libgc) + ("librsvg" ,librsvg) ; for the pixbuf loader ("libsoup" ,libsoup-minimal-2) ("libcdr" ,libcdr) ("libvisio" ,libvisio) @@ -223,6 +229,7 @@ (define-public inkscape/stable ("lcms" ,lcms) ("boost" ,boost) ("python" ,python-wrapper) + ("python-cssselect" ,python-cssselect) ; to render qrcode ("python-scour" ,python-scour) ("python-pyserial" ,python-pyserial) ("python-numpy" ,python-numpy) @@ -255,25 +262,4 @@ (define-public inkscape "inkscape-" version ".tar.xz")) (sha256 (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")))) - (build-system cmake-build-system) - (arguments - (substitute-keyword-arguments (package-arguments inkscape/stable) - ((#:phases phases) - `(modify-phases ,phases - (replace 'wrap-program - ;; Ensure Python is available at runtime. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/inkscape") - `("GUIX_PYTHONPATH" prefix - (,(getenv "GUIX_PYTHONPATH"))) - ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load - ;; its own icons in pure environments. - `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))) - (inputs (modify-inputs (package-inputs inkscape/stable) - (replace "lib2geom" lib2geom-1.2) - (append bash-minimal - librsvg ;for the pixbuf loader - python-cssselect))) ;to render qrcode (properties (alist-delete 'hidden? (package-properties inkscape/stable))))) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 02 13:27:26 2023 Received: (at 62467) by debbugs.gnu.org; 2 Apr 2023 17:27:26 +0000 Received: from localhost ([127.0.0.1]:42538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj1UE-0002K2-Hq for submit@debbugs.gnu.org; Sun, 02 Apr 2023 13:27:26 -0400 Received: from out-60.mta0.migadu.com ([91.218.175.60]:61250) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj1UC-0002Jr-0z for 62467@debbugs.gnu.org; Sun, 02 Apr 2023 13:27:24 -0400 Message-ID: <1be19600-e14b-c98f-e9bf-8fe11905d749@raghavgururajan.name> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1680456443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ePPmVjeKr2rri8Mqlr7LrjNFJOK1is7Lz1fxYxJ6nCM=; b=nQNvlWBZC+qUyVWJoXZQedFFMRaovLW4+iRpMmuV+Z/4KILyp7zH0UhYycziF/x3KxLYiJ aL45sWoghPuYk3X8v5H4DdAGcftzkNHHzapxxuNZlgLkuXnYiN3E4QDqdq6ECz8anjoBOa TlAYfCaNO75ayxZ17ISPbW2BG3D9WSp8RDdvKZEE4jpndNAnrkO1cczGTJIKM9G9x1JMt0 tN4gKXnbpPT7nB+p6LA3sarOcYD9nJY8c8SNJKb5U2/3iSlnfZiONMhgWmoNWLeHEXykxL QR8tXLiSodGefig5pii2RZsHSPtRiNKXxc2VCcXkhRarrjJxolXK4krNj3bjgw== Date: Sun, 2 Apr 2023 13:27:14 -0400 MIME-Version: 1.0 To: Liliana Marie Prikler , 62467@debbugs.gnu.org References: <0ed14785943a6e49788a2168c1fb4d6bbd82ef5c.camel@gmail.com> Content-Language: en-CA X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan Subject: Re: [PATCH gnome-team v2 00/12] Update fundamental packages In-Reply-To: <0ed14785943a6e49788a2168c1fb4d6bbd82ef5c.camel@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------UiU7WDtFywjReMLpPv2Dyfoz" X-Migadu-Flow: FLOW_OUT X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: Maxim Cournoyer 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 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------UiU7WDtFywjReMLpPv2Dyfoz Content-Type: multipart/mixed; boundary="------------8qJ4kxEzZUizlnUxSOGRASWY"; protected-headers="v1" From: Raghav Gururajan To: Liliana Marie Prikler , 62467@debbugs.gnu.org Cc: Maxim Cournoyer Message-ID: <1be19600-e14b-c98f-e9bf-8fe11905d749@raghavgururajan.name> Subject: Re: [PATCH gnome-team v2 00/12] Update fundamental packages References: <0ed14785943a6e49788a2168c1fb4d6bbd82ef5c.camel@gmail.com> In-Reply-To: <0ed14785943a6e49788a2168c1fb4d6bbd82ef5c.camel@gmail.com> --------------8qJ4kxEzZUizlnUxSOGRASWY Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 TGlseVAsDQoNCj4gV2l0aCB0aGlzIHNlcmllcywgZXZlcnl0aGluZyB1cCB0byBpbmtzY2Fw ZSBidWlsZHMuICBUaGUgbmV4dCBiaWcgc3RlcA0KPiBpcyBidWlsZGluZyBHU3RyZWFtZXIu ICBGb3IgdGhpcywgSSdkIGxpa2UgdG8gYnVtcCBNZXNvbiB0byAxLjAsIGJ1dA0KPiBldmVu IHRoZW4sIHRoZXJlIGFyZSBzb21lIGRpZmZpY3VsdGllcy4gIChJJ20gY3VycmVudGx5IHN0 cnVnZ2xpbmcNCj4gd2l0aCBhbiBFQkFERiBpbiBnc3QtcGx1Z2lucy1iYXNlLikNCg0KRUJB REUgYXMgaW4g4oCcSW52YWxpZCBleGNoYW5nZS7igJ0gZXJyb3I/DQoNCkxlbW1lIGdpdmUg aXQgYSB0cnkuDQoNClJlZ2FyZHMsDQpSRy4NCg== --------------8qJ4kxEzZUizlnUxSOGRASWY-- --------------UiU7WDtFywjReMLpPv2Dyfoz Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCZCm68gUDAAAAAAAKCRBfWBZkf4vlUYXw AQDIiDIFJUhm1M8QkrvygXkozNW6u7OsLSZlwphsmh+PdgD/SIttWrnG0x84uTtcDbtg/8to98py 4xo+5TqTtTzU1Qo= =enGf -----END PGP SIGNATURE----- --------------UiU7WDtFywjReMLpPv2Dyfoz-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 02 14:20:23 2023 Received: (at 62467) by debbugs.gnu.org; 2 Apr 2023 18:20:24 +0000 Received: from localhost ([127.0.0.1]:42626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj2JT-00049T-Hd for submit@debbugs.gnu.org; Sun, 02 Apr 2023 14:20:23 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:39821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj2JR-00049D-4Y for 62467@debbugs.gnu.org; Sun, 02 Apr 2023 14:20:21 -0400 Received: by mail-ed1-f67.google.com with SMTP id ek18so108957477edb.6 for <62467@debbugs.gnu.org>; Sun, 02 Apr 2023 11:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680459615; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:from:to:cc:subject:date:message-id:reply-to; bh=Z+uM/kjoqvtQ2qWt9KYhPzOM0biu6S5G7a9Wlw5jXTI=; b=DGmHBYJ/eDF9WOBVha1qDToHx82k32JpkTVaKhDyuekcMkEuqiynFxwW1tCiSvkxBM XdAHrq52DvSJ/ympI7hHXOP42hymHM4xsJursm2PgO5sw8ZskjF0r7s/5sBXiaJNWlSQ RXW2ZiNqnPV//oRSFH83uJS3MDeDWrrlLsNAqa0N4pchrwnCj/P88i2KECYU3uM2yWI0 JWzMIqh+5ZOOtJHqwli2rcpglftwc2F72ctw9EOlQxdMa2n9nihC5Euopmi4p78XV5IJ ifk6Xoq4Uo0MG366dwWpCsb8MOXCbUFa8g1cISWS39XhNhYs4yW3eErCI3gFQw8hPCYn M/4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680459615; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Z+uM/kjoqvtQ2qWt9KYhPzOM0biu6S5G7a9Wlw5jXTI=; b=iDArgz4dOx2w6N0AWN6HlX94uUwMhGW36CRDpgRQ+oAToi1p9+GdGOKVp14lWkx5om yX66N5abNBsV1a3Kg4EX08h2AA7F8tWSf4LRgKim6MVGbXh/YLshvFw6nYdtgNf0+Nq/ dPp5x1nndR+6DBTKamhOzt636doJ7yNIdEBgyl6byUZ3af0C7vnuOE1GqDckKriXCEmS HM1lxNDzG8/rGKLL/mubYKDxEt1J1pN34l9MNBtq1506nGCbaOGHKHfOF5mA1fkYFfhG CJkyKfpRhl6uD2DWnCi12G78hH9S6qzkslBCwm0FIjyBU5EQUtwtnz7BMihn19Lyj39h K3NA== X-Gm-Message-State: AAQBX9eD410RsSp1zKaIqXIo2fyxrjkp3N8RCXbcsoLKZVHZcOv5AvAI nLU+tHc2ZL+6moyR62xK6fo= X-Google-Smtp-Source: AKy350ZTMdY6tOspmnZmHT29EDDnKrXZFbeA08I1Gxu38zgvDk4CxeE1849nChkRh41APRrsZf1i0Q== X-Received: by 2002:a17:906:4e1a:b0:935:20d8:c3c with SMTP id z26-20020a1709064e1a00b0093520d80c3cmr32724012eju.61.1680459615083; Sun, 02 Apr 2023 11:20:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i24-20020a508718000000b005024aff3bb5sm3516419edb.80.2023.04.02.11.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Apr 2023 11:20:14 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v2 00/12] Update fundamental packages From: Liliana Marie Prikler To: Raghav Gururajan , 62467@debbugs.gnu.org Date: Sun, 02 Apr 2023 20:20:13 +0200 In-Reply-To: <1be19600-e14b-c98f-e9bf-8fe11905d749@raghavgururajan.name> References: <0ed14785943a6e49788a2168c1fb4d6bbd82ef5c.camel@gmail.com> <1be19600-e14b-c98f-e9bf-8fe11905d749@raghavgururajan.name> Content-Type: multipart/mixed; boundary="=-F+ZPqKBiDywb/sw8RzxH" User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: Maxim Cournoyer 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 (-) --=-F+ZPqKBiDywb/sw8RzxH Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Am Sonntag, dem 02.04.2023 um 13:27 -0400 schrieb Raghav Gururajan: > LilyP, >=20 > > With this series, everything up to inkscape builds.=C2=A0 The next big > > step is building GStreamer.=C2=A0 For this, I'd like to bump Meson to > > 1.0, but even then, there are some difficulties.=C2=A0 (I'm currently > > struggling with an EBADF in gst-plugins-base.) >=20 > EBADE as in =E2=80=9CInvalid exchange.=E2=80=9D error? EBADF as in invalid file descriptor. I actually have a fix for that locally already, attached below. The bug is that GLib raises a warning here, which IIUC is the correct thing to do (assuming EBADF to be a programming error rather than a recoverable one). Cheers --=-F+ZPqKBiDywb/sw8RzxH Content-Disposition: attachment; filename="gst-plugins-base-fix-broken-test.patch" Content-Type: text/x-patch; name="gst-plugins-base-fix-broken-test.patch"; charset="UTF-8" Content-Transfer-Encoding: base64 SW5kZXg6IGdzdC1wbHVnaW5zLWJhc2UtMS4yMi4xL3Rlc3RzL2NoZWNrL2xpYnMvYWxsb2NhdG9y cy5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIGdzdC1wbHVnaW5zLWJhc2UtMS4yMi4xLm9yaWcvdGVzdHMvY2hl Y2svbGlicy9hbGxvY2F0b3JzLmMKKysrIGdzdC1wbHVnaW5zLWJhc2UtMS4yMi4xL3Rlc3RzL2No ZWNrL2xpYnMvYWxsb2NhdG9ycy5jCkBAIC04MCw3ICs4MCw3IEBAIEdTVF9TVEFSVF9URVNUICh0 ZXN0X2ZkbWVtKQogCiAgIGFsbG9jID0gZ3N0X2ZkX2FsbG9jYXRvcl9uZXcgKCk7CiAgIGZhaWxf dW5sZXNzIChhbGxvYyk7Ci0gIG1lbSA9IGdzdF9mZF9hbGxvY2F0b3JfYWxsb2MgKGFsbG9jLCBm ZCwgMTAsIEdTVF9GRF9NRU1PUllfRkxBR19LRUVQX01BUFBFRCk7CisgIG1lbSA9IGdzdF9mZF9h bGxvY2F0b3JfYWxsb2MgKGFsbG9jLCBmZCwgMTAsIEdTVF9GRF9NRU1PUllfRkxBR19LRUVQX01B UFBFRCB8IEdTVF9GRF9NRU1PUllfRkxBR19ET05UX0NMT1NFKTsKIAogICBmYWlsX3VubGVzcyAo Z3N0X21lbW9yeV9tYXAgKG1lbSwgJmluZm8sIEdTVF9NQVBfUkVBRCkpOwogICBmYWlsX3VubGVz cyAoaW5mby5kYXRhWzVdID09ICc1Jyk7CkBAIC05NSw3ICs5NSw3IEBAIEdTVF9TVEFSVF9URVNU ICh0ZXN0X2ZkbWVtKQogICBnc3RfbWVtb3J5X3VubWFwIChtZW0sICZpbmZvKTsKIAogICBnc3Rf bWVtb3J5X3VucmVmIChtZW0pOwotICBmYWlsX3VubGVzcyAoZ19jbG9zZSAoZmQsIE5VTEwpID09 IDApOworICBmYWlsX3VubGVzcyAoZ19jbG9zZSAoZmQsIE5VTEwpKTsKICAgZ3N0X29iamVjdF91 bnJlZiAoYWxsb2MpOwogfQogCg== --=-F+ZPqKBiDywb/sw8RzxH-- From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:34:57 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:34:57 +0000 Received: from localhost ([127.0.0.1]:59576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEKu-00087T-Lk for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:34:57 -0400 Received: from mail-qv1-f49.google.com ([209.85.219.49]:37719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEKs-000879-9q for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:34:54 -0400 Received: by mail-qv1-f49.google.com with SMTP id l1so4383647qvv.4 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:34:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982488; x=1683574488; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=vwRkXbWGLA3Xo/Ul11QiEGNCPfLBrfl3ZbJ26XiSKrs=; b=hBNr0/IK4GhP4JX0gs1Dd1sRngZ9Z2netCEn6CAQfMFs1jUpatxtE/mHOGl7J8IKzw 6a8iwp5/Ckl5fATqrdzitAebfX+uoi31y25uRTFyOI4YKorA6m4eDlrMYOwVs1qbQo5T T7zaNfbIkwnb3R2jBUG46EYqe3JOZIilyFOePfOSYw9JkJcBVzBfNAi6db5GfMnltn6d kqnY6TuwXdb8JHf0LQHNYvoHeupUxnFsyST2IBfLK1cL2+8QnHHXW8DMlqAPY/ydCaYB gBJIYfxR3D5TyZwYuxippMGoASW9l34qFHFs5P8wSRYZZ3lzJBk5kyMIs6dr2JALbOrA /b4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982488; x=1683574488; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vwRkXbWGLA3Xo/Ul11QiEGNCPfLBrfl3ZbJ26XiSKrs=; b=HTyhFBZl7vxCD5aM8LBtQh9WSaidr7MLpXe+QFV0Xg5UYBRJF2lJjMh5zTfHFGt12m zMMuvKmpRQ1vKCNHwwG0QxPlE3+O1pM6Iv4WdAPw9NeDnV6CFnLlThQWzcEOTerFd/xO j5aFqC2t++9hNXBLlvL1J6IH8cU6aS3CjlV9Yy3fF1pouHFQQh99AgFUjLEELns91j85 hM6dwv9oRp3Mg38eOMVin/5NnbA4hCu8slgcAUkBApXsZ5hcnsXG8bZHoJOqmKOy5WyJ 2/wOZwdwgmDjJ1Hiwwtpk2RnZ1P6t+4+BZviWy1ShqcMoUzvX2MHKYTt1U/r5g1+mLqv /u5A== X-Gm-Message-State: AAQBX9d1i73C7KvJ/LwyfV/XSyoK9mwXhX5TC+zHQ1E+pJeDUShydq6I B4RW8oHJT8jzdJb45XPhUSE= X-Google-Smtp-Source: AKy350Ytjw28B0Nqg9bC7X8/+uqa+lSLVxAFBJV8hITr5uFQqF/ZuvxhnwYwad/j3XFeONKF7D/IEw== X-Received: by 2002:a05:6214:c2f:b0:5a2:e3e4:59b0 with SMTP id a15-20020a0562140c2f00b005a2e3e459b0mr10715342qvd.44.1680982488247; Sat, 08 Apr 2023 12:34:48 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id w2-20020a0562140b2200b005ea9156e72bsm104737qvj.33.2023.04.08.12.34.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:34:47 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37. References: <95f94cbe9b3f1cee46e75577f9aac5cb751c83a4.camel@gmail.com> Date: Sat, 08 Apr 2023 15:34:46 -0400 In-Reply-To: <95f94cbe9b3f1cee46e75577f9aac5cb751c83a4.camel@gmail.com> (Liliana Marie Prikler's message of "Thu, 30 Mar 2023 06:28:00 +0200") Message-ID: <87ile6rwvd.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/gtk.scm (gtk+): Update to 3.24.37. > [native-inputs]: Add docbook-xsl. > [build-system]: Use meson-build-system. > [arguments]: Add =E2=80=98glib-or-gtk?=E2=80=99. Adjust configure-flags = accordingly. > <#:phases>: Remove =E2=80=98generate-gdk-pixbuf-loaders-cache-file=E2=80= =99. > Adjust =E2=80=98disable-failing-tests=E2=80=99. > Rename =E2=80=98move-desktop-files=E2=80=99 to =E2=80=98move-files=E2=80= =99 and move documentation as well. > --- > gnu/packages/gtk.scm | 85 +++++++++++++++++++++++--------------------- > 1 file changed, 44 insertions(+), 41 deletions(-) > > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm > index 196d767160..75e56d4166 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -1101,7 +1101,7 @@ (define-public gtk+ > (package > (inherit gtk+-2) > (name "gtk+") > - (version "3.24.30") > + (version "3.24.37") > (source > (origin > (method url-fetch) > @@ -1110,7 +1110,7 @@ (define-public gtk+ > name "-" version ".tar.xz")) > (sha256 > (base32 > - "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds")) > + "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7")) > (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" > "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.p= atch")))) > (propagated-inputs > @@ -1152,6 +1152,7 @@ (define-public gtk+ > rest)) > (native-inputs > (list docbook-xml-4.1.2 > + docbook-xsl > gettext-minimal > `(,glib "bin") > gobject-introspection > @@ -1164,47 +1165,29 @@ (define-public gtk+ > ;; of updating xorg-server directly on the master branch. > xorg-server-for-tests > libxslt)) > + (build-system meson-build-system) > (arguments > - `(#:imported-modules ((guix build glib-or-gtk-build-system) > - ,@%gnu-build-system-modules) > - #:modules ((guix build utils) > - (guix build gnu-build-system) > - ((guix build glib-or-gtk-build-system) #:prefix glib-o= r-gtk:)) > + `(#:glib-or-gtk? #t > #:disallowed-references (,xorg-server-for-tests) > - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB= goes > - ;; to "doc". > - #:configure-flags (list (string-append "--with-html-dir=3D" > - (assoc-ref %outputs "doc") > - "/share/gtk-doc/html") > - "--enable-cloudproviders" > + #:configure-flags (list "-Dcloudproviders=3Dtrue" > ;; The header file is = required > ;; by gnome-control-center > - "--enable-wayland-backend" > + "-Dwayland_backend=3Dtrue" > ;; This is necessary to build both backen= ds. > - "--enable-x11-backend" > + "-Dx11_backend=3Dtrue" > ;; This enables the HTML5 websocket backe= nd. > - "--enable-broadway-backend") > + "-Dbroadway_backend=3Dtrue" > + "-Dman=3Dtrue") > #:phases > (modify-phases %standard-phases > - (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 'disable-failing-tests > (lambda _ > - (substitute* "testsuite/gtk/Makefile.in" > - (("builderparser cellarea check-icon-names check-cursor-n= ames") > - "builderparser cellarea check-cursor-names") > - (("notify no-gtk-init object objects-finalize papersize r= btree") > - "no-gtk-init papersize rbtree") > - (("stylecontext templates textbuffer textiter treemodel t= reepath") > - "stylecontext textbuffer textiter treemodel treepath")) > - (substitute* "testsuite/a11y/Makefile.in" > - (("accessibility-dump tree-performance text children deri= ve") > - "tree-performance text children derive")) > - (substitute* "testsuite/reftests/Makefile.in" > - (("TEST_PROGS =3D gtk-reftest") > - "TEST_PROGS =3D ")) > - #t)) > + (substitute* "testsuite/gtk/meson.build" > + (("\\['defaultvalue'\\],") "") > + (("\\['objects-finalize', .*\\],") "")) > + (substitute* "testsuite/reftests/meson.build" > + (("'flipping-icons(\\.[^.]*)?\\.ui',") "") > + (("'gtk-icontheme-sizing(\\.[^.]*)?\\.ui',") "")))) > (add-before 'check 'pre-check > (lambda _ > ;; Tests require a running X server. > @@ -1217,15 +1200,35 @@ (define-public gtk+ > ;; For missing '/etc/machine-id'. > (setenv "DBUS_FATAL_WARNINGS" "0") > #t)) > - (add-after 'install 'move-desktop-files > - ;; Move desktop files into 'bin' to avoid cycle references. > + (add-after 'install 'move-files > (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out")) > - (bin (assoc-ref outputs "bin"))) > - (mkdir-p (string-append bin "/share")) > - (rename-file (string-append out "/share/applications") > - (string-append bin "/share/applications")) > - #t)))))) > + (define-values (out bin doc) > + (values (assoc-ref outputs "out") > + (assoc-ref outputs "bin") > + (assoc-ref outputs "doc"))) > + (for-each mkdir-p > + (list > + (string-append bin "/bin") > + (string-append bin "/share/applications") > + (string-append bin "/share/icons") > + (string-append bin "/share/man") > + (string-append bin "/share/metainfo") > + (string-append doc "/share/doc"))) > + ;; Move programs and related files to output 'bin'. > + (for-each (lambda (dir) > + (rename-file > + (string-append out dir) > + (string-append bin dir))) > + (list > + "/bin" > + "/share/applications" > + "/share/icons" > + "/share/man")) > + ;; Move HTML documentation to output 'doc'. > + (when (file-exists? (string-append out "/share/doc")) > + (rename-file > + (string-append out "/share/doc") > + (string-append doc "/share/doc")))))))) > (native-search-paths > (list (search-path-specification > (variable "GUIX_GTK3_PATH") Sorry for not noticing about this earlier; I pushed a change to core-updates already with the update, but failed to manually moved the binaries to the "bin" output, expecting the meson build system to do that for us (it didn't). I'm not testing a change to the meson-build-system; will push if it fixes this as I expect and doesn't seem to introduce new issues. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:38:00 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:38:01 +0000 Received: from localhost ([127.0.0.1]:59581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plENs-0008CO-Gv for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:38:00 -0400 Received: from mail-qv1-f41.google.com ([209.85.219.41]:44948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plENr-0008CA-2L for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:37:59 -0400 Received: by mail-qv1-f41.google.com with SMTP id dw2so14959993qvb.11 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982673; x=1683574673; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=HcLikVJjJyQp1ncjggPp4VLanqGWDzGlK5o15P3XtoU=; b=ejOQeZ3SNPejCyKY8lecDE+iWeLLTgIUD7nc3blnirQgNQ6fjU049I69yXV40fWKy9 xqFQBp0s9FttcWtu6AsVaiP1zH1/LS2yAE8d0NKFvhqsVzOu9AvyKWhwUdph3Eu93vv1 ZjfyYljcAwzhFraDVpjFZ7UpJvzhyxdkbsFm230gHr0ppobKYNlFYC4B6b5ihNpg6Ukm zeCRgNOeoMeRYgiiKFrfEkO1rnB38QT59PLVcJ+/TisqYPCSb2h8brAcZhF5BGjL6TKA ZLTNLGJn++5UCVh/R1hFIcdDZwgW1+nQRe9TRQoJG9JQCJRaykW6d2dlyKQOgLLSEafz dbDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982673; x=1683574673; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HcLikVJjJyQp1ncjggPp4VLanqGWDzGlK5o15P3XtoU=; b=WMvHAz7+oI5Me/IgNlQKRv72FKTGFUZPSF126oHuxXE59bWSiuw/Bb7ja26ullzrz3 BbnkYsRxHdwkEPtgqCxECCWam3ANDNCBc62CpJENstSiv5kfXM5xyT+XZc4iA200NaJM aJ8fBADWqNmRYXVEA4yuSVx/AnHw5KtXD0DYknqPe/XSgMVUfy3OZ80ujyqCwF87rC3q fwPEbTkyamYWVYQoPGeTfCpq9oq8GDmjjqAJ2QdHzo+bT1QET/vp81ovRZ4BxV3a63kr ojcy9dhYie/9YQPX8DpSCYI854EwsHzI3/+faK7NYE2vvX2lU2W/vp0GjdGTy5vu7+bg 7CRA== X-Gm-Message-State: AAQBX9cWfV0W8X7qRCeBkr8RXjqZk3utTHe+kBsDHBnY1EvYYayNfN9j e965kTx5soNbu4fEv3wzAxA= X-Google-Smtp-Source: AKy350ZwUbMLeupyMT96qqvJjl3/69QuBvwZQ5KQ3zVWpHsTdyshh+7R3iNY6ZKPSnXiSANg29yWmQ== X-Received: by 2002:a05:6214:212d:b0:5a9:609d:e239 with SMTP id r13-20020a056214212d00b005a9609de239mr11934230qvc.48.1680982673642; Sat, 08 Apr 2023 12:37:53 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id k16-20020a05621414f000b005dd8b93457asm2274951qvw.18.2023.04.08.12.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:37:53 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1. References: Date: Sat, 08 Apr 2023 15:37:52 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Sun, 26 Mar 2023 17:39:11 +0200") Message-ID: <87edourwq7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi! Liliana Marie Prikler writes: > * gnu/packages/glib.scm (glib): Update to 2.76.1. > [source]: Adjust accordingly. > [arguments]<#:phases>: Add =E2=80=98set-G_TEST_SRCDIR=E2=80=99. Update = =E2=80=98delete-failing-tests=E2=80=99. > [propagated-inputs]: Replace pcre with pcre2. > (glib-with-documentation): Inherit from glib. > * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib. > * gnu/packages/gtk.scm (gtksourceview): Use glib. > * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. > * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly. > --- > gnu/packages/glib.scm | 92 +++++-------------- > gnu/packages/gnome.scm | 8 +- > gnu/packages/gtk.scm | 2 +- > gnu/packages/guile-xyz.scm | 2 +- > .../patches/glib-skip-failing-test.patch | 3 +- > 5 files changed, 30 insertions(+), 77 deletions(-) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index f85d5e3225..ecf5cb491f 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -215,7 +215,7 @@ (define-public dbus-verbose > (define glib > (package > (name "glib") > - (version "2.70.2") > + (version "2.76.1") > (source > (origin > (method url-fetch) > @@ -224,14 +224,14 @@ (define glib > name "/" (string-take version 4) "/" > name "-" version ".tar.xz")) > (sha256 > - (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85")) > + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) > (patches > (search-patches "glib-appinfo-watch.patch" > "glib-skip-failing-test.patch")) > (modules '((guix build utils))) > (snippet > '(begin > - (substitute* "tests/spawn-test.c" > + (substitute* "glib/tests/spawn-test.c" > (("/bin/sh") "sh")))))) > (build-system meson-build-system) > (outputs '("out" ;libraries, locales, etc > @@ -256,6 +256,9 @@ (define glib > #:phases > (modify-phases %standard-phases > ;; Needed to pass the test phase on slower ARM and i686 machine= s. > + (add-after 'unpack 'set-G_TEST_SRCDIR > + (lambda _ > + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests= ")))) > (add-after 'unpack 'increase-test-timeout > (lambda _ > (substitute* "meson.build" > @@ -270,9 +273,19 @@ (define glib > (substitute* '("unix.c" "utils.c") > (("[ \t]*g_test_add_func.*;") ""))) > (with-directory-excursion "gio/tests" > - (substitute* '("contenttype.c" "gdbus-address-get-session= .c" > - "gdbus-peer.c" "appinfo.c" "desktop-app-in= fo.c") > - (("[ \t]*g_test_add_func.*;") ""))) > + (substitute* '("contenttype.c" > + "gdbus-address-get-session.c" > + "gdbus-server-auth.c" > + "gdbus-peer.c" > + "appinfo.c" > + "desktop-app-info.c") > + (("[ \t]*g_test_add_func.*;") "")) > + (unless (which "update-desktop-database") > + (substitute* '("file.c") file.c doesn't need to be in a list. > + (("[ \t]*g_test_add_func.*query-default-handler.*;") ""= ))) The indentation seems off here. Is it really necessary to use the unless conditional here? I'd perhaps simply disable the test generally. The rest LGTM. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:39:11 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:39:11 +0000 Received: from localhost ([127.0.0.1]:59585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEP1-0008EZ-15 for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:39:11 -0400 Received: from mail-qv1-f43.google.com ([209.85.219.43]:38714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEOz-0008EN-R2 for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:39:10 -0400 Received: by mail-qv1-f43.google.com with SMTP id ly9so4474359qvb.5 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982744; x=1683574744; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=XGp0iKRarEawOahhvRDmuZIgPK8F0/UH1ku6jrg5z7E=; b=FWPqx3usbku3dM0asBxDlGZgZhNxBiQeDkj5gBKicCQUmBl5qfbO6f7fqQEDRjDXsr NKWvuKMDNy3BT5RaIEnLbTOQoGrYv+aa/tFeropj18HqR6T6DpJRB6hhCrgLazhYPF5w Bx8ZauPgRnTaiIYXvbArIFtjkIejmp3aSRaRzdOQ3mkKmhBWE7JqQopI7YMxoHeoJ7dA n5UlC2kr5m/SWFz/mHX97C2XI0Ws3T023zfi+z/2nLSxqoo9jqQum54kAnPkbuc6wRBy ORBGASoAFZL5Jy7Rm55FdOxzH3SAKkTCwh/X0N3xna8H9f9pC+2pncIQDKUXH/9DxeQ5 g7zA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982744; x=1683574744; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XGp0iKRarEawOahhvRDmuZIgPK8F0/UH1ku6jrg5z7E=; b=X+pxkrZEnC5gNuGz7AE1wDgrt1pRYYYyAOaG3m6NZiG6UYdUz9sUm9V2NP/xPyWSOJ 7CXBM+3pyCVv/th6pAtfBcJIh06kuq2Oe+CAsnTLB4Utz3AxXN4n45jHtJY4B1Gc/GgG EKKhe9cKRxIQ4IOsHzyf7N+gP4dyVUHb2BFokQQpOM66Oteu4sFPykvo+uxvCGPk150E /jTT+736W/tdhrfoZHL6mt1ZZRoQxdMZbiLcF8bY0HUDLn5zGOQh8npnfbXTHM+Drdhr L35MV/j4JhFHbrhKBWZWHWdgnU1O/bJPDABcoo2lAd2zMuUBojcdQJzqpFlA0HQzDo6D yB7g== X-Gm-Message-State: AAQBX9f+J1QSizs6CKGI14UlmTzOk81vE72ilouQmYhbm5HxsQ6tuqzJ x4ZwlzZKH6/u3VhwowY/RyE+B+Zrs/g= X-Google-Smtp-Source: AKy350bCnnzwUjrHu7ZWS2DLJXW2B5n3TMBQC25GIE7mMJz0YAcqdxaXmIuLbRqlnX72tBYtpeQMPQ== X-Received: by 2002:ad4:5cc7:0:b0:56e:b1e0:3fef with SMTP id iu7-20020ad45cc7000000b0056eb1e03fefmr10722013qvb.24.1680982744339; Sat, 08 Apr 2023 12:39:04 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id ny3-20020a056214398300b005dd8b9345a7sm2220551qvb.63.2023.04.08.12.39.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:39:03 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 02/12] gnu: Make pango-next the new pango. References: <37c811a577c518a4d8de4e46c20121366fae4c82.camel@gmail.com> Date: Sat, 08 Apr 2023 15:39:02 -0400 In-Reply-To: <37c811a577c518a4d8de4e46c20121366fae4c82.camel@gmail.com> (Liliana Marie Prikler's message of "Sun, 26 Mar 2023 17:53:13 +0200") Message-ID: <87a5zirwo9.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/gtk.scm (pango): Update to 1.50.4. > (pango-next): Delete variable. > (pango-1.48): New variable, defining old pango with inheritance. > (gtk)[propagated-inputs]: Use pango instead of pango-next. > (pangomm)[propagated-inputs]: Likewise. > (gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next. > (pangomm-2.46)[inputs]: Use pango-1.48. > * gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next. > * gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise. > * gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise. > (network-manager-openvpn)[inputs]: Likewise. > (network-manager-vpnc)[inputs]: Likewise. > (network-manager-openconnect)[inputs]: Likewise. > (network-manager-fortisslvpn)[inputs]: Likewise. > (gnome-bluetooth)[inputs]: Likewise. > (baobab)[inputs]: Likewise. > (gnome-calendar)[inputs]: Likewise. > (gtranslator)[inputs]: Likewise. > * gnu/packages/ibus.scm (ibus)[inputs]: Likewise. > * gnu/packages/messaging.scm (dino)[inputs]: Likewise. > * gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise. LGTM. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:40:08 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:40:08 +0000 Received: from localhost ([127.0.0.1]:59593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEPv-0008Gg-OX for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:40:07 -0400 Received: from mail-qv1-f44.google.com ([209.85.219.44]:37384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEPt-0008Fq-Tw for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:40:06 -0400 Received: by mail-qv1-f44.google.com with SMTP id l1so4388551qvv.4 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982800; x=1683574800; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=5bfsZx3nzjwFgSs3o2JntOFC5mF7NwXkTUDRwn00kaQ=; b=UG8ig+pGrIXF26JAyLtRV+oQdzO72IP4VRlyzdpMNe+MW7rSm8ofzX+TagSGygF2H7 o4vXTydXMqyOCEt7AcMOl7uToFbnqZxuaOmaxWqHiw4zwpaB/JPQtc8JOV073ZmryZTx 3rmIcdWXR444PTbMr1fLCn7LMU/1wyD559Wlk5Uh6K8uZMWdb1OIS265Kj7aNpSvpltq uSXyV3oVC96+Ji4/bb1nbTBA93dLSL9uaXwzDgvLXOYnCrNE1TzhXOBVcNFj+f7KP06i 7Fww0z1GBr39wa6D0cwmUdhnXhXjyzxK3Iiu6r7IXxksJbOkm9G40SiA8NIGkMUeg3t2 veww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982800; x=1683574800; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5bfsZx3nzjwFgSs3o2JntOFC5mF7NwXkTUDRwn00kaQ=; b=pvh6TgFJnTgimqfKmxeu3isePYw5yZaaOVrWHi9eWlnw+ZQGNWSi3tEWnEUbcwoJ3d kG2gCxIrWNAgH9YIsRamjYxT/BTRPmhUAJnh4uZI/+I0w2L6LzD5s+1cwGgRnQ49g57n 7AeyVHVI2kV/4L08QlrJlzJVoy8dNZZqtpb+Eb0Z2Wgo2E+3kSGQcbLsPLi37LoLpgs1 MNL+Z15B9dtvQqeXPxUOqZE3KQVO51BtJR3MjuE3vXC04KXiuzkA7x/kQWimvCoza41u 7MOiaYhLAO4TaCNwThmToFJRsIK3ve6WxdJQAy8hqrp5N0y948FKOV13MAbYpQLt4uhZ xc3A== X-Gm-Message-State: AAQBX9fjujTzgdIlVHyF4Sw5tVHtH2rE0qKmg1w2HHbmSVMiRYGuYrNX ihnh1EijBoffN0OE676vbQM82Bf5Fmk= X-Google-Smtp-Source: AKy350aQVnyQcjI8Z3Hrb9ChaijiENetIXOYtwEizYYcZxahJzmIhjG5kzxcNbTegB8Ybjp/yKTgPQ== X-Received: by 2002:a05:6214:509d:b0:5ea:3abd:db7c with SMTP id kk29-20020a056214509d00b005ea3abddb7cmr2307235qvb.1.1680982800356; Sat, 08 Apr 2023 12:40:00 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id dt5-20020a05620a478500b00748461ac012sm2170966qkb.63.2023.04.08.12.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:39:59 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 03/12] gnu: pango: Update to 1.50.14. References: <391ba920371bd54d8f6d74a2b2443c61b9592390.camel@gmail.com> Date: Sat, 08 Apr 2023 15:39:58 -0400 In-Reply-To: <391ba920371bd54d8f6d74a2b2443c61b9592390.camel@gmail.com> (Liliana Marie Prikler's message of "Sun, 26 Mar 2023 20:53:15 +0200") Message-ID: <875ya6rwmp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/gtk.scm (pango): Update to 1.50.14. > --- > 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 29494c36b1..6d5e7f56bc 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -427,7 +427,7 @@ (define-public libthai > (define-public pango > (package > (name "pango") > - (version "1.50.4") > + (version "1.50.14") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnome/sources/pango/" > @@ -436,7 +436,7 @@ (define-public pango > (patches (search-patches "pango-skip-libthai-test.patch")) > (sha256 > (base32 > - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) > + "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx")))) > (build-system meson-build-system) > (arguments > '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas LGTM. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:40:29 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:40:29 +0000 Received: from localhost ([127.0.0.1]:59596 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEQH-0008HK-2M for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:40:29 -0400 Received: from mail-qv1-f51.google.com ([209.85.219.51]:39688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEQF-0008H7-Fs for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:40:27 -0400 Received: by mail-qv1-f51.google.com with SMTP id lz6so1240245qvb.6 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982822; x=1683574822; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=ra6ZkRJkMGQwSyeZvaDCgNRXAUYqBafGNSTRCdA9n/c=; b=oI6HvmlD7tMcrymadvDAFM5uixyXl0g95VVDNwPfXSsi+SYYrWHDTcuMjvWPymiVQx GlGf5riQMVS7EdRSaY6OjAIXI3VMyTzoY7ABzSPNxeLkoVv3sUr2DE9N/BjztDge7+AI JimxhV85RbFFvH2zv4e7BFzP75234fre/0suBA1PtG/6VewsWlrXtsCdJyuOkWcmvc0X 5izrUSg1AHxcRoqJkVQK2HrdfU7s52UHXmGgWULRZ4srMAV6HQ+Y2Bo13iKy9qS0U8ZY au2QO3TL+F2y6QjGlQwcGLpvGbvF9VX9BxT9UVn3FonUtG0f1LiBkZ/69nMjufEO7H8q b9mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982822; x=1683574822; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ra6ZkRJkMGQwSyeZvaDCgNRXAUYqBafGNSTRCdA9n/c=; b=a1FsKkQ4g2lOKVixvUQMcukw5X6EfQVDRWvcuhxEnB6+Bp2YHegCWiB8GlTNkul5zy iyYx/Enit6JBoJ6FlJ7Y4QYoV/Ke7xPCc6o9aH4tNS5hBKx/TjiFgMKBppkxsK9+NTNQ wak+2S8j3AoaOVanYaAWczVvjsu61p1TIlZqIV7GnuGENRNFkNd7Z9A52OH+qaBccbxv wTCM2fw/FkVmpQ5MdZhWB+heK9+LHLKwIgKM/7AaeZlyTrTGTuSW8LkL6j3j0oHVoybX Me0ov8i0188jku2ocxbb+UTVmGklf6ray0djQB7zZvEuCI7NAecbF79Z2hAgmPtT+/Vn j7lA== X-Gm-Message-State: AAQBX9e23r9ZhGvqkF3bAYD+KoCYPezYdg/mo+hfiSQDeKflh6Iop0L+ 58tdZXQy60lCRJmKhJmFoxg= X-Google-Smtp-Source: AKy350aguP64fqQs0THqrmoQqKDB4sjRaA6CHt1UNSXCZbfABw9ITYc+MDBNKnXPcr4YQcNZtfncwQ== X-Received: by 2002:a05:6214:27c9:b0:5df:d208:8b7c with SMTP id ge9-20020a05621427c900b005dfd2088b7cmr18755190qvb.15.1680982822131; Sat, 08 Apr 2023 12:40:22 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id i65-20020a37b844000000b007465ad44891sm2175948qkf.102.2023.04.08.12.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:40:21 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 05/12] gnu: gobject-introspection: Update to 1.76.1. References: <643edface1af07593df5ddd170f479c8d77eecee.camel@gmail.com> Date: Sat, 08 Apr 2023 15:40:20 -0400 In-Reply-To: <643edface1af07593df5ddd170f479c8d77eecee.camel@gmail.com> (Liliana Marie Prikler's message of "Sun, 26 Mar 2023 21:19:11 +0200") Message-ID: <871qkurwm3.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. > --- > gnu/packages/glib.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 09386d1652..4115e54782 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -477,14 +477,14 @@ (define target-name > (define gobject-introspection > (package > (name "gobject-introspection") > - (version "1.73.1") > + (version "1.76.1") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnome/sources/" > "gobject-introspection/" (version-major+minor version) > "/gobject-introspection-" version ".tar.xz")) > (sha256 > - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) > + (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r")) > (patches (search-patches > "gobject-introspection-cc.patch" > "gobject-introspection-girepository.patch" LGTM. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:41:48 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:41:48 +0000 Received: from localhost ([127.0.0.1]:59601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plERY-0008JV-Fi for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:41:48 -0400 Received: from mail-qt1-f182.google.com ([209.85.160.182]:33339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plERX-0008JJ-4L for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:41:47 -0400 Received: by mail-qt1-f182.google.com with SMTP id cr18so39355811qtb.0 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:41:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982901; x=1683574901; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=IRYVW1FpoAitqVGn/53m+3hXT9XLw156GEW6xbX7tgg=; b=bH0VX0eN7sjuzz6ZoxAVPACcbBSL3V78gWWe2syZSAmXH7o7SoeaLTVzpI9C1LJGoV fT8kJiCiA+kM3pcEOO3sxkWVWKt+Sr99O0Y1gBQqMfvfF+78An0PaP2MN4AfJZsCMH/8 1PpCB7OE2bKpEkHy1cgYJ3k155yZiYIZvth4xLklkX6O1LubHe3vQ0XA52578macieSU ayNKc4bfpXO/4d6XWAfQ9/Wv4AoP89Nf8PQlHryTcqiym5psqDJlxr5SOTlFJ6yQ/DcV AGsYx9RrXduFkPlJ+r7zac1BPiBzEtXRJTF4TOSFQ+1XIV2l1vcwHze1kzpiWe4ySRCU RIeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982901; x=1683574901; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=IRYVW1FpoAitqVGn/53m+3hXT9XLw156GEW6xbX7tgg=; b=wvRTvaAYTalsx1fz9yBM5dej7hskoCF1cF9UWgES0/gGI/8NoO0Sg5oB76sSd4UTuO A5YtOta4uReQ6QLyFjdsQs/+FNnKsov4ga+7tbamyvoUdHct0GGAk+fafsqw6xzfxwrB q2d26j0TkuFr/GIFHdmpV7nt5msJJrP5SzILO5/YF3+zfeGL422wO0XS85qcgmS1/Bcy tr9pAsbrKyDbETyUYFO7kPOf5DYSDn1z6mvnVl+uZxlpcUdVnutSJ63ghWHqzHjOAGW+ KeMIUCeOi3DzJG1GPafw5pABtHoUmbIfgvlXiuIn9Edv5nKHTS6bM0yuTvqPGVon1qR8 cu7A== X-Gm-Message-State: AAQBX9fqjSczN0Z30EB2OFN+eLry0ewzUUO49eo3NIAO+bCFi7xE0V3P DNd/bqYF8qRK7ry3RglyPx8= X-Google-Smtp-Source: AKy350bhUKl/MZ9Xo0tOeN7NzwfrE0oeJgi0JZXzUjPp1g6sCfI4HRitCNQpIXALAZ3xHv1xyks83w== X-Received: by 2002:ac8:5c05:0:b0:3e4:f002:2b6e with SMTP id i5-20020ac85c05000000b003e4f0022b6emr10360294qti.32.1680982901646; Sat, 08 Apr 2023 12:41:41 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id f1-20020ac84701000000b003e64ea3faf7sm1991454qtp.59.2023.04.08.12.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:41:41 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 04/12] gnu: Make gobject-introspection-next the new gobject-introspection. References: Date: Sat, 08 Apr 2023 15:41:40 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Sun, 26 Mar 2023 21:14:47 +0200") Message-ID: <87wn2mqhzf.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. > (gobject-introspection-next): Delete variable. > * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: > Replace gobject-introspection-next with gobject-introspection. > * gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]: > Replace gobject-introspection-next with gobject-introspection. > * gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.pat= ch: > Rename to=E2=80=A6 > * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: > =E2=80=A6 this. > * gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to=E2= =80=A6 > * gnu/packages/patches/gobject-introspection-cc.patch: =E2=80=A6 this. > * gnu/local.mk (dist_patch_DATA): Adjust accordingly. LGTM. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:42:44 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:42:44 +0000 Received: from localhost ([127.0.0.1]:59605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plESR-0008L6-RN for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:42:44 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:42543) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plESQ-0008Ku-G0 for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:42:42 -0400 Received: by mail-qt1-f180.google.com with SMTP id y26so1389499qtv.9 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982957; x=1683574957; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Y2bxNTh0wr8LTLqS9u5iuNqFqRjix7JfZ+TgGJOsolg=; b=QrjLlMEASuKdKjCj7cKtqo3jxBUN2QA9rlUW1HISkHAnhQzBtQoNGZmNNxGYY2WxzE nzoDTofuyRSTSXBgWJ9Xd2NnJpqaS5TUSyffl0NgouNukkNdQaR3kJvlQu6QSgFY6Ub6 pt0sYHWB15n1KFiBPdnfR/GGSk1GaaFHOyR7w6vLfiVHFKb7kL6tz0/PYsk+ENtAz/o8 011e8tfsfBDHvvv++KqG4GSYPtjdPLQ2cpANaaXvPRtxAu59N2ZjdqrJnlOPMCsE7qKI 5QJAqsLtdi6gf/6rAZoY+X6nnnhG3NnGOT+eWaJeu4sB9WxNEhXP1MhnAXTzba7/AIJB p9wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982957; x=1683574957; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Y2bxNTh0wr8LTLqS9u5iuNqFqRjix7JfZ+TgGJOsolg=; b=wb3RckAbGO6sreFNYOu93mkmUpTJvCADuLxvAFeHURWuD18HdZ1qmu9/vgSfjNndKK DYnDTLUU43xRzxH3ynmvcfc3a6I4OyKhgsFW77e6acBgkDvKEt7QOTKutICuW7xCW9Hv vJFzS2w0AE/wgawsfQ1rUJeulrLGYdub5f4Va9QLcsbVXQPtiCvlYFv0Gy5iDKrZY22C FeNB/Rw5E7zEdL4ki3F8+x4TP3VCNbgilj/ZUXCIm+pKealjMLs8pONLkecONU44lBBY fzKgbpnyHrsSfoU0K0I2ioRsMOUAxxLEYRejZs8R1QGzeV3iTVfxtBCH+y1i4D2+mJJf mOJw== X-Gm-Message-State: AAQBX9d2UwAs3R0+ubvCDW8IN0dSXYqYIA2auqY8BD6aMGnS7JnlaZb7 06TAD1Q4HshQ+WxFaJg0p0s= X-Google-Smtp-Source: AKy350aeqR9oJnjytnAjTLUZrWDeFVqf1hrHeVh06CRlkRgN5+dLR09VNCq1fqjKeg5EcK5HwI9Vpg== X-Received: by 2002:ac8:7f11:0:b0:3e6:6c6d:94dc with SMTP id f17-20020ac87f11000000b003e66c6d94dcmr25060677qtk.26.1680982957074; Sat, 08 Apr 2023 12:42:37 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id d23-20020a05620a141700b00746803d7e8dsm2172359qkj.113.2023.04.08.12.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:42:36 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3. References: Date: Sat, 08 Apr 2023 15:42:35 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Tue, 28 Mar 2023 06:26:28 +0200") Message-ID: <87sfdaqhxw.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. > --- > gnu/packages/gnome.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 90e33d72b6..4f47e60505 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -5263,7 +5263,7 @@ (define-public libsoup-minimal > ;;; An older variant kept to build the 'rest' package. > (define-public libsoup-minimal-2 > (package/inherit libsoup-minimal > - (version "2.72.0") > + (version "2.74.3") > (source (origin > (method url-fetch) > (uri (string-append "mirror://gnome/sources/libsoup/" > @@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2 > "libsoup-" version ".tar.xz")) > (sha256 > (base32 > - "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p")))) > + "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) > (arguments > (substitute-keyword-arguments (package-arguments libsoup-minimal) > ((#:phases phases) LGTM. Hopefully we can get rid of the libsoup-2 stuff after we've updated all of GNOME to 43 (which had a hard requirement to not rely on libsoup@2). -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:43:00 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:43:00 +0000 Received: from localhost ([127.0.0.1]:59608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plESi-0008Lf-5e for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:43:00 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:44977) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plESg-0008LR-VV for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:42:59 -0400 Received: by mail-qt1-f171.google.com with SMTP id s12so39583753qtx.11 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982973; x=1683574973; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=KmSvoOzDPx3G3Vr0KpqQYZIEuWbTyRHWca+/SfCt73w=; b=D9w6MOYgzI0/qpYvnCoFKzfsG0Da0TM7hidZgYOsmUx2NAQhO2Ds+Sm8NadEANo6Ke r+0tt3bK1pdJqHdcn9SkFswF1wtmQaqQaGEsfij0GZA7BY0cuN/pPAxeSRx1fIFppt/k MhAaoPUxG4X8MlMjuKc8Cp32j79mT5TpUPoc10kKgZkgKWuTQIwkkIbZ0cRd1f76Doa/ 3cYmLhDnz/agGTjfCL++lJtWMPc4vjiwoupI2ux17lVNzwlqKcaJxUKP1Bb6aFSB8oas ud1ovdQxv6+5TcDk4SnlLrfDaibgqimlOGmHP5OUz34k/vSBzvE1sDFKwbejqpOApCCg z4ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982973; x=1683574973; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KmSvoOzDPx3G3Vr0KpqQYZIEuWbTyRHWca+/SfCt73w=; b=ydZsiE6yHt2L8MENTSCpaV656j9INnGiyeCPwLF/v9Edsb5c8zpbmBCnrh9D3d+fIh p4Yfnm/J6cRcNxgKvXweI0+aoxxGMUIcxpPVmyKTA/nMI0wtpZvCHjI8c6g1CiK/UT0c lqW3yqX8OO0jHl7f4abIqrj6SmaKQfBgrLLDHfMnBtRaXfK2PKrOnaqGPTVgJXMGN79V 5Orlrk0EXdA6OBAsPTWLTscsdpmto6Pwro3S1hGnZTHYlxSf/xqynCQZ006iqLHEPWcn RWJaGw2nh+m05Qh7E1PvwfHzZa03B8vmsbNr4xn47WceHj3vlD9odkAr8S2/TgC9VvNX ky2Q== X-Gm-Message-State: AAQBX9dY3xEaXyS/MuifbXPsRxig46oTh2rbv/b7ZQmobArq7GMuvict K8SnpDxOsYu9/XHjqBlNrk0= X-Google-Smtp-Source: AKy350Y43a5Ms0AEGjmQPJ5fJnPIUQt/2TVKw8yGrJFTclLaVW2Bzy0FUMPEWdm83tOy0HlxDfLrag== X-Received: by 2002:ac8:5a4a:0:b0:3e4:d4b3:50cb with SMTP id o10-20020ac85a4a000000b003e4d4b350cbmr10740130qta.19.1680982973563; Sat, 08 Apr 2023 12:42:53 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id 190-20020a3707c7000000b0074672975d5csm2190909qkh.91.2023.04.08.12.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:42:53 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 07/12] gnu: python-pygobject: Set upstream-name. References: <79a1a16f7acdf5079456c84949c8ae7789a5bb4a.camel@gmail.com> Date: Sat, 08 Apr 2023 15:42:52 -0400 In-Reply-To: <79a1a16f7acdf5079456c84949c8ae7789a5bb4a.camel@gmail.com> (Liliana Marie Prikler's message of "Tue, 28 Mar 2023 18:50:30 +0200") Message-ID: <87o7nyqhxf.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name. > --- > gnu/packages/glib.scm | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 4115e54782..40d6dd3c86 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -967,7 +967,8 @@ (define-public python-pygobject > (synopsis "Python bindings for GObject") > (description > "Python bindings for GLib, GObject, and GIO.") > - (license license:lgpl2.1+))) > + (license license:lgpl2.1+) > + (properties '((upstream-name . "pygobject"))))) LGTM. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:43:18 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:43:18 +0000 Received: from localhost ([127.0.0.1]:59613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plET0-0008Mf-Hv for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:43:18 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:40736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plESy-0008MS-IW for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:43:16 -0400 Received: by mail-qt1-f178.google.com with SMTP id x17so21135556qtv.7 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:43:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680982991; x=1683574991; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=FxNpai1uqsPi9uUcEyjBYIaFo1vQzGZnboW+qpIaU4g=; b=JKzQygklYtEYcokDTL8z1PLQQaqGTDpqIBht3peYe36JhdhprmWSExBayrZFlZsX3q 08p3OOIY3Z05elv4ydkX5sQNIt0BJcWYsmGaB3wlQ2MG2QU74MO7boFrr61gPjqMMOJL DgOFwTAGM48/RLpxVjvqgy12TWxfJWKR1c0wyhxHX9Zikig5H02wsmjMUW62IyaxUH4w m0xForb3dEW+jB83yeTTbduXOekOI/A3rfDjxMS4CW1h6mpHOzeOOa1H9XvNTeQW9NFU oQVwPDiHWFlVRRTNxk2W8Efrd1gyf2E0DfXbbYKmD425dzapjelkLBm6D+0NIWda3n/h NLnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680982991; x=1683574991; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FxNpai1uqsPi9uUcEyjBYIaFo1vQzGZnboW+qpIaU4g=; b=WMBByDzEmYxNuzuPrnOxxl3+pWGRlajsB03H1xa7ybIoaX6obxvdbgt71xeEE0kisb Fg/VDOwiTnACyZUaiFMBA8oRwOXVoxcxOPmgA6wJtu8LW4rwKcnA1SfSnoVwpkcHnX2r fD5I+r627rKFaNElR+OhBPw2RnfJc36GjR1dj99z43BFqu8v8mkpEQn51GmsuvMyLuz9 Kysm8W1vasyjfqTXV6YOEViT6ZBQVIOMdOO0cI297VPYzi9CLAr57qPlorRY1xKWupXo OTTihz0MsN05nqGoLMqVdnL5niAciAR74+NG4AtWMXvle1hXkZu6OWAyCXcmCTVR+MNS 0Lcw== X-Gm-Message-State: AAQBX9dgW62pcBhaDH5qR1aGXoXeEvjWHxB7QCINTWMTcpO8xIJFCy4l QoHQheGHuK8xZhJ+PtoWDFo= X-Google-Smtp-Source: AKy350Z25HnaRiMfmESoJNTysEh3btq1SpF0U6Ekjf+pLdXNzCsLdlO1q1fID/AlYmiAor+5MyHwJA== X-Received: by 2002:a05:622a:1c6:b0:3e6:71d6:5d5f with SMTP id t6-20020a05622a01c600b003e671d65d5fmr12321475qtw.1.1680982991069; Sat, 08 Apr 2023 12:43:11 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id v22-20020ac873d6000000b003e29583cf22sm1970783qtp.91.2023.04.08.12.43.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:43:10 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 08/12] gnu: python-pygobject: Update to 3.44.1. References: <7b3c644c0441aae15695aa0e26faccd3c947e1a1.camel@gmail.com> Date: Sat, 08 Apr 2023 15:43:09 -0400 In-Reply-To: <7b3c644c0441aae15695aa0e26faccd3c947e1a1.camel@gmail.com> (Liliana Marie Prikler's message of "Tue, 28 Mar 2023 18:51:06 +0200") Message-ID: <87jzymqhwy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/glib.scm (python-pygobject): Update to 3.44.1. > --- > gnu/packages/glib.scm | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm > index 40d6dd3c86..24f66f133c 100644 > --- a/gnu/packages/glib.scm > +++ b/gnu/packages/glib.scm > @@ -922,7 +922,7 @@ (define-public glibmm-2.64 > (define-public python-pygobject > (package > (name "python-pygobject") > - (version "3.40.1") > + (version "3.44.1") > (source > (origin > (method url-fetch) > @@ -931,7 +931,7 @@ (define-public python-pygobject > "/pygobject-" version ".tar.xz")) > (sha256 > (base32 > - "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0")) > + "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w")) > (modules '((guix build utils))) > (snippet > '(begin LGTM. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:47:16 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:47:16 +0000 Received: from localhost ([127.0.0.1]:59626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEWp-0002Sj-RL for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:47:16 -0400 Received: from mail-qv1-f41.google.com ([209.85.219.41]:34401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEWo-0002SV-7I for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:47:14 -0400 Received: by mail-qv1-f41.google.com with SMTP id ks2so2312076qvb.1 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680983229; x=1683575229; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=OxaxbZTb7OCGUoNX220CjQg03sncc5JpourzVAcYsCQ=; b=oI7IDoJjA/E5I1W0MwljeaHLLkRtcW9IykmuIYepSjj3qA9Vu/ibDE31wnGpzmt9SF QBSUs6ERMhOdpfpYqwV4Y1dRhh9fQ0vlVKyaWolMj/u4o5JLMmRqXkbq67W31KYQFK6b hLosV9Rr7Ow+Yx/ff9Dg20HSA0dkFJqSXZeAY6fWC9kPsYwBHdI27A+psM5iqTdcci0h 6NZLH1OYSZz58zJ/uB4jxzrwvYo4/fHYMClsRMFyEdhcVdQF9XXhzdxiQrmV0JR2HeID 0kmNSc6swoRoGIzZZA+myMBfjMAvkKHo6Ik7Jrh04u6Lmv3C399RuCROqdexoU1F8EF9 qh8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680983229; x=1683575229; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OxaxbZTb7OCGUoNX220CjQg03sncc5JpourzVAcYsCQ=; b=3AFpaOZP8HiXkjGUABprv+7V7H/QoNPhdd3WLPqdE1WtATONeFBo5/nd5RzqkfjJ7N O11vwKP9rs02H6FLnfDBPIF8sHN1nOUBkoa2l6fhbGiGSqqRhNU5oiqAxGhJWaSIPtNV ksRDsZ4dzRcfmkdfEbxfCP9YOq6p0CHTZ6mWc0aZha919Wg4qyWk7mb7tin/xiSibWjW RXzBM2tlsKjzhXaiVXyjuFk5tWXtZfiRe80uHHwgFm4R5DB/rZEngNyBz/E3pG47z9EM HgCd7mA9bRtoE0F5e1F8jfls2DfQx9o3eAv4P9CQCo1lyTfrjq98nzJLrAWxK5DFeS+8 1zqw== X-Gm-Message-State: AAQBX9dr01qsRM7759+3JV/tYNV3ZNj2Iyjs7UehLIbMoNv9fGnBTpFu jBhpIwEX5frKlS7TpCAAkOM= X-Google-Smtp-Source: AKy350bMdz7pD69gLlF+uzPgBF5HjB5Af+p2zTIAhw9TVTeXUsFC6wsXIB/5+I6hD7DLWUzoQzfJtw== X-Received: by 2002:a05:6214:2401:b0:5a6:24f6:724d with SMTP id fv1-20020a056214240100b005a624f6724dmr10950178qvb.13.1680983228823; Sat, 08 Apr 2023 12:47:08 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id r10-20020a0cf80a000000b005eac706d223sm3798qvn.124.2023.04.08.12.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:47:08 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store. References: <09b3598cb0fb0acd211dd59fc10686188b941d8e.camel@gmail.com> Date: Sat, 08 Apr 2023 15:47:07 -0400 In-Reply-To: <09b3598cb0fb0acd211dd59fc10686188b941d8e.camel@gmail.com> (Liliana Marie Prikler's message of "Thu, 30 Mar 2023 20:41:59 +0200") Message-ID: <87fs9aqhqc.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/patches/gtk2-harden-list-store.patch: New file. > * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here. > * gnu/local.mk (dist_patch_DATA): Register it here. > --- > gnu/local.mk | 1 + > gnu/packages/gtk.scm | 1 + > .../patches/gtk2-harden-list-store.patch | 42 +++++++++++++++++++ > 3 files changed, 44 insertions(+) > create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 3e94281ccf..31456c5be8 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1303,6 +1303,7 @@ dist_patch_DATA = \ > %D%/packages/patches/guile-rsvg-pkgconfig.patch \ > %D%/packages/patches/guile-emacs-fix-configure.patch \ > %D%/packages/patches/gtk2-fix-builder-test.patch \ > + %D%/packages/patches/gtk2-harden-list-store.patch \ > %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ > %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ > %D%/packages/patches/gtk2-theme-paths.patch \ > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm > index c756f39e24..196d767160 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -1014,6 +1014,7 @@ (define-public gtk+-2 > "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc")) > (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" > "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" > + "gtk2-harden-list-store.patch" > "gtk2-theme-paths.patch" > "gtk2-fix-builder-test.patch")))) > (build-system gnu-build-system) > diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch b/gnu/packages/patches/gtk2-harden-list-store.patch > new file mode 100644 > index 0000000000..b107ba2bcc > --- /dev/null > +++ b/gnu/packages/patches/gtk2-harden-list-store.patch > @@ -0,0 +1,42 @@ > +Mimic the implemenetation in gtk+-3. Typo: implementation. I'd like to see a bit more metadata in this patch; is it original work, or was it retrieved from another distribution such as Debian? It probably exists elsewhere, if GTK2 can't be built anymore otherwise? Does upstream still maintain GTK2, or is it completely abandoned? > + > +Index: gtk+-2.24.33/gtk/gtkliststore.c > +=================================================================== > +--- gtk+-2.24.33.orig/gtk/gtkliststore.c > ++++ gtk+-2.24.33/gtk/gtkliststore.c > +@@ -1195,16 +1195,31 @@ gboolean > + gtk_list_store_iter_is_valid (GtkListStore *list_store, > + GtkTreeIter *iter) > + { > ++ GSequenceIter *seq_iter; > ++ > + g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE); > + g_return_val_if_fail (iter != NULL, FALSE); > + > +- if (!VALID_ITER (iter, list_store)) > +- return FALSE; > ++ /* can't use VALID_ITER() here, because iter might point > ++ * to random memory. > ++ * > ++ * We MUST NOT dereference it. > ++ */ > + > +- if (g_sequence_iter_get_sequence (iter->user_data) != list_store->seq) > ++ if (iter == NULL || > ++ iter->user_data == NULL || > ++ list_store->stamp != iter->stamp) > + return FALSE; > + > +- return TRUE; > ++ for (seq_iter = g_sequence_get_begin_iter (list_store->seq); > ++ !g_sequence_iter_is_end (seq_iter); > ++ seq_iter = g_sequence_iter_next (seq_iter)) > ++ { > ++ if (seq_iter == iter->user_data) > ++ return TRUE; > ++ } > ++ > ++ return FALSE; > + } > + > + static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source, I don't know my way much in this code base, but the above looks reasonable to me, especially if it was mostly copy-pasted from GTK 3. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:49:24 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:49:24 +0000 Received: from localhost ([127.0.0.1]:59635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEYt-0002b1-Nb for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:49:23 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:35672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEYr-0002ao-Ta for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:49:22 -0400 Received: by mail-qv1-f48.google.com with SMTP id e9so1257626qvv.2 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680983356; x=1683575356; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=TN8TRSnu1l5tZdCpqvY91Mo2YPqE1IBV8/7cLhLDtRY=; b=qeUtXRSU7YzQkPZNYeMFTQFrWeyUIPPfD+1zLoYIBwEwug3urXPMyUzE1OXnHXZ9Um jN2T9hl8+6ij/7HGO0GFHF930kAFCJCtKU6LJjZl9cJDqATV06/XjePQK6SFPw2qR4nu ET1ib2IgEyZqNMDxxWdMb+6dAZ6iz0NRjdj0kxHQEPeVuGGqFWDSlbQskBSd+ofKGmKh GPQe/L/KLwrAluFHFurEf5jvQNdnpUlvvMkJMyNUn/p2OQsaak1n0/Z9YeNwHCxn+hRf mD9D/3qvmz2v4RQ8kspVYWoo9wXGk8AxcQLZyTZW03VZaxI5FWFdTlHmCQOQToSYGAIW W5/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680983356; x=1683575356; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TN8TRSnu1l5tZdCpqvY91Mo2YPqE1IBV8/7cLhLDtRY=; b=ZLssf/VsUVPcCXCNUg/XuUv6JPIOTDO+2Z9Duy0ZDaA6LMc7GpbBySKblkwYVKepw2 N1jnl/BrcrnoyBMASKEQLf1tCgmZh7e/NLyiGDwpgVreZ2NohdwzJ/thaKf42H07dHuT olTdfgp6N0V5jp2Jnb4D8ZP0buGRlFozTzbvZSPZ5Er/moOLAu0ZrOTHuVIOixq5w8hQ aFL8VnmAbOPnjwB7mtnbmhD4XIQ/tAs05r0OFwDA7CIlOACp5G89ks8vSmJQYKJaT4fT 2xL9472GyQds4IrYsEJoqlSAFfPNPFsDb+4vS/jutu22FtssLMHVx8YbEcqaATtUKWWp uH2g== X-Gm-Message-State: AAQBX9cxhGQAwjvhceWuqngy4Rf4MpC3sbctr/fjETMSF/D60I47T6o1 y5sau1onV9Oe0C3qRVOwXi0= X-Google-Smtp-Source: AKy350ajx4MW4+taPczDpzfq8nau9B+dU8SwY6v/SpTWDvaJCJi+3iHM6WQiI0ghyvdWehF6bmy9SA== X-Received: by 2002:ad4:5962:0:b0:5a6:ecda:bd8d with SMTP id eq2-20020ad45962000000b005a6ecdabd8dmr9868726qvb.4.1680983356483; Sat, 08 Apr 2023 12:49:16 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id g3-20020a0cfdc3000000b005dd8b9345dcsm2246189qvs.116.2023.04.08.12.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:49:16 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build. References: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> Date: Sat, 08 Apr 2023 15:49:15 -0400 In-Reply-To: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> (Liliana Marie Prikler's message of "Tue, 28 Mar 2023 21:34:04 +0200") Message-ID: <87bkjyqhms.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/gnome.scm (librsvg)[#:phases]: Also > delete SVG files that have been broken by the recent updates. > --- > gnu/packages/gnome.scm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 4f47e60505..e43e24dd94 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -3696,7 +3696,12 @@ (define-public librsvg > (("fn multiple_input_files_not_allowed_for_png_output" all) > (string-append "#[ignore] " all)) > (("fn stylesheet_option_error" all) > - (string-append "#[ignore] " all))))) > + (string-append "#[ignore] " all))) > + ;; XXX: re-enable when updating this package > + (with-directory-excursion "tests/fixtures/reftests/" > + (delete-file "filter-component-transfer-from-reference-page.svg") > + (delete-file "filter-morphology-from-reference-page.svg") > + (delete-file "svg1.1/text-text-03-b.svg")))) I think a fix for this was contributed to core-updates already; it used another approach: adjusting the expected value. We should rebase this branch on top of core-updates to get it. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:51:56 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:51:56 +0000 Received: from localhost ([127.0.0.1]:59640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEbM-0002jr-8A for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:51:56 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:41616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEbK-0002jc-Ok for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:51:55 -0400 Received: by mail-qt1-f176.google.com with SMTP id cn12so39849063qtb.8 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680983509; x=1683575509; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=nkhZS5oe/Zj20YgVYtoy+VQjrvO2PxLEA0u8Gyii1DQ=; b=LtuZGMWvbuU7raS576WcOghGZ79jeHV6c5TSHpkQ0HADkLOsX3nDTZBKzVpvmvzeRj Ke1kbvkACbL8GFs37Dt/Hu7S95lKYXwVKpxDrJ5bKzh7UAwIoAyDHC9CQd5ZbvIgfUdK AQ02fKnz0xLInzMLOJYu/HzdVFtV/jwDW9vwSsaVpkKS/NYgQuW1nnNWgFJ+y8sWHHBv 9YqUnREv9zFDdsvRLmFyQT09Fufaonl+7uIfjEvA+CS7biX/DTBczEbsuI5745i1oWld TlVxflSw88bBzWF3lMu46Uwgij/Dhp4QgIUCE62u7kKr5JaPLSAqKoDv4J18ENjJLaB5 Ltkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680983509; x=1683575509; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=nkhZS5oe/Zj20YgVYtoy+VQjrvO2PxLEA0u8Gyii1DQ=; b=3ckSLPNCmdzSx4SWV8RAYHpK4ZgWdzZUa+sPfiFlsxqPVTj0ebT7IkeGnxSe/A6Xp2 CTnlKKBP//ixFXW+JrmeZNQmtnpLKnHOaLA5XJODGhOYJGlYGU+zWs2B655xuY4YyDFT VquNyhvZVZxxrenhOcsgrpRT7LfF17OIvYJQdxNeMpEC5Apx2kIVvWLN9iSNHG+/uv2Y P+lYmn2A93OFqUVGuxZHSkRMlgT17qyMT5OvZqST3kwdf1jjE0bNtw2+s1HaiShFblWK /G3zxHfTXyrsAryU4mH9NAQzaSMxpRQ3VXZyF5WSHMY1MqmRLET+KneLpitQPhl0PvKO W0WA== X-Gm-Message-State: AAQBX9eueVIHgt/rIoA9h6B87oNhAruBoNh+8hEnfXmOqqMfGEawKu6L nAT856ahXICXlKCJMVFZ8ZM= X-Google-Smtp-Source: AKy350YJ1GxZlJiFPq/ZoxkYpRpK5nsSwi/hvE1waUzLoLJ8V0eh8ezALTA+ND7pnW2IenulR1gqow== X-Received: by 2002:a05:622a:199f:b0:3e4:3f79:9d7b with SMTP id u31-20020a05622a199f00b003e43f799d7bmr10091718qtc.55.1680983509184; Sat, 08 Apr 2023 12:51:49 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id 15-20020a05620a040f00b0073b8512d2dbsm2180941qkp.72.2023.04.08.12.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:51:48 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1. References: Date: Sat, 08 Apr 2023 15:51:47 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Fri, 31 Mar 2023 20:54:00 +0200") Message-ID: <877cumqhik.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > * gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1. > [inputs]: Add bash-minimal, librsvg and python-cssselect. > Use lib2geom-1.2 rather than lib2geom. Could we simply make lib2geom the latest? I think inkscape is its sole user. > (inkscape): Inherit build-system, arguments and inputs. > --- > gnu/packages/inkscape.scm | 36 +++++++++++------------------------- > 1 file changed, 11 insertions(+), 25 deletions(-) > > diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm > index d1ac5e7312..b8e78c2b11 100644 > --- a/gnu/packages/inkscape.scm > +++ b/gnu/packages/inkscape.scm > @@ -61,7 +61,7 @@ (define-public inkscape/stable > (hidden-package > (package > (name "inkscape") > - (version "1.1.1") > + (version "1.2.1") > (source > (origin > (method url-fetch) > @@ -69,7 +69,7 @@ (define-public inkscape/stable > "resources/file/" > "inkscape-" version ".tar.xz")) > (sha256 > - (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf")) > + (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")) > (modules '((guix build utils) > (ice-9 format))) > (snippet > @@ -196,9 +196,14 @@ (define-public inkscape/stable > (let ((out (assoc-ref outputs "out"))) > (wrap-program (string-append out "/bin/inkscape") > `("GUIX_PYTHONPATH" ":" prefix > - (,(getenv "GUIX_PYTHONPATH")))))))))) > + (,(getenv "GUIX_PYTHONPATH"))) > + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load > + ;; its own icons in pure environments. > + `("GDK_PIXBUF_MODULE_FILE" = > + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) > (inputs > `(("aspell" ,aspell) > + ("bash-minimal" ,bash-minimal) > ("autotrace" ,autotrace) > ("gdl" ,gdl-minimal) > ("gtkmm" ,gtkmm-3) > @@ -206,12 +211,13 @@ (define-public inkscape/stable > ("gtkspell3" ,gtkspell3) > ("gsl" ,gsl) > ("poppler" ,poppler) > - ("lib2geom" ,lib2geom) > + ("lib2geom" ,lib2geom-1.2) > ("libjpeg" ,libjpeg-turbo) > ("libpng" ,libpng) > ("libxml2" ,libxml2) > ("libxslt" ,libxslt) > ("libgc" ,libgc) > + ("librsvg" ,librsvg) ; for the pixbuf loader > ("libsoup" ,libsoup-minimal-2) > ("libcdr" ,libcdr) > ("libvisio" ,libvisio) > @@ -223,6 +229,7 @@ (define-public inkscape/stable > ("lcms" ,lcms) > ("boost" ,boost) > ("python" ,python-wrapper) > + ("python-cssselect" ,python-cssselect) ; to render qrcode > ("python-scour" ,python-scour) > ("python-pyserial" ,python-pyserial) > ("python-numpy" ,python-numpy) > @@ -255,25 +262,4 @@ (define-public inkscape > "inkscape-" version ".tar.xz")) It'd be nice (in a follow-up commit) to get rid of these input labels and use gexps for the arguments, while we're touching it. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:54:58 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:54:59 +0000 Received: from localhost ([127.0.0.1]:59656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEeI-0002tC-Ba for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:54:58 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:34361) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEeG-0002sM-3J for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:54:56 -0400 Received: by mail-wr1-f66.google.com with SMTP id i27so1400765wrc.1 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680983690; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=jpeTnD1hOSpH1z+gf18xIzIGzCcTLDS1SMiqOslXgTI=; b=V+7chGq4EyXmjMglT1DYcinU2FJcsHJI4N3LXi3gtCsxbxNjULSZ4wQVpo0f+wDTBM 4olWkuwFPagkHMjTAEdS19DTxfK+CAkplLl4KEOgfCrT8gu7BY/ZULuuVX3yB92LUzY+ SRf91WcbgYW5sdlifFy2LeIpPsHy/fkhHhm0LlQCawpyLM675gapeEfba8Uh2NF2dXdd B4lBfBF8dJK3oHVtR3VjdqaI5C2Icp71OV5mM1TfN8vGtbaAPx3HL/dalTOJt+ZORDgq asVwGl6gXIvZ5+tv14/v8A4ynKwk+7HvJVKTXlOos2Wc6JPLcXi4LAZaxUaNSlHRedIE QgTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680983690; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=jpeTnD1hOSpH1z+gf18xIzIGzCcTLDS1SMiqOslXgTI=; b=46o2ZCrEOSPCOb/NmPHvAlk7XikaTtXB1Sg+Fawm8cIdOmSdLYzC8e1uto2IapADqR IFMfX9eDjMvxBu92CRl7wFXPPaMWbgF7UopC6RctgBt8SgRhQcVnkh/BKPhCGbpd7PDo srCVG24sjcWlCZxVKJmAJ1C4wyHzhHFRFuz3iodaT1Xx4so1yN7eRPuL6i+KdaOFRHFj xzL0fKBEcUD0RcMxR8Xu/nHovNcMcIXS6R+EbgrwXkUX8dA2YUhKewlTeXvKb1f6T2PS GCvYPQseQ9Lzs40ystiNZIVopkTIu3XBa9IU0eaV3roj1Ma/9qlL5/gBuVR8/bYbVdyW 6fGQ== X-Gm-Message-State: AAQBX9eKqtwNyMu58Jg884dCPzqdj7UPZiQ6CE+oOK+TC0oc2tADSssu RF/1B40/mpfMJShVd3HXtI8= X-Google-Smtp-Source: AKy350Yp847/oARIttOqoFRzEIYd/9hFwhVH2rUondElkuYUjSrOHPID8UzbVK9FARpcQOm+XLNX0w== X-Received: by 2002:a5d:6948:0:b0:2e3:a506:e348 with SMTP id r8-20020a5d6948000000b002e3a506e348mr4016477wrw.62.1680983690199; Sat, 08 Apr 2023 12:54:50 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id k15-20020a056000004f00b002c71dd1109fsm7657358wrx.47.2023.04.08.12.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:54:49 -0700 (PDT) Message-ID: <9eddedcd289dcaaa6c16562daabaaab752582562.camel@gmail.com> Subject: Re: [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Sat, 08 Apr 2023 21:54:48 +0200 In-Reply-To: <87edourwq7.fsf@gmail.com> References: <87edourwq7.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) QW0gU2Ftc3RhZywgZGVtIDA4LjA0LjIwMjMgdW0gMTU6MzcgLTA0MDAgc2NocmllYiBNYXhpbSBD b3Vybm95ZXI6Cj4gSGkhCj4gCj4gTGlsaWFuYSBNYXJpZSBQcmlrbGVyIDxsaWxpYW5hLnByaWts ZXJAZ21haWwuY29tPiB3cml0ZXM6Cj4gCj4gPiAqIGdudS9wYWNrYWdlcy9nbGliLnNjbSAoZ2xp Yik6IFVwZGF0ZSB0byAyLjc2LjEuCj4gPiBbc291cmNlXTxzbmlwcGV0PjogQWRqdXN0IGFjY29y ZGluZ2x5Lgo+ID4gW2FyZ3VtZW50c108IzpwaGFzZXM+OiBBZGQg4oCYc2V0LUdfVEVTVF9TUkNE SVLigJkuwqAgVXBkYXRlIOKAmGRlbGV0ZS0KPiA+IGZhaWxpbmctdGVzdHPigJkuCj4gPiBbcHJv cGFnYXRlZC1pbnB1dHNdOiBSZXBsYWNlIHBjcmUgd2l0aCBwY3JlMi4KPiA+IChnbGliLXdpdGgt ZG9jdW1lbnRhdGlvbik6IEluaGVyaXQgZnJvbSBnbGliLgo+ID4gKiBnbnUvcGFja2FnZXMvZ25v bWUuc2NtIChzeXNwcm9mLCBndHJhbnNsYXRvcik6IFVzZSBnbGliLgo+ID4gKiBnbnUvcGFja2Fn ZXMvZ3RrLnNjbSAoZ3Rrc291cmNldmlldyk6IFVzZSBnbGliLgo+ID4gKiBnbnUvcGFja2FnZXMv Z3VpbGUteHl6LnNjbSAoZ3VpbGUtZy1nb2xmKTogVXNlIGdsaWIuCj4gPiAqIGdudS9wYWNrYWdl cy9wYXRjaGVzL2dsaWItc2tpcC1mYWlsaW5nLXRlc3QucGF0Y2g6IEFkanVzdAo+ID4gYWNjb3Jk aW5nbHkuCj4gPiAtLS0KPiA+IMKgZ251L3BhY2thZ2VzL2dsaWIuc2NtwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHwgOTIgKysrKystLS0tLS0tLS0tCj4g PiAtLS0tCj4gPiDCoGdudS9wYWNrYWdlcy9nbm9tZS5zY23CoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHzCoCA4ICstCj4gPiDCoGdudS9wYWNrYWdlcy9ndGsu c2NtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgfMKg IDIgKy0KPiA+IMKgZ251L3BhY2thZ2VzL2d1aWxlLXh5ei5zY23CoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCB8wqAgMiArLQo+ID4gwqAuLi4vcGF0Y2hlcy9nbGliLXNraXAt ZmFpbGluZy10ZXN0LnBhdGNowqDCoMKgwqDCoCB8wqAgMyArLQo+ID4gwqA1IGZpbGVzIGNoYW5n ZWQsIDMwIGluc2VydGlvbnMoKyksIDc3IGRlbGV0aW9ucygtKQo+ID4gCj4gPiBkaWZmIC0tZ2l0 IGEvZ251L3BhY2thZ2VzL2dsaWIuc2NtIGIvZ251L3BhY2thZ2VzL2dsaWIuc2NtCj4gPiBpbmRl eCBmODVkNWUzMjI1Li5lY2Y1Y2I0OTFmIDEwMDY0NAo+ID4gLS0tIGEvZ251L3BhY2thZ2VzL2ds aWIuc2NtCj4gPiArKysgYi9nbnUvcGFja2FnZXMvZ2xpYi5zY20KPiA+IEBAIC0yMTUsNyArMjE1 LDcgQEAgKGRlZmluZS1wdWJsaWMgZGJ1cy12ZXJib3NlCj4gPiDCoChkZWZpbmUgZ2xpYgo+ID4g wqDCoCAocGFja2FnZQo+ID4gwqDCoMKgwqAgKG5hbWUgImdsaWIiKQo+ID4gLcKgwqDCoCAodmVy c2lvbiAiMi43MC4yIikKPiA+ICvCoMKgwqAgKHZlcnNpb24gIjIuNzYuMSIpCj4gPiDCoMKgwqDC oCAoc291cmNlCj4gPiDCoMKgwqDCoMKgIChvcmlnaW4KPiA+IMKgwqDCoMKgwqDCoMKgIChtZXRo b2QgdXJsLWZldGNoKQo+ID4gQEAgLTIyNCwxNCArMjI0LDE0IEBAIChkZWZpbmUgZ2xpYgo+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCBuYW1lICIvIiAo c3RyaW5nLXRha2UgdmVyc2lvbiA0KSAiLyIKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgbmFtZSAiLSIgdmVyc2lvbiAiLnRhci54eiIpKQo+ID4gwqDC oMKgwqDCoMKgwqAgKHNoYTI1Ngo+ID4gLcKgwqDCoMKgwqDCoMKgIChiYXNlMzIKPiA+ICIwdncw OHA0amxsYXZwOXFtbHFnMXlsMXphbm15NTN5aWQ0NndpcGFzNmdmZGhuZjRhbDg1IikpCj4gPiAr wqDCoMKgwqDCoMKgwqAgKGJhc2UzMgo+ID4gIjE3eDF6cHIyYXZqOGhqYnBjNmhwMnNmMjg4NWx4 YWM0NnYwa2Fqc2dhbjM5MjltMHpwMjMiKSkKPiA+IMKgwqDCoMKgwqDCoMKgIChwYXRjaGVzCj4g PiDCoMKgwqDCoMKgwqDCoMKgIChzZWFyY2gtcGF0Y2hlcyAiZ2xpYi1hcHBpbmZvLXdhdGNoLnBh dGNoIgo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg ICJnbGliLXNraXAtZmFpbGluZy10ZXN0LnBhdGNoIikpCj4gPiDCoMKgwqDCoMKgwqDCoCAobW9k dWxlcyAnKChndWl4IGJ1aWxkIHV0aWxzKSkpCj4gPiDCoMKgwqDCoMKgwqDCoCAoc25pcHBldAo+ ID4gwqDCoMKgwqDCoMKgwqDCoCAnKGJlZ2luCj4gPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1 YnN0aXR1dGUqICJ0ZXN0cy9zcGF3bi10ZXN0LmMiCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqAg KHN1YnN0aXR1dGUqICJnbGliL3Rlc3RzL3NwYXduLXRlc3QuYyIKPiA+IMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICgoIi9iaW4vc2giKSAic2giKSkpKSkpCj4gPiDCoMKgwqDCoCAoYnVpbGQt c3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKPiA+IMKgwqDCoMKgIChvdXRwdXRzICcoIm91dCLC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7bGlicmFyaWVzLCBsb2NhbGVz LCBldGMKPiA+IEBAIC0yNTYsNiArMjU2LDkgQEAgKGRlZmluZSBnbGliCj4gPiDCoMKgwqDCoMKg wqDCoCAjOnBoYXNlcwo+ID4gwqDCoMKgwqDCoMKgwqAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJk LXBoYXNlcwo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgIDs7IE5lZWRlZCB0byBwYXNzIHRoZSB0ZXN0 IHBoYXNlIG9uIHNsb3dlciBBUk0gYW5kIGk2ODYKPiA+IG1hY2hpbmVzLgo+ID4gK8KgwqDCoMKg wqDCoMKgwqAgKGFkZC1hZnRlciAndW5wYWNrICdzZXQtR19URVNUX1NSQ0RJUgo+ID4gK8KgwqDC oMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAo c2V0ZW52ICJHX1RFU1RfU1JDRElSIiAoc3RyaW5nLWFwcGVuZCAoZ2V0Y3dkKQo+ID4gIi9naW8v dGVzdHMiKSkpKQo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgIChhZGQtYWZ0ZXIgJ3VucGFjayAnaW5j cmVhc2UtdGVzdC10aW1lb3V0Cj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXwo+ ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHN1YnN0aXR1dGUqICJtZXNvbi5idWlsZCIK PiA+IEBAIC0yNzAsOSArMjczLDE5IEBAIChkZWZpbmUgZ2xpYgo+ID4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAnKCJ1bml4LmMiICJ1dGlscy5jIikKPiA+IMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiWyBcdF0qZ190ZXN0X2FkZF9mdW5j Lio7IikgIiIpKSkKPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICh3aXRoLWRpcmVjdG9y eS1leGN1cnNpb24gImdpby90ZXN0cyIKPiA+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg IChzdWJzdGl0dXRlKiAnKCJjb250ZW50dHlwZS5jIiAiZ2RidXMtYWRkcmVzcy1nZXQtCj4gPiBz ZXNzaW9uLmMiCj4gPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAiZ2RidXMtcGVlci5jIiAiYXBwaW5mby5jIiAiZGVza3RvcC0KPiA+ IGFwcC1pbmZvLmMiKQo+ID4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIlsg XHRdKmdfdGVzdF9hZGRfZnVuYy4qOyIpICIiKSkpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoc3Vic3RpdHV0ZSogJygiY29udGVudHR5cGUuYyIKPiA+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJnZGJ1cy1hZGRy ZXNzLWdldC1zZXNzaW9uLmMiCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiZ2RidXMtc2VydmVyLWF1dGguYyIKPiA+ICvCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJn ZGJ1cy1wZWVyLmMiCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAiYXBwaW5mby5jIgo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImRlc2t0b3AtYXBwLWluZm8u YyIpCj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiWyBcdF0qZ190ZXN0 X2FkZF9mdW5jLio7IikgIiIpKQo+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKHVu bGVzcyAod2hpY2ggInVwZGF0ZS1kZXNrdG9wLWRhdGFiYXNlIikKPiA+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoc3Vic3RpdHV0ZSogJygiZmlsZS5jIikKPiAKPiBmaWxlLmMg ZG9lc24ndCBuZWVkIHRvIGJlIGluIGEgbGlzdC4KTmljZSBjYXRjaC4KCj4gPiArwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiWyBcdF0qZ190ZXN0X2FkZF9mdW5jLipxdWVyeS1k ZWZhdWx0LQo+ID4gaGFuZGxlci4qOyIpICIiKSkpCj4gCj4gVGhlIGluZGVudGF0aW9uIHNlZW1z IG9mZiBoZXJlLsKgIElzIGl0IHJlYWxseSBuZWNlc3NhcnkgdG8gdXNlIHRoZQo+IHVubGVzcyBj b25kaXRpb25hbCBoZXJlP8KgIEknZCBwZXJoYXBzIHNpbXBseSBkaXNhYmxlIHRoZSB0ZXN0Cj4g Z2VuZXJhbGx5LgpJJ2QgbGlrZSB0byBsZXQgaXQgcnVuIHdoZW4gdGhlIGlucHV0IGV4aXN0cywg YnV0IHRoYXQncyBhIGNpcmNsZS4gCldlJ2QgaGF2ZSB0byBjaGVjayBpdCBpbiBnbGliLXdpdGgt ZG9jdW1lbnRhdGlvbi4KCkNoZWVycwo= From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 15:56:55 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 19:56:55 +0000 Received: from localhost ([127.0.0.1]:59664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEgB-0002xH-3w for submit@debbugs.gnu.org; Sat, 08 Apr 2023 15:56:55 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:45852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEg8-0002x2-Fg for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 15:56:54 -0400 Received: by mail-wm1-f65.google.com with SMTP id gw11-20020a05600c850b00b003f07d305b32so1959858wmb.4 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 12:56:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680983807; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ajSvqkEs2mfG1bpt0b4U4WIiy7itfCXvTcsOpqXanPk=; b=c7yj3diMd4lZ2X+VbBtTRYvI1+qkNWODuDuT7oUwNygYAFrSl1DPugidk0DZ+xroUV jUMaei0fpgD0nps7FLqvezZNCMf5cUjM0a3etkMbChR6r8n7l1c8f9eLIOa+1Q8ATBWT 5pTPp/T2++cDtG5/+vnFS51Ll+PO1gzBBhdPaPiBLYj+VERoB2lS9MN5uA+p7xZ7o0KD rcwimE/U4LLjpGmApueLX479le+xg64pBXOJ7Konf9ZLHe4nHMhthEYNMrVJmqe9m4aq Qk8fNveS9IsSk/u/0seYabOEp9HSh38tHKqHXnLYvv82tPOgkm/s+LWNlPQO5Td9vfHi Fm1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680983807; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ajSvqkEs2mfG1bpt0b4U4WIiy7itfCXvTcsOpqXanPk=; b=rjV2zGUA3tGfrWIs9LHK8INJA/8lI/TRzTeDAKku1nllakRbPkgixfdOqohL2RaE7s WtgO2SFVxzvtbYHwQ9XgEWz1vWGMKZt1pcPZWH8Vr3XpqZXEIhQKJ3Aj5fP6HZFQ1WIH xb88FQbHvI2r3nTl/dO6o28V8Wgn+gpJxkP0Q8nq/ZgT/162mkFeg89XYxZWZvbG3iDu woUm8vBDURjBrcIZ80JX4+e2mk0VkZHl+S9z6ElEvSznUt1nVYWr68CxXRew79WYm90u z3ALHd30fLJuQrzTqKC3Ru25UZVyFIkhdBBF/M+jgdCyboPbhcfyArQv1jjS8yVE3vcH kjfg== X-Gm-Message-State: AAQBX9d9O3RWTabD+G1+SnyvC7PUtRIayGRHG1I3LsLpooTrqgdooxke 3guknYOLcGreudv/cYH0tWARJ/W9prpzJg== X-Google-Smtp-Source: AKy350b0mkOL3ExukYLy5/ugVOBiJm6VIWC7VerGyCn3bOoVBqS2On17OyyfuS6BxeMYywNQYsHKrQ== X-Received: by 2002:a1c:770c:0:b0:3f0:310c:e3cf with SMTP id t12-20020a1c770c000000b003f0310ce3cfmr1848322wmi.37.1680983806733; Sat, 08 Apr 2023 12:56:46 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r13-20020a05600c458d00b003f07ddfc3dfsm5802441wmo.3.2023.04.08.12.56.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 12:56:46 -0700 (PDT) Message-ID: <7e7567f08a7c880cd86a48c963ecb2ca0eacdadc.camel@gmail.com> Subject: Re: [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Sat, 08 Apr 2023 21:56:45 +0200 In-Reply-To: <87sfdaqhxw.fsf@gmail.com> References: <87sfdaqhxw.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Am Samstag, dem 08.04.2023 um 15:42 -0400 schrieb Maxim Cournoyer: > Hi, >=20 > Liliana Marie Prikler writes: >=20 > > * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. > > --- > > =C2=A0gnu/packages/gnome.scm | 4 ++-- > > =C2=A01 file changed, 2 insertions(+), 2 deletions(-) > >=20 > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > > index 90e33d72b6..4f47e60505 100644 > > --- a/gnu/packages/gnome.scm > > +++ b/gnu/packages/gnome.scm > > @@ -5263,7 +5263,7 @@ (define-public libsoup-minimal > > =C2=A0;;; An older variant kept to build the 'rest' package. > > =C2=A0(define-public libsoup-minimal-2 > > =C2=A0=C2=A0 (package/inherit libsoup-minimal > > -=C2=A0=C2=A0=C2=A0 (version "2.72.0") > > +=C2=A0=C2=A0=C2=A0 (version "2.74.3") > > =C2=A0=C2=A0=C2=A0=C2=A0 (source (origin > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (method url-fetch) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (uri (string-append > > "mirror://gnome/sources/libsoup/" > > @@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2 > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "libsoup-" ver= sion ".tar.xz")) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (sha256 > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (base32 > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 > > "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p")))) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 > > "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) > > =C2=A0=C2=A0=C2=A0=C2=A0 (arguments > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (substitute-keyword-arguments (package-a= rguments libsoup- > > minimal) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ((#:phases phases) >=20 > LGTM.=C2=A0 Hopefully we can get rid of the libsoup-2 stuff after we've > updated all of GNOME to 43 (which had a hard requirement to not rely > on libsoup@2). Well, the goal is to move to 44 directly, but aren't there non-GNOME packages out there running libsoup-2 just like there's stuff still running GTK 2? From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 16:00:24 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 20:00:24 +0000 Received: from localhost ([127.0.0.1]:59677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEjY-000350-2n for submit@debbugs.gnu.org; Sat, 08 Apr 2023 16:00:24 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:40484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEjV-00034h-Im for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 16:00:22 -0400 Received: by mail-wm1-f66.google.com with SMTP id d11-20020a05600c3acb00b003ef6e6754c5so23183326wms.5 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 13:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680984016; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=PQWEnLBP5ycyXk6Kb7wW3dunp9wTMw0PQnX9KrjBxWs=; b=AKoVVWC+Z4ndQAAtSjhY/1BuKw3QQsUy9jX4yh/7JgTUjLCtk9XQLPQk2b9/FRoDHk Ej6fbrfsWFXVvYyf1u8n8AIpCD6nDLcZB33OeL9ILc7pFmChPlD2uouKvl4hI+wAEBpf N2eleRFc0G9Go02qssd77yrtHik2CYrbrjfAr6Bed6baPKSsUXCSQ6J6XOcNzFJ0ugvo whKIrlvfiZdj1JtuM+Eiotn2QXVoXeGR28lBo+weyh58alrrD2kUjV1rQXp1ooa5Fo4h KOOFC/b1Q+OZzKPpcQ7ngqfce6P82EC95dhHO3sMVF9p2LHHOrD2Q+GWb2lcVoU0u3oO CSIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680984016; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PQWEnLBP5ycyXk6Kb7wW3dunp9wTMw0PQnX9KrjBxWs=; b=eh/U2+y9wLyoG7aVCF4Sv2kTfA7tt26BqzjuIbAdGHY/RMSyplUJHrOoFDoLpIVIKH 65kBFyFAKwQ+EOAELMMhCjgAQzg1/877tWwTMi3mNFc6Wmqu10uI9In/6hzi8sUsNf2p gNIm9ozp5AWhsszPncWFJQMe+LkyUxDTmn1ASkWriV7UrDmZCVsg8CBqXhe85+0qgOMN 9L17+tODXVcYJkeuWhdhtnNtPJEpi+CcCVX5EofIMlXXl30E+9r/9b17HUeXha3eqzIc oJmbbjSeAwGWDn3rsYehHzYl7cOOjOE2VfAA8NktlNLI/GTgej3drFoKv1kDAQgaO2pc iS5w== X-Gm-Message-State: AAQBX9cWBIKSviIcrE7PwAV6kRjmYPtD6wrdnofvaPPf2M1S1Tq4BGlJ LAw6hUPG9XhmiqA98ASCUDg= X-Google-Smtp-Source: AKy350b2OCT9jGIr8EB5TSVjXHMTgXEyWdjrTQAQYrx6eQnWZojqswmW+0dLCR5nWZ3+VNKQnyqToA== X-Received: by 2002:a05:600c:204b:b0:3f0:7f4b:f3c0 with SMTP id p11-20020a05600c204b00b003f07f4bf3c0mr2948773wmg.19.1680984015876; Sat, 08 Apr 2023 13:00:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id b5-20020adfee85000000b002c557f82e27sm7547414wro.99.2023.04.08.13.00.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 13:00:15 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Sat, 08 Apr 2023 22:00:14 +0200 In-Reply-To: <87fs9aqhqc.fsf@gmail.com> References: <09b3598cb0fb0acd211dd59fc10686188b941d8e.camel@gmail.com> <87fs9aqhqc.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) QW0gU2Ftc3RhZywgZGVtIDA4LjA0LjIwMjMgdW0gMTU6NDcgLTA0MDAgc2NocmllYiBNYXhpbSBD b3Vybm95ZXI6Cj4gSGksCj4gCj4gTGlsaWFuYSBNYXJpZSBQcmlrbGVyIDxsaWxpYW5hLnByaWts ZXJAZ21haWwuY29tPiB3cml0ZXM6Cj4gCj4gPiAqIGdudS9wYWNrYWdlcy9wYXRjaGVzL2d0azIt aGFyZGVuLWxpc3Qtc3RvcmUucGF0Y2g6IE5ldyBmaWxlLgo+ID4gKiBnbnUvcGFja2FnZXMvZ3Rr LnNjbSAoZ3RrKy0yKVtwYXRjaGVzXTogQWRkIGl0IGhlcmUuCj4gPiAqIGdudS9sb2NhbC5tayAo ZGlzdF9wYXRjaF9EQVRBKTogUmVnaXN0ZXIgaXQgaGVyZS4KPiA+IC0tLQo+ID4gwqBnbnUvbG9j YWwubWvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqAgfMKgIDEgKwo+ID4gwqBnbnUvcGFja2FnZXMvZ3RrLnNjbcKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIHzCoCAxICsKPiA+IMKg Li4uL3BhdGNoZXMvZ3RrMi1oYXJkZW4tbGlzdC1zdG9yZS5wYXRjaMKgwqDCoMKgwqAgfCA0Mgo+ ID4gKysrKysrKysrKysrKysrKysrKwo+ID4gwqAzIGZpbGVzIGNoYW5nZWQsIDQ0IGluc2VydGlv bnMoKykKPiA+IMKgY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wYXRjaGVzL2d0azIt aGFyZGVuLWxpc3QtCj4gPiBzdG9yZS5wYXRjaAo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZ251L2xv Y2FsLm1rIGIvZ251L2xvY2FsLm1rCj4gPiBpbmRleCAzZTk0MjgxY2NmLi4zMTQ1NmM1YmU4IDEw MDY0NAo+ID4gLS0tIGEvZ251L2xvY2FsLm1rCj4gPiArKysgYi9nbnUvbG9jYWwubWsKPiA+IEBA IC0xMzAzLDYgKzEzMDMsNyBAQCBkaXN0X3BhdGNoX0RBVEEKPiA+ID3CoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgXAo+ID4gwqDCoCAlRCUvcGFja2FnZXMvcGF0Y2hlcy9ndWlsZS1yc3ZnLXBrZ2Nv bmZpZy5wYXRjaMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBcCj4gPiDCoMKgICVEJS9wYWNr YWdlcy9wYXRjaGVzL2d1aWxlLWVtYWNzLWZpeC1jb25maWd1cmUucGF0Y2jCoMKgwqDCoMKgwqDC oMKgwqBcCj4gPiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2d0azItZml4LWJ1aWxkZXItdGVz dC5wYXRjaMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgXAo+ID4gK8KgICVEJS9wYWNrYWdlcy9w YXRjaGVzL2d0azItaGFyZGVuLWxpc3Qtc3RvcmUucGF0Y2jCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqBcCj4gPiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2d0azItcmVzcGVjdC1HVUlYX0dUSzJf UEFUSC5wYXRjaMKgwqDCoMKgwqDCoMKgXAo+ID4gwqDCoCAlRCUvcGFja2FnZXMvcGF0Y2hlcy9n dGsyLXJlc3BlY3QtR1VJWF9HVEsyX0lNX01PRFVMRV9GSUxFLnBhdGNoCj4gPiBcCj4gPiDCoMKg ICVEJS9wYWNrYWdlcy9wYXRjaGVzL2d0azItdGhlbWUtcGF0aHMucGF0Y2jCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBcCj4gPiBkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2d0 ay5zY20gYi9nbnUvcGFja2FnZXMvZ3RrLnNjbQo+ID4gaW5kZXggYzc1NmYzOWUyNC4uMTk2ZDc2 NzE2MCAxMDA2NDQKPiA+IC0tLSBhL2dudS9wYWNrYWdlcy9ndGsuc2NtCj4gPiArKysgYi9nbnUv cGFja2FnZXMvZ3RrLnNjbQo+ID4gQEAgLTEwMTQsNiArMTAxNCw3IEBAIChkZWZpbmUtcHVibGlj IGd0aystMgo+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAKPiA+ICIxbm42a2tz MXp5dmI1eGlrcjl5Mms3cjlid2p5MWc0YjBtMHM2NjUzMmJjbHltYndmYW1jIikpCj4gPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChwYXRjaGVzIChzZWFyY2gtcGF0Y2hlcyAiZ3RrMi1y ZXNwZWN0LQo+ID4gR1VJWF9HVEsyX1BBVEgucGF0Y2giCj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqAgImd0azItcmVzcGVjdC0KPiA+IEdVSVhfR1RLMl9JTV9NT0RVTEVfRklMRS5wYXRjaCIKPiA+ ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICJndGsyLWhhcmRlbi1saXN0LQo+ID4gc3RvcmUucGF0Y2gi Cj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgImd0azItdGhlbWUtcGF0aHMucGF0Y2giCj4gPiDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqAgImd0azItZml4LWJ1aWxkZXItCj4gPiB0ZXN0LnBhdGNoIikp KSkKPiA+IMKgwqDCoMKgIChidWlsZC1zeXN0ZW0gZ251LWJ1aWxkLXN5c3RlbSkKPiA+IGRpZmYg LS1naXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9ndGsyLWhhcmRlbi1saXN0LXN0b3JlLnBhdGNo Cj4gPiBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2d0azItaGFyZGVuLWxpc3Qtc3RvcmUucGF0Y2gK PiA+IG5ldyBmaWxlIG1vZGUgMTAwNjQ0Cj4gPiBpbmRleCAwMDAwMDAwMDAwLi5iMTA3YmEyYmNj Cj4gPiAtLS0gL2Rldi9udWxsCj4gPiArKysgYi9nbnUvcGFja2FnZXMvcGF0Y2hlcy9ndGsyLWhh cmRlbi1saXN0LXN0b3JlLnBhdGNoCj4gPiBAQCAtMCwwICsxLDQyIEBACj4gPiArTWltaWMgdGhl IGltcGxlbWVuZXRhdGlvbiBpbiBndGsrLTMuCj4gCj4gVHlwbzogaW1wbGVtZW50YXRpb24uCk5p Y2UgY2F0Y2guCgo+IEknZCBsaWtlIHRvIHNlZSBhIGJpdCBtb3JlIG1ldGFkYXRhIGluIHRoaXMg cGF0Y2g7IGlzIGl0IG9yaWdpbmFsCj4gd29yaywgb3Igd2FzIGl0IHJldHJpZXZlZCBmcm9tIGFu b3RoZXIgZGlzdHJpYnV0aW9uIHN1Y2ggYXMgRGViaWFuP8KgCj4gSXQgcHJvYmFibHkgZXhpc3Rz IGVsc2V3aGVyZSwgaWYgR1RLMiBjYW4ndCBiZSBidWlsdCBhbnltb3JlCj4gb3RoZXJ3aXNlPwpJ IGxvb2tlZCBhcm91bmQgaW4gdGhlIEdUSyAzIHNvdXJjZSB0cmVlIGdpdmVuIHRoYXQgdGhhdCBw YWNrYWdlIGJ1aWx0LApidXQgR1RLIDIgZGlkbid0LCB0aGVuIHRyaWVkIHRvIGNvcHkgdGhlIGZp bGUgYXMtaXMsIGZhaWxlZCwgdGhlbgpjb3BpZWQganVzdCB0aGVzZSByZWxldmFudCBiaXRzLiAg SSBoYXZlbid0IGxvb2tlZCBhdCBwcmlvciBhcnQgaW4Kb3RoZXIgZGlzdHJvcy4KCj4gRG9lcyB1 cHN0cmVhbSBzdGlsbCBtYWludGFpbiBHVEsyLCBvciBpcyBpdCBjb21wbGV0ZWx5IGFiYW5kb25l ZD8KQXMgZmFyIGFzIEkgY2FuIHNlZSwgd2UncmUgcnVubmluZyB0aGUgbGF0ZXN0IHZlcnNpb24u CgpDaGVlcnMKPiAK From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 08 16:03:14 2023 Received: (at 62467) by debbugs.gnu.org; 8 Apr 2023 20:03:14 +0000 Received: from localhost ([127.0.0.1]:59681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEmH-00039q-P8 for submit@debbugs.gnu.org; Sat, 08 Apr 2023 16:03:14 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:55426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plEmG-00039c-Qe for 62467@debbugs.gnu.org; Sat, 08 Apr 2023 16:03:13 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-50489c9f455so475030a12.2 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 13:03:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680984187; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=P+HsTCZC9292hc7p3j44IFUHYCo3KsdKz27UUaVll3c=; b=RnxgegsjSAsIiHsb8suBFPNHS9lnIE7PFB4v3Y/sqO1tzJLpfqUxnSiARMn7tSM2ui 5ljComarfBQY9bQ/pVE5LGyR3nA1WCaveDnrTS0tmwOP1m8ZRZHQt7VM/eDDSET0Dq+9 6U1stNGdwYDkh669cYNI8xGwhv/WGSnr2ArxiH2wfJPSk/tnZT3syFM4/4RgRUch/lnw 3o6YqgTI1te5Nhted0AOy5NzDaRPuUJ2Vd9F+xKxO3w7xesFxF9vsfq9N6H/Mul+ywTz yio8Xu3VV47fpplLJeAzrCIvtRz99Q9EojJfSQ8RFyTfBdgr2VnL4rEPuzpDYz09Fnq6 zbzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680984187; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=P+HsTCZC9292hc7p3j44IFUHYCo3KsdKz27UUaVll3c=; b=kWKFgyY2/8FifoI/CWE0kiKzXBxcuarrlMDGc7N2wWCEgT92Wk0QXG/8ivMfCzFlM0 IdLDnbVNzmNsO7cthrtQ1LHXl/xe5oDUVAI/bDWQcZi7FozOI1RWZDilVayzg/AC3Uje dTyfQrAJ01wg3NiaENtrmTKqd7+rm0+iBwsf7vLJ/pJmGzK3tawVCL72xNg7hfHXpRAt WBjYeXQIJI/VR384HHuFcg+hUsaQeIEMvHp5w/xHQNtjpqQfyO1Exmnv8izuxF2ijSbZ 90EzUrZPyMMuxILcptEeY0us3CCOZnYHjiEHXKZscHhofJtu4OP1LvIYbt+PkOevSpxD jX9A== X-Gm-Message-State: AAQBX9d7Jf/Gs7F+TzTgTSrrl7/pIJetzGA+Ah/haZzWVpzUKTkk5XtB NXjertaXzDur6tQ3LHE4aD4= X-Google-Smtp-Source: AKy350aywSM2Yek8tib02SFVlPCaQ3dquwRhr4d8IdTc3CchyeDaoKCzQPI8+t30UVkhZYIaSmNHIw== X-Received: by 2002:aa7:d1c7:0:b0:504:890a:c974 with SMTP id g7-20020aa7d1c7000000b00504890ac974mr2603289edp.39.1680984186925; Sat, 08 Apr 2023 13:03:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id t6-20020a50ab46000000b0050499afe96bsm83641edc.10.2023.04.08.13.03.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 13:03:06 -0700 (PDT) Message-ID: <2c333d3ed5a27ef1783feec1a75f67bee1cf5903.camel@gmail.com> Subject: Re: [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Sat, 08 Apr 2023 22:03:05 +0200 In-Reply-To: <87bkjyqhms.fsf@gmail.com> References: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> <87bkjyqhms.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer: > Hi, >=20 > Liliana Marie Prikler writes: >=20 > > * gnu/packages/gnome.scm (librsvg)[#:phases]: > > Also > > delete SVG files that have been broken by the recent updates. > > --- > > =C2=A0gnu/packages/gnome.scm | 7 ++++++- > > =C2=A01 file changed, 6 insertions(+), 1 deletion(-) > >=20 > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > > index 4f47e60505..e43e24dd94 100644 > > --- a/gnu/packages/gnome.scm > > +++ b/gnu/packages/gnome.scm > > @@ -3696,7 +3696,12 @@ (define-public librsvg > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (("fn > > multiple_input_files_not_allowed_for_png_output" all) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "#[ignore] " all)) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (("fn stylesheet_option_error" all) > > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (string-append "#[ignore] " all))))) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (string-append "#[ignore] " all))) > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 ;; XXX: re-enable when updating this package > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (with-directory-excursion "tests/fixtures/reftests/" > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-component-transfer-from- > > reference-page.svg") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-morphology-from-reference- > > page.svg") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "svg1.1/text-text-03-b.svg")))) >=20 > I think a fix for this was contributed to core-updates already; it > used another approach: adjusting the expected value.=C2=A0 We should > rebase this branch on top of core-updates to get it. I'm not sure how to feel about waiting for core-updates to get through (especially given that GStreamer, the next big project is on staging, and the path to getting both merged is still very unclear from my POV). I did see the core-updates patch, though, and will try cherry-picking it. Cheers From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 09 01:03:49 2023 Received: (at 62467) by debbugs.gnu.org; 9 Apr 2023 05:03:49 +0000 Received: from localhost ([127.0.0.1]:60116 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNDR-0005st-84 for submit@debbugs.gnu.org; Sun, 09 Apr 2023 01:03:49 -0400 Received: from mail-qv1-f52.google.com ([209.85.219.52]:37879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNDO-0005sV-PI for 62467@debbugs.gnu.org; Sun, 09 Apr 2023 01:03:47 -0400 Received: by mail-qv1-f52.google.com with SMTP id l1so4832109qvv.4 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 22:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681016621; x=1683608621; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=HH84xnpxxmXSMabceU7VXJzIkeQcH0KHyFKH6peI/so=; b=H1/rSt5xr0CILvbYvi8JZHOQ2qGoDpfCimS/UUw5xPn+VTII4P1gsf9blcdzlR0n5j Wq/FPP6m7ojQSKyE5CdKjjyMbJM+MDoQMfXaaSiAB3vQltB0t5P2TDvj/gbqkmkx0isA dwRQhMrLE5LlK1jtecKf1OYeZj545/F1yEFqJvgh2huda/dgwq/g16JGn+XLBRFu/cow 1O7TBGYikUBDmwUO3K9tZmL5sbJosDIH1CjdxIebFtt8Xx4rCvrAhPhi3xsP4BNwx4M9 oUz+Z/4h6MOWIlbv8aU55CryzFsuM1xHM9n8T1ichrNTBIflZTwCRK+unxVbl7QnY/Ew WqHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681016621; x=1683608621; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HH84xnpxxmXSMabceU7VXJzIkeQcH0KHyFKH6peI/so=; b=a5CMzKYufR21cG4hse2rCNZN154sWgG73weDtk3hKUBD2DYivsfe5IPe/X62zY5+yH j+sdCzv49KP8aK6/0co2UltwNQBqeRB1y3F6WvqsWUPbc0BQ4A55PeNl4ZlzzMQwq+jh KcXikgZa5CBK0KxEQ6Rr6miOcQaQWTqxzUlq1NAtFYJwBxCDXnBuGEqUTkrT4I+CT8JK 6/nNNFQ+HcTkHkvpodvX3IPF+ICC9hCLdjBvv95eLct/Tk19mXt38pH0Aba6dpkSWvJL t14Me5k1jsarcqSpg0ky3Nut7ZlBdeycJPQH1uiUqps32hDmgalAnIP6LGSes4hFV/+R 7L9Q== X-Gm-Message-State: AAQBX9fApWZcoKkHqah4hmVEeUOF4WZNCXivfpTdRX/+oUwndM1U/IaT CZkAjoQOCjbLcOHObIav4neJ3d/jZhw= X-Google-Smtp-Source: AKy350aFYxed4TDqj5w8Vfdu6pyTh2E8QXn4QHKMzQ4+dsQf1hfITcUKbQ96lpUu6s17Hk9bgbGSLw== X-Received: by 2002:ad4:5aef:0:b0:5e9:952f:4ec7 with SMTP id c15-20020ad45aef000000b005e9952f4ec7mr6862833qvh.35.1681016621066; Sat, 08 Apr 2023 22:03:41 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id ob9-20020a0562142f8900b005e1e999edcasm2546169qvb.42.2023.04.08.22.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 22:03:40 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1. References: <87edourwq7.fsf@gmail.com> <9eddedcd289dcaaa6c16562daabaaab752582562.camel@gmail.com> Date: Sun, 09 Apr 2023 01:03:39 -0400 In-Reply-To: <9eddedcd289dcaaa6c16562daabaaab752582562.camel@gmail.com> (Liliana Marie Prikler's message of "Sat, 08 Apr 2023 21:54:48 +0200") Message-ID: <87h6tpprys.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) SGksDQoNCkxpbGlhbmEgTWFyaWUgUHJpa2xlciA8bGlsaWFuYS5wcmlrbGVyQGdtYWlsLmNvbT4g d3JpdGVzOg0KDQo+IEFtIFNhbXN0YWcsIGRlbSAwOC4wNC4yMDIzIHVtIDE1OjM3IC0wNDAwIHNj aHJpZWIgTWF4aW0gQ291cm5veWVyOg0KPj4gSGkhDQo+PiANCj4+IExpbGlhbmEgTWFyaWUgUHJp a2xlciA8bGlsaWFuYS5wcmlrbGVyQGdtYWlsLmNvbT4gd3JpdGVzOg0KPj4gDQo+PiA+ICogZ251 L3BhY2thZ2VzL2dsaWIuc2NtIChnbGliKTogVXBkYXRlIHRvIDIuNzYuMS4NCj4+ID4gW3NvdXJj ZV08c25pcHBldD46IEFkanVzdCBhY2NvcmRpbmdseS4NCj4+ID4gW2FyZ3VtZW50c108IzpwaGFz ZXM+OiBBZGQg4oCYc2V0LUdfVEVTVF9TUkNESVLigJkuwqAgVXBkYXRlIOKAmGRlbGV0ZS0NCj4+ ID4gZmFpbGluZy10ZXN0c+KAmS4NCj4+ID4gW3Byb3BhZ2F0ZWQtaW5wdXRzXTogUmVwbGFjZSBw Y3JlIHdpdGggcGNyZTIuDQo+PiA+IChnbGliLXdpdGgtZG9jdW1lbnRhdGlvbik6IEluaGVyaXQg ZnJvbSBnbGliLg0KPj4gPiAqIGdudS9wYWNrYWdlcy9nbm9tZS5zY20gKHN5c3Byb2YsIGd0cmFu c2xhdG9yKTogVXNlIGdsaWIuDQo+PiA+ICogZ251L3BhY2thZ2VzL2d0ay5zY20gKGd0a3NvdXJj ZXZpZXcpOiBVc2UgZ2xpYi4NCj4+ID4gKiBnbnUvcGFja2FnZXMvZ3VpbGUteHl6LnNjbSAoZ3Vp bGUtZy1nb2xmKTogVXNlIGdsaWIuDQo+PiA+ICogZ251L3BhY2thZ2VzL3BhdGNoZXMvZ2xpYi1z a2lwLWZhaWxpbmctdGVzdC5wYXRjaDogQWRqdXN0DQo+PiA+IGFjY29yZGluZ2x5Lg0KPj4gPiAt LS0NCj4+ID4gwqBnbnUvcGFja2FnZXMvZ2xpYi5zY23CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgfCA5MiArKysrKy0tLS0tLS0tLS0NCj4+ID4gLS0tLQ0K Pj4gPiDCoGdudS9wYWNrYWdlcy9nbm9tZS5zY23CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgIHzCoCA4ICstDQo+PiA+IMKgZ251L3BhY2thZ2VzL2d0ay5zY23C oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCB8wqAgMiAr LQ0KPj4gPiDCoGdudS9wYWNrYWdlcy9ndWlsZS14eXouc2NtwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgfMKgIDIgKy0NCj4+ID4gwqAuLi4vcGF0Y2hlcy9nbGliLXNraXAt ZmFpbGluZy10ZXN0LnBhdGNowqDCoMKgwqDCoCB8wqAgMyArLQ0KPj4gPiDCoDUgZmlsZXMgY2hh bmdlZCwgMzAgaW5zZXJ0aW9ucygrKSwgNzcgZGVsZXRpb25zKC0pDQo+PiA+IA0KPj4gPiBkaWZm IC0tZ2l0IGEvZ251L3BhY2thZ2VzL2dsaWIuc2NtIGIvZ251L3BhY2thZ2VzL2dsaWIuc2NtDQo+ PiA+IGluZGV4IGY4NWQ1ZTMyMjUuLmVjZjVjYjQ5MWYgMTAwNjQ0DQo+PiA+IC0tLSBhL2dudS9w YWNrYWdlcy9nbGliLnNjbQ0KPj4gPiArKysgYi9nbnUvcGFja2FnZXMvZ2xpYi5zY20NCj4+ID4g QEAgLTIxNSw3ICsyMTUsNyBAQCAoZGVmaW5lLXB1YmxpYyBkYnVzLXZlcmJvc2UNCj4+ID4gwqAo ZGVmaW5lIGdsaWINCj4+ID4gwqDCoCAocGFja2FnZQ0KPj4gPiDCoMKgwqDCoCAobmFtZSAiZ2xp YiIpDQo+PiA+IC3CoMKgwqAgKHZlcnNpb24gIjIuNzAuMiIpDQo+PiA+ICvCoMKgwqAgKHZlcnNp b24gIjIuNzYuMSIpDQo+PiA+IMKgwqDCoMKgIChzb3VyY2UNCj4+ID4gwqDCoMKgwqDCoCAob3Jp Z2luDQo+PiA+IMKgwqDCoMKgwqDCoMKgIChtZXRob2QgdXJsLWZldGNoKQ0KPj4gPiBAQCAtMjI0 LDE0ICsyMjQsMTQgQEAgKGRlZmluZSBnbGliDQo+PiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgbmFtZSAiLyIgKHN0cmluZy10YWtlIHZlcnNpb24gNCkg Ii8iDQo+PiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg bmFtZSAiLSIgdmVyc2lvbiAiLnRhci54eiIpKQ0KPj4gPiDCoMKgwqDCoMKgwqDCoCAoc2hhMjU2 DQo+PiA+IC3CoMKgwqDCoMKgwqDCoCAoYmFzZTMyDQo+PiA+ICIwdncwOHA0amxsYXZwOXFtbHFn MXlsMXphbm15NTN5aWQ0NndpcGFzNmdmZGhuZjRhbDg1IikpDQo+PiA+ICvCoMKgwqDCoMKgwqDC oCAoYmFzZTMyDQo+PiA+ICIxN3gxenByMmF2ajhoamJwYzZocDJzZjI4ODVseGFjNDZ2MGthanNn YW4zOTI5bTB6cDIzIikpDQo+PiA+IMKgwqDCoMKgwqDCoMKgIChwYXRjaGVzDQo+PiA+IMKgwqDC oMKgwqDCoMKgwqAgKHNlYXJjaC1wYXRjaGVzICJnbGliLWFwcGluZm8td2F0Y2gucGF0Y2giDQo+ PiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiZ2xp Yi1za2lwLWZhaWxpbmctdGVzdC5wYXRjaCIpKQ0KPj4gPiDCoMKgwqDCoMKgwqDCoCAobW9kdWxl cyAnKChndWl4IGJ1aWxkIHV0aWxzKSkpDQo+PiA+IMKgwqDCoMKgwqDCoMKgIChzbmlwcGV0DQo+ PiA+IMKgwqDCoMKgwqDCoMKgwqAgJyhiZWdpbg0KPj4gPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqAg KHN1YnN0aXR1dGUqICJ0ZXN0cy9zcGF3bi10ZXN0LmMiDQo+PiA+ICvCoMKgwqDCoMKgwqDCoMKg wqDCoCAoc3Vic3RpdHV0ZSogImdsaWIvdGVzdHMvc3Bhd24tdGVzdC5jIg0KPj4gPiDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoCAoKCIvYmluL3NoIikgInNoIikpKSkpKQ0KPj4gPiDCoMKgwqDC oCAoYnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkNCj4+ID4gwqDCoMKgwqAgKG91dHB1 dHMgJygib3V0IsKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIDtsaWJyYXJp ZXMsIGxvY2FsZXMsIGV0Yw0KPj4gPiBAQCAtMjU2LDYgKzI1Niw5IEBAIChkZWZpbmUgZ2xpYg0K Pj4gPiDCoMKgwqDCoMKgwqDCoCAjOnBoYXNlcw0KPj4gPiDCoMKgwqDCoMKgwqDCoCAobW9kaWZ5 LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzDQo+PiA+IMKgwqDCoMKgwqDCoMKgwqDCoCA7OyBOZWVk ZWQgdG8gcGFzcyB0aGUgdGVzdCBwaGFzZSBvbiBzbG93ZXIgQVJNIGFuZCBpNjg2DQo+PiA+IG1h Y2hpbmVzLg0KPj4gPiArwqDCoMKgwqDCoMKgwqDCoCAoYWRkLWFmdGVyICd1bnBhY2sgJ3NldC1H X1RFU1RfU1JDRElSDQo+PiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoCAobGFtYmRhIF8NCj4+ID4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAoc2V0ZW52ICJHX1RFU1RfU1JDRElSIiAoc3RyaW5n LWFwcGVuZCAoZ2V0Y3dkKQ0KPj4gPiAiL2dpby90ZXN0cyIpKSkpDQo+PiA+IMKgwqDCoMKgwqDC oMKgwqDCoCAoYWRkLWFmdGVyICd1bnBhY2sgJ2luY3JlYXNlLXRlc3QtdGltZW91dA0KPj4gPiDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgIChsYW1iZGEgXw0KPj4gPiDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAoc3Vic3RpdHV0ZSogIm1lc29uLmJ1aWxkIg0KPj4gPiBAQCAtMjcwLDkgKzI3Mywx OSBAQCAoZGVmaW5lIGdsaWINCj4+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChz dWJzdGl0dXRlKiAnKCJ1bml4LmMiICJ1dGlscy5jIikNCj4+ID4gwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoCAoKCJbIFx0XSpnX3Rlc3RfYWRkX2Z1bmMuKjsiKSAiIikpKQ0KPj4g PiDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAod2l0aC1kaXJlY3RvcnktZXhjdXJzaW9uICJn aW8vdGVzdHMiDQo+PiA+IC3CoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRl KiAnKCJjb250ZW50dHlwZS5jIiAiZ2RidXMtYWRkcmVzcy1nZXQtDQo+PiA+IHNlc3Npb24uYyIN Cj4+ID4gLcKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgImdkYnVzLXBlZXIuYyIgImFwcGluZm8uYyIgImRlc2t0b3AtDQo+PiA+IGFwcC1p bmZvLmMiKQ0KPj4gPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKCgiWyBcdF0q Z190ZXN0X2FkZF9mdW5jLio7IikgIiIpKSkNCj4+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqAgKHN1YnN0aXR1dGUqICcoImNvbnRlbnR0eXBlLmMiDQo+PiA+ICvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJnZGJ1cy1hZGRy ZXNzLWdldC1zZXNzaW9uLmMiDQo+PiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICJnZGJ1cy1zZXJ2ZXItYXV0aC5jIg0KPj4gPiAr wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oCAiZ2RidXMtcGVlci5jIg0KPj4gPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiYXBwaW5mby5jIg0KPj4gPiArwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiZGVza3RvcC1h cHAtaW5mby5jIikNCj4+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIlsg XHRdKmdfdGVzdF9hZGRfZnVuYy4qOyIpICIiKSkNCj4+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqAgKHVubGVzcyAod2hpY2ggInVwZGF0ZS1kZXNrdG9wLWRhdGFiYXNlIikNCj4+ID4g K8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgIChzdWJzdGl0dXRlKiAnKCJmaWxlLmMi KQ0KPj4gDQo+PiBmaWxlLmMgZG9lc24ndCBuZWVkIHRvIGJlIGluIGEgbGlzdC4NCj4gTmljZSBj YXRjaC4NCj4NCj4+ID4gK8KgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgICgoIlsgXHRd KmdfdGVzdF9hZGRfZnVuYy4qcXVlcnktZGVmYXVsdC0NCj4+ID4gaGFuZGxlci4qOyIpICIiKSkp DQo+PiANCj4+IFRoZSBpbmRlbnRhdGlvbiBzZWVtcyBvZmYgaGVyZS7CoCBJcyBpdCByZWFsbHkg bmVjZXNzYXJ5IHRvIHVzZSB0aGUNCj4+IHVubGVzcyBjb25kaXRpb25hbCBoZXJlP8KgIEknZCBw ZXJoYXBzIHNpbXBseSBkaXNhYmxlIHRoZSB0ZXN0DQo+PiBnZW5lcmFsbHkuDQo+IEknZCBsaWtl IHRvIGxldCBpdCBydW4gd2hlbiB0aGUgaW5wdXQgZXhpc3RzLCBidXQgdGhhdCdzIGEgY2lyY2xl LiANCj4gV2UnZCBoYXZlIHRvIGNoZWNrIGl0IGluIGdsaWItd2l0aC1kb2N1bWVudGF0aW9uLg0K DQpJIHNlZS4gIExHVE0gdGhlbi4NCg0KLS0gDQpUaGFua3MsDQpNYXhpbQ0K From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 09 01:04:27 2023 Received: (at 62467) by debbugs.gnu.org; 9 Apr 2023 05:04:27 +0000 Received: from localhost ([127.0.0.1]:60125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNE3-0005uF-2V for submit@debbugs.gnu.org; Sun, 09 Apr 2023 01:04:27 -0400 Received: from mail-qt1-f177.google.com ([209.85.160.177]:45819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNE1-0005u3-99 for 62467@debbugs.gnu.org; Sun, 09 Apr 2023 01:04:25 -0400 Received: by mail-qt1-f177.google.com with SMTP id g12so1935315qtj.12 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 22:04:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681016659; x=1683608659; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=SyEMc9wkkhAwTGqzBXDley/vWp4dAmRHu8tgZE6jTWk=; b=mzWGYl/ubApx1Qy94zGtDl5RxEyeXV5wV5gMhNZz3RGjAe5O8KZ9sC2IJ9YXYFxi9W cKUTzXwB8j+sgQOoI8upS0VOg2rq0Ass6iRqMuiw/1CnQH/ysvLJyqPvYkDBUIPPYhoF H/ZLpmAmZEKX2hGnx9DAYAB48NJPPyLqAI4b+CoYyVKHvz/b9fxoj2LWRoTqpIw768Cn NuT2n3cAnUVfDpTJKWRKlIzOmAMX1u615ufM27S6oDNTVwkVucatJEepVxqZyKgsQLgY 18wsmJYPJcWQjexl+OIA7BuVB+LxUbAe0s7s3a3kOoGxEMymbSzM/vOC+KSr6fw/OHAV SQMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681016659; x=1683608659; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SyEMc9wkkhAwTGqzBXDley/vWp4dAmRHu8tgZE6jTWk=; b=rn6hJRUVzjSt4S/OF/a1IXnippEU5+JQZXaH6FfQkLoXlI0eMosLSX4lhTiqKxapCx 1k5gyJOq4XGhQu5bt9IEZD1h8/kEMQYApGj0wOQTteTxV5ld8FUXtM3JZsjwkYw85W4G Omjv4j7Oi18T16In8g9l9HsEEH/0FSWjsKuXk6LeIBeuBoT8rzJ41pN9Toar2++N9ikc bk3AHMOiW48fI47+ZVXoiBwdro3Ty3VROXMKgo0MFsfPT1VZnxfXdnkbsxodqssn5Qcx YJJYc4gP6v79ccudrYvETHL4B8Qieuhzb1wttGtLfuTA9iUJkQ+T/S7GpmBBiDfGFon5 q3Eg== X-Gm-Message-State: AAQBX9dM+9rSMDw8KWUVdHSFTA8P1HQPCDDqRJHw2Gi2u/JJaJ/i7Z3v JPx3vdjJvq7+sf47m5cpeav0dzt1ysY= X-Google-Smtp-Source: AKy350aCLaj/gyygujev9raQnuv1AYA+go6miuIvxkvvlEth+17A2ZCqgQ7cIk5qpHX3cu3DpSoqXg== X-Received: by 2002:ac8:5c47:0:b0:3e4:e8de:b241 with SMTP id j7-20020ac85c47000000b003e4e8deb241mr11328028qtj.31.1681016659511; Sat, 08 Apr 2023 22:04:19 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id y7-20020ac85247000000b003c034837d8fsm2239735qtn.33.2023.04.08.22.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 22:04:19 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3. References: <87sfdaqhxw.fsf@gmail.com> <7e7567f08a7c880cd86a48c963ecb2ca0eacdadc.camel@gmail.com> Date: Sun, 09 Apr 2023 01:04:18 -0400 In-Reply-To: <7e7567f08a7c880cd86a48c963ecb2ca0eacdadc.camel@gmail.com> (Liliana Marie Prikler's message of "Sat, 08 Apr 2023 21:56:45 +0200") Message-ID: <87cz4dprxp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Liliana Marie Prikler writes: > Am Samstag, dem 08.04.2023 um 15:42 -0400 schrieb Maxim Cournoyer: >> Hi, >>=20 >> Liliana Marie Prikler writes: >>=20 >> > * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. >> > --- >> > =C2=A0gnu/packages/gnome.scm | 4 ++-- >> > =C2=A01 file changed, 2 insertions(+), 2 deletions(-) >> >=20 >> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm >> > index 90e33d72b6..4f47e60505 100644 >> > --- a/gnu/packages/gnome.scm >> > +++ b/gnu/packages/gnome.scm >> > @@ -5263,7 +5263,7 @@ (define-public libsoup-minimal >> > =C2=A0;;; An older variant kept to build the 'rest' package. >> > =C2=A0(define-public libsoup-minimal-2 >> > =C2=A0=C2=A0 (package/inherit libsoup-minimal >> > -=C2=A0=C2=A0=C2=A0 (version "2.72.0") >> > +=C2=A0=C2=A0=C2=A0 (version "2.74.3") >> > =C2=A0=C2=A0=C2=A0=C2=A0 (source (origin >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (method url-fetch) >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (uri (string-append >> > "mirror://gnome/sources/libsoup/" >> > @@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2 >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 "libsoup-" ver= sion ".tar.xz")) >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (sha256 >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (base32 >> > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 >> > "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p")))) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 >> > "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) >> > =C2=A0=C2=A0=C2=A0=C2=A0 (arguments >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (substitute-keyword-arguments (package-= arguments libsoup- >> > minimal) >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ((#:phases phases) >>=20 >> LGTM.=C2=A0 Hopefully we can get rid of the libsoup-2 stuff after we've >> updated all of GNOME to 43 (which had a hard requirement to not rely >> on libsoup@2). > Well, the goal is to move to 44 directly, but aren't there non-GNOME > packages out there running libsoup-2 just like there's stuff still > running GTK 2? Perhaps! But at least we'll hopefully get a single webkitgtk soonish, eh! --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 09 01:06:27 2023 Received: (at 62467) by debbugs.gnu.org; 9 Apr 2023 05:06:27 +0000 Received: from localhost ([127.0.0.1]:60129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNFy-0005xI-Ib for submit@debbugs.gnu.org; Sun, 09 Apr 2023 01:06:26 -0400 Received: from mail-qv1-f47.google.com ([209.85.219.47]:38822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNFw-0005x5-Qv for 62467@debbugs.gnu.org; Sun, 09 Apr 2023 01:06:25 -0400 Received: by mail-qv1-f47.google.com with SMTP id ly9so4921653qvb.5 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 22:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681016779; x=1683608779; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=Jx+a8NKojC+F8pgRg2XJuATBYPsyOuyfALDoleow204=; b=gZGxkgTKm9LvbTuS6DiWE3NY9cXBNuG/hbkl1zFANwFLnbtQbgCK/z5Nis3W8vNZwg MdpdbxJuTLWfsPVo286qCgDN2PoTrCJ+MLYfswb/gbIhtkCj92BEaJQruDlrvQRJiwze 4YL+2W0ZGIKtls33QuUvY+xrxP81vPbhJissusLVskwv0KWo7c9WbZuvE3QxAzXkOC8m yJREGLz4MwpRXgxycDezZLv1VJ6St5+ErgpTevRgszWXOhpkuRQr51Ejp61QWLpuFQpr Q96mGn+n7BkTC43Y7Odfrdah/1233IAny7+Gc5SLh4fwetmoxwgW7qVU8r68SmFFafH8 x3OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681016779; x=1683608779; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Jx+a8NKojC+F8pgRg2XJuATBYPsyOuyfALDoleow204=; b=t5qxiMUyQYoxm7xXhLR29LOj6+JJZAYTBv+kbCaTsssTCte8gRJHN1CHjKNN8szYLF rEEZsI7+tS3CCCgsSZOmb7IZ3sMh2Xj88FeCY4R8jhhdcQIQ2RGt5bigi1t8s/Zzih38 3JkFtJ4jsDZvGDsUPQztwetG4zxT5XJNpvte3nlg6CQheTXETuICOFPi0SN0XkE8lJeZ EcttXyHm1MUU27ozn2reHjqD8nwnLxOjeDL84anKLdwLZHzzeGijuWfVEx6y6QJ20pf5 /EKLd9wHA/KAFgcR6woPQhpgrbFpXDnq1ygDaU6zI4dQalSllGGoo3Xw7+iFyC/+lEb2 c19g== X-Gm-Message-State: AAQBX9cJblwYV62+rRGLxxf1W1bMMSBgwfxAPZ3qsiZySxpsF/HB0mb/ ISsrmXVnCD73RMw571ZKGP2D9UGaei8= X-Google-Smtp-Source: AKy350aPfpA5Kt9SiNXwy4R51gKmD3LCYSr8T8qco45Sex4BzeOhDS+4CrJr1PB/L1j1bp16A5S9dw== X-Received: by 2002:a05:6214:2b0c:b0:5a9:c0a1:d320 with SMTP id jx12-20020a0562142b0c00b005a9c0a1d320mr7737214qvb.43.1681016779423; Sat, 08 Apr 2023 22:06:19 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id k16-20020a05621414f000b005dd8b93457asm2550690qvw.18.2023.04.08.22.06.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 22:06:19 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store. References: <09b3598cb0fb0acd211dd59fc10686188b941d8e.camel@gmail.com> <87fs9aqhqc.fsf@gmail.com> Date: Sun, 09 Apr 2023 01:06:18 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Sat, 08 Apr 2023 22:00:14 +0200") Message-ID: <878rf1prud.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) SGkgTGlsaWFuYSwNCg0KTGlsaWFuYSBNYXJpZSBQcmlrbGVyIDxsaWxpYW5hLnByaWtsZXJAZ21h aWwuY29tPiB3cml0ZXM6DQoNCj4gQW0gU2Ftc3RhZywgZGVtIDA4LjA0LjIwMjMgdW0gMTU6NDcg LTA0MDAgc2NocmllYiBNYXhpbSBDb3Vybm95ZXI6DQo+PiBIaSwNCj4+IA0KPj4gTGlsaWFuYSBN YXJpZSBQcmlrbGVyIDxsaWxpYW5hLnByaWtsZXJAZ21haWwuY29tPiB3cml0ZXM6DQo+PiANCj4+ ID4gKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9ndGsyLWhhcmRlbi1saXN0LXN0b3JlLnBhdGNoOiBO ZXcgZmlsZS4NCj4+ID4gKiBnbnUvcGFja2FnZXMvZ3RrLnNjbSAoZ3RrKy0yKVtwYXRjaGVzXTog QWRkIGl0IGhlcmUuDQo+PiA+ICogZ251L2xvY2FsLm1rIChkaXN0X3BhdGNoX0RBVEEpOiBSZWdp c3RlciBpdCBoZXJlLg0KPj4gPiAtLS0NCj4+ID4gwqBnbnUvbG9jYWwubWvCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgfMKg IDEgKw0KPj4gPiDCoGdudS9wYWNrYWdlcy9ndGsuc2NtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgfMKgIDEgKw0KPj4gPiDCoC4uLi9wYXRjaGVzL2d0 azItaGFyZGVuLWxpc3Qtc3RvcmUucGF0Y2jCoMKgwqDCoMKgIHwgNDINCj4+ID4gKysrKysrKysr KysrKysrKysrKw0KPj4gPiDCoDMgZmlsZXMgY2hhbmdlZCwgNDQgaW5zZXJ0aW9ucygrKQ0KPj4g PiDCoGNyZWF0ZSBtb2RlIDEwMDY0NCBnbnUvcGFja2FnZXMvcGF0Y2hlcy9ndGsyLWhhcmRlbi1s aXN0LQ0KPj4gPiBzdG9yZS5wYXRjaA0KPj4gPiANCj4+ID4gZGlmZiAtLWdpdCBhL2dudS9sb2Nh bC5tayBiL2dudS9sb2NhbC5taw0KPj4gPiBpbmRleCAzZTk0MjgxY2NmLi4zMTQ1NmM1YmU4IDEw MDY0NA0KPj4gPiAtLS0gYS9nbnUvbG9jYWwubWsNCj4+ID4gKysrIGIvZ251L2xvY2FsLm1rDQo+ PiA+IEBAIC0xMzAzLDYgKzEzMDMsNyBAQCBkaXN0X3BhdGNoX0RBVEENCj4+ID4gPcKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqBcDQo+PiA+IMKgwqAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ3VpbGUt cnN2Zy1wa2djb25maWcucGF0Y2jCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgXA0KPj4gPiDC oMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2d1aWxlLWVtYWNzLWZpeC1jb25maWd1cmUucGF0Y2jC oMKgwqDCoMKgwqDCoMKgwqBcDQo+PiA+IMKgwqAgJUQlL3BhY2thZ2VzL3BhdGNoZXMvZ3RrMi1m aXgtYnVpbGRlci10ZXN0LnBhdGNowqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBcDQo+PiA+ICvC oCAlRCUvcGFja2FnZXMvcGF0Y2hlcy9ndGsyLWhhcmRlbi1saXN0LXN0b3JlLnBhdGNowqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgXA0KPj4gPiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2d0azIt cmVzcGVjdC1HVUlYX0dUSzJfUEFUSC5wYXRjaMKgwqDCoMKgwqDCoMKgXA0KPj4gPiDCoMKgICVE JS9wYWNrYWdlcy9wYXRjaGVzL2d0azItcmVzcGVjdC1HVUlYX0dUSzJfSU1fTU9EVUxFX0ZJTEUu cGF0Y2gNCj4+ID4gXA0KPj4gPiDCoMKgICVEJS9wYWNrYWdlcy9wYXRjaGVzL2d0azItdGhlbWUt cGF0aHMucGF0Y2jCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqBcDQo+PiA+IGRp ZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvZ3RrLnNjbSBiL2dudS9wYWNrYWdlcy9ndGsuc2NtDQo+ PiA+IGluZGV4IGM3NTZmMzllMjQuLjE5NmQ3NjcxNjAgMTAwNjQ0DQo+PiA+IC0tLSBhL2dudS9w YWNrYWdlcy9ndGsuc2NtDQo+PiA+ICsrKyBiL2dudS9wYWNrYWdlcy9ndGsuc2NtDQo+PiA+IEBA IC0xMDE0LDYgKzEwMTQsNyBAQCAoZGVmaW5lLXB1YmxpYyBndGsrLTINCj4+ID4gwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqANCj4+ID4gIjFubjZra3Mxenl2YjV4aWtyOXkyazdyOWJ3 ankxZzRiMG0wczY2NTMyYmNseW1id2ZhbWMiKSkNCj4+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAocGF0Y2hlcyAoc2VhcmNoLXBhdGNoZXMgImd0azItcmVzcGVjdC0NCj4+ID4gR1VJ WF9HVEsyX1BBVEgucGF0Y2giDQo+PiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCAiZ3RrMi1yZXNw ZWN0LQ0KPj4gPiBHVUlYX0dUSzJfSU1fTU9EVUxFX0ZJTEUucGF0Y2giDQo+PiA+ICvCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgICJndGsyLWhhcmRlbi1saXN0LQ0KPj4gPiBzdG9yZS5wYXRjaCINCj4+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqDCoMKgICJndGsyLXRoZW1lLXBhdGhzLnBhdGNoIg0KPj4gPiDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoMKgwqAgImd0azItZml4LWJ1aWxkZXItDQo+PiA+IHRlc3QucGF0Y2giKSkp KQ0KPj4gPiDCoMKgwqDCoCAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pDQo+PiA+IGRp ZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcGF0Y2hlcy9ndGsyLWhhcmRlbi1saXN0LXN0b3JlLnBh dGNoDQo+PiA+IGIvZ251L3BhY2thZ2VzL3BhdGNoZXMvZ3RrMi1oYXJkZW4tbGlzdC1zdG9yZS5w YXRjaA0KPj4gPiBuZXcgZmlsZSBtb2RlIDEwMDY0NA0KPj4gPiBpbmRleCAwMDAwMDAwMDAwLi5i MTA3YmEyYmNjDQo+PiA+IC0tLSAvZGV2L251bGwNCj4+ID4gKysrIGIvZ251L3BhY2thZ2VzL3Bh dGNoZXMvZ3RrMi1oYXJkZW4tbGlzdC1zdG9yZS5wYXRjaA0KPj4gPiBAQCAtMCwwICsxLDQyIEBA DQo+PiA+ICtNaW1pYyB0aGUgaW1wbGVtZW5ldGF0aW9uIGluIGd0aystMy4NCj4+IA0KPj4gVHlw bzogaW1wbGVtZW50YXRpb24uDQo+IE5pY2UgY2F0Y2guDQo+DQo+PiBJJ2QgbGlrZSB0byBzZWUg YSBiaXQgbW9yZSBtZXRhZGF0YSBpbiB0aGlzIHBhdGNoOyBpcyBpdCBvcmlnaW5hbA0KPj4gd29y aywgb3Igd2FzIGl0IHJldHJpZXZlZCBmcm9tIGFub3RoZXIgZGlzdHJpYnV0aW9uIHN1Y2ggYXMg RGViaWFuP8KgDQo+PiBJdCBwcm9iYWJseSBleGlzdHMgZWxzZXdoZXJlLCBpZiBHVEsyIGNhbid0 IGJlIGJ1aWx0IGFueW1vcmUNCj4+IG90aGVyd2lzZT8NCj4gSSBsb29rZWQgYXJvdW5kIGluIHRo ZSBHVEsgMyBzb3VyY2UgdHJlZSBnaXZlbiB0aGF0IHRoYXQgcGFja2FnZSBidWlsdCwNCj4gYnV0 IEdUSyAyIGRpZG4ndCwgdGhlbiB0cmllZCB0byBjb3B5IHRoZSBmaWxlIGFzLWlzLCBmYWlsZWQs IHRoZW4NCj4gY29waWVkIGp1c3QgdGhlc2UgcmVsZXZhbnQgYml0cy4gIEkgaGF2ZW4ndCBsb29r ZWQgYXQgcHJpb3IgYXJ0IGluDQo+IG90aGVyIGRpc3Ryb3MuDQo+DQo+PiBEb2VzIHVwc3RyZWFt IHN0aWxsIG1haW50YWluIEdUSzIsIG9yIGlzIGl0IGNvbXBsZXRlbHkgYWJhbmRvbmVkPw0KPiBB cyBmYXIgYXMgSSBjYW4gc2VlLCB3ZSdyZSBydW5uaW5nIHRoZSBsYXRlc3QgdmVyc2lvbi4NCg0K T0shICBQZXJoYXBzIHN0cmVzcyB0aGUgcG9pbnQgbW9yZSB0aGF0IHRoaXMgaXMgYmFja3BvcnRl ZCBmcm9tIEdUSyAzIGluDQp0aGUgcGF0Y2ggbWV0YWRhdGEgKHRvcCBjb21tZW50KS4NCg0KTEdU TSB3aXRoIHRoaXMuDQoNCi0tIA0KVGhhbmtzLA0KTWF4aW0NCg== From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 09 01:08:07 2023 Received: (at 62467) by debbugs.gnu.org; 9 Apr 2023 05:08:07 +0000 Received: from localhost ([127.0.0.1]:60133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNHb-00066S-4N for submit@debbugs.gnu.org; Sun, 09 Apr 2023 01:08:07 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:39835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plNHZ-00065u-Je for 62467@debbugs.gnu.org; Sun, 09 Apr 2023 01:08:05 -0400 Received: by mail-qt1-f171.google.com with SMTP id gb12so1986552qtb.6 for <62467@debbugs.gnu.org>; Sat, 08 Apr 2023 22:08:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681016880; x=1683608880; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=/9hxQgoazh9O9XRAl/my1/2/UwYZic8dYKM6val5l3U=; b=Xm4OS+JDX1NFSbmenrLk9VoA55m/y56uIFaYP9or8Qv3JLIMWeKb2NUPLYat78+r4h bcUQr/CuoIICo33MS2gEF9PWrZNbvLSzrKzOAAuBJ4MmbNYx36L6a6ju210bCv2zU/m9 sEDOAqv0RVNT/3avt1hHjnwM1eUwdwDsTnhqsH4ZO7yYh6ni7OzDEExOObGsXlrkkJ7Q AWAD33wYAqi8VaoDpYj/eCtBRRGB2N3BPf5dTD+NQc/cwznUWsxHpEoCKIroLgbb/3io 3YK9X9zeMhClasnehqvXc4zp3vzGtNi4Qtl1BkwCtLwwR7l1Qb/4ZPtdGh3APDSvW7eG rCww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681016880; x=1683608880; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/9hxQgoazh9O9XRAl/my1/2/UwYZic8dYKM6val5l3U=; b=fYsR0X4yCneFy5zTd+S1Hn1Jiohq8hglYzrocb2cjTbpFMPY9fdc3KDV6BqfSvSaHx kE0gDVWxna+NxjTLhnMTz+gXUaz7ZTJD02vc0p/j7Tt22Xos+D/XOhoBU46jUjobk16V 5GNmAGcaj3THYQXCIKqB7CyI4hF3mlOdJL0LmQbyOrc2BsQOEaiQwVSy22Z9iLHD2+5X MZSAxUoDH5UX6HL8eWiblHRgSixH5lsKKAy9OBX9FfX9KvBkqWobtYC8adoa5VLr922O BpKEtujuOXVsa9NrgW2XCjAXboSvJWP10GD9458O51GxEVaVPLaxDNOWV2VhZQWXH5N+ lY5g== X-Gm-Message-State: AAQBX9es0PCBddKfUlNCwAPsrh6xBD90Mot7M5jIQxoA4a8pAJ529SHN kLkuzfKtT6WBIcJoqB2hkqg= X-Google-Smtp-Source: AKy350bz0bov44c/K1icCZ+BMWuIRaQT649qid92eZiXTpsoi9J/IpiKoFvCziGeO9YKecR6PMqBcw== X-Received: by 2002:ac8:5c47:0:b0:3e4:e8de:b241 with SMTP id j7-20020ac85c47000000b003e4e8deb241mr11335463qtj.31.1681016880158; Sat, 08 Apr 2023 22:08:00 -0700 (PDT) Received: from hurd (dsl-205-233-125-210.b2b2c.ca. [205.233.125.210]) by smtp.gmail.com with ESMTPSA id g19-20020ac870d3000000b003e4c6b2cc35sm2231792qtp.24.2023.04.08.22.07.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Apr 2023 22:07:59 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build. References: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> <87bkjyqhms.fsf@gmail.com> <2c333d3ed5a27ef1783feec1a75f67bee1cf5903.camel@gmail.com> Date: Sun, 09 Apr 2023 01:07:58 -0400 In-Reply-To: <2c333d3ed5a27ef1783feec1a75f67bee1cf5903.camel@gmail.com> (Liliana Marie Prikler's message of "Sat, 08 Apr 2023 22:03:05 +0200") Message-ID: <874jppprrl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi Liliana, Liliana Marie Prikler writes: > Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer: >> Hi, >>=20 >> Liliana Marie Prikler writes: >>=20 >> > * gnu/packages/gnome.scm (librsvg)[#:phases]: >> > Also >> > delete SVG files that have been broken by the recent updates. >> > --- >> > =C2=A0gnu/packages/gnome.scm | 7 ++++++- >> > =C2=A01 file changed, 6 insertions(+), 1 deletion(-) >> >=20 >> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm >> > index 4f47e60505..e43e24dd94 100644 >> > --- a/gnu/packages/gnome.scm >> > +++ b/gnu/packages/gnome.scm >> > @@ -3696,7 +3696,12 @@ (define-public librsvg >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (("fn >> > multiple_input_files_not_allowed_for_png_output" all) >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 (string-append "#[ignore] " all)) >> > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (("fn stylesheet_option_error" all) >> > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (string-append "#[ignore] " all))))) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 (string-append "#[ignore] " all))) >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 ;; XXX: re-enable when updating this package >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (with-directory-excursion "tests/fixtures/reftests/" >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-component-transfer-from- >> > reference-page.svg") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-morphology-from-reference- >> > page.svg") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "svg1.1/text-text-03-b.svg")))) >>=20 >> I think a fix for this was contributed to core-updates already; it >> used another approach: adjusting the expected value.=C2=A0 We should >> rebase this branch on top of core-updates to get it. > I'm not sure how to feel about waiting for core-updates to get through > (especially given that GStreamer, the next big project is on staging, > and the path to getting both merged is still very unclear from my POV). > I did see the core-updates patch, though, and will try cherry-picking > it. Staging is at near-merge, if I can get the substitute % a bit higher and a new python-cryptography in (it fixes a CVE). --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 10 08:51:45 2023 Received: (at 62467) by debbugs.gnu.org; 10 Apr 2023 12:51:45 +0000 Received: from localhost ([127.0.0.1]:34524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plqzp-0000VC-Dg for submit@debbugs.gnu.org; Mon, 10 Apr 2023 08:51:45 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:56790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1plqzn-0000Ux-Mg for 62467@debbugs.gnu.org; Mon, 10 Apr 2023 08:51:44 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-50489b16e6aso1112895a12.1 for <62467@debbugs.gnu.org>; Mon, 10 Apr 2023 05:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681131098; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=on3Vd/6G6kLm65i4L755MvcA/0kPELVIr5mjNNN+SfQ=; b=ALBnnL/NnHiEuq2H8vcLts0dvunzgQYctpwthcS0kCmgkQHrrF+rvGNU/3umYHq9su 9rDC1U5Y+BxUBApBRL3DiNx+WAzerlibVkDMdNMHUp9aBSKHbdiT4ndIfKvFLUc3coOO 9Tf9Pq64s1o+RlNgdfGRlhayEP2FEnaJ8QcaifVK3caqQXRZ87rEKisKKljV3hRCdLBZ UpZrTZidSGyT/lMW9gKE11nflooatpkguHE/J8RSRqX6BIiQsDLsjx28/o0qSdTbGeC9 0CIgGSGpuGe7b0tzI0nEc/mDdjuclb0Ine5Sb1lHeCaWKYtnE0hvr/VW3r1GhKovwad6 yiKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681131098; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=on3Vd/6G6kLm65i4L755MvcA/0kPELVIr5mjNNN+SfQ=; b=FMobPp8yjJeHuOtOjWwrDJXgKtKXEOPCacDpDrVZSAeG+XXY1YvNAryrn536tNAHrV /C5gpnd0lVIoJA2DCCMrDYEDUlk1XjqZdtkSHnacUr7ZSZ86FUk9kkG913z/Q77NIv89 OE7lcWrszl2W+gMuk64irIudfArPVa6ovG5kZLHJ0uFEPasEgORq9fUG5P43ObcQ4MIh qSjce7+PVdlZyU7aLhHI5293qTu9Q894M8i2zImiK3ilwC9mD460aTrru9xgJW+AwHe0 UOvpVlYA63CmdNxJM28u/A4C4+u+JFDRionyyHX2NwZHFQBCEClKEtxccfqhvlrly92Q QH4g== X-Gm-Message-State: AAQBX9f/WMoCTTtGwZkgWex464Erj4yz/Otbdg2HGc88PJyWcyy2gStu gAPa6z8T8LADdAZfJBBD9YU= X-Google-Smtp-Source: AKy350ZCuRQF5KpGeGxkMGy/dnY1NywaGaYe336ISW33S0OrH881QUvnGHpqtqlYSEKWRqJn27WmHA== X-Received: by 2002:a50:fb87:0:b0:501:d532:d84e with SMTP id e7-20020a50fb87000000b00501d532d84emr8396307edq.39.1681131097606; Mon, 10 Apr 2023 05:51:37 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id i17-20020a50d751000000b004fa19f5ba99sm4835073edj.79.2023.04.10.05.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 05:51:37 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Mon, 10 Apr 2023 14:51:35 +0200 In-Reply-To: <87bkjyqhms.fsf@gmail.com> References: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> <87bkjyqhms.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer: > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (with-directory-excursion "tests/fixtures/reftests/" > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-component-transfer-from- > > reference-page.svg") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-morphology-from-reference- > > page.svg") > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "svg1.1/text-text-03-b.svg")))) >=20 > I think a fix for this was contributed to core-updates already; it > used another approach: adjusting the expected value. Looking at the core-updates patch, it appears to be targeting tests/fixtures/reftests/bugs/587721-text-transform.svg, not any of the files referenced above. Am I missing something? From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 10 21:49:27 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 01:49:27 +0000 Received: from localhost ([127.0.0.1]:36190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm38R-00055K-Dr for submit@debbugs.gnu.org; Mon, 10 Apr 2023 21:49:27 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:37776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm38Q-000556-Fx for 62467@debbugs.gnu.org; Mon, 10 Apr 2023 21:49:26 -0400 Received: by mail-qt1-f174.google.com with SMTP id l11so8988619qtj.4 for <62467@debbugs.gnu.org>; Mon, 10 Apr 2023 18:49:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681177760; x=1683769760; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=hUrxwdj8UByYXJqsGCD9HLv+GE3JSLRMgI2/TMCwZNQ=; b=PsAcNcbctzijtRHIZG2y7SK4GL/lbt/bKjEh6tjBz4KsVkoqlnze2xkv4jLvHZj4E3 2Q2jvxlwEFJ7QjZb+vMRWqDvTuBfvBpezHt7VXl0Q2MmxYQU5Bb8YcBIiV90fMCynDSA 4pCxWMDr7Woboq5XkSbI9OwodZBBPgJi8HjiAXWyh69Z2s1Mx9lMcHmAAbqXW1E8dt3k z2xdhrrWSqm0mI5xhlhH4tming1iQt4Fnv+3GVKYyuSE/0g/ajm8MZC7Qc7cXxi+oI9M lUamvXblgD+upial2/ZatJvwAdK3Rb0Xu48lqX6HILkpis22xpEuYhD1SOft4uq9WLln aaXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681177760; x=1683769760; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=hUrxwdj8UByYXJqsGCD9HLv+GE3JSLRMgI2/TMCwZNQ=; b=xkKEmxalCKn3OORt39oaeSI6fQfY+GHsvRuJ3a8Q2q4Nfy18+k7y2mxjOzpE85JuQN CpbkV1Pammd8GNa4iGhqc3rVM2cWY7r0+ijBdNHbBy+LK48zagjYdpS6jLEizz5JGzjD s3bHZ1ov1bklcRilXjfaG3AhluDg2ErujPkN4Qo8DgXwKDn+PZKvgLnEZ6442qzy2c8Z ac3FdW5NXx4F3ZNfh5vLikSDIYTIargRYLlgmhOBEBKP69cRxHIQwztGrI668pElWy3P JFWRi3XGONHHKETSrJjK6kO6MpDU+XpJcqUA5pJP3hMT6BuqBdvHDwCjSWFYXqdmvhGk Rk4w== X-Gm-Message-State: AAQBX9cjw6qPulfs30SiCwr6ds0g5iyelELG9kJSfpYtAfg1sNIT0lWK 4GwvMxGcptpoTJe2J8aZHWU= X-Google-Smtp-Source: AKy350Z3Nm/gH0GmPAnqcfsZ/gtAKeh1Mk8NVHftSqcpKisRWExCOywifXNq84Tkjbv+kJZuHD1rnQ== X-Received: by 2002:ac8:5e0b:0:b0:3e6:8df2:5d10 with SMTP id h11-20020ac85e0b000000b003e68df25d10mr19283083qtx.37.1681177760605; Mon, 10 Apr 2023 18:49:20 -0700 (PDT) Received: from hurd (dsl-154-253.b2b2c.ca. [66.158.154.253]) by smtp.gmail.com with ESMTPSA id k23-20020ac84797000000b003b63b8df24asm3354818qtq.36.2023.04.10.18.49.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 18:49:20 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build. References: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> <87bkjyqhms.fsf@gmail.com> Date: Mon, 10 Apr 2023 21:49:18 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Mon, 10 Apr 2023 14:51:35 +0200") Message-ID: <87r0srnq75.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi Liliana, Liliana Marie Prikler writes: > Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer: >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 (with-directory-excursion "tests/fixtures/reftests/" >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-component-transfer-from- >> > reference-page.svg") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "filter-morphology-from-reference- >> > page.svg") >> > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 (delete-file "svg1.1/text-text-03-b.svg")))) >>=20 >> I think a fix for this was contributed to core-updates already; it >> used another approach: adjusting the expected value. > Looking at the core-updates patch, it appears to be targeting > tests/fixtures/reftests/bugs/587721-text-transform.svg, not any of the > files referenced above. Am I missing something? I see; I guess it was a coincidence but that the issues really are different? I didn't look carefully, just thought that two edits fixing test suite bugs probably were targetting the same one :-). --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:16 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:16 +0000 Received: from localhost ([127.0.0.1]:36442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88u-0008E4-5k for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:16 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:40480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88r-0008De-Nu for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:14 -0400 Received: by mail-ej1-f65.google.com with SMTP id ud9so17633559ejc.7 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197008; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=9vqg64XYaRdG/4/d4lEaB9RSjSpPbp4KwYOhPB5AIwA=; b=mERTG+TPdOzsPSV2AtoINtIimGoPChlWkQ2MiBSBCUycdPdS9pburVtkS9fhIGfLTl cBAyWHs0pwlLJ3T+2kROrQA+VLWt76LbR5ouWaxdj88E/GCCPMdKKIfxRvPuGXagwbu2 hDvpmfA98Te4j7aSOg6JY3bYr/K7I4SfydkhVretICNfXxvDLMbmgBkQLtnnTxn2Vi3X qPvEZvTdCZQiaqitXGDTxY+Z5j+oQUIjx7avCvmeMHv3cnt73VIA99wR0k/XPx61e09R Rb+KUS1YRhIlEVXlEmuZpRNPvKSPHkZyv/X3V+h89I3V7mMhQpT1I1YTnoYh1oIWufXz FwMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197008; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9vqg64XYaRdG/4/d4lEaB9RSjSpPbp4KwYOhPB5AIwA=; b=a0sajaVYWmO+/PakO+cC0zlBuZ4mPvB88g8HktnMSMBTUkMJYwCMQVE1iMt2aEIsex Hprbatw+kyhmOlBWlTQCXrYHTvGkOWvikZFWb8wiTEAFhwXlPTeSY1gos0KQavHp+CFl ND7xCGsVMIihYAMy5CsFgKgELHUET58nXY0s0O0ofjF+POAnxUrBfrUIB8jgwGdWPN7m Izj8GHDYuCcHSn9VL6HH672uIodMnEVsehX1MHFuBMR0uhPN7m11c6qAD8Kebm4/F9T2 EthReKVCRV4wAx37HDa1TnwjUM0k7bbcT4TNzju1DkWTsRhQEPOuxa/Niw+QsoBCaG11 5daQ== X-Gm-Message-State: AAQBX9cAEzAlicJJoSUTQqgjpfUIi0uoHjoufYxhJMx3+269hTLEGGNe 9IFSfmti20BkOA6J/nlv4nH6ePDLTfCoLg== X-Google-Smtp-Source: AKy350bRG6aPVV8g9cLf3cPhmlUd9wwxEL/heWJTt04HDWxetJzJz7+UDjAE/Yqf9bkSVSMFaoW12Q== X-Received: by 2002:a17:907:60ce:b0:948:b667:ebbe with SMTP id hv14-20020a17090760ce00b00948b667ebbemr11991600ejc.7.1681197007804; Tue, 11 Apr 2023 00:10:07 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:07 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 11 Apr 2023 09:06:54 +0200 Subject: [PATCH gnome-team v3 00/15] Update glib to 2.76.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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 (-) Hi team, hi Guix, I've incorporated Maxim's suggestions from v2 and Kaelyn's patch for core-updates. Sadly, it doesn't appear to work for the librsvg package (fitting, as it targets librsvg-2.40), so we probably still need a proper SVG patch there. Cheers Kaelyn Takata (1): gnu: librsvg-2.40: Fix test failure with Pango 1.50. Liliana Marie Prikler (14): gnu: glib: Update to 2.76.1. gnu: Make pango-next the new pango. gnu: pango: Update to 1.50.14. gnu: Make gobject-introspection-next the new gobject-introspection. gnu: gobject-introspection: Update to 1.76.1. gnu: libsoup-minimal@2: Update to 2.74.3. gnu: python-pygobject: Set upstream-name. gnu: python-pygobject: Update to 3.44.1. gnu: gtk+-2: Fix build by hardening list store. gnu: gtk+: Update to 3.24.37. gnu: librsvg: Fix build. gnu: inkscape: Update stable version to 1.2.1. gnu: inkscape: Use new package style. gnu: Remove lib2geom 1.1. gnu/local.mk | 3 +- gnu/packages/freedesktop.scm | 4 +- gnu/packages/geo.scm | 1 - gnu/packages/glib.scm | 118 +++--------- gnu/packages/gnome.scm | 51 +++-- gnu/packages/graphics.scm | 22 +-- gnu/packages/gtk.scm | 120 ++++++------ gnu/packages/guile-xyz.scm | 4 +- gnu/packages/ibus.scm | 2 +- gnu/packages/inkscape.scm | 174 ++++++++---------- gnu/packages/messaging.scm | 1 - gnu/packages/music.scm | 6 +- .../patches/glib-skip-failing-test.patch | 3 +- ...trospection-absolute-shlib-path-1.72.patch | 173 ----------------- ...ct-introspection-absolute-shlib-path.patch | 51 ++--- .../gobject-introspection-cc-1.72.patch | 15 -- .../patches/gobject-introspection-cc.patch | 11 +- .../patches/gtk2-harden-list-store.patch | 42 +++++ gnu/packages/webkit.scm | 3 +- 19 files changed, 285 insertions(+), 519 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:19 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:19 +0000 Received: from localhost ([127.0.0.1]:36448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88v-0008EX-UT for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:19 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:42799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88s-0008Dg-EW for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:16 -0400 Received: by mail-ej1-f68.google.com with SMTP id sg7so29253633ejc.9 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197008; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=G7allNrlcfeyjXpPwavZWbiCF2hwbdsPf8etFCBs8I4=; b=hhO8UL5McPMjgcdN8AbzcgRp1q9mTCCJHnUqnRB+YeRUZSWbcMngCHXF6K9p/Gxoi2 xuoNq7ntD21OyfJukgd6dmH4OHNig0EBu1UmwIhRKwD30PWIBxESZdpgt8WIE2kfjl1y j0VfD2y5Tn1zqS+nsRlohjnnOo1Hva+3aJnonVvK8T9WpH+zLs/wj4WiqpTCyyNUpn2x NW7k3ET7nxsokGS3PInXV4XfNy5/SWfosAy5fUUG2OZe911kxAoGlNMtB/XjlCC45oqK 5LWFhqMWtAM3zAG3YPg+Dqe02ppmhOHQjHKOzULMUVxvrc8rkBFgrZ+Jthfv6nP28EPI vo4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197008; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=G7allNrlcfeyjXpPwavZWbiCF2hwbdsPf8etFCBs8I4=; b=ldwPPkBg3sTqFEC4Rg9yphG7p4CsWCVU+NoOYVwfdMOTtcbJvQt80yHwSbrFNdAeoi bm4zErsy9caj4AL+X16VUYDjQ8bGCN0UeM6s0RgiJGuBAzHUKojqOpT+qTl5AjsMqAl0 0GQ/lsSXr5RI1I0kuCjntFy6VMauwyiqYikkLYVr9Qqdgs4Hxc0wi0RNeNuRGc31iHsI RN43BiAi9kG3APGcKyZk4UW2hKuhZTAaJpYEq/mgpm/un79F74h/Dg54fCSVkDVDmQH7 BpjVamCcD3tKlw4R9rqR8L6o+AmADoanZTYQDZVdmlU4NgghFgY81Kd6Jy1jDVFNFv8s 6sJQ== X-Gm-Message-State: AAQBX9clfleGjZ8GEUCRrskFI/9pO6qWroIchulG5d/rE8M5Fau0QZnd Apj/DhV84KPDLWyubJKTn2ZqFV3LHqGyXQ== X-Google-Smtp-Source: AKy350YiIxQfvh1KwSxzQhaUTNolMTKv2Hk0X8cgqolcgOkTK/coJ6I+rOkbUUO43r/uzFUZySDnlQ== X-Received: by 2002:a17:907:7b9f:b0:94a:5d8e:ddbf with SMTP id ne31-20020a1709077b9f00b0094a5d8eddbfmr8772097ejc.14.1681197008625; Tue, 11 Apr 2023 00:10:08 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:08 -0700 (PDT) From: Kaelyn Takata X-Google-Original-From: Kaelyn Takata Date: Mon, 3 Apr 2023 16:37:58 +0000 Subject: [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50. to: 62467@debbugs.gnu.org Message-ID: <0ff0469c1b12b2572b7707e1da89408b65b96de3.camel@protonmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (librsvg-2.40): Fix test failure with Pango 1.50. Signed-off-by: Andreas Enge Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 7 +++++++ 1 file changed, 7 insertions(+) Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (librsvg-2.40): Fix test failure with Pango 1.50. Signed-off-by: Andreas Enge Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 7 +++++++ 1 file changed, 7 insertions(+) Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 PP_MIME_FAKE_ASCII_TEXT BODY: MIME text/plain claims to be ASCII but isn't 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (librsvg-2.40): Fix test failure with Pango 1.50. Signed-off-by: Andreas Enge Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 49ff1464f5..6db6004356 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2022 Rene Saavedra ;;; Copyright © 2022 Alexandros Theodotou ;;; Copyright © 2022 Arjan Adriaanse +;;; Copyright © 2023 Kaelyn Takata ;;; ;;; This file is part of GNU Guix. ;;; @@ -3780,6 +3781,12 @@ (define-public librsvg-2.40 (("gdk_pixbuf_cache_file = .*$") "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) #t)) + (add-before 'check 'fix-test-with-pango-1.50 + (lambda _ + ;; Changes between pango 1.48 and 1.50 caused the text to be one + ;; pixel lower in the output image compared to the reference. + (substitute* "tests/fixtures/reftests/bugs/587721-text-transform.svg" + (("660\\.9") "659.9")))) (add-before 'check 'remove-failing-tests (lambda _ (with-directory-excursion "tests/fixtures/reftests" -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:21 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:21 +0000 Received: from localhost ([127.0.0.1]:36452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88x-0008En-Aj for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:21 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:36795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88t-0008Dj-MN for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:16 -0400 Received: by mail-ej1-f67.google.com with SMTP id q23so8375772ejz.3 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197010; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=qDpfvPEl74Z2k0DbB37YNZp4yILSm+7qaUe0dKztgRM=; b=caaGuehp49kc72MkEPlEzwix2Yp8O+lEMur4gnRP1Y1mY1qJnzseik2gJ/PNXYgsC9 ee0A74ZdhRgAs/Hd6WFiF9b9rByxlXL9wjKVKaaeXV9kRXaY8HmLxfvC22fdQ854lSgq 1t5rk2D0y0iG02NxM/mKxDZI/nLl44UNiGGmjifiT6H0AYZnzuwtV0Rq1GE8nsZFkWeK +YqU4G0gKXMOGP9gIZZ1TyFtaPpZDVZhHK3WeGAON+DO+ElvzS+1QQ/1H/vlhsiNJ46N tJ4JccIrUTGzq+Ye6+/LZrxky4frspXR/662RuFYooB03BSzo7C1/4SnFJ+IaOyG4gEn /DwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197010; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qDpfvPEl74Z2k0DbB37YNZp4yILSm+7qaUe0dKztgRM=; b=6ipadfcphqt6VFrYttL2pRRH1e5nxaFighjlaLgy2abZRQfBilmFQVm0nYaP2Re73Z m09vym/IN6d6ShM8vHWiIASx9HOHHWNn7dve8wLsqf3vV6PacTeSH1sq5EBQPyp2zlDl v0mpQm/OqeGjLAtyVP4eXrwJxCCC/M4Do9/xUPhd66kkAGVvmuA9eLo/sbZegeIv41M7 Mso+Ef9bUFZRApMXf2JXTug6sdYixCDcV5607U2g5J3c0ekiksbbdyCWXWDfWL/mH3sw NA8NC8E9+0ttC1hImRo+PkMFVf9+MQik97mM6d7Hbm2DfI1aGgVpu2gNOop7gggL0L8Z MxEw== X-Gm-Message-State: AAQBX9f08ZRPok+V1r8YX5MdXsKthN4HrYJ85nmcjdDap+jeP9yLT+il Ni6EQvl4mjtfHN4FJ2fTLWcRQb2h4KCiGg== X-Google-Smtp-Source: AKy350Z4TwieACwXFGPvzB8yT/2Dq6BJWSM5XjJ7bN4a8xkpouG0+6lELIF/5MeSPCzKvW6gbx//fA== X-Received: by 2002:a17:907:2105:b0:94a:7d5b:2a7 with SMTP id qn5-20020a170907210500b0094a7d5b02a7mr5957765ejb.47.1681197009707; Tue, 11 Apr 2023 00:10:09 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:09 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:39:11 +0200 Subject: [PATCH gnome-team v3 02/15] gnu: glib: Update to 2.76.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Rep [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Rep [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Replace pcre with pcre2. (glib-with-documentation): Inherit from glib. * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib. * gnu/packages/gtk.scm (gtksourceview, libpanel): Use glib. * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. * gnu/packages/music.scm (zrythm): Use glib. * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly. --- gnu/packages/glib.scm | 92 +++++-------------- gnu/packages/gnome.scm | 8 +- gnu/packages/gtk.scm | 6 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/music.scm | 4 +- .../patches/glib-skip-failing-test.patch | 3 +- 6 files changed, 34 insertions(+), 81 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index f85d5e3225..d9a9c58fbb 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -215,7 +215,7 @@ (define-public dbus-verbose (define glib (package (name "glib") - (version "2.70.2") + (version "2.76.1") (source (origin (method url-fetch) @@ -224,14 +224,14 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85")) + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) (modules '((guix build utils))) (snippet '(begin - (substitute* "tests/spawn-test.c" + (substitute* "glib/tests/spawn-test.c" (("/bin/sh") "sh")))))) (build-system meson-build-system) (outputs '("out" ;libraries, locales, etc @@ -256,6 +256,9 @@ (define glib #:phases (modify-phases %standard-phases ;; Needed to pass the test phase on slower ARM and i686 machines. + (add-after 'unpack 'set-G_TEST_SRCDIR + (lambda _ + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests")))) (add-after 'unpack 'increase-test-timeout (lambda _ (substitute* "meson.build" @@ -270,9 +273,19 @@ (define glib (substitute* '("unix.c" "utils.c") (("[ \t]*g_test_add_func.*;") ""))) (with-directory-excursion "gio/tests" - (substitute* '("contenttype.c" "gdbus-address-get-session.c" - "gdbus-peer.c" "appinfo.c" "desktop-app-info.c") - (("[ \t]*g_test_add_func.*;") ""))) + (substitute* '("contenttype.c" + "gdbus-address-get-session.c" + "gdbus-server-auth.c" + "gdbus-peer.c" + "appinfo.c" + "desktop-app-info.c") + (("[ \t]*g_test_add_func.*;") "")) + (unless (which "update-desktop-database") + (substitute* "file.c" + (("[ \t]*g_test_add_func.*query-default-handler.*;") ""))) + (substitute* '("portal-support-snap.c") + (("g_test_init .*") + "return EXIT_SUCCESS;"))) ,@(if (target-x86-32?) ;; Comment out parts of timer.c that fail on i686 due to @@ -357,7 +370,7 @@ (define glib libelf)) (propagated-inputs (list libffi ; in the Requires.private field of gobject-2.0.pc - pcre ; in the Requires.private field of glib-2.0.pc + pcre2 ; in the Requires.private field of glib-2.0.pc `(,util-linux "lib") ;for libmount zlib)) ; in the Requires.private field of glib-2.0.pc (native-search-paths @@ -383,68 +396,10 @@ (define glib (license license:lgpl2.1+) (properties '((hidden? . #t))))) -(define-public glib-next - (package - (inherit glib) - (name "glib") - (version "2.73.3") - (source - (origin - (inherit (package-source glib)) - (uri - (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (snippet - '(substitute* "glib/tests/spawn-test.c" - (("/bin/sh") "sh"))) - (sha256 - (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz")))) - (arguments - (substitute-keyword-arguments (package-arguments glib) - ((#:test-options test-options ''()) - ;; Skip flaky or slow tests. - `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options)) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (replace 'disable-failing-tests - (lambda _ - (with-directory-excursion "glib/tests" - (substitute* '("unix.c" "utils.c") - (("[ \t]*g_test_add_func.*;") ""))) - ;; The "glib:gio / file" test fails with the error "No - ;; application is registered as handling this file" (see: - ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). - (with-directory-excursion "gio/tests" - (substitute* '("appinfo.c" - "contenttype.c" - "desktop-app-info.c" - "file.c" - "gdbus-address-get-session.c" - "gdbus-peer.c") - (("[ \t]*g_test_add_func.*;") ""))) - - ,@(if (target-x86-32?) - ;; Comment out parts of timer.c that fail on i686 due to - ;; excess precision when building with GCC 10: - ;; . - '((substitute* "glib/tests/timer.c" - (("^ g_assert_cmpuint \\(micros.*" all) - (string-append "//" all "\n")) - (("^ g_assert_cmpfloat \\(elapsed, ==.*" all) - (string-append "//" all "\n")))) - '()))))))) - (native-inputs - (modify-inputs (package-native-inputs glib) - (append desktop-file-utils))) - (propagated-inputs - (modify-inputs (package-propagated-inputs glib) - (replace "pcre" pcre2))))) - (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. - (let ((base glib-next)) + (let ((base glib)) (package/inherit base (properties (alist-delete 'hidden? (package-properties base))) (outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference @@ -624,10 +579,7 @@ (define-public gobject-introspection-next (patches (search-patches "gobject-introspection-cc-1.72.patch" "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs gobject-introspection) - (replace "glib" glib-next))))) + "gobject-introspection-absolute-shlib-path-1.72.patch")))))) (define intltool (package diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6db6004356..99ca0fef88 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13174,7 +13174,7 @@ (define-public sysprof (propagated-inputs (list polkit)) (inputs - (list glib-next + (list glib gtk json-glib libadwaita @@ -13183,7 +13183,7 @@ (define-public sysprof polkit)) (native-inputs (list gettext-minimal - `(,glib-next "bin") ;for gdbus-codegen, etc. + `(,glib "bin") ;for gdbus-codegen, etc. itstool libxml2 pkg-config)) @@ -13452,7 +13452,7 @@ (define-public gtranslator (substitute* "build-aux/meson/meson_post_install.py" (("gtk-update-icon-cache") (which "true")))))))) (native-inputs - (list `(,glib-next "bin") + (list `(,glib "bin") gettext-minimal itstool pkg-config)) @@ -13460,7 +13460,7 @@ (define-public gtranslator (list json-glib jsonrpc-glib gettext-minimal - glib-next + glib gsettings-desktop-schemas gspell libgda diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e4026c601f..89ce459e4c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -710,7 +710,7 @@ (define-public gtksourceview ;; gtksourceview-5.pc refers to all these. (list fontconfig fribidi - glib-next + glib gtk libxml2 pcre2 @@ -3063,11 +3063,11 @@ (define-public libpanel (substitute* "meson.build" (("gtk_update_icon_cache: true") "gtk_update_icon_cache: false"))))))) - (native-inputs (list `(,glib-next "bin") + (native-inputs (list `(,glib "bin") gobject-introspection pkg-config vala)) - (inputs (list glib-next gtk libadwaita)) + (inputs (list glib gtk libadwaita)) (home-page "https://gitlab.gnome.org/GNOME/libpanel") (synopsis "Dock and panel library for GTK 4") (description "Libpanel provides a library to create IDE-like applications diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fd8fb25da1..e6cef165ea 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2327,7 +2327,7 @@ (define (get lib) (setenv "DISPLAY" ":1") #t))))) (inputs - (list guile-3.0 guile-lib glib-next)) + (list guile-3.0 guile-lib glib)) (native-inputs (list autoconf automake diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 69fe7009be..5a28e1321f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6481,7 +6481,7 @@ (define-public zrythm flex font-dseg gettext-minimal - glib-next + glib glibc graphviz gtk @@ -6519,7 +6519,7 @@ (define-public zrythm ;; XDG_DATA_DIRS. (list breeze-icons ;native because not executable help2man - `(,glib-next "bin") ;for 'glib-compile-resources' + `(,glib "bin") ;for 'glib-compile-resources' pkg-config python-sphinx python-sphinx-intl diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch index c7706aaa74..3fde5cb1e2 100644 --- a/gnu/packages/patches/glib-skip-failing-test.patch +++ b/gnu/packages/patches/glib-skip-failing-test.patch @@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build index a926ae0..4fdbe7a 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -317,10 +317,6 @@ if host_machine.system() != 'windows' +@@ -317,11 +317,6 @@ if host_machine.system() != 'windows' 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'], }, - 'gdbus-threading' : { - 'extra_sources' : extra_sources, +- 'extra_programs': extra_programs, - 'suite' : ['slow'], - }, 'gmenumodel' : { -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:25 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:25 +0000 Received: from localhost ([127.0.0.1]:36461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm892-0008Fr-IN for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:24 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:36795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88v-0008Dj-85 for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:17 -0400 Received: by mail-ej1-f67.google.com with SMTP id q23so8376366ejz.3 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=e7RBfkGSTKZmkOrAFuoCajc3oUpaPvH4bkChZk/uN24=; b=bMp0hGD30e+De/eIfLFVgBoFutG5Sw9z2avv80IxHSrxoetdeULwDCCzI/GS6UBYFv B3PWZqdYSDxCRXOJfTxRIizJbM61+TLW4I8s9tTcvEdM0VdIf3MvZZssc3sR+wV2lm66 nuK2up7xi4TBk7kSTDiymbjZKFuoeiqkBDv99vZahn1LG8Irug7uGJZv/M4a3qf55/pr eN0Ao0UDgo7s+c5ERF/WKLwEHSvF3O3W1BrF1rcbDHJLrZ2kxZbqE2YtLXE9Tg1TMo/d GZxa16/0FWcV5noVy8dhPWLdhiwp80e1u98guXRYckaIkjAgnaRGvYhvP1+m4rh2u4KH fbGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=e7RBfkGSTKZmkOrAFuoCajc3oUpaPvH4bkChZk/uN24=; b=ws1mLhiIo0mHOfqbWvaFebCRI+qqvS1PYh6ULBjLrN/jFsyqDsuIyJ7rrS8RqliszK rX+iUcfNIdTzWLf1qEqSSfk6MRr3Bb3nQY/emwbCVpz+oWRgisLpQ0d0tXImTcKx4t/p 4p6XCMK/PrtQSR4J7bp470hgM/xUakn67UqtUFT6r+v6x+JOUU0d7w4+llNZM/LMqM6y jqocn1Ejg+uPhWQNiC9CrHac0WUjWg9rzZUBVa+edldSLqyql/w3t+iyYr5e4Syklx6M 7bgAtLPMCe1LF4+iC4I6PNsdfVsJ2jjykqJySBiIkxPnJD4BlurKUdfs90nw4XQl9Isc FFBw== X-Gm-Message-State: AAQBX9emjI9O9SZn40s4biSHoVhfu6tHplgT8M7iyC/VAHp4WPA0T0bF qbVk1G/ogUrnUlt64Kix4EWvZPI280SBcA== X-Google-Smtp-Source: AKy350ZhWrKICD6JWwIvpVVW77P/yDWC/PSvaTShjbSHU1y/SqYfeqTqxyA5+5LPn8hG8KuWb6IDsg== X-Received: by 2002:a17:907:7f0e:b0:93f:f70:b2e6 with SMTP id qf14-20020a1709077f0e00b0093f0f70b2e6mr1830411ejc.0.1681197016865; Tue, 11 Apr 2023 00:10:16 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:16 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 31 Mar 2023 20:54:00 +0200 Subject: [PATCH gnome-team v3 13/15] gnu: inkscape: Update stable version to 1.2.1. to: 62467@debbugs.gnu.org Message-ID: MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1. [inputs]: Add bash-minimal, librsvg and python-cssselect. Use lib2geom-1.2 rather than lib2geom. (inkscape): Inherit build-system, argum [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1. [inputs]: Add bash-minimal, librsvg and python-cssselect. Use lib2geom-1.2 rather than lib2geom. (inkscape): Inherit build-system, argum [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1. [inputs]: Add bash-minimal, librsvg and python-cssselect. Use lib2geom-1.2 rather than lib2geom. (inkscape): Inherit build-system, arguments and inputs. --- gnu/packages/inkscape.scm | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index d1ac5e7312..b8e78c2b11 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -61,7 +61,7 @@ (define-public inkscape/stable (hidden-package (package (name "inkscape") - (version "1.1.1") + (version "1.2.1") (source (origin (method url-fetch) @@ -69,7 +69,7 @@ (define-public inkscape/stable "resources/file/" "inkscape-" version ".tar.xz")) (sha256 - (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf")) + (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")) (modules '((guix build utils) (ice-9 format))) (snippet @@ -196,9 +196,14 @@ (define-public inkscape/stable (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/inkscape") `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH")))))))))) + (,(getenv "GUIX_PYTHONPATH"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load + ;; its own icons in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (inputs `(("aspell" ,aspell) + ("bash-minimal" ,bash-minimal) ("autotrace" ,autotrace) ("gdl" ,gdl-minimal) ("gtkmm" ,gtkmm-3) @@ -206,12 +211,13 @@ (define-public inkscape/stable ("gtkspell3" ,gtkspell3) ("gsl" ,gsl) ("poppler" ,poppler) - ("lib2geom" ,lib2geom) + ("lib2geom" ,lib2geom-1.2) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libgc" ,libgc) + ("librsvg" ,librsvg) ; for the pixbuf loader ("libsoup" ,libsoup-minimal-2) ("libcdr" ,libcdr) ("libvisio" ,libvisio) @@ -223,6 +229,7 @@ (define-public inkscape/stable ("lcms" ,lcms) ("boost" ,boost) ("python" ,python-wrapper) + ("python-cssselect" ,python-cssselect) ; to render qrcode ("python-scour" ,python-scour) ("python-pyserial" ,python-pyserial) ("python-numpy" ,python-numpy) @@ -255,25 +262,4 @@ (define-public inkscape "inkscape-" version ".tar.xz")) (sha256 (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6")))) - (build-system cmake-build-system) - (arguments - (substitute-keyword-arguments (package-arguments inkscape/stable) - ((#:phases phases) - `(modify-phases ,phases - (replace 'wrap-program - ;; Ensure Python is available at runtime. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/inkscape") - `("GUIX_PYTHONPATH" prefix - (,(getenv "GUIX_PYTHONPATH"))) - ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load - ;; its own icons in pure environments. - `("GDK_PIXBUF_MODULE_FILE" = - (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))) - (inputs (modify-inputs (package-inputs inkscape/stable) - (replace "lib2geom" lib2geom-1.2) - (append bash-minimal - librsvg ;for the pixbuf loader - python-cssselect))) ;to render qrcode (properties (alist-delete 'hidden? (package-properties inkscape/stable))))) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:25 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:25 +0000 Received: from localhost ([127.0.0.1]:36463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm892-0008Fu-VY for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:25 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:38857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88v-0008Dq-RU for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:18 -0400 Received: by mail-ej1-f68.google.com with SMTP id j17so8182738ejs.5 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197012; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=5MIPgrIoNsR6G78ADBdDvGa+1msifACfu5xZ+lDeYeY=; b=WzaAIhD4UbXqkgiGVYegZpYBNeL9NFZ1jUdIGAsdlYai8Hwcbb4d+9Ubfb+EBRW36v rMg+HahF4NSBog/Zy6Dqgl8MImXQ2yIj2TmXPp4QzwKQTHUn8o0Cgn0i6jNCap+6Fv9L 9wGbuHYBGoYQjcdsbLtR/NeHUBQfqHJj1827fq9ZisNQab/nzCF+oWf4gTIXIft7+Mpr Iy2f18uGt8WMFWFZyDuv7UpgY5Ko3C2NAILKh3t72M0tICgqUGVkvd+o2ouAKGtra7P8 llrUILEyglrv/vb1YrVxbARQgoKeXYkxiyKWYsV8xn1BSsSxsptcTMxhFYE7FNDlMV8G xHlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197012; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=5MIPgrIoNsR6G78ADBdDvGa+1msifACfu5xZ+lDeYeY=; b=STX3i9qZZ0s/agVZznqzFiKhAtAhXHBDBOOlg1cTTW+9ANHwpnMKbX3oO/b54J1pq3 xyJeu50mIL/Ynck1D3NIZulOMHYqodqaPag6tD6qhkQfS4zD5YZF8AEebggoiG4KvMZV YHpcinmIbpKdfhEHX/GZGBZpUJi4vemYwZrMQNXtW5ZlH4yHYNLHTzdo+JfDCD0yydL+ Joka5yz4VDHJFUqRZBNNSNDjvjVaSgDjIsr/VzePh2fHXfBRASTXazOgMaf09YihYl6C VoELqcdh2PfEeJJI4v+q+HRsgSUwM9/c2Ib7PABtUd1Twr6VJRhWocu1+oNcZ6Hl+rq9 iqfA== X-Gm-Message-State: AAQBX9elIx8IOwl5TGZbZsFcutg/+AiTeqS5UGpLfi+cHrB78KNwYPCM LVdOvPcLWznaBzBTYr672zaWicLI8/l9sw== X-Google-Smtp-Source: AKy350bioMa3eHMAYqV2j9Hv1G/+fVVkPMP8HMzkXekfHTnJA5/QYJqDLRY5FMvJU6cn90jNDecOfQ== X-Received: by 2002:a17:907:100a:b0:94a:a60f:74aa with SMTP id ox10-20020a170907100a00b0094aa60f74aamr3937905ejb.54.1681197012333; Tue, 11 Apr 2023 00:10:12 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:11 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:19:11 +0200 Subject: [PATCH gnome-team v3 06/15] gnu: gobject-introspection: Update to 1.76.1. to: 62467@debbugs.gnu.org Message-ID: <092a52a81efa1ccadf3d54779d36d10d469b892b.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4bc7198ccb..08972bfe85 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4bc7198ccb..08972bfe85 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 4bc7198ccb..08972bfe85 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.73.1") + (version "1.76.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) + (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:25 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:25 +0000 Received: from localhost ([127.0.0.1]:36465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm893-0008G2-9R for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:25 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:38855) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88u-0008Dn-PS for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:18 -0400 Received: by mail-ej1-f68.google.com with SMTP id j17so8182650ejs.5 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197011; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=c4WQ/GOt7/Vomy9g0RXWlQeDgzTtXvp6smjqJR36Xc0=; b=Dn/ReZqASUhfJ2iv7YDqpbrJSs1oGQyT8Xw/8rfuLM0y+286fDvgL3AhqR4vP0UCrI xgPFbY//wnq/J+ZcPDqxY+3ELWnJBVNmnqpxHqAA3TbvaGQNgmaZR0uDqP4x5Wcnogg6 p+ibvmcK6EUcUubLz8gFkW31RcPtEJZzJ5r1ASusJKpYe9876vb1nbQi0CC8prkwdlmv PYwHloaG3T1O8bLxU7yXy1n2+Xup8PABHSOqhIWFeD7jx24Av3vJpZg6O+JNw7ycAc3d HGT8EhVWiBLzJeqvsauc4FE5A68WivZCdz50aeU5JKx8b49inWoEmxG0BzE5nC0NEQud SlqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197011; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=c4WQ/GOt7/Vomy9g0RXWlQeDgzTtXvp6smjqJR36Xc0=; b=NYkGLj6jX9Ux4RVbjaLn39fxyAuVTADHjzJiFHGxsClha29sv40TU/xves38z7BpmK AaORaLnY4ahWY6xkWuaG4lSlKcY5CIGBmLtHYE8nmqPJtxqn5MP3N+aXjhF7x5lsXY+1 WloyHU8HcUIDezTVbigqPCVkoxbceD2kYaPTt30ryKNVesUv6JBJvby/lNtpahRQGsRN pfL19niMTQLb8VXtoylBY7shsuzusppxRuvPa8I66Bupj0Be0JEXsBhESLLRACN9hlZx d4y5oB7SB9JaxQ7dmzGkMg23d5SFz5rzK/pvvW/tV/tiG7RNAPeHhJMes1tXxkmDyi4W UEoA== X-Gm-Message-State: AAQBX9eHKixtkbypvrhPWMZSyO9Eup3MWOhDgQjUBkR7988PbRLkCclC mult6WPngFagK0aRO9MxVYbGQPCEdL5zGQ== X-Google-Smtp-Source: AKy350YV59nC0QbvGsbtB0Gbm0WbMYVG8hEdPfFbuYDES861lK9YFbTUPtgiabhGqHSK/CqSruO1PQ== X-Received: by 2002:a17:906:ad94:b0:94d:fd87:44eb with SMTP id la20-20020a170906ad9400b0094dfd8744ebmr1451199ejb.63.1681197011092; Tue, 11 Apr 2023 00:10:11 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:10 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 20:53:15 +0200 Subject: [PATCH gnome-team v3 04/15] gnu: pango: Update to 1.50.14. to: 62467@debbugs.gnu.org Message-ID: <1a7b92f42f43f43ca6e2c90c5585a745df5831e9.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- 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 edcdda8187..589d861a50 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427, 7 +427, 7 @@ (define-public libthai (define-pu [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- 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 edcdda8187..589d861a50 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-pu [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- 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 edcdda8187..589d861a50 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.50.4") + (version "1.50.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -436,7 +436,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) + "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:25 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:25 +0000 Received: from localhost ([127.0.0.1]:36467 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm893-0008GA-JL for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:25 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:43933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88w-0008Ds-KE for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:19 -0400 Received: by mail-ej1-f65.google.com with SMTP id sh8so17781607ejc.10 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197013; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=1icAz8zePn2GBEN6E1/RPWEYBJq940HeSuMFCcx/CgA=; b=Ax6VWHb2FKJ6eUB6G+xBlbOwtUmNbitIYie+2/B2oqKs0L2tgBLzaLxiIfjKWKYfNJ Od5QI7pMdXStqquuKW1uLUn8ENh+JhiRIaLMoER4SAKiQyJ7XnR1LZ4jsMUoo5wDnYyB +jH9/a3JiOI+IRIRlVbJNksyXrX9b3b1o4axaai1WYngeTxy15IE/O1wUYxYfPoAsV/r CcEVgpq1fAPxMWWSEeugCkHlj791dRyYNBB7E9KSf/P8NKYgUOX55Dj/BUbb8PpHw3bd LbMDEsM/G+9Luihu+9cmjVGV2KfTBu6K+vPWv19v+6J051sYYZhSCjwvq+pmmwNq8iSw NZHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197013; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=1icAz8zePn2GBEN6E1/RPWEYBJq940HeSuMFCcx/CgA=; b=5xMl41f43wVoOfo/koc1muqiHDRUCtmKtaSmDI3iVfyIjy2FPDd9yCtqfws6q7ClVm wosCACJn6mANtx8UZ9lTYC+mYLufXCbd4JPtgWfcj/lnY6V0HAZit8A1y3Xd1nPxHU7Z Y5uGnCvtsfXFy58//H8AkYxSYzXebtVOxtSgE5wDeUu2A5zF+lM9aK0ZFKUkkGwmW2V4 lNnt53vPdz6h/9tnd0ApquvLIgglXWpxTH7QgYDkGEuQZNBqcSiSrcDM1aZFPjye45nn cU7oqkGdj3LLW/ELGUr2O/Q1771qEDLzxjjbe3uVXh1aPOYOWLmUu19qEUliR5KSFRWP knGg== X-Gm-Message-State: AAQBX9fJ1GNl+0K5YMX/bqCvtilmXg4zZ2J1hl7bdFslA8cD0nh7bh7Q HyBc7DqGKS56+tBFPVKlKV3ZS1mGCOxkuQ== X-Google-Smtp-Source: AKy350bn3KV0udMhLmUodYdzjSN5AfhwsOQ80os7zXvd3bqB3mDjZacEOGuqLppCbXQVRwu72K4RLQ== X-Received: by 2002:a17:906:40d9:b0:94a:78a2:6092 with SMTP id a25-20020a17090640d900b0094a78a26092mr6396515ejk.66.1681197013053; Tue, 11 Apr 2023 00:10:13 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:12 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 06:26:28 +0200 Subject: [PATCH gnome-team v3 07/15] gnu: libsoup-minimal@2: Update to 2.74.3. to: 62467@debbugs.gnu.org Message-ID: MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2f73c0a9b7..a7eed081fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5270,7 +5270,7 @@ (define-public libsoup- [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2f73c0a9b7..a7eed081fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5270,7 +5270,7 @@ (define-public libsoup- [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2f73c0a9b7..a7eed081fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5270,7 +5270,7 @@ (define-public libsoup-minimal ;;; An older variant kept to build the 'rest' package. (define-public libsoup-minimal-2 (package/inherit libsoup-minimal - (version "2.72.0") + (version "2.74.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -5278,7 +5278,7 @@ (define-public libsoup-minimal-2 "libsoup-" version ".tar.xz")) (sha256 (base32 - "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p")))) + "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) ((#:phases phases) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:26 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:26 +0000 Received: from localhost ([127.0.0.1]:36469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm893-0008GH-Sx for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:26 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:46684) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88x-0008Dt-7i for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:19 -0400 Received: by mail-ej1-f65.google.com with SMTP id xi5so17834417ejb.13 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197013; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=td6NpH4+XNVhjPoq8hH125v1LwmRTH6IEV3k3YXRzls=; b=gT52+0lRwRdllH+IuZt1nlcNeKiI01U0gIQRN+ZUVKQWx7pdEX52h64V9Yf5+yFS67 yb936JfP2h36oTN7VKjeM/3ALQ6cvhtPE5VRdbWm641oYWqT6f4Y5wFEL0va0INVXX0f 40NvSkeoyezzT53Fs00JgdUjfqvvGbhz9Ow4KcrLBSogqNPIOCK3LnGskbPzjALyBZfT lP/Gq0Rzg2D64WOChWlSOaNtrBe4uC86KvuvFwvazmnjlyyQs8HWK6TJe2mE0M/X6luP yv/hKwgnqU8I2+GVT8HX6D9ukv9BeX+Sw56z+YCxB1Ovf29nC/ghhX1+k6PiQp+Ek5qX 8rbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197013; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=td6NpH4+XNVhjPoq8hH125v1LwmRTH6IEV3k3YXRzls=; b=tKal0Reb0mrHXh+6S3PIa0/m21cUGkhrvy/oF3/r3bIq8TZWfWZ9ljseWDzmtxb26s vSzyan2tWCHFk7hWFCUOWooQDbeO8eb+EbmQKlyjJin4fbwW0+Juza+cxqI/GeEj1lxt vLbd+BDKfe1ZbwoIHVRRoyRXkO73HRNOycJlbED1z3ymcoohwu7B+jvbcoVKeVn8iox5 Eu3ZTQ4C6GkHqKlE6Ys1AnIznAIEk2H58hH7GzAZE7oXS7LnEwDWT+I5FuD1/Gdg0deh rl+VKdktIwZNMWSqbTHtgRxGrq3Pi2QDpyFqh1hByyn6/X3MASsIZsiaCggZmwCHgsbn hGOw== X-Gm-Message-State: AAQBX9f6dStk3M1kx+oBOn3Hdx2bPP09y4ReWJIQ/+puaw4E0NqUm8c0 D7xFgqoNe0IOaI2jNSB4zQ+mg0SwrZixlA== X-Google-Smtp-Source: AKy350YDiSbP5YVK78JLCqt8e6HQ+LlRidjGsO4ubClxgkc+74RBDmgJKoRq4WXYNKWaCwbSasGUgQ== X-Received: by 2002:a17:907:784f:b0:94a:972d:451 with SMTP id lb15-20020a170907784f00b0094a972d0451mr1491670ejc.67.1681197013683; Tue, 11 Apr 2023 00:10:13 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:13 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 18:50:30 +0200 Subject: [PATCH gnome-team v3 08/15] gnu: python-pygobject: Set upstream-name. to: 62467@debbugs.gnu.org Message-ID: <4e10565baf7ad043c9fd1d155a14d5a1aea8a7da.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name. --- gnu/packages/glib.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 08972bfe85..9be8b46c34 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -967,7 +967,8 @@ (define-public python-pygobje [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name. --- gnu/packages/glib.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 08972bfe85..9be8b46c34 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -967,7 +967,8 @@ (define-public python-pygobje [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name. --- gnu/packages/glib.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 08972bfe85..9be8b46c34 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -967,7 +967,8 @@ (define-public python-pygobject (synopsis "Python bindings for GObject") (description "Python bindings for GLib, GObject, and GIO.") - (license license:lgpl2.1+))) + (license license:lgpl2.1+) + (properties '((upstream-name . "pygobject"))))) (define-public perl-glib (package -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:26 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:27 +0000 Received: from localhost ([127.0.0.1]:36471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm894-0008GP-58 for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:26 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:35619) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88u-0008Dl-4Y for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:20 -0400 Received: by mail-ej1-f65.google.com with SMTP id jg21so17504761ejc.2 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197010; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=QQkEIU1yY+kP96+xlSo6c/rdh6pPIpteqqJjx8kRjRc=; b=IzXVmFjLaJ04xjU8jyMjGJye2c+6ZRHj8lGgb5ZWkSeqC+9iD1psFwy0/tHksmUx83 wYxkI4l8xHuTUkp9s0KChb5bo4M52h3LS6BddqD7uPWfwbUG5Fwag4SaW+sSJ0UXO6Vj 4BVBMA6/PF6skre+T3U5Y8vN+8dVWooGUfv8J90SzNzn3U7WfB6UuD9bCQx4x3mlruC+ QbL0xowNdbiN9emWSL/JOzT6bzAaw7KcT2/62nFqr8PXmZ3lwRbNMpSl0qzdmj6NEoHg vbDBvo9J2L2U+CsOn8Q/nrLCEKIJTuQjZC/ujHkgXSgl+Bz9jYGqKpMnM36YXJGiXAkn ETGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197010; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QQkEIU1yY+kP96+xlSo6c/rdh6pPIpteqqJjx8kRjRc=; b=DmdmtgObkGR6kckZZRvLQoQhXQnS82dgL0q3BAeddVi/qF0oSlJ9gsfnZbcbjgeO6G 2i9m/ermRNCeI9QA7GnyOKsGloSoCHvhgKaXwKTPPo97VsnQqhxg/zXo+IgUFTiNhncv YhAM/vyKV5QU+gzlZzgK7f6E3D+HYYd8SQatmoQz3Fj2kRYJYMlpS4ziuBTIHw/IE6wS yb9t2PyDRzVmyGZCuWaF8iimsjiAhWXs+5jqC7AMD8LMW7c3jWWDSCllod4XAfZg9Ub/ S9M4Z9elR0bzCsw1ciL1Yh1ZthPEsvTymg8kll/NC/atbQ/rmdPZqM+MTQWZtUL0KEzi 1sGg== X-Gm-Message-State: AAQBX9fCZlNZsUVNV39F6/R2sPfQwes2tXz0TeaGpG1pd8UcE8PmQxEx WFQnmgIU15y5HoWS12iFtMIlnopNHuK1VQ== X-Google-Smtp-Source: AKy350ZBHMaxTTdlWx1fPoFbnpu1Wc9MbJQNG6UUO0NFGyThetdD5E4Unu9aqHbaHTqmQkbtOtWEjQ== X-Received: by 2002:a17:907:c24b:b0:94a:32ed:5cb7 with SMTP id tj11-20020a170907c24b00b0094a32ed5cb7mr8686852ejc.31.1681197010408; Tue, 11 Apr 2023 00:10:10 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:10 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:53:13 +0200 Subject: [PATCH gnome-team v3 03/15] gnu: Make pango-next the new pango. to: 62467@debbugs.gnu.org Message-ID: <9ba78c2d91159e8896f2e112714d5c7beb7ba22f.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (pango-1.48): New variable, defining old pango with inheritance. (gtk)[propagated-inputs]: Use pango instead of pango-n [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (pango-1.48): New variable, defining old pango with inheritance. (gtk)[propagated-inputs]: Use pango instead of pango-n [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gtk.scm (pango): Update to 1.50.4. (pango-next): Delete variable. (pango-1.48): New variable, defining old pango with inheritance. (gtk)[propagated-inputs]: Use pango instead of pango-next. (pangomm)[propagated-inputs]: Likewise. (gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next. (pangomm-2.46)[inputs]: Use pango-1.48. * gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next. * gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise. * gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise. (network-manager-openvpn)[inputs]: Likewise. (network-manager-vpnc)[inputs]: Likewise. (network-manager-openconnect)[inputs]: Likewise. (network-manager-fortisslvpn)[inputs]: Likewise. (gnome-bluetooth)[inputs]: Likewise. (baobab)[inputs]: Likewise. (gnome-calendar)[inputs]: Likewise. (gtranslator)[inputs]: Likewise. * gnu/packages/ibus.scm (ibus)[inputs]: Likewise. * gnu/packages/messaging.scm (dino)[inputs]: Likewise. * gnu/packages/music.scm (zrythm)[inputs]: Likewise. * gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise. --- gnu/packages/freedesktop.scm | 4 +--- gnu/packages/geo.scm | 1 - gnu/packages/gnome.scm | 25 ++++++------------------- gnu/packages/gtk.scm | 26 +++++++++++--------------- gnu/packages/ibus.scm | 2 +- gnu/packages/messaging.scm | 1 - gnu/packages/music.scm | 2 +- gnu/packages/webkit.scm | 3 +-- 8 files changed, 21 insertions(+), 43 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 043d1ec92b..d63faedb85 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2113,9 +2113,7 @@ (define-public colord-gtk pkg-config vala)) (inputs - ;; TODO: remove pango-next after it's the default. - (list gtk+ - pango-next)) + (list gtk+)) (propagated-inputs ;; colord-gtk.pc refers to all these. (list colord gtk)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 753ab558ad..9465c0eda7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -388,7 +388,6 @@ (define-public gnome-maps libshumate libsoup libxml2 - pango-next ;TODO: remove when it's the default rest-next webkitgtk)) (synopsis "Graphical map viewer and wayfinding program") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 99ca0fef88..2f73c0a9b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8406,7 +8406,6 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - pango-next ;remove after it's the default webkitgtk)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") @@ -8714,8 +8713,7 @@ (define-public network-manager-openvpn libnma libsecret network-manager - openvpn - pango-next)) ;remove after it's the default + openvpn)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenVPN plug-in for NetworkManager") (description @@ -8765,8 +8763,7 @@ (define-public network-manager-vpnc vpnc network-manager libnma - libsecret - pango-next)) ;TODO: remove after it's the default + libsecret)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "VPNC plug-in for NetworkManager") (description @@ -8818,8 +8815,7 @@ (define-public network-manager-openconnect libxml2 lz4 network-manager - openconnect - pango-next)) ;TODO: remove after it's the default + openconnect)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "OpenConnect plug-in for NetworkManager") (description @@ -8882,7 +8878,6 @@ (define-public network-manager-fortisslvpn libsecret network-manager openfortivpn - pango-next ;TODO: remove after it's the default ppp)) (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN") (synopsis "Fortinet SSLVPN plug-in for NetworkManager") @@ -9309,8 +9304,6 @@ (define-public gnome-bluetooth (list eudev gsound libnotify - ;; TODO: Delete pango-next after it's the default. - pango-next python-dbus upower)) (synopsis "GNOME Bluetooth subsystem") @@ -10023,10 +10016,7 @@ (define-public baobab python vala)) (inputs - (list gtk libadwaita libhandy - ;; XXX: Ensure pango-next is used instead of the equally propagated - ;; 'pango'. - pango-next)) + (list gtk libadwaita libhandy)) (synopsis "Disk usage analyzer for GNOME") (description "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk @@ -10624,9 +10614,7 @@ (define-public gnome-calendar gsettings-desktop-schemas libadwaita libdazzle - libgweather4-with-libsoup2 - ;; Remove pango-next when it's the default. - pango-next)) + libgweather4-with-libsoup2)) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") (description @@ -13465,8 +13453,7 @@ (define-public gtranslator gspell libgda libhandy - libsoup - pango-next)) + libsoup)) (propagated-inputs (list gtksourceview-4)) ; required for source view (home-page "https://wiki.gnome.org/Apps/Gtranslator") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 89ce459e4c..edcdda8187 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -427,7 +427,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.48.10") + (version "1.50.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -436,7 +436,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))) + "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas @@ -481,21 +481,19 @@ (define-public pango (home-page "https://pango.gnome.org/") (license license:lgpl2.0+))) -;; TODO: Make this the default package in next release cycle. -(define-public pango-next +(define-public pango-1.48 (package (inherit pango) - (name "pango-next") ;to avoid profile conflicts - (version "1.50.4") + (version "1.48.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" - (version-major+minor version) - "/pango-" version ".tar.xz")) + (version-major+minor version) "/" + "pango-" version ".tar.xz")) (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl")))))) + "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91")))))) (define-public pango-1.42 (package @@ -713,8 +711,7 @@ (define-public gtksourceview glib gtk libxml2 - pcre2 - pango-next)) + pcre2)) (home-page "https://wiki.gnome.org/Projects/GtkSourceView") (synopsis "GNOME source code widget") (description "GtkSourceView is a text widget that extends the standard @@ -741,7 +738,6 @@ (define-public gtksourceview-4 (propagated-inputs (modify-inputs (package-propagated-inputs gtksourceview) (replace "gtk" gtk+) - (replace "pango-next" pango) (replace "glib" glib))))) (define-public gtksourceview-3 @@ -1413,7 +1409,7 @@ (define-public gtk libxkbcommon libxrandr libxrender - pango-next + pango vulkan-headers vulkan-loader ;for vulkan graphics API support wayland ;for wayland display-backend @@ -1830,7 +1826,7 @@ (define-public pangomm ("python" ,python) ("xsltproc" ,libxslt))) (propagated-inputs - (list cairo cairomm glibmm pango-next)) + (list cairo cairomm glibmm pango)) (home-page "https://pango.gnome.org//") (synopsis "C++ interface to the Pango text rendering library") (description @@ -1853,7 +1849,7 @@ (define-public pangomm-2.46 (sha256 (base32 "06zczkaxf5p5kjgnzrfylzi40w9a8lxpndgs7rpn12qrsq27sy6k")))) (propagated-inputs - (list cairomm-1.14 glibmm-2.64 pango)))) + (list cairomm-1.14 glibmm-2.64 pango-1.48)))) (define-public atkmm (package diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 7d52c5889e..2bcad54656 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -248,7 +248,7 @@ (define-public ibus ((#:configure-flags flags) #~(cons* "--enable-gtk4" #$flags)))) (inputs (modify-inputs (package-inputs ibus-minimal) - (prepend gtk pango-next))) + (prepend gtk))) (properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (define-public ibus-libpinyin diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ebb9bc17b3..2365e4f848 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1396,7 +1396,6 @@ (define-public dino libsignal-protocol-c libsoup libsrtp ;for calls support - pango-next ;gtk4 wants pango 1.50+ qrencode sqlite webrtc-audio-processing)) ;for A/V support diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5a28e1321f..bcf587f010 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6501,7 +6501,7 @@ (define-public zrythm libyaml lilv lv2 - pango-next + pango pipewire pulseaudio reproc diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0a51479985..8ef95ce518 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -290,8 +290,7 @@ (define-public webkitgtk-next (replace "gtk+" gtk))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "gtk+-2" "libnotify") - (append pango-next))))) ;TODO: remove after it's the default + (delete "gtk+-2" "libnotify"))))) ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3: -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:27 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:27 +0000 Received: from localhost ([127.0.0.1]:36473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm894-0008GW-SC for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:27 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:46686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88y-0008Dv-3b for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:20 -0400 Received: by mail-ej1-f66.google.com with SMTP id xi5so17834472ejb.13 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197014; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=dCI7bVBosTNi3MdhkOdDwG08B8c9Exn93yxGJtv9Jck=; b=XtW4OEwwegGlNJ+2mz9OvBxvcRAsG9b+JgeqJQSQhIz1A1nLLFmYD8w3MKIkr63m1O gsXvAlVCyxFV5nTHl3VAYi8mjGsIPjRJALFeD5vO07qMtJMjmjrywK+46x7UPdBDQEfQ qEay7F7cU57+mtLFWh/eudNpiWNQAFHdkJcHY8gh9pq0FV1Jl8LAFKEjC8Lz+hakT1qz 5ptC5lIDNgEdnGQnrtgzboF2SgaLqMTsQ2fxqHnd5e1YqgPJzUhBQv8bR021ndC+ve+5 mX73VEblyZ7y72S/RREYQ9ZFrylvoN+BM3TcN3WCPMg9NEzTRypI4BagygTj2hkdZzyO Zjow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197014; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=dCI7bVBosTNi3MdhkOdDwG08B8c9Exn93yxGJtv9Jck=; b=C/3xUKWL53Iul/HTEOXxPMzzp42imOG9GPuwI5TQ5R/iYLzFVReMMnKpoCXxXrc/mR FBYDPvWxHEuJlOgGKBjYyKJSI6SIWTQcYCWwTeVMaKOGtfQvVeHD+QKRFtowgs781JMZ rY9AUY7obQBdXpYODKCW5DbPIa2KfWftxrNRhTgmQOOEMvjHj0UuHTG25Pumkeqt7o27 +AaaBx8DjQkpJoYXhEwf4Y1yTK5pEQjr1Gm/5NmYw4OID+CaBfrQSqrcw5rxUwsi1rRP 9yhEkzClu4xYc8pfySnFIdcpqNIfz+gP+1JJ4LJu3b6aP5R2OANiH9BRLwi74AQoPF7O ImfA== X-Gm-Message-State: AAQBX9f5eX1BXaf3He1uPnNdk9FzZEeqXUVg8h1M+kGKj+w3Ujt61zRF LF45VYrZI7nyyY2nMefYWEaDVOBtv+sqJg== X-Google-Smtp-Source: AKy350Z72xFPOnKc3oDMFWmyZXbN8FNTQo+H3ZJosiACM8GCZ3R+1FV+qAzUYd2DnD3t61umvCwz2Q== X-Received: by 2002:a17:907:1686:b0:930:f953:962c with SMTP id hc6-20020a170907168600b00930f953962cmr12032884ejc.1.1681197014307; Tue, 11 Apr 2023 00:10:14 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:13 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 18:51:06 +0200 Subject: [PATCH gnome-team v3 09/15] gnu: python-pygobject: Update to 3.44.1. to: 62467@debbugs.gnu.org Message-ID: <970b8d6307004f8028a99c25d4617145960a23fb.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (python-pygobject): Update to 3.44.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9be8b46c34..54d21c362f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -922,7 +922,7 @@ (define-public glibmm-2.64 (d [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (python-pygobject): Update to 3.44.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9be8b46c34..54d21c362f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -922,7 +922,7 @@ (define-public glibmm-2.64 (d [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (python-pygobject): Update to 3.44.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9be8b46c34..54d21c362f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -922,7 +922,7 @@ (define-public glibmm-2.64 (define-public python-pygobject (package (name "python-pygobject") - (version "3.40.1") + (version "3.44.1") (source (origin (method url-fetch) @@ -931,7 +931,7 @@ (define-public python-pygobject "/pygobject-" version ".tar.xz")) (sha256 (base32 - "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0")) + "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w")) (modules '((guix build utils))) (snippet '(begin -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:28 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:28 +0000 Received: from localhost ([127.0.0.1]:36475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm895-0008Gj-Ar for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:28 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:35621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88v-0008Do-Cv for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:20 -0400 Received: by mail-ej1-f65.google.com with SMTP id jg21so17504854ejc.2 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197012; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=WQhNDxOKuJM7Ft+6/VPN3qvpfmMwuN2p3EcA38FyKUk=; b=nuXlP5PxYjmONj6FZ0vkwacoY1jT6ubGNUh4CQUccbDg/1RPzfunu8IsNwoaXwzBQK ppD0AxTe11GKc2FgpD19/rR/M6OX9ocBp+IJSUTeboU/DPmxbgkO228qINkKltTiersX y69ER1HiBBifnH1ycDpmb0ct9zZ/LYlUBn1WduTLPrHE59Ia58KkWTmsgwRGydzQr3OM oQKl0kfbPma6UJlqZAjpgYvVe30ojk38ZQWs2s4GySYts4lfR+Wi1pKAqq6VvUA9yM25 dY3biq96uBcdmC8npBXC6g9vc3Q7/jACfq5K7/VkxJRm4WPfNQXYIW4XW/3hzTcmAXl5 X7Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197012; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=WQhNDxOKuJM7Ft+6/VPN3qvpfmMwuN2p3EcA38FyKUk=; b=pL4S6A86jUtSZG+FpqZHYaIng9b5n1OgEWxaG4v6crI1OaqptOkY6nCflCtTuAjiDC xCU9hwIBkk0jcP1YtdBG92jJ5RHFWvMhQ1kozE5KPWIgDMTWSoPuDbNxlPLumI6VRJd2 yMPo8z+tKwiaWYPV5uVVlDmGYBbDkqQExlIZwxMPasguyQQKzEYbAfa3JvdoZJfIXz+c hIy3f/CgPb0IFPlocwbJ3aGoNiBoj0oHB2yrwWm/VKKajOe5eB3jR3MZoXevtWOgJVtX LeO2WSvfxMZlSAWGCS9Y6JEKlIXLslj67xKdFeaWt1y2c3cz2YvR5fF05FCkYYLZvIsK O2LA== X-Gm-Message-State: AAQBX9dj1lXQY6plqK/680kr3TjP+K7YSIMxTcAaylIjrMzYugXqwG07 jGW05bnhHPyfc5/Y19DbRKuXzMJZCZWBtg== X-Google-Smtp-Source: AKy350aFNUyJkCda15cvOk0PgbZnpPP0WJJV4YllrHXdzKGadqs9P2HDiTjk7Z7XbGiFah4FGEdNGg== X-Received: by 2002:a17:906:40d4:b0:94c:da2e:3993 with SMTP id a20-20020a17090640d400b0094cda2e3993mr3069005ejk.26.1681197011670; Tue, 11 Apr 2023 00:10:11 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:11 -0700 (PDT) From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:14:47 +0200 Subject: [PATCH gnome-team v3 05/15] gnu: Make gobject-introspection-next the new gobject-introspection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: <66e47b9789b29b55367619e5c21a990e4e69231e.camel@gmail.com> X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. (gobject-introspection-next): Delete variable. * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: Replace gobject-introspecti [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. (gobject-introspection-next): Delete variable. * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: Replace gobject-introspecti [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1. (gobject-introspection-next): Delete variable. * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]: Replace gobject-introspection-next with gobject-introspection. * gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]: Replace gobject-introspection-next with gobject-introspection. * gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch: Rename to… * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch: … this. * gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to… * gnu/packages/patches/gobject-introspection-cc.patch: … this. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 - gnu/packages/glib.scm | 21 +-- gnu/packages/gtk.scm | 2 +- gnu/packages/guile-xyz.scm | 2 +- ...trospection-absolute-shlib-path-1.72.patch | 173 ------------------ ...ct-introspection-absolute-shlib-path.patch | 51 +++--- .../gobject-introspection-cc-1.72.patch | 15 -- .../patches/gobject-introspection-cc.patch | 11 +- 8 files changed, 39 insertions(+), 238 deletions(-) delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch diff --git a/gnu/local.mk b/gnu/local.mk index f0a228f19f..67ec1b754a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1264,9 +1264,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnutls-cross.patch \ %D%/packages/patches/gnutls-guile-eintr-eagain.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ - %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ - %D%/packages/patches/gobject-introspection-cc-1.72.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d9a9c58fbb..4bc7198ccb 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -477,14 +477,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.66.1") + (version "1.73.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x")) + (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" @@ -564,23 +564,6 @@ (define gobject-introspection ;; For tools. license:gpl2+)))) -(define-public gobject-introspection-next - (package - (inherit gobject-introspection) - (name "gobject-introspection") - (version "1.73.1") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" - "gobject-introspection/" (version-major+minor version) - "/gobject-introspection-" version ".tar.xz")) - (sha256 - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) - (patches (search-patches - "gobject-introspection-cc-1.72.patch" - "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))))) - (define intltool (package (name "intltool") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 589d861a50..3e57035bac 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -698,7 +698,7 @@ (define-public gtksourceview (list `(,glib "bin") ; for glib-genmarshal, etc. gettext-minimal gi-docgen - gobject-introspection-next + gobject-introspection pkg-config vala ;; For testing. diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e6cef165ea..2bd5e1448c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2340,7 +2340,7 @@ (define (get lib) clutter xorg-server-for-tests)) (propagated-inputs - (list gobject-introspection-next)) + (list gobject-introspection)) (home-page "https://www.gnu.org/software/g-golf/") (synopsis "Guile bindings for GObject Introspection") (description diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch deleted file mode 100644 index 8bb86467c0..0000000000 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch +++ /dev/null @@ -1,173 +0,0 @@ -Names of libraries included in typelib files are opened by dlopen. -Here we add the full path. - -This patch was provided by Luca Bruno , -for 'gobject-introspection' 1.40.0 in Nix. - -It has since been updated to work with newer versions of -gobject-introspection. - -diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py -index 1d39ab84..e12ed24e 100644 ---- a/giscanner/scannermain.py -+++ b/giscanner/scannermain.py -@@ -95,6 +95,39 @@ def get_windows_option_group(parser): - return group - - -+def _get_default_fallback_libpath(): -+ # Newer multiple-output-optimized stdenv has an environment variable -+ # $outputLib which in turn specifies another variable which then is used as -+ # the destination for the library contents (${!outputLib}/lib). -+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None -+ if store_path is None: -+ outputs = os.environ.get("outputs", "out").split() -+ if "lib" in outputs: -+ # For multiple output derivations let's try whether there is a $lib -+ # environment variable and use that as the base store path. -+ store_path = os.environ.get("lib") -+ elif "out" in outputs: -+ # Otherwise we have a single output derivation, so the libraries -+ # most certainly will end up in "$out/lib". -+ store_path = os.environ.get("out") -+ -+ if store_path is not None: -+ # Even if we have a $lib as output, there still should be a $lib/lib -+ # directory. -+ return os.path.join(store_path, 'lib') -+ else: -+ # If we haven't found a possible scenario, let's return an empty string -+ # so that the shared library won't be prepended with a path. -+ # -+ # Note that this doesn't mean that all hope is lost, because after all -+ # we can still use --fallback-library-path to set one. -+ # -+ # Also, we're not returning None, because that would make it very -+ # difficult to disable adding fallback paths altogether using something -+ # like: --fallback-library-path="" -+ return "" -+ -+ - def _get_option_parser(): - parser = optparse.OptionParser('%prog [options] sources', - version='%prog ' + giscanner.__version__) -@@ -220,6 +253,10 @@ match the namespace prefix.""") - parser.add_option("", "--compiler", - action="store", dest="compiler", default=None, - help="the C compiler to use internally") -+ parser.add_option("", "--fallback-library-path", -+ action="store", dest="fallback_libpath", -+ default=_get_default_fallback_libpath(), -+ help="Path to prepend to unknown shared libraries") - - group = get_preprocessor_option_group(parser) - parser.add_option_group(group) -diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py -index 9f8ab5df..8aa37c99 100644 ---- a/giscanner/shlibs.py -+++ b/giscanner/shlibs.py -@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): - $""" % re.escape(library_name), re.VERBOSE) - - -+def _ldd_library_guix_pattern(library_name): -+ store_dir = re.escape( -+ os.environ.get("NIX_STORE", default="/gnu/store") -+ ) -+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' -+ return re.compile(pattern % (store_dir, re.escape(library_name))) -+ -+ - # This is a what we do for non-la files. We assume that we are on an - # ELF-like system where ldd exists and the soname extracted with ldd is - # a filename that can be opened with dlopen(). -@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): - output = output.decode("utf-8", "replace") - - shlibs = resolve_from_ldd_output(libraries, output) -- return list(map(sanitize_shlib_path, shlibs)) -+ fallback_libpath = options.fallback_libpath or ""; -+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) - - - def sanitize_shlib_path(lib): -@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib): - # In case we get relative paths on macOS (like @rpath) then we fall - # back to the basename as well: - # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 -- if sys.platform == "darwin": -- if not os.path.isabs(lib): -- return os.path.basename(lib) -- return lib -- else: -+ -+ # Always use absolute paths if available -+ if not os.path.isabs(lib): - return os.path.basename(lib) -+ return lib - - - def resolve_from_ldd_output(libraries, output): - patterns = {} - for library in libraries: - if not os.path.isfile(library): -- patterns[library] = _ldd_library_pattern(library) -+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) - if len(patterns) == 0: - return [] - -@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): - if line.endswith(':'): - continue - for word in line.split(): -- for library, pattern in patterns.items(): -- m = pattern.match(word) -+ for library, (pattern, guix_pattern) in patterns.items(): -+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") -+ if line.find(store_dir) != -1: -+ m = guix_pattern.match(word) -+ else: -+ m = pattern.match(word) - if m: - del patterns[library] - shlibs.append(m.group()) -diff --git a/giscanner/utils.py b/giscanner/utils.py -index 31c7ea48..630002a8 100644 ---- a/giscanner/utils.py -+++ b/giscanner/utils.py -@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): - if dlname is None: - return None - -- # Darwin uses absolute paths where possible; since the libtool files never -- # contain absolute paths, use the libdir field -- if platform.system() == 'Darwin': -- dlbasename = os.path.basename(dlname) -- libdir = _extract_libdir_field(la_file) -- if libdir is None: -- return dlbasename -- return libdir + '/' + dlbasename -- # Older libtools had a path rather than the raw dlname -- return os.path.basename(dlname) -+ dlbasename = os.path.basename(dlname) -+ libdir = _extract_libdir_field(la_file) -+ if libdir is None: -+ return dlbasename -+ return libdir + '/' + dlbasename - - - # Returns arguments for invoking libtool, if applicable, otherwise None -diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py -index a8337c60..7f123103 100644 ---- a/tests/scanner/test_shlibs.py -+++ b/tests/scanner/test_shlibs.py -@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): - - self.assertEqual( - sanitize_shlib_path('/foo/bar'), -- '/foo/bar' if sys.platform == 'darwin' else 'bar') -+ # Always use an absolute filename for Guix -+ '/foo/bar') - - def test_unresolved_library(self): - output = '' diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch index 956fa617c3..8bb86467c0 100644 --- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch @@ -1,11 +1,14 @@ -# Names of libraries included in typelib files are opened by dlopen. Here we -# add the full path. -# -# This patch was provided by Luca Bruno for -# 'gobject-introspection' 1.40.0 in Nix. -# -# It has since been updated to work with newer versions of -# gobject-introspection. +Names of libraries included in typelib files are opened by dlopen. +Here we add the full path. + +This patch was provided by Luca Bruno , +for 'gobject-introspection' 1.40.0 in Nix. + +It has since been updated to work with newer versions of +gobject-introspection. + +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index 1d39ab84..e12ed24e 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -95,6 +95,39 @@ def get_windows_option_group(parser): @@ -48,10 +51,10 @@ def _get_option_parser(): parser = optparse.OptionParser('%prog [options] sources', version='%prog ' + giscanner.__version__) -@@ -205,6 +238,10 @@ match the namespace prefix.""") - parser.add_option("", "--filelist", - action="store", dest="filelist", default=[], - help="file containing headers and sources to be scanned") +@@ -220,6 +253,10 @@ match the namespace prefix.""") + parser.add_option("", "--compiler", + action="store", dest="compiler", default=None, + help="the C compiler to use internally") + parser.add_option("", "--fallback-library-path", + action="store", dest="fallback_libpath", + default=_get_default_fallback_libpath(), @@ -59,6 +62,8 @@ group = get_preprocessor_option_group(parser) parser.add_option_group(group) +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 9f8ab5df..8aa37c99 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): @@ -76,7 +81,7 @@ # This is a what we do for non-la files. We assume that we are on an # ELF-like system where ldd exists and the soname extracted with ldd is # a filename that can be opened with dlopen(). -@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries): +@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): output = output.decode("utf-8", "replace") shlibs = resolve_from_ldd_output(libraries, output) @@ -86,7 +91,7 @@ def sanitize_shlib_path(lib): -@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib): +@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib): # In case we get relative paths on macOS (like @rpath) then we fall # back to the basename as well: # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 @@ -111,7 +116,7 @@ if len(patterns) == 0: return [] -@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output): +@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): if line.endswith(':'): continue for word in line.split(): @@ -126,10 +131,11 @@ if m: del patterns[library] shlibs.append(m.group()) - +diff --git a/giscanner/utils.py b/giscanner/utils.py +index 31c7ea48..630002a8 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py -@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file): +@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): if dlname is None: return None @@ -141,8 +147,7 @@ - if libdir is None: - return dlbasename - return libdir + '/' + dlbasename -- # From the comments in extract_libtool(), older libtools had -- # a path rather than the raw dlname +- # Older libtools had a path rather than the raw dlname - return os.path.basename(dlname) + dlbasename = os.path.basename(dlname) + libdir = _extract_libdir_field(la_file) @@ -151,10 +156,12 @@ + return libdir + '/' + dlbasename - def extract_libtool(la_file): + # Returns arguments for invoking libtool, if applicable, otherwise None +diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py +index a8337c60..7f123103 100644 --- a/tests/scanner/test_shlibs.py +++ b/tests/scanner/test_shlibs.py -@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase): +@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): self.assertEqual( sanitize_shlib_path('/foo/bar'), @@ -163,4 +170,4 @@ + '/foo/bar') def test_unresolved_library(self): -output = '' + output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch deleted file mode 100644 index d3b1df82af..0000000000 --- a/gnu/packages/patches/gobject-introspection-cc-1.72.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use gcc as the default C compiler if CC is not set. - -diff --git a/giscanner/__init__.py b/giscanner/__init__.py -index 7c2f365a..607fe341 100644 ---- a/giscanner/__init__.py -+++ b/giscanner/__init__.py -@@ -21,6 +21,8 @@ import os - builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') - if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422 -+if not 'CC' in os.environ: -+ os.environ['CC'] = 'gcc' - try: - from ._version import __version__ - except ImportError: diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch index 6a86b56b44..d3b1df82af 100644 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ b/gnu/packages/patches/gobject-introspection-cc.patch @@ -1,12 +1,13 @@ Use gcc as the default C compiler if CC is not set. -diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py ---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100 -+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100 -@@ -22,6 +22,8 @@ +diff --git a/giscanner/__init__.py b/giscanner/__init__.py +index 7c2f365a..607fe341 100644 +--- a/giscanner/__init__.py ++++ b/giscanner/__init__.py +@@ -21,6 +21,8 @@ import os builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') if builddir is not None: - __path__.append(os.path.join(builddir, 'giscanner')) + __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422 +if not 'CC' in os.environ: + os.environ['CC'] = 'gcc' try: -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:29 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:29 +0000 Received: from localhost ([127.0.0.1]:36477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm896-0008Gm-Fn for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:28 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:37515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88y-0008E2-Jv for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:21 -0400 Received: by mail-ej1-f66.google.com with SMTP id qa44so17534131ejc.4 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197015; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=zzr63bWRbSd6xaTz+K5E65nc6aN9B0DjHKIhCOeXbd8=; b=GLDUz1NZcSD5j3HD4N098ENhR7SslZQlov/RhP2EBjen+1PRBx03QP0FbpU08YUWC4 r7147gvlidEvbfbCBMeZVnBIb0YA7U/9StvHiEmYdApQ1C9Q9W8ZUvSvrD5jcRe5rubg eLHw8nem9jm7GUhv3PzF/2yUbPUQoEkDUISsvJBk/KCx0Jde73PvC3QH0YOfRmwP/lIu gJTyMK2efW6A9U3Iot4fitKaZMcfOelK1+oZ95Kfg7qTC0yaxx/kDTzqrNgyftRm9lXA 5yO16O2uU89gar4YOD/PFlhf7Afb1lhhohqNMVRDB41k7WRd/YJCYX2p9Vas/nHA6hky 8E/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197015; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zzr63bWRbSd6xaTz+K5E65nc6aN9B0DjHKIhCOeXbd8=; b=DVzIHTWIwOaoVRJ7mZG/RkIXCMINZiJgPBpLPMa/CKMO4Nu3//5pdC5oInQZ2+LUsk llEEhVSSk8NCQpWpmHwqQrMOL72ZZbedKODyHn5jQoymx1e5ZwBzlHnAS/L4n3bSWM7p HxWvpi49PT85OzCYw0koNXRYQOn0aPrxrtErShuRTjkSysU2/a1WrwsruJh3JoFJSwGU rLDXAzUkJMVuCuW9eNi7MnDCxGtBB6E47kQdDwaFA2LMXdn+fIhcPalpiOg9JIKbFUnX K9n/+K1VDaIZzzZuxmdSAq9Saqsq2iuxwaYyzHzcF+XsV7LD912LxoDzv7O1zUcf6g25 vW5A== X-Gm-Message-State: AAQBX9fs+nuA5kKOJMTw7BWfHh5pcHzXbfpsuX6UNQuigJfpDlkn5r86 NLcQYW3uhfllbZsZ6Rd9G3Wx6445IV7B0A== X-Google-Smtp-Source: AKy350aJsXU25UVXS1yVYqcm+xlMsgvfSF8Wa6iWZyF4YCFmoan0OgQDae1YmkrQYdIJqgnPkdLRgA== X-Received: by 2002:a17:907:874f:b0:94a:532b:3f70 with SMTP id qo15-20020a170907874f00b0094a532b3f70mr6155477ejc.20.1681197015057; Tue, 11 Apr 2023 00:10:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:14 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 30 Mar 2023 20:41:59 +0200 Subject: [PATCH gnome-team v3 10/15] gnu: gtk+-2: Fix build by hardening list store. to: 62467@debbugs.gnu.org Message-ID: <4dbf541e337c0b2324247fc10ff532f788bd0afd.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/gtk2-harden-list-store.patch: New file. * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/pac [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/gtk2-harden-list-store.patch: New file. * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/pac [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/patches/gtk2-harden-list-store.patch: New file. * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 1 + .../patches/gtk2-harden-list-store.patch | 42 +++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch diff --git a/gnu/local.mk b/gnu/local.mk index 67ec1b754a..df78ce263e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1303,6 +1303,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ + %D%/packages/patches/gtk2-harden-list-store.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3e57035bac..6d3bbb42be 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1014,6 +1014,7 @@ (define-public gtk+-2 "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" + "gtk2-harden-list-store.patch" "gtk2-theme-paths.patch" "gtk2-fix-builder-test.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch b/gnu/packages/patches/gtk2-harden-list-store.patch new file mode 100644 index 0000000000..f49dc3bc77 --- /dev/null +++ b/gnu/packages/patches/gtk2-harden-list-store.patch @@ -0,0 +1,42 @@ +Backport the implementation of gtk_list_store_iter_is_valid from gtk+-3. + +Index: gtk+-2.24.33/gtk/gtkliststore.c +=================================================================== +--- gtk+-2.24.33.orig/gtk/gtkliststore.c ++++ gtk+-2.24.33/gtk/gtkliststore.c +@@ -1195,16 +1195,31 @@ gboolean + gtk_list_store_iter_is_valid (GtkListStore *list_store, + GtkTreeIter *iter) + { ++ GSequenceIter *seq_iter; ++ + g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE); + g_return_val_if_fail (iter != NULL, FALSE); + +- if (!VALID_ITER (iter, list_store)) +- return FALSE; ++ /* can't use VALID_ITER() here, because iter might point ++ * to random memory. ++ * ++ * We MUST NOT dereference it. ++ */ + +- if (g_sequence_iter_get_sequence (iter->user_data) != list_store->seq) ++ if (iter == NULL || ++ iter->user_data == NULL || ++ list_store->stamp != iter->stamp) + return FALSE; + +- return TRUE; ++ for (seq_iter = g_sequence_get_begin_iter (list_store->seq); ++ !g_sequence_iter_is_end (seq_iter); ++ seq_iter = g_sequence_iter_next (seq_iter)) ++ { ++ if (seq_iter == iter->user_data) ++ return TRUE; ++ } ++ ++ return FALSE; + } + + static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source, -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:29 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:29 +0000 Received: from localhost ([127.0.0.1]:36479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm897-0008Gt-0D for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:29 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:43939) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88z-0008E6-Fo for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:22 -0400 Received: by mail-ej1-f68.google.com with SMTP id sh8so17781850ejc.10 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197016; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=KmKyheuo+WljJzomi+AFHXKDZEYe72cFaM4ASHYZgBE=; b=YRx037c7coA4SixAD7n97JAtM3SioXvcR/vGOpHTX2q0tPQneG7j8m7eoq0QzVX+Z9 XczdTq0BJ7AZmNjM+chG6RIq7DKNKtOtM24D20S1Zep+8Y+3wa8AJ3UHf8KmDuJZmaV8 engVhDlDt4+1elOE/osziryz4Y+qQc8LUu3khw/o6vLlyYYRKYXYleNgWMuW1cfuwCLv m0q2VmObbJ5un6P6rB8vM5uXI4oOVqgeN/LAUu7Eiv54Zc2Ft8hIJVtZ6PfkChvqVumZ Y6+JYJBz5q+WJQI31DRHEHAqf8VJc+9Uk+UGek0My0FnxAdQ87aGPkqPP9GnPArwM5/+ UYdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197016; h=message-id:cc:to:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KmKyheuo+WljJzomi+AFHXKDZEYe72cFaM4ASHYZgBE=; b=ZpKc5jNhbjzceqx3GvX99Sb61AhaVdJhH5xBMQAD4p1/SmJZxFe5Y7Su6fLvX3ppYC /jOGso2xABOgRZmq9fsPcKywkQ6yhSmBDaxNOWxnDpC8QN/AUemFzGARfgyLDxxrSKI9 IUn5b/JnmG0brSp3pvCizcegUIOmL7YpQgEv/OYruR4RYEQ0CGqJ+Fswh0fwDa+O9FT5 79gneM7ILYKMUpv6egRpWfw3g3B6d4g9uEtfXDN58YmLIq1d5UG/Wgdctzn31evpHSKG urLm4GUQ0HxR0twYDVK2q72BGxN1pjWRg3xAf4AAKLdMZb9t2v1tHbMe4zaHRgU6K/FO F3LQ== X-Gm-Message-State: AAQBX9e58UvRQjkBuKkeR9A81Cz9Rrv4XgvCl2DiW5jlsNr2pfKGXWXp R0C/9SyT/xAZPLHprY59gnb70fV9WCGubw== X-Google-Smtp-Source: AKy350Z6o7vJsBRsEqGsgbjm7aIc2ruKMrFtTfy+lsXXNL+gPsN0w1wWtCCE7Brm5Ah0ubbywCmxEA== X-Received: by 2002:a17:906:70cf:b0:939:e870:2b37 with SMTP id g15-20020a17090670cf00b00939e8702b37mr11257502ejk.70.1681197015720; Tue, 11 Apr 2023 00:10:15 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:15 -0700 (PDT) From: Liliana Marie Prikler Date: Thu, 30 Mar 2023 06:28:00 +0200 Subject: [PATCH gnome-team v3 11/15] gnu: gtk+: Update to 3.24.37. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit to: 62467@debbugs.gnu.org Message-ID: X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (gtk+): Update to 3.24.37. [native-inputs]: Add docbook-xsl. [build-system]: Use meson-build-system. [arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly. <#: [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gtk.scm (gtk+): Update to 3.24.37. [native-inputs]: Add docbook-xsl. [build-system]: Use meson-build-system. [arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly. <#: [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.68 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.68 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gtk.scm (gtk+): Update to 3.24.37. [native-inputs]: Add docbook-xsl. [build-system]: Use meson-build-system. [arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly. <#:phases>: Remove ‘generate-gdk-pixbuf-loaders-cache-file’. Adjust ‘disable-failing-tests’. Rename ‘move-desktop-files’ to ‘move-files’ and move documentation as well. --- gnu/packages/gtk.scm | 85 +++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6d3bbb42be..e49115ad0e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1101,7 +1101,7 @@ (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.30") + (version "3.24.37") (source (origin (method url-fetch) @@ -1110,7 +1110,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds")) + "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (propagated-inputs @@ -1152,6 +1152,7 @@ (define-public gtk+ rest)) (native-inputs (list docbook-xml-4.1.2 + docbook-xsl gettext-minimal `(,glib "bin") gobject-introspection @@ -1164,47 +1165,29 @@ (define-public gtk+ ;; of updating xorg-server directly on the master branch. xorg-server-for-tests libxslt)) + (build-system meson-build-system) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) - ,@%gnu-build-system-modules) - #:modules ((guix build utils) - (guix build gnu-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) + `(#:glib-or-gtk? #t #:disallowed-references (,xorg-server-for-tests) - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes - ;; to "doc". - #:configure-flags (list (string-append "--with-html-dir=" - (assoc-ref %outputs "doc") - "/share/gtk-doc/html") - "--enable-cloudproviders" + #:configure-flags (list "-Dcloudproviders=true" ;; The header file is required ;; by gnome-control-center - "--enable-wayland-backend" + "-Dwayland_backend=true" ;; This is necessary to build both backends. - "--enable-x11-backend" + "-Dx11_backend=true" ;; This enables the HTML5 websocket backend. - "--enable-broadway-backend") + "-Dbroadway_backend=true" + "-Dman=true") #:phases (modify-phases %standard-phases - (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 'disable-failing-tests (lambda _ - (substitute* "testsuite/gtk/Makefile.in" - (("builderparser cellarea check-icon-names check-cursor-names") - "builderparser cellarea check-cursor-names") - (("notify no-gtk-init object objects-finalize papersize rbtree") - "no-gtk-init papersize rbtree") - (("stylecontext templates textbuffer textiter treemodel treepath") - "stylecontext textbuffer textiter treemodel treepath")) - (substitute* "testsuite/a11y/Makefile.in" - (("accessibility-dump tree-performance text children derive") - "tree-performance text children derive")) - (substitute* "testsuite/reftests/Makefile.in" - (("TEST_PROGS = gtk-reftest") - "TEST_PROGS = ")) - #t)) + (substitute* "testsuite/gtk/meson.build" + (("\\['defaultvalue'\\],") "") + (("\\['objects-finalize', .*\\],") "")) + (substitute* "testsuite/reftests/meson.build" + (("'flipping-icons(\\.[^.]*)?\\.ui',") "") + (("'gtk-icontheme-sizing(\\.[^.]*)?\\.ui',") "")))) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. @@ -1217,15 +1200,35 @@ (define-public gtk+ ;; For missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") #t)) - (add-after 'install 'move-desktop-files - ;; Move desktop files into 'bin' to avoid cycle references. + (add-after 'install 'move-files (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (bin (assoc-ref outputs "bin"))) - (mkdir-p (string-append bin "/share")) - (rename-file (string-append out "/share/applications") - (string-append bin "/share/applications")) - #t)))))) + (define-values (out bin doc) + (values (assoc-ref outputs "out") + (assoc-ref outputs "bin") + (assoc-ref outputs "doc"))) + (for-each mkdir-p + (list + (string-append bin "/bin") + (string-append bin "/share/applications") + (string-append bin "/share/icons") + (string-append bin "/share/man") + (string-append bin "/share/metainfo") + (string-append doc "/share/doc"))) + ;; Move programs and related files to output 'bin'. + (for-each (lambda (dir) + (rename-file + (string-append out dir) + (string-append bin dir))) + (list + "/bin" + "/share/applications" + "/share/icons" + "/share/man")) + ;; Move HTML documentation to output 'doc'. + (when (file-exists? (string-append out "/share/doc")) + (rename-file + (string-append out "/share/doc") + (string-append doc "/share/doc")))))))) (native-search-paths (list (search-path-specification (variable "GUIX_GTK3_PATH") -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:29 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:30 +0000 Received: from localhost ([127.0.0.1]:36481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm897-0008H1-Iw for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:29 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:34688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm88z-0008EC-QE for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:22 -0400 Received: by mail-ej1-f67.google.com with SMTP id f26so11724179ejb.1 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197016; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=+cUgBxHncHHx4HTYDB34lYxe178gOTwjSmJD4tyD1+o=; b=O09GF31G/hiYvhIRjaTcvVmgaqtZvEHYIfkEXlnqbojQX6PQnQkAPDeIKQgH5TujSW 6cD14K7ufKOFESQl8jUU9C8qyAbG7fpDwFbVKuH7ydPQDxR2dCEpSE+nRwHE+tKH1h0m +zSDngreRkwHehp5F4DebHrGYLQ6rCKNFa+tqF/Ryq0m632vqKLNrQoZcgVO/FNDdEF+ dlxGM7MAeNnO2fPOKFbUO9mL3TeZJ4Ho+VixLzRzenRKuGUJKUu3GjgcLjNs3dQxYOlH jZ+B3duj3vfTdOhj/07pbvel6YszlrL9kfjJQrlRS4gcNs2gTRV2aop7ZK5AB9F/mgL+ ESjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197016; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+cUgBxHncHHx4HTYDB34lYxe178gOTwjSmJD4tyD1+o=; b=eT84HO36K9lKvEMKdpkWhp5DDy5c82qOJoR8lRAmRIkdZImTkvBrVieqV2z3Yv9z0W G5TxBbIAG5vkjZtYfdCSDXwjEbi6vNaEMw9y/T/f1yJW3S1Is3Xveq4qEZA8rqxuxa6C Jmqw4yKm4NLKhWhxRefhsLZVQMJzuaROJO5f6z8IKlq4NUK8/2uLfZsgMcSaPLjgx01J yR4ULGPsAib6yL+rOx8Zr0beD2tTxuAwT2vov9aHJo7gerlvKZCxcOBCqtjGRcFRTmi4 E5XHtXig0F+QWJrB+Fw/jLvVDLEWtcfU+za/oAf0pU9ioxqomFnojrOogJQOJewBijdy E6xQ== X-Gm-Message-State: AAQBX9cW9Mf1QQeawpOmF+yq3JAg+Ro7LFcPgQpM13fLFfmDAFSxZquQ OnJUwaCSah3vxl15E0Sfhzx4rNqFnq1LbQ== X-Google-Smtp-Source: AKy350axj/gj2KuQNzNPTpDXDW42v009SqDpbfGT/BgerIITTFM866kY3Y/rhP9FqYc0IqoS3xmt3A== X-Received: by 2002:a17:906:b297:b0:94a:e482:e26e with SMTP id q23-20020a170906b29700b0094ae482e26emr3424469ejz.36.1681197016297; Tue, 11 Apr 2023 00:10:16 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:16 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 21:34:04 +0200 Subject: [PATCH gnome-team v3 12/15] gnu: librsvg: Fix build. to: 62467@debbugs.gnu.org Message-ID: <1de9e1d3df8f55e3bc41e534a5745035a15a62fb.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 2.1 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (librsvg)[#:phases]: Also delete SVG files that have been broken by the recent updates. --- gnu/packages/gnome.scm | 7 ++++++- 1 file changed, 6 insertio [...] Content analysis details: (2.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/gnome.scm (librsvg)[#:phases]: Also delete SVG files that have been broken by the recent updates. --- gnu/packages/gnome.scm | 7 ++++++- 1 file changed, 6 insertio [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.67 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.67 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 2.1 DATE_IN_PAST_96_XX Date: is 96 hours or more before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/gnome.scm (librsvg)[#:phases]: Also delete SVG files that have been broken by the recent updates. --- gnu/packages/gnome.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a7eed081fb..725471c1c3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3697,7 +3697,12 @@ (define-public librsvg (("fn multiple_input_files_not_allowed_for_png_output" all) (string-append "#[ignore] " all)) (("fn stylesheet_option_error" all) - (string-append "#[ignore] " all))))) + (string-append "#[ignore] " all))) + ;; XXX: re-enable when updating this package + (with-directory-excursion "tests/fixtures/reftests/" + (delete-file "filter-component-transfer-from-reference-page.svg") + (delete-file "filter-morphology-from-reference-page.svg") + (delete-file "svg1.1/text-text-03-b.svg")))) (replace 'check (lambda* args ((assoc-ref gnu:%standard-phases 'check) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:30 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:30 +0000 Received: from localhost ([127.0.0.1]:36483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm897-0008H8-Sf for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:30 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:37519) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm890-0008EQ-Vz for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:23 -0400 Received: by mail-ej1-f66.google.com with SMTP id qa44so17534382ejc.4 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=UZWoqSvezsSlumvUBL8almECrICUUenOdaKmuvDS1Tc=; b=frfVfFBVxdr7HT3i56bRv5LF5ne0uCn+u1gxAlyv3aEWLtJ8KJet9H+lWl6kWHcZAP MVNObzIrKwjJ/xPSphdfq/+Y8r+nlnJ/AKOchovTpZuMrIPTpnnCQ8jgtZd4gdBFBCm8 ZNs3xQTQ/rAF22GAG5urXsdWpEesBfd/NWc+Gu9Z88AMa3+PGcgnnRlBQfr3V9J8KaKX tCm4Pp7iQCi/IqjMSJ30HGmBT5eu5+qDcyb+l41wbxk2Z7xJg4PP2uHCGXOjmN3w7Y1C 986rd+7NWKkcAueA1LqDzHqpjzMaeh1kAsrhYYfcLZjlR4uGFPcbVB8u0oxzbJ3rCQJm g+9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197017; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UZWoqSvezsSlumvUBL8almECrICUUenOdaKmuvDS1Tc=; b=opgbIdKNyo9EbmzPpWRdz3Lp7SNNu+uEPeSfpURLe8AUnzW10mlY7y3FYxNMThCYxl San3/Nyt2DdlwI5qEOJUKT3L8Oe+ukz0obcqzAFGCIqbmMo4FL5JgFnd8Y5qAXE5WXcy UjrpBWsRZY93crwmAFGVSVmF3RvM1Vrp1vSDo1Jn0BA4Qj7+ZpeNa9+RaqL63peV2TVt HIK7NbthXzHQWYBH/UHUM+7Yv7bpPpZ05Ksaf821awq5qmsyRw8gakKfR3hXUBm+CFtm Fdl5764e08vHc79/NWe/qK5NL4Z+415YQtRrJiWPEOVKRpsd2I22jtqxO1ZHgd/W/GBb 8L0w== X-Gm-Message-State: AAQBX9cEtLqqu7MPeEpvra3CS3IH1dDkqn1A9XybvUal2vqH8G91IGyI IMSN97S7aDtQC6UkqJtY7BOKntsgxMLOsw== X-Google-Smtp-Source: AKy350bPJiDSm4SAubrhROb8JnRitHgQlCsVaxoPC9OxyRtAV+zR5zyomB/s6AbS5qa4HbnnL5I5jw== X-Received: by 2002:a17:907:77c6:b0:8f4:ec13:d599 with SMTP id kz6-20020a17090777c600b008f4ec13d599mr10898198ejc.27.1681197017419; Tue, 11 Apr 2023 00:10:17 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:17 -0700 (PDT) From: Liliana Marie Prikler Date: Mon, 10 Apr 2023 09:08:38 +0200 Subject: [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style. to: 62467@debbugs.gnu.org Message-ID: <17d1e460476b5c72d75e4224661720557b7de2b2.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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: -0.5 (/) * gnu/packages/inkscape.scm (inkscape)[arguments]: Convert to list of G-Expressions. [inputs]: Drop labels. --- gnu/packages/inkscape.scm | 150 +++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 74 deletions(-) diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index b8e78c2b11..7762271299 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -26,6 +26,7 @@ (define-module (gnu packages inkscape) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix utils) #:use-module (guix build-system cmake) @@ -153,87 +154,88 @@ (define-public inkscape/stable ((".*find_package\\(DoubleConversion.*") "")))))) (build-system cmake-build-system) (arguments - `(#:test-target "check" ;otherwise some test binaries are missing - #:imported-modules (,@%cmake-build-system-modules + (list + #:test-target "check" ; otherwise some test binaries are missing + #:imported-modules `(,@%cmake-build-system-modules (guix build glib-or-gtk-build-system)) - #:modules ((guix build cmake-build-system) + #:modules '((guix build cmake-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) - #:phases - (modify-phases %standard-phases - (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-icon-cache-generator - (lambda _ - (substitute* "share/icons/application/CMakeLists.txt" - (("gtk-update-icon-cache") "true")))) - (add-after 'unpack 'disable-latex-export-tests - ;; FIXME: For some reason the test.pdf_tex file generated by the - ;; "--export-latex" lacks "some text" in its content when run in - ;; the build environment. Skip the related tests. - (lambda _ - (substitute* "testfiles/cli_tests/CMakeLists.txt" - (("add_cli_test\\(export-latex") - "message(TEST_DISABLED: export-latex")))) - (add-after 'unpack 'set-home - ;; Mute Inkscape warnings during tests. - (lambda _ - (setenv "HOME" (getcwd)))) - ;; Move the check phase after the install phase, as when run in the - ;; tests, Inkscape relies on files that are not yet installed, such - ;; as the "share/inkscape/ui/units.xml" file. - (delete 'check) - (add-after 'install 'check - (assoc-ref %standard-phases 'check)) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'install 'wrap-program - ;; Ensure Python is available at runtime. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/inkscape") - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH"))) - ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load + #:phases + #~(modify-phases %standard-phases + (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-icon-cache-generator + (lambda _ + (substitute* "share/icons/application/CMakeLists.txt" + (("gtk-update-icon-cache") "true")))) + (add-after 'unpack 'disable-latex-export-tests + ;; FIXME: For some reason the test.pdf_tex file generated by the + ;; "--export-latex" lacks "some text" in its content when run in + ;; the build environment. Skip the related tests. + (lambda _ + (substitute* "testfiles/cli_tests/CMakeLists.txt" + (("add_cli_test\\(export-latex") + "message(TEST_DISABLED: export-latex")))) + (add-after 'unpack 'set-home + ;; Mute Inkscape warnings during tests. + (lambda _ + (setenv "HOME" (getcwd)))) + ;; Move the check phase after the install phase, as when run in the + ;; tests, Inkscape relies on files that are not yet installed, such + ;; as the "share/inkscape/ui/units.xml" file. + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) + (add-after 'install 'wrap-program + ;; Ensure Python is available at runtime. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/inkscape") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))) + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load ;; its own icons in pure environments. `("GDK_PIXBUF_MODULE_FILE" = (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))) (inputs - `(("aspell" ,aspell) - ("bash-minimal" ,bash-minimal) - ("autotrace" ,autotrace) - ("gdl" ,gdl-minimal) - ("gtkmm" ,gtkmm-3) - ("gtk" ,gtk+) - ("gtkspell3" ,gtkspell3) - ("gsl" ,gsl) - ("poppler" ,poppler) - ("lib2geom" ,lib2geom-1.2) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("libgc" ,libgc) - ("librsvg" ,librsvg) ; for the pixbuf loader - ("libsoup" ,libsoup-minimal-2) - ("libcdr" ,libcdr) - ("libvisio" ,libvisio) - ("libwpd" ,libwpd) - ("libwpg" ,libwpg) - ("freetype" ,freetype) - ("popt" ,popt) - ("potrace" ,potrace) - ("lcms" ,lcms) - ("boost" ,boost) - ("python" ,python-wrapper) - ("python-cssselect" ,python-cssselect) ; to render qrcode - ("python-scour" ,python-scour) - ("python-pyserial" ,python-pyserial) - ("python-numpy" ,python-numpy) - ("python-lxml" ,python-lxml))) + (list aspell + bash-minimal + autotrace + gdl-minimal + gtkmm-3 + gtk+ + gtkspell3 + gsl + poppler + lib2geom-1.2 + libjpeg-turbo + libpng + libxml2 + libxslt + libgc + librsvg ; for the pixbuf loader + libsoup-minimal-2 + libcdr + libvisio + libwpd + libwpg + freetype + popt + potrace + lcms + boost + python-wrapper + python-cssselect ; to render qrcode + python-scour + python-pyserial + python-numpy + python-lxml)) (native-inputs (list imagemagick ;for tests intltool -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 03:10:31 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 07:10:31 +0000 Received: from localhost ([127.0.0.1]:36485 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm898-0008HG-IL for submit@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:30 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:46690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pm891-0008EZ-HJ for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 03:10:24 -0400 Received: by mail-ej1-f66.google.com with SMTP id xi5so17834732ejb.13 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 00:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681197018; h=mime-version:message-id:cc:to:subject:date:from:from:to:cc:subject :date:message-id:reply-to; bh=QBf6lg4AlUlAYCeCgN8PmJWUYLGfxNBMIW8WlTxJcxE=; b=L1PuV0qKa1jFtOWy536DMvEQuIgVpzmYxLGG17GJ9p6CFnZIU5RyhD7G58HZbauGHC My2BNngPXOE3IKU4aABDx2yMLFEHIsuFlrEQ/sy6aO5UARsjaisZXDf2zUNR0W1eruRJ F/oOSkAxO2GsCAziTDImMTBUY4zUr0GWFmwiYhG5ToqYHeRDwwqhaDWjbEyoeOoObcXE 5Ek1Ghh92VJGrK43ijWZI2mYC+R4q08LmDGDGy6dumz1jZn5jEBVx4eTStUdltbNqBdS CQO3FA+caLehoHGNMeEtxz19nKPAOm8dQl/fLECX8dkpvCYQPaASDuiADxmOShMJRjp1 xpWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681197018; h=mime-version:message-id:cc:to:subject:date:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=QBf6lg4AlUlAYCeCgN8PmJWUYLGfxNBMIW8WlTxJcxE=; b=kqb1Mut70b26NbE1vJJUV6sgVMRAP0VvnkiH+/2jPAPFaRcWf+jXzeVSfWEtFzUQWV 4JtwfyzlcxU+xfUSstKoYkFW3MZmdtvnZ1oNsgOZnqoyomVFzR37x0X2coWgksmd+1J1 mZrgUMFIVuxIrezx4znWCWznJtyochyErJBaCijUTHhG4S1msTWAsl0miIM3UHIAuZQc o2/fpAhHhxpdj9pyq5R0cdg2nI4n80MhwqMBV7D8coWgZxWLPEldJomjXB9qxlQEQ7OP jQKrrz3aPh15uqTMEuYazCwXQSGBA3LOxRL/jmb6Ux/ScEX61NuKZXIq+1fZDWCVbis/ fRnQ== X-Gm-Message-State: AAQBX9cL05oGeqky8OZYCgyGmUFtckU3kpVKxZcz+e/RaZ/ZLuq7UwW6 Ps4rrVXYzztJv6Vj9jkrBqY3vJkuyd1uwQ== X-Google-Smtp-Source: AKy350Y9hjlWQjH1A0aqqQ+K7K5dqUesIQHsnjz8ydHQfWFO4LTLtD5OAQEn+6GefMtG+Jo49ec2qw== X-Received: by 2002:a17:907:674e:b0:94b:466b:a492 with SMTP id qm14-20020a170907674e00b0094b466ba492mr4333265ejc.19.1681197017985; Tue, 11 Apr 2023 00:10:17 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id md15-20020a170906ae8f00b0094b87711c9fsm1169185ejb.99.2023.04.11.00.10.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 00:10:17 -0700 (PDT) From: Liliana Marie Prikler Date: Mon, 10 Apr 2023 18:12:19 +0200 Subject: [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1. to: 62467@debbugs.gnu.org Message-ID: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> MIME-Version: 1.0 X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, Maxim Cournoyer 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: -0.2 (/) * gnu/packages/graphics.scm (lib2geom): Update to 1.2. (lib2geom-1.2): Remove variable. * gnu/packages/inkscape.scm (inkscape)[inputs]: Use libgeom. --- gnu/packages/graphics.scm | 22 ++++------------------ gnu/packages/inkscape.scm | 2 +- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index bcc27cc3bf..336f1dd19d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -872,16 +872,16 @@ (define-public ilmbase (define-public lib2geom (package (name "lib2geom") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/inkscape/lib2geom.git") + (url "https://gitlab.com/inkscape/lib2geom") (commit version))) - (file-name (git-file-name name version)) + (file-name (git-file-name "lib2geom" version)) (sha256 (base32 - "03bx9k1m4bfhmx0ldsg0bks6i8h7fmvl5vbg6gmpq0bk0nkmpnmv")))) + "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8")))) (build-system cmake-build-system) (arguments `(#:imported-modules ((guix build python-build-system) @@ -938,20 +938,6 @@ (define-public lib2geom ;; https://gitlab.com/inkscape/inkscape/issues/784). (license license:gpl3+))) -(define-public lib2geom-1.2 - (package - (inherit lib2geom) - (version "1.2") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/inkscape/lib2geom") - (commit version))) - (file-name (git-file-name "lib2geom" version)) - (sha256 - (base32 - "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8")))))) - (define-public python-booleanoperations (package (name "python-booleanoperations") diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm index 7762271299..5c1689fcc7 100644 --- a/gnu/packages/inkscape.scm +++ b/gnu/packages/inkscape.scm @@ -213,7 +213,7 @@ (define-public inkscape/stable gtkspell3 gsl poppler - lib2geom-1.2 + lib2geom libjpeg-turbo libpng libxml2 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 16:52:27 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 20:52:27 +0000 Received: from localhost ([127.0.0.1]:38376 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmKyY-0001Ab-RQ for submit@debbugs.gnu.org; Tue, 11 Apr 2023 16:52:27 -0400 Received: from mail-qv1-f54.google.com ([209.85.219.54]:33368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmKyW-0001AN-LT for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 16:52:25 -0400 Received: by mail-qv1-f54.google.com with SMTP id o7so7345770qvs.0 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 13:52:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681246339; x=1683838339; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=aB3sIFps6b2/AiWCkFb52ZUkiQu312LfPBIkaZd+C14=; b=FA8aAtEizWYk59+p73eUbaKRy0casgqAchm9bm6kG1Q3Iq+UWdle8rZF56RlP/AyY1 qeDp1y/hVbPyrPHUBRPnHzRbGMzjyuMPx9UFLMvATnaHn87Z6DgDWnfN0D5Xie39eVoc /fo7l6BAMfEo2DpuTygnL/rKjD9wQqe/NbHdhr/mwL+nhKYjm+Ayg5qIKTUdIG5sRnAU CVSnvqY9GQxdrcSoOievVQzQGZdqu1mREzUE9J+9SP89qRjO+B1Wsfq1xa7ywXccSRDW clZht8YXoWohE3iKQ+75JK5cqpX4hrKWSJoVYmS47JtDd+nDVLtkGEPTrTUzq0f6ln0w oJyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681246339; x=1683838339; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aB3sIFps6b2/AiWCkFb52ZUkiQu312LfPBIkaZd+C14=; b=6TiayKE2h5EKNuPiloCgPbwZBL889iM6PFRLOxyW0uNJkcBLgZ7/eWuHx782e01ZGz y5xc3otGLsyWd2epZ0J6cNa253Rq1+vq0lmfEbvl91xri+Am55+pE2Wv47imHxstgHlK f+mCFzFhRP0iDP+KhGkUA8KNW0PLjbIG3awKCmjWuLWLLi9b3bMdc2flG0/i4oBXvC6g VNK20FWUSOvgOkz9JX2nrEdQj+EcjJruosNjiGx0AyWRP3jNqfk016IOoceQ+Aa4AaBx m7hrwM6ZwgRlMNmtBWIMzMoVVtRWH7UBQPKzohLAZVdyprHBS4UoqygaAuGzVnQHg0HE z0Rg== X-Gm-Message-State: AAQBX9c6/bE4wy+VrMGquH2UO1OYK0gWCGurfeGQWGjX+gqrdVynpBQF JWKT+J8n5vDw5OHft9ECZAo= X-Google-Smtp-Source: AKy350ZPJo9OWuQ6lfYRnlhlSlkxCSJREyt3jH4yYSUeFnxOOEnDkINpESe0giOxS94yaLC/FIcrLw== X-Received: by 2002:a05:6214:d84:b0:5ea:9fc5:fca2 with SMTP id e4-20020a0562140d8400b005ea9fc5fca2mr6572870qve.45.1681246338945; Tue, 11 Apr 2023 13:52:18 -0700 (PDT) Received: from hurd (dsl-152-224.b2b2c.ca. [66.158.152.224]) by smtp.gmail.com with ESMTPSA id dz8-20020ad45888000000b005dd8b9345a2sm3627092qvb.58.2023.04.11.13.52.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 13:52:18 -0700 (PDT) From: Maxim Cournoyer To: Kaelyn Takata Subject: Re: [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50. References: <0ff0469c1b12b2572b7707e1da89408b65b96de3.camel@protonmail.com> Date: Tue, 11 Apr 2023 16:52:17 -0400 In-Reply-To: <0ff0469c1b12b2572b7707e1da89408b65b96de3.camel@protonmail.com> (Kaelyn Takata's message of "Mon, 3 Apr 2023 16:37:58 +0000") Message-ID: <87leiykupq.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi, Kaelyn Takata writes: > * gnu/packages/gnome.scm (librsvg-2.40): Fix test failure with Pango 1.50. > > Signed-off-by: Andreas Enge > Signed-off-by: Liliana Marie Prikler > --- > gnu/packages/gnome.scm | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 49ff1464f5..6db6004356 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -73,6 +73,7 @@ > ;;; Copyright =C2=A9 2022 Rene Saavedra > ;;; Copyright =C2=A9 2022 Alexandros Theodotou > ;;; Copyright =C2=A9 2022 Arjan Adriaanse > +;;; Copyright =C2=A9 2023 Kaelyn Takata > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -3780,6 +3781,12 @@ (define-public librsvg-2.40 > (("gdk_pixbuf_cache_file =3D .*$") > "gdk_pixbuf_cache_file =3D $(TMPDIR)/loaders.cache\n")) > #t)) > + (add-before 'check 'fix-test-with-pango-1.50 > + (lambda _ > + ;; Changes between pango 1.48 and 1.50 caused the text to be one > + ;; pixel lower in the output image compared to the reference. > + (substitute* "tests/fixtures/reftests/bugs/587721-text-tran= sform.svg" > + (("660\\.9") "659.9")))) > (add-before 'check 'remove-failing-tests > (lambda _ > (with-directory-excursion "tests/fixtures/reftests" LGTM, although such fragil tests perhaps could be simply disabled to spare someone the hassle to investigate them when they break again in the future. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue Apr 11 16:57:45 2023 Received: (at 62467) by debbugs.gnu.org; 11 Apr 2023 20:57:46 +0000 Received: from localhost ([127.0.0.1]:38381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmL3h-0001M9-MA for submit@debbugs.gnu.org; Tue, 11 Apr 2023 16:57:45 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:33768) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmL3f-0001Lw-K3 for 62467@debbugs.gnu.org; Tue, 11 Apr 2023 16:57:44 -0400 Received: by mail-qv1-f53.google.com with SMTP id o7so7354990qvs.0 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 13:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681246658; x=1683838658; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=BRvrb1vSJKMI3jm1vasNzA/fKGTiapVWDkibfs+XMXk=; b=loM8MlKSPFX1jdPNCtUfDwXC8QeSnla2j2SqwcCTUF0yEDaNXkRGiNhZB5QLfmuKu+ +gfRJ3GWpdzOLk4oZQkIbm8GglQ6pzYOgY83POCmQzPnAX3A7ExnXG6EnMf7Jg0YWlQu QAlm2CNeWirTmRCO9+yJry6Tvakl1/MsaQSv1DVuvXbCCEH606UCwyDDSpgCOErz+2xK 5JPZj5ZHqoVhiFGgPA6PH4FYjBRy/NpjXyOFKvM1alkCdaImLfLt4MIHxz/eJYaZqC/m EtQL2+RngJshtBltaNj51HeIVuyPSTs9f+7z2Al5hgqOsXRc5rQsxuphN9ZucidZfgpo ADSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681246658; x=1683838658; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BRvrb1vSJKMI3jm1vasNzA/fKGTiapVWDkibfs+XMXk=; b=pd2vFkAMCs8ov+IGN72gVGsmHGx5JekaE59sodUAsOXyVF5fwIEv1tDtnRmIdfIWOS NOsIMJG7nd83+AkwqpIcPVbkLLFmfOgYSvZsuLiSHq0M56lXpH/aU19LNP+TeLZqIr8S QmRrQpw4AWCyXfIMAJOOF3Bgjwoq8TXmoIXGkwBIX6LI2Sn/Y1fWT6zu7LLLpxYWt4Pw FdLm0DrSKgfUWyaVma4aTIV5Kqc9SsDOKCmMSlwslQ4Wv7BUsxDl3xm0UqDEZPVtDFFC zxo9Ege+JvGK86NRlf59zB4X76AfI3MDl4luQdB1jRxzsgmcSSEazcUaFLvVWxUnLBh5 iVxQ== X-Gm-Message-State: AAQBX9ew7+IRPx5pc+BLJOlGmJmlGejtZuKt1R5R9DwtJJF3GmUszsEN R1JzcjpHTMV6xEPlw8hAUXc= X-Google-Smtp-Source: AKy350ZJRkpi4gfNSCeZQkxVLcNpC+X9MxlG/egW2rPIrLQNN2Xc/e6ogTETF+zyqNpiaBM2Bifx/g== X-Received: by 2002:a05:6214:23ce:b0:5cc:b552:328f with SMTP id hr14-20020a05621423ce00b005ccb552328fmr27377222qvb.5.1681246658061; Tue, 11 Apr 2023 13:57:38 -0700 (PDT) Received: from hurd (dsl-152-224.b2b2c.ca. [66.158.152.224]) by smtp.gmail.com with ESMTPSA id d23-20020a05620a141700b00746803d7e8dsm4184334qkj.113.2023.04.11.13.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 13:57:37 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1. References: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> Date: Tue, 11 Apr 2023 16:57:36 -0400 In-Reply-To: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> (Liliana Marie Prikler's message of "Mon, 10 Apr 2023 18:12:19 +0200") Message-ID: <87h6tmkugv.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi Liliana, The whole series looks good to me (LGTM), although you may want to cherry-pick my GTK 3 update from core-updates to avoid having to resolve conflicts down the road. Feel free to push it to the gnome-team branch (do we have such a branch yet?). -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 12 01:34:09 2023 Received: (at 62467) by debbugs.gnu.org; 12 Apr 2023 05:34:09 +0000 Received: from localhost ([127.0.0.1]:38738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmT7R-0006yf-4N for submit@debbugs.gnu.org; Wed, 12 Apr 2023 01:34:09 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:41520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmT7P-0006yG-9o for 62467@debbugs.gnu.org; Wed, 12 Apr 2023 01:34:07 -0400 Received: by mail-ej1-f65.google.com with SMTP id dm2so25983903ejc.8 for <62467@debbugs.gnu.org>; Tue, 11 Apr 2023 22:34:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681277641; x=1683869641; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=JERYxErCSrV+IxaJ+aZt/fEDZl9+RLnjWmIU6RkNFag=; b=VHHEjDmYLfRQ2dXsM58o0/7RTLdIBfW1IDA0EDsyTuhmD/hkBJ3X4IpxnJjyh5h+DY ymxo3XeyR1ukC4SXA6mH2o5LJcjVtG76xZKBCQdqT+IMq/rKgdZxt7wu1lROsSnu3ybu tb0ooO2QS3bRlMkKWGcEK1dq4/c49db+5ojmPf80bLBvcrsg4ACFMnFbqkU3wnbJGC23 Qw4GBwmVe1BTFqggeEFiSXVSvB5jLzhsKE70l1+yTXm0ugMCqscxeAxnTSpp/dONu0Ii 1u0Ku052aHVuMgEBJ5uVpMaWNqby7m9ex4Vl5A1qi1eehc4TplYaa9fL1Se+3ui7EizE kmCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681277641; x=1683869641; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=JERYxErCSrV+IxaJ+aZt/fEDZl9+RLnjWmIU6RkNFag=; b=dT7wTrQ/c4vuJEhs3eU4fAtDzgGVQxdSIVLFwDjNzdal7VapvnhKZAWz65zgiLmQ5e mxjIa43G6MQ24zJVIVSZC5wNKexroJLPThxCbgBzFsasGBmzcVkAjmhZ//Guxo5terHK MbcQWCJSQtb6ZJtnnPEVjZlHd42zHuFQAwxxVrbU9FUNMNsam5pXtpfcGgDKv9mARzCm tpYFEifgfGZgRKmXMfhs8zDfbJWOYSXeEk6dBllGwu2zdpi4NOcHB0fvCj6zLpsUmpUr 56XTptssWSsm86xdQYgaOBedOaYasWAArqrNBZFeV6Yjj6s98VuHI9DPbEm7kupHJm8r HYfQ== X-Gm-Message-State: AAQBX9fESNBl+yEWWdlloT2moMlIGYp7UmF1HZExQ7+4+mdMYAm1PDYq Mma0soKU0lZn7/b7AeA5+KM= X-Google-Smtp-Source: AKy350YqPQZbZCqEu8h7ElZhglFXQ5hvfyoXNUqkxXN3iOy/hVWNj7Zjz4m1hnkH6Dx1gKmSoDWLlA== X-Received: by 2002:a17:906:e2c2:b0:94c:a048:f123 with SMTP id gr2-20020a170906e2c200b0094ca048f123mr761630ejb.6.1681277640925; Tue, 11 Apr 2023 22:34:00 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l23-20020a170906079700b0094dde59ad39sm1840331ejc.79.2023.04.11.22.34.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 22:34:00 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Wed, 12 Apr 2023 07:33:59 +0200 In-Reply-To: <87h6tmkugv.fsf@gmail.com> References: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> <87h6tmkugv.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Am Dienstag, dem 11.04.2023 um 16:57 -0400 schrieb Maxim Cournoyer: > Hi Liliana, >=20 > The whole series looks good to me (LGTM), although you may want to > cherry-pick my GTK 3 update from core-updates to avoid having to > resolve conflicts down the road. IIRC your GTK 3 update requires some changes in Meson that are not currently in master/gnome-team, right? Can you tell me which commits I need to isolate for that? > Feel free to push it to the gnome-team branch (do we have such a > branch yet?). We do, it's currently still tracking master (and I'd like it to stay that way in case we're done before c-u =E2=80=93 even if not, we can rebase= it on the merged master again). Cheers From debbugs-submit-bounces@debbugs.gnu.org Wed Apr 12 22:33:20 2023 Received: (at 62467) by debbugs.gnu.org; 13 Apr 2023 02:33:20 +0000 Received: from localhost ([127.0.0.1]:42173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmmlz-0001j1-Me for submit@debbugs.gnu.org; Wed, 12 Apr 2023 22:33:20 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:34710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmmlu-0001ik-Hv for 62467@debbugs.gnu.org; Wed, 12 Apr 2023 22:33:18 -0400 Received: by mail-qt1-f173.google.com with SMTP id l16so2046531qtv.1 for <62467@debbugs.gnu.org>; Wed, 12 Apr 2023 19:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681353189; x=1683945189; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=+8R8Wwan2RFTo+TKvWwcC7e6GqlwH5YityItbjWbxKE=; b=qrzFSlMDrGH2eqydejuARMLs8DP2lQfKM9bjJymqAOvOqoDlnhUnzbngAm/JOAWOND Geb7d6EZKW3LcCoBEIxteqRYtcOPyC2vOODvO6b0Ip+5Su5oZHldSEDoRfcf2R8vITDm OriGYgaBB6pcS/talBBW2oPKYdjQ8fJJadSzSOD3KLSu8xjGCIC10ch2Je4Jv7uzLtKS 0KMJQpElIIut9Sr5Y5RKDc9vLPAVeChrB7j/uAptEFXvKOQss0x2WSi//TSRS22IrBMR LUXmf0Dh+0v1evHkOLD/nP33JrclRE4LivPnMq+MeI5JM3TBJVX9V64GYzCXhygWtz7F XIyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681353189; x=1683945189; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+8R8Wwan2RFTo+TKvWwcC7e6GqlwH5YityItbjWbxKE=; b=Y1PlCVmSs+T9CGz5u1lYxEPksbucs7YLFJ8R5nXVJO3LOWIakeZrjsP6ZgEGXklwB5 JSNe21CCMjApNnAFNqb5AnSlpJ2iMVVG/0aC4cUFNVohkgNdX1BtpJ4wZeFUnzmskSc2 Q4FLVLl7Z6xhkOePfvRuC+PYMBuV02pPrL4YA+BGAbq0jppp/XDD1W/MU7m5FESBGO/q 7nSeOWauE0qDc4Z7a9VY0YkBzb7LX+uGR/NF6TpDXb0xiNDHGBAlaB5sAiLDouTXGjhh MaFmErEEm3+DgcPw3Vx50CNSvNvMfYtwxqcyxz1ypLAvJZ7qv8CEyiUyI9Dk4B8x1N0O i/BA== X-Gm-Message-State: AAQBX9d6500qWUPygOfcpNj3Co9hVOQGP/ezK08gWcIY/pYcK7WWjQ1R 1uikB5FSp8BB86woFDbavFB7mFAS7A26bA== X-Google-Smtp-Source: AKy350YmHEc+9+wcW9bWXlAUIzlKZvskb3kxm7xUasxbBh4U7gB/vy0Vui74ecUaChNXmgjaJuQKEg== X-Received: by 2002:a05:622a:651:b0:3e3:8f1b:3f37 with SMTP id a17-20020a05622a065100b003e38f1b3f37mr1042652qtb.54.1681353188997; Wed, 12 Apr 2023 19:33:08 -0700 (PDT) Received: from hurd (dsl-152-224.b2b2c.ca. [66.158.152.224]) by smtp.gmail.com with ESMTPSA id ee2-20020a05620a800200b0074589d41342sm144728qkb.17.2023.04.12.19.33.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 19:33:08 -0700 (PDT) From: Maxim Cournoyer To: Liliana Marie Prikler Subject: Re: [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1. References: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> <87h6tmkugv.fsf@gmail.com> Date: Wed, 12 Apr 2023 22:33:07 -0400 In-Reply-To: (Liliana Marie Prikler's message of "Wed, 12 Apr 2023 07:33:59 +0200") Message-ID: <87zg7cjyu4.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62467 Cc: rg@raghavgururajan.name, 62467@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 (-) Hi Liliana, Liliana Marie Prikler writes: > Am Dienstag, dem 11.04.2023 um 16:57 -0400 schrieb Maxim Cournoyer: >> Hi Liliana, >> >> The whole series looks good to me (LGTM), although you may want to >> cherry-pick my GTK 3 update from core-updates to avoid having to >> resolve conflicts down the road. > IIRC your GTK 3 update requires some changes in Meson that are not > currently in master/gnome-team, right? Can you tell me which commits I > need to isolate for that? Ah, right, it needed at least the change to the meson-build-system in 9bf0a6e4a87c76852c3115476f76056434886181; while you're at it you can pick 22491ed9c5cc5135db819b80a7ec2ba7dceaa1ee and the meson update to 1.0.1 in 46873adc04ccf2c753362ee14c7faa81fed602c4, 311255adc0d1c3b3aa0f6bed5af58e718f0607b2, c808cd1bf9c541c1af243bb6bc468ece40b5b05a, and the fixup commit 1887100a2f0bfa99a4670d83587bdc1af5ee1c1c. Meson 1.1.0 has just been released... it'd be tempting to update it at the same time since touching meson-build-system entails a full rebuild of the meson world anyway. I realize this may be a bit more involved than what you may had been ready for, and I won't object if you prefer to keep your version, knowing we'll have to fix some conflicting commit a bit later after core-updates is merged into master. Let me know if you hit any issue if you do attempt it, it's still fresh. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 13 01:13:11 2023 Received: (at 62467-done) by debbugs.gnu.org; 13 Apr 2023 05:13:11 +0000 Received: from localhost ([127.0.0.1]:42342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmpGh-0000XY-1h for submit@debbugs.gnu.org; Thu, 13 Apr 2023 01:13:11 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:45956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmpGb-0000Ww-Uv for 62467-done@debbugs.gnu.org; Thu, 13 Apr 2023 01:13:09 -0400 Received: by mail-ej1-f65.google.com with SMTP id os24so4697904ejb.12 for <62467-done@debbugs.gnu.org>; Wed, 12 Apr 2023 22:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681362780; x=1683954780; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=efeSdDuvTAAHnJMVkotkgJKhB6FoPPBVRY7yXmWeW9Q=; b=FZ5QqaEkYTQXxWExqzLkV7rmVksGUa8Fcz7ssZT0uOUfYEBs4ivKh3W928o3pwZCCG ZNrW8nqq/SorlELTbEClg2RqrxNO4olxNKgN5WXQPO0EU2Az+FdV4GvQbci73TumeHtB yD/CRHf+yG4S0BciUOw2fZUk+i+8wGf3/QkwJup41IpO6tQ/Wvy7TfDzqThNNWPvLCrJ SwUeLclCicTnfhV92Xg/EAIO3FiZXtq2dvNPOJEccKSpYq+FhX+teTE/SGa1+XvLige6 9w1GYXmW8NvkoOjkhL08NZPLKjdysW6TIJURgl3WKcmnyG0eocdwOD1mslMRNHjVbLdi 5byg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681362780; x=1683954780; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=efeSdDuvTAAHnJMVkotkgJKhB6FoPPBVRY7yXmWeW9Q=; b=ZvHSxkSoOnYoHPb2anUCich7MU56FYh5rvaOwbS2MuD2PXsbAfeWVlB7j2CN5QS4Cb UI+6pw/6XpxuBt04ReViStGE60sTr2l1J8D+vJbikolWDhGDIpTMju33C1hxIZdI8Ngd EtRwZ5t0/e+rUofeT9DOIMFC+IX7SywWsROoOpasvKG11keCUT8NM3NgSg+WReiM/wCD +/wq8ha4bRazDXqali6PQonQfmywpz2nONo6Hye3pwebc6p98Fw+7/EAsZEdj7NTRMjs omGyulJNYtPd4vAR3qiuv0Pdh4GH/uhNL3VHQk92GRpVlbVtyHOzVlb0eVp4/6EwDd7f rjdQ== X-Gm-Message-State: AAQBX9fU4SpGFKU+LDLUXSl/5oIBDMw79dYOfcmR8n9X51Qg0eUDGwoR X65E3zbdjkb665gJf02WX4M= X-Google-Smtp-Source: AKy350aVrjZgp18kPD27RZsJURrorK4r/6xaO7Uhe60Xko31Tjccv3hECIylVWn0CEmqMvjcQ5y+dg== X-Received: by 2002:a17:907:4d8:b0:94a:783d:cd1e with SMTP id vz24-20020a17090704d800b0094a783dcd1emr1254880ejb.32.1681362780132; Wed, 12 Apr 2023 22:13:00 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hr33-20020a1709073fa100b00931db712768sm377851ejc.4.2023.04.12.22.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Apr 2023 22:12:59 -0700 (PDT) Message-ID: Subject: Re: [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1. From: Liliana Marie Prikler To: Maxim Cournoyer Date: Thu, 13 Apr 2023 07:12:58 +0200 In-Reply-To: <87zg7cjyu4.fsf@gmail.com> References: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> <87h6tmkugv.fsf@gmail.com> <87zg7cjyu4.fsf@gmail.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Mittwoch, dem 12.04.2023 um 22:33 -0400 schrieb Maxim Cournoyer: > Ah, right, it needed at least the change to the meson-build-system in > 9bf0a6e4a87c76852c3115476f76056434886181; while you're at [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.218.65 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.218.65 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.218.65 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 62467-done Cc: rg@raghavgururajan.name, 62467-done@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: 0.3 (/) Am Mittwoch, dem 12.04.2023 um 22:33 -0400 schrieb Maxim Cournoyer: > Ah, right, it needed at least the change to the meson-build-system in > 9bf0a6e4a87c76852c3115476f76056434886181; while you're at it you can > pick 22491ed9c5cc5135db819b80a7ec2ba7dceaa1ee and the meson update to > 1.0.1 in 46873adc04ccf2c753362ee14c7faa81fed602c4, > 311255adc0d1c3b3aa0f6bed5af58e718f0607b2, > c808cd1bf9c541c1af243bb6bc468ece40b5b05a, and the fixup commit > 1887100a2f0bfa99a4670d83587bdc1af5ee1c1c. >=20 > Meson 1.1.0 has just been released... it'd be tempting to update it > at the same time since touching meson-build-system entails a full > rebuild of the meson world anyway. >=20 > I realize this may be a bit more involved than what you may had been > ready for, and I won't object if you prefer to keep your version, > knowing we'll have to fix some conflicting commit a bit later after > core-updates is merged into master. My personal plan was to bump Meson just before GStreamer, which is the next big block =E2=80=93 thus I'll commit this series as-is and follow up w= ith the Meson changes afterwards. I'll first look into bumping Meson to 1.1.0, and if that doesn't work out apply the commits you mentioned as necessary. Cheers From unknown Fri Jun 20 07:23:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 11 May 2023 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