From patchwork Sun Aug 20 07:00:33 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: 53613 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 315AD27BBE9; Wed, 6 Sep 2023 21:25:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9377127BBE2 for ; Wed, 6 Sep 2023 21:25:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdz4N-0007mA-C4; Wed, 06 Sep 2023 16:24:11 -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 1qdz4F-0007jK-E3 for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qdz4D-0006lF-MB for guix-patches@gnu.org; Wed, 06 Sep 2023 16:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdz4E-00048g-TE; Wed, 06 Sep 2023 16:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65644] [PATCH gnome-team v2 1/9] gnu: gcr: Update to 4.0.0. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65644 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65644@debbugs.gnu.org Cc: Maxim Cournoyer , liliana.prikler@gmail.com, rg@raghavgururajan.name X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, rg@raghavgururajan.name Received: via spool by 65644-submit@debbugs.gnu.org id=B65644.169403182315834 (code B ref 65644); Wed, 06 Sep 2023 20:24:02 +0000 Received: (at 65644) by debbugs.gnu.org; 6 Sep 2023 20:23:43 +0000 Received: from localhost ([127.0.0.1]:37848 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3u-000477-6r for submit@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:43 -0400 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]:50207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdz3f-00044h-O5 for 65644@debbugs.gnu.org; Wed, 06 Sep 2023 16:23:29 -0400 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2bcc14ea414so5000751fa.0 for <65644@debbugs.gnu.org>; Wed, 06 Sep 2023 13:23:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694031800; x=1694636600; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:message-id:from:to:cc:subject :date:message-id:reply-to; bh=UD1H4uO33oXfjtOoqJcY8AAt2R9i+sSNjMQJoeIu4PM=; b=ZfCcGIUqFeam5UaNwFugKRRLpK4ClUvzvwW74BbStgoPmf5pA2f0trdQkT815WOQIV q8TesPEPhOQhgIeZkLhoaCZLEKroLYqJ+zcIGIk2MqUTzHyNZNzG1o9V8MMbYVkPAkbr oH0I1EOQSjkBukBAnH3EamziY1/fY8qhDTmQqi9IUMMWtQ9+59X6yqbqx7wfdZU5IoDS M9pPvzv3Lc/juGRJjKGWi+hG8BHfYodlwiPhCGLK0zAFrenyJEOkDyE0TYM2pQRKkxOg KibrVRId1bAZ4B+cZ7V/Rxpng34fcbKz6MHg46woqbt56R3GKqTLEuQ+8CqahxwDofT/ FwiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694031800; x=1694636600; h=mime-version:cc:to:subject:date:from:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=UD1H4uO33oXfjtOoqJcY8AAt2R9i+sSNjMQJoeIu4PM=; b=M8gMJ5qajcyji4nFmWfy6NPOuZ0PWMRIm5AWYkxD5x3fK6AokLx2AV4zwd34cwvzI1 kmBUvDc1u4Z5viBieTtPHZp0QH501IJExKg3y366CRuRV567O2R63sE/XKy5j2p+QtyA Gl1D9K0i6VzEb3UBBG43mwiN/U5hGoJ3VlEUiXPVOkEgYUCqIPGwefbGJ2zTt38NZRCY PIa2KTfuRmobzkvvzwmx2Yh1CE5hlGTOkv8zRhxfBbNcnAlRfq1Ag0biY+siloySWm6W 4zucwHmWBeEziOyRPyWbsgmNrB/ai16bvHloUNnlS2ZCfu1YIdlr4vU7BMLz5CesTd8S vSIw== X-Gm-Message-State: AOJu0YzRDYEm2Ch2mPzT23HYLjCd8N4LhruD/1MWjY7oru9mAoE/Iw0c LDqeSa3stdcDVS67cWl82oqWkWmYt6QF3w== X-Google-Smtp-Source: AGHT+IEbiYcQIA/KfNMckhwN+8kJfDlsCUxTP3RDbW6kVy3TEumhfT+QUtO3CnaGGK+68FFFsY9x0g== X-Received: by 2002:a05:651c:103b:b0:2bc:c51d:daa1 with SMTP id w27-20020a05651c103b00b002bcc51ddaa1mr3096082ljm.39.1694031800477; Wed, 06 Sep 2023 13:23:20 -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 um16-20020a170906cf9000b00992d70f8078sm9429602ejb.106.2023.09.06.13.23.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 13:23:19 -0700 (PDT) Message-ID: <35a9ebf83ef1063dfdda255b5a670d19747564f7.1694031712.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 09:00:33 +0200 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 (gcr): Update to 4.0.0. (gcr-3): New variable for current version. (libgdata)[propagated-inputs]: Replace gcr with gcr-3. (gnome-keyring)[inputs]: Likewise. (seahorse)[inputs]: Likewise. (gnome-settings-daemon)[inputs]: Likewise. (gvfs)[inputs]: Likewise. (epiphany)[inputs]: Likewise. (gexiv2)[inputs]: Likewise. (shotwell)[inputs]: Likewise. (gnome-online-accounts)[inputs]: Likewise. (evolution-data-server)[inputs]: Likewise. (network-manager-openconnect)[inputs]: Likewise. (network-manager-applet)[inputs]: Likewise. (gnome-shell)[inputs]: Likewise. (evolution)[inputs]: Likewise. (geary)[inputs]: Likewise. * gnu/packages/gnome-xyz.scm (gpaste)[native-inputs]: Likewise. * gnu/packages/gnupg.scm (pinentry-gnome3)[inputs]: Likewise. * gnu/packages/suckless.scm (surf)[inputs]: Likewise. * gnu/packages/web-browsers.scm (midori)[inputs]: Likewise. --- gnu/packages/gnome-xyz.scm | 2 +- gnu/packages/gnome.scm | 81 ++++++++++++++++++++++------------- gnu/packages/gnupg.scm | 2 +- gnu/packages/suckless.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- 5 files changed, 56 insertions(+), 33 deletions(-) base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index a1701aaa77..9e13bcb59d 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1030,7 +1030,7 @@ (define-public gpaste (search-patches "gpaste-fix-paths.patch")))) (build-system meson-build-system) (native-inputs - (list gcr + (list gcr-3 gettext-minimal gobject-introspection (list glib "bin") ; for glib-compile-resources diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 922d6ba24b..6f49114893 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1775,7 +1775,7 @@ (define-public libnma pkg-config vala)) (inputs - (list gcr + (list gcr-3 (if (supported-package? gtk) gtk gtk+) iso-codes mobile-broadband-provider-info @@ -2021,7 +2021,7 @@ (define-public libgdata (inputs (list cyrus-sasl glib-networking vala)) (propagated-inputs - `(("gcr" ,gcr) + `(("gcr" ,gcr-3) ("glib" ,glib) ("gnome-online-accounts" ,gnome-online-accounts) ("json-glib" ,json-glib) @@ -2373,7 +2373,7 @@ (define-public gnome-font-viewer (define-public gcr (package (name "gcr") - (version "3.41.1") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2381,7 +2381,7 @@ (define-public gcr name "-" version ".tar.xz")) (sha256 (base32 - "0kx2pv272p0qc0nq1287gciyn34d95yxg41vq3lzxfzyqaijhwdv")))) + "0z7cviri25qy2v042hw6x731bj1azpx8plrd7ssbmrqf9y95an64")))) (build-system meson-build-system) (arguments (list @@ -2394,11 +2394,11 @@ (define-public gcr (substitute* (find-files "." "^meson\\.build$") ((".*'--fatal-warnings',.*") "")))) (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) - (add-before 'check 'pre-check + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-before 'check 'pre-check (lambda _ ;; Some tests expect to write to $HOME. (setenv "HOME" "/tmp"))) @@ -2432,11 +2432,9 @@ (define-public gcr pkg-config python-wrapper vala)) - ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc - (propagated-inputs - (list glib - gtk+ - p11-kit)) + ;; GLib and p11-kit are mentioned in gck.pc and gcr.pc + ;; GTK is kept for symmetry with gcr-3, which propagates gtk+. + (propagated-inputs (list glib gtk p11-kit)) (home-page "https://www.gnome.org") (synopsis "Libraries for displaying certificates and accessing key stores") (description @@ -2445,6 +2443,31 @@ (define-public gcr GNOME Desktop.") (license license:lgpl2.1+))) +(define-public gcr-3 + (package + (inherit gcr) + (name "gcr") + (version "3.41.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0kx2pv272p0qc0nq1287gciyn34d95yxg41vq3lzxfzyqaijhwdv")))) + (arguments + (substitute-keyword-arguments (package-arguments gcr) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")))))))) + ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc + (propagated-inputs (list glib gtk+ p11-kit)))) + (define-public gdl (package (name "gdl") @@ -2570,7 +2593,7 @@ (define-public gnome-keyring "1")))))))) (inputs (list dbus - gcr + gcr-3 libgcrypt linux-pam openssh)) @@ -2587,7 +2610,7 @@ (define-public gnome-keyring pkg-config python-wrapper)) ;for tests (propagated-inputs - (list gcr)) + (list gcr-3)) ;; XXX: There are concerning test failures on i686-linux and other 32-bit ;; platforms: . @@ -4374,7 +4397,7 @@ (define-public seahorse (setenv "HOME" (getcwd))))))) (inputs (list gtk+ - gcr + gcr-3 gnupg gpgme openldap @@ -5952,7 +5975,7 @@ (define-public gnome-settings-daemon baobab colord cups - gcr + gcr-3 geoclue geocode-glib-with-libsoup2 gnome-desktop @@ -6939,7 +6962,7 @@ (define-public gvfs dbus elogind fuse - gcr + gcr-3 glib gnome-online-accounts gsettings-desktop-schemas @@ -7117,7 +7140,7 @@ (define-public epiphany xorg-server-for-tests)) (inputs (list avahi - gcr + gcr-3 glib-networking gnome-desktop gsettings-desktop-schemas @@ -7402,7 +7425,7 @@ (define-public gexiv2 (python:site-packages %build-inputs %outputs) "/gi/overrides")))) (native-inputs - (list gcr + (list gcr-3 `(,glib "bin") pkg-config python @@ -7454,7 +7477,7 @@ (define-public shotwell python vala)) (inputs - (list gcr + (list gcr-3 gexiv2 gst-plugins-base gstreamer @@ -7981,7 +8004,7 @@ (define-public gnome-online-accounts gtk+)) ; required by goa-backend-1.0.pc (inputs (list docbook-xsl - gcr + gcr-3 json-glib libsecret mit-krb5 @@ -8097,7 +8120,7 @@ (define-public evolution-data-server (inputs (list bdb boost - gcr + gcr-3 gnome-online-accounts json-glib libcanberra @@ -8503,7 +8526,7 @@ (define-public network-manager-openconnect libnma pkg-config)) (inputs - (list gcr + (list gcr-3 gtk gtk+ kmod @@ -8634,7 +8657,7 @@ (define-public network-manager-applet ;; nm-applet need by org.gnome.nm-applet.gschema.xml libnma)) (inputs - (list gcr + (list gcr-3 libappindicator libgudev libsecret @@ -9047,7 +9070,7 @@ (define-public gnome-control-center colord-gtk cups dconf - gcr + gcr-3 gnome-bluetooth gnome-desktop gnome-online-accounts @@ -9226,7 +9249,7 @@ (define-public gnome-shell caribou docbook-xsl evolution-data-server - gcr + gcr-3 gdm librsvg gjs @@ -11659,7 +11682,7 @@ (define-public evolution (list cmark enchant evolution-data-server ;must be the same version - gcr + gcr-3 gsettings-desktop-schemas gnome-autoar gnome-desktop @@ -12346,7 +12369,7 @@ (define-public geary (inputs (list enchant folks - gcr + gcr-3 glib gmime gnome-online-accounts diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a5b8587a14..00307ec270 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -866,7 +866,7 @@ (define-public pinentry-gnome3 (name "pinentry-gnome3") (inputs (modify-inputs (package-inputs pinentry-tty) - (prepend gtk+-2 gcr glib))) + (prepend gtk+-2 gcr-3 glib))) (arguments `(#:configure-flags '("--enable-pinentry-gnome3" "--enable-fallback-curses"))) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 400832045f..e8cf86f504 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -514,7 +514,7 @@ (define-public surf #t))))) (inputs `(("dmenu" ,dmenu) - ("gcr" ,gcr) + ("gcr" ,gcr-3) ("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk-with-libsoup2) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index ac46cffb19..3003f16c83 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -138,7 +138,7 @@ (define-public midori ("which" ,which))) ;for tests (inputs `(("adwaita-icon-theme" ,adwaita-icon-theme) - ("gcr" ,gcr) + ("gcr" ,gcr-3) ("glib" ,glib) ("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)