From patchwork Sun Mar 26 15:39:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48722 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 824BB1700B; Sun, 26 Mar 2023 20:25:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0B02C16934 for ; Sun, 26 Mar 2023 20:25:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgVzF-0007kr-MR; Sun, 26 Mar 2023 15:25:05 -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 1pgVzC-0007k8-E9 for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgVzB-00071U-Uo for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgVzB-0004H1-MN for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Mar 2023 19:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.167985867716353 (code B ref 62467); Sun, 26 Mar 2023 19:25:01 +0000 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 MIME-Version: 1.0 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: 42fbe62d52a82d1003c3d7039d3c4a46806c5cee 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' : { From patchwork Sun Mar 26 15:53:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48723 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 215321700B; Sun, 26 Mar 2023 20:25:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B6F7816934 for ; Sun, 26 Mar 2023 20:25:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgVzG-0007lA-1z; Sun, 26 Mar 2023 15:25:06 -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 1pgVzE-0007kQ-EC for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgVzC-00071o-Pq for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgVzC-0004HG-LG for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team 2/5] gnu: Make pango-next the new pango. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Mar 2023 19:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.167985867816367 (code B ref 62467); Sun, 26 Mar 2023 19:25:02 +0000 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 Message-ID: <642173f1a695e2c2bef270e178af7dec0c165220.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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: From patchwork Sun Mar 26 18:53:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48719 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 30FF51700A; Sun, 26 Mar 2023 20:25:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B294C16934 for ; Sun, 26 Mar 2023 20:25:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgVzF-0007ks-Mf; Sun, 26 Mar 2023 15:25:05 -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 1pgVzC-0007kF-Ll for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgVzC-00071h-Cf for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgVzC-0004H8-6f for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team 3/5] gnu: pango: Update to 1.50.14. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Mar 2023 19:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.167985867716359 (code B ref 62467); Sun, 26 Mar 2023 19:25:02 +0000 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 Message-ID: <5c3d13f2dca82ffcf8234257a4a53dd0bac9afa4.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Sun Mar 26 19:14:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48720 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 213341700B; Sun, 26 Mar 2023 20:25:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 457EF16934 for ; Sun, 26 Mar 2023 20:25:26 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgVzH-0007m2-KB; Sun, 26 Mar 2023 15:25:07 -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 1pgVzE-0007kR-KR for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgVzD-00077q-NM for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgVzD-0004HW-It for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Mar 2023 19:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.167985867916387 (code B ref 62467); Sun, 26 Mar 2023 19:25:03 +0000 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 MIME-Version: 1.0 Message-ID: <53cc392242bc66f39be8e2b0c6d694600ed57825.camel@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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: From patchwork Sun Mar 26 19:19:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48721 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8838216FC4; Sun, 26 Mar 2023 20:25:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 984381700A for ; Sun, 26 Mar 2023 20:25:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pgVzH-0007ln-G5; Sun, 26 Mar 2023 15:25:07 -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 1pgVzE-0007kP-Dz for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pgVzD-00073O-9Y for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pgVzD-0004HN-3u for guix-patches@gnu.org; Sun, 26 Mar 2023 15:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team 5/5] gnu: gobject-introspection: Update to 1.76.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Mar 2023 19:25:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.167985867816377 (code B ref 62467); Sun, 26 Mar 2023 19:25:03 +0000 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 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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" From patchwork Tue Mar 28 04:26:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48881 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 408E11723F; Fri, 31 Mar 2023 22:49:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B556C16F3F for ; Fri, 31 Mar 2023 22:49:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcM-0006CY-OQ; Fri, 31 Mar 2023 17:49:06 -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 1piMcL-0006Ba-GU for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcL-0001X4-8q for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcL-0001tQ-4t for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993407183 (code B ref 62467); Fri, 31 Mar 2023 21:49:05 +0000 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 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Tue Mar 28 16:50:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48891 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 63CB817278; Fri, 31 Mar 2023 22:50:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ADE73171B4 for ; Fri, 31 Mar 2023 22:50:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcN-0006D9-9J; Fri, 31 Mar 2023 17:49:07 -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 1piMcL-0006BK-3h for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcK-0001Wv-SR for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcK-0001tJ-OI for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 07/12] gnu: python-pygobject: Set upstream-name. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993397176 (code B ref 62467); Fri, 31 Mar 2023 21:49:04 +0000 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 Message-ID: <79a1a16f7acdf5079456c84949c8ae7789a5bb4a.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Tue Mar 28 16:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48889 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BE8DD1723F; Fri, 31 Mar 2023 22:50:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4739116F3F for ; Fri, 31 Mar 2023 22:50:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcN-0006Cj-0L; Fri, 31 Mar 2023 17:49:07 -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 1piMcL-0006C3-SC for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcL-0001XA-KU for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcL-0001tY-Hg for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 08/12] gnu: python-pygobject: Update to 3.44.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993407190 (code B ref 62467); Fri, 31 Mar 2023 21:49:05 +0000 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 Message-ID: <7b3c644c0441aae15695aa0e26faccd3c947e1a1.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Thu Mar 30 18:41:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48884 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0D78B1723F; Fri, 31 Mar 2023 22:49:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3377116F3F for ; Fri, 31 Mar 2023 22:49:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcO-0006Dy-2t; Fri, 31 Mar 2023 17:49:08 -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 1piMcM-0006CN-8V for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcM-0001XI-10 for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcL-0001tf-U6 for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993407197 (code B ref 62467); Fri, 31 Mar 2023 21:49:05 +0000 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 Message-ID: <09b3598cb0fb0acd211dd59fc10686188b941d8e.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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, From patchwork Thu Mar 30 04:28:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48890 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E03661729C; Fri, 31 Mar 2023 22:50:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9F3C416F3F for ; Fri, 31 Mar 2023 22:50:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcN-0006D8-9T; Fri, 31 Mar 2023 17:49:07 -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 1piMcM-0006CW-Kd for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcM-0001XR-DK for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcM-0001tm-AB for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993417205 (code B ref 62467); Fri, 31 Mar 2023 21:49:06 +0000 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 MIME-Version: 1.0 Message-ID: <95f94cbe9b3f1cee46e75577f9aac5cb751c83a4.camel@gmail.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Tue Mar 28 19:34:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48882 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 61EC817278; Fri, 31 Mar 2023 22:49:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4428D171B4 for ; Fri, 31 Mar 2023 22:49:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcP-0006F1-B4; Fri, 31 Mar 2023 17:49:09 -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 1piMcN-0006Cv-2D for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcM-0001Xe-Pj for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcM-0001tu-Ms for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993417215 (code B ref 62467); Fri, 31 Mar 2023 21:49:06 +0000 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 Message-ID: <38ca3dfd225bc7f5d1c55bd26b0b4ed4ae3dc460.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Fri Mar 31 18:54:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 48888 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D6CC0170EA; Fri, 31 Mar 2023 22:50:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A0FA171B4 for ; Fri, 31 Mar 2023 22:50:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piMcP-0006Ew-5n; Fri, 31 Mar 2023 17:49:09 -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 1piMcN-0006DF-D4 for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piMcN-0001Xs-5V for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piMcN-0001u1-2n for guix-patches@gnu.org; Fri, 31 Mar 2023 17:49:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 21:49:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.16802993427225 (code B ref 62467); Fri, 31 Mar 2023 21:49:07 +0000 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 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))))) From patchwork Fri Mar 31 18:54:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49074 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1BC0817491; Tue, 11 Apr 2023 08:11:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4D299172BD for ; Tue, 11 Apr 2023 08:11:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89i-0004CD-8P; Tue, 11 Apr 2023 03:11:06 -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 1pm89g-0004A8-8o for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pm89f-0000vC-Vc for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89f-0008IR-RV for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 13/15] gnu: inkscape: Update stable version to 1.2.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 07:11:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168119702531741 (code B ref 62467); Tue, 11 Apr 2023 07:11:03 +0000 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 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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))))) From patchwork Mon Apr 10 07:08:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49076 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BE9741748D; Tue, 11 Apr 2023 08:12:01 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B8B311748A for ; Tue, 11 Apr 2023 08:11:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89o-0004J0-Qp; Tue, 11 Apr 2023 03:11:12 -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 1pm89l-0004FX-1F for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pm89k-0000yN-NZ for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89k-0008Jm-JC for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 07:11:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168119703031825 (code B ref 62467); Tue, 11 Apr 2023 07:11:08 +0000 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 Message-ID: <17d1e460476b5c72d75e4224661720557b7de2b2.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Mon Apr 10 16:12:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 49071 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2EA341748D; Tue, 11 Apr 2023 08:11:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9CECF172BD for ; Tue, 11 Apr 2023 08:11:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pm89p-0004Je-6p; Tue, 11 Apr 2023 03:11:13 -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 1pm89l-0004FY-DD for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pm89l-0000yh-56 for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pm89l-0008Jt-0K for guix-patches@gnu.org; Tue, 11 Apr 2023 03:11:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1. References: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Apr 2023 07:11:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62467 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62467@debbugs.gnu.org Cc: rg@raghavgururajan.name, Maxim Cournoyer Received: via spool by 62467-submit@debbugs.gnu.org id=B62467.168119703131831 (code B ref 62467); Tue, 11 Apr 2023 07:11:08 +0000 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 Message-ID: <63a739b5f7043911be26be98643cf3be4d94c14f.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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