@@ -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
@@ -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: <https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/124>.
@@ -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
@@ -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")))
@@ -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)
@@ -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)