GNOME 3.32 patches

  • Done
  • quality assurance status badge
Details
2 participants
  • Kei Kebreau
  • Leo Famulari
Owner
unassigned
Submitted by
Kei Kebreau
Severity
normal

Debbugs page

Kei Kebreau wrote 5 years ago
(address . guix-patches@gnu.org)
20191102013904.2797-1-kkebreau@posteo.net
Hello all,

This is a series of patches which updates some GNOME packages to their 3.32.* versions.
Kei Kebreau wrote 5 years ago
[PATCH 01/80] gnu: adwaita-icon-theme: Update to 3.32.0.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-1-kkebreau@posteo.net
* gnu/packages/gnome.scm (adwaita-icon-theme): Update to 3.32.0.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2a664e3db7..ad6db32505 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -939,7 +939,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
(define-public adwaita-icon-theme
(package (inherit gnome-icon-theme)
(name "adwaita-icon-theme")
- (version "3.30.1")
+ (version "3.32.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -947,7 +947,7 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1kp1lis3dr16jmlgycz1b29jsr6ir8wmqj6laqwlhs663cmjlxbd"))))
+ "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9"))))
(native-inputs
`(("gtk-encode-symbolic-svg" ,gtk+ "bin")))))
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 02/80] gnu: baobab: Update to 3.32.0.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-2-kkebreau@posteo.net
* gnu/packages/gnome.scm (baobab): Update to 3.32.0.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ad6db32505..b11b3ed6c9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6453,7 +6453,7 @@ files.")
(define-public baobab
(package
(name "baobab")
- (version "3.30.0")
+ (version "3.32.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -6462,7 +6462,7 @@ files.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0kx721s1hhw1g0nvbqhb93g8iq6f852imyhfhl02zcqy4ipx0kay"))))
+ "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t))
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 03/80] gnu: eog: Update to 3.32.2.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-3-kkebreau@posteo.net
* gnu/packages/gnome.scm (eog): Update to 3.32.2.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b11b3ed6c9..5c98427a31 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4075,7 +4075,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
(define-public eog
(package
(name "eog")
- (version "3.28.4")
+ (version "3.32.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4083,7 +4083,7 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1wrq3l3z0x6q0hnc1vqr2hnyb1b14qw6aqvc5dldfgbs0yys6p55"))))
+ "1bcxpqgzlk2cy4wfb3b5h66mhpj2fhrk1rrb5qqcv5xrr62ik5xy"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 04/80] gnu: epiphany: Update to 3.32.3.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-4-kkebreau@posteo.net
* gnu/packages/gnome.scm (epiphany): Update to 3.32.3.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5c98427a31..1a9588c280 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4422,7 +4422,7 @@ a secret password store, an adblocker, and a modern UI.")
(define-public epiphany
(package
(name "epiphany")
- (version "3.30.4")
+ (version "3.32.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/epiphany/"
@@ -4430,7 +4430,7 @@ a secret password store, an adblocker, and a modern UI.")
"epiphany-" version ".tar.xz"))
(sha256
(base32
- "0nk0krzrfck6hhfs52f4sjmj93yjyvabm72bq8i8f9l1pass5vgd"))))
+ "0gx386k1p78ppjhvdanv99hfiwana0ccn9d499qrp0rvlicnijrw"))))
(build-system meson-build-system)
(arguments
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 05/80] gnu: evince: Update to 3.32.0.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-5-kkebreau@posteo.net
* gnu/packages/gnome.scm (evince): Update to 3.32.0.
[home-page]: Follow permanent redirect.
---
gnu/packages/gnome.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

Toggle diff (34 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1a9588c280..28f25b744f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -771,7 +771,7 @@ forgotten when the session ends.")
(define-public evince
(package
(name "evince")
- (version "3.30.2")
+ (version "3.32.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -779,7 +779,7 @@ forgotten when the session ends.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0k7jln6dpg4bpv61niicjzkzyq6fhb3yfld7pc8ck71c8pmvsnx9"))))
+ "0h2c6b2h6g3zy0gnycrjk1y7rp0kf7ppci76dmd2zvb6chhpgngh"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags '("--disable-nautilus")
@@ -828,8 +828,7 @@ forgotten when the session ends.")
("glib" ,glib "bin")
("pkg-config" ,pkg-config)
("xmllint" ,libxml2)))
- (home-page
- "https://www.gnome.org/projects/evince/")
+ (home-page "https://wiki.gnome.org/Apps/Evince")
(synopsis "GNOME's document viewer")
(description
"Evince is a document viewer for multiple document formats. It
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 06/80] gnu: file-roller: Update to 3.32.1.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-6-kkebreau@posteo.net
* gnu/packages/gnome.scm (file-roller): Update to 3.32.1.
[inputs]: Move itstool...
[native-inputs]: ...here.
---
gnu/packages/gnome.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

Toggle diff (38 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 28f25b744f..5d8add8c55 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4757,7 +4757,7 @@ share them with others via social networking and more.")
(define-public file-roller
(package
(name "file-roller")
- (version "3.30.1")
+ (version "3.32.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4765,11 +4765,12 @@ share them with others via social networking and more.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1"))))
+ "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw"))))
(build-system meson-build-system)
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("intltool" ,intltool)
+ ("itstool" ,itstool)
("pkg-config" ,pkg-config)
("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
("glib:bin" ,glib "bin")))
@@ -4780,7 +4781,7 @@ share them with others via social networking and more.")
("json-glib" ,json-glib)
("libarchive" ,libarchive)
("libnotify" ,libnotify)
- ("itstool" ,itstool)
+ ("nettle" ,nettle)
("libxml2" ,libxml2)))
(synopsis "Graphical archive manager for GNOME")
(description "File Roller is an archive manager for the GNOME desktop
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 07/80] gnu: gedit: Update to 3.32.2.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-7-kkebreau@posteo.net
* gnu/packages/gnome.scm (gedit): Update to 3.32.2.
[build-system]: Use meson-build-system.
[arguments]: Set glib-or-gtk? flag; add 'patch-libgd-fetch' phase; pass
configure flag to add $out/lib/gedit to RUNPATH.
[native-inputs]: Add desktop-file-utils, libgd, glib:bin and gtk+:bin.
[inputs]: Replace gtksourceview-3 with gtksourceview.
---
gnu/packages/gnome.scm | 67 +++++++++++++++++++++++++++++-------------
1 file changed, 46 insertions(+), 21 deletions(-)

Toggle diff (99 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5d8add8c55..c1cba7687a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4922,7 +4922,7 @@ javascript engine and the GObject introspection framework.")
(define-public gedit
(package
(name "gedit")
- (version "3.30.2")
+ (version "3.32.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4930,38 +4930,63 @@ javascript engine and the GObject introspection framework.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza"))))
- (build-system glib-or-gtk-build-system)
+ "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"))))
+ (build-system meson-build-system)
(arguments
- `(#:phases
+ `(#:glib-or-gtk? #t
+ #:configure-flags
+ ;; Otherwise, the RUNPATH will lack the final path component.
+ (list (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out") "/lib/gedit"))
+ #:phases
(modify-phases %standard-phases
- (add-after
- 'install 'wrap-gedit
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (gtksourceview (assoc-ref inputs "gtksourceview"))
- (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
- (wrap-program (string-append out "/bin/gedit")
- ;; For plugins.
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))
- ;; For language-specs.
- `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
- "/share")))))
- #t)))))
+ (add-after 'unpack 'patch-libgd-fetch
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libgd (assoc-ref inputs "libgd")))
+ ;; Calling git is unnecessary because libgd is fetched as a
+ ;; native input to this package.
+ (substitute* "meson.build"
+ ((".*git.*") ""))
+ (copy-recursively libgd "subprojects/libgd")
+ #t)))
+ (add-after 'install 'wrap-gedit
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (gtksourceview (assoc-ref inputs "gtksourceview"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+ (python-path (getenv "PYTHONPATH")))
+ (wrap-program (string-append out "/bin/gedit")
+ ;; For plugins.
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
+ `("PYTHONPATH" ":" prefix (,python-path))
+ ;; For language-specs.
+ `("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
+ "/share")))))
+ #t)))))
(propagated-inputs
`(("dconf" ,dconf)))
(native-inputs
- `(("intltool" ,intltool)
+ `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+ ("intltool" ,intltool)
("itstool" ,itstool)
+ ("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
("gobject-introspection" ,gobject-introspection)
+ ("gtk+" ,gtk+ "bin") ; for gtk-update-icon-cache
+ ("libgd"
+ ,(origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.gnome.org/GNOME/libgd")
+ (commit "c7c7ff4e05d3fe82854219091cf116cce6b19de0")))
+ (file-name (git-file-name "libgd" version))
+ (sha256
+ (base32 "16yld0ap7qj1n96h4f2sqkjmibg7xx5xwkqxdfzam2nmyfdlrrrs"))))
("pkg-config" ,pkg-config)))
(inputs
`(("glib" ,glib)
("gspell" ,gspell)
("gtk+" ,gtk+)
- ("gtksourceview" ,gtksourceview-3)
+ ("gtksourceview" ,gtksourceview)
("libpeas" ,libpeas)
("libxml2" ,libxml2)
("iso-codes" ,iso-codes)
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 08/80] gnu: gnome-backgrounds: Update to 3.32.0.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-8-kkebreau@posteo.net
* gnu/packages/gnome.scm (gnome-backgrounds): Update to 3.32.0.
[home-page]: Follow permanent redirect.
---
gnu/packages/gnome.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c1cba7687a..f229708d1c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6514,7 +6514,7 @@ is complete it provides a graphical representation of each selected folder.")
(define-public gnome-backgrounds
(package
(name "gnome-backgrounds")
- (version "3.30.0")
+ (version "3.32.0")
(source
(origin
(method url-fetch)
@@ -6523,11 +6523,11 @@ is complete it provides a graphical representation of each selected folder.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1179jrl16bp9gqabqhw7nnfp8qzf5y1vf9fi45bni6rfmwm3mrpc"))))
+ "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz"))))
(build-system meson-build-system)
(native-inputs
`(("intltool" ,intltool)))
- (home-page "https://git.gnome.org/browse/gnome-backgrounds")
+ (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds")
(synopsis "Background images for the GNOME desktop")
(description
"GNOME backgrounds package contains a collection of graphics files which
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 09/80] gnu: gnome-bluetooth: Update to 3.32.1.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014058.3061-9-kkebreau@posteo.net
* gnu/packages/gnome.scm (gnome-bluetooth): Update to 3.32.1.
[propagated-inputs]: Add glib and move eudev...
[inputs]: ...to here.
---
gnu/packages/gnome.scm | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)

Toggle diff (39 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f229708d1c..c335cf5639 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5970,7 +5970,7 @@ usage and information about running processes.")
(define-public gnome-bluetooth
(package
(name "gnome-bluetooth")
- (version "3.28.0")
+ (version "3.32.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -5978,7 +5978,7 @@ usage and information about running processes.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0q7yzklrlayj99risj096mr5x35anx94wvr6nbf6pwbvvzv7453p"))))
+ "1am1gf0nzwg6x1s8ly13j0xnjzgrfj06j0dp52x4zy9s67ywlhb4"))))
(build-system meson-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for gdbus-codegen, etc.
@@ -5989,10 +5989,11 @@ usage and information about running processes.")
("xmllint" ,libxml2)))
(propagated-inputs
;; gnome-bluetooth-1.0.pc refers to all these.
- `(("gtk+" ,gtk+)
- ("udev" ,eudev)))
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+)))
(inputs
- `(("libcanberra" ,libcanberra)
+ `(("eudev" ,eudev)
+ ("libcanberra" ,libcanberra)
("libnotify" ,libnotify)))
(synopsis "GNOME Bluetooth subsystem")
(home-page "https://wiki.gnome.org/Projects/GnomeBluetooth")
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-1-kkebreau@posteo.net
* gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 3.32.0.
[build-system]: Use meson-build-system.
---
gnu/packages/gnome.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c335cf5639..4d073a8474 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -840,7 +840,7 @@ on the GNOME Desktop with a single simple application.")
(define-public gsettings-desktop-schemas
(package
(name "gsettings-desktop-schemas")
- (version "3.28.1")
+ (version "3.32.0")
(source
(origin
(method url-fetch)
@@ -849,8 +849,8 @@ on the GNOME Desktop with a single simple application.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0bshwm49cd01ighsxqlbqn10q0ch71ff99gcrx8pr2gyky2ad3pq"))))
- (build-system gnu-build-system)
+ "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"))))
+ (build-system meson-build-system)
(inputs
`(("glib" ,glib)))
(native-inputs
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 11/80] gnu: gnome-icon-theme: Update home page.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-2-kkebreau@posteo.net
* gnu/packages/gnome.scm (gnome-icon-theme)[home-page]: Follow permanent
redirect.
---
gnu/packages/gnome.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

Toggle diff (21 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4d073a8474..5b0448c87c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -927,11 +927,9 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
`(("icon-naming-utils" ,icon-naming-utils)
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
- (home-page "https://art.gnome.org/")
- (synopsis
- "GNOME icon theme")
- (description
- "Icons for the GNOME desktop.")
+ (home-page "https://wiki.gnome.org/Personalization")
+ (synopsis "GNOME icon theme")
+ (description "Icons for the GNOME desktop.")
(license license:lgpl3))) ; or Creative Commons BY-SA 3.0
;; gnome-icon-theme was renamed to adwaita-icon-theme after version 3.12.0.
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 12/80] gnu: gnome-desktop: Update to 3.32.2.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-3-kkebreau@posteo.net
* gnu/packages/gnome.scm (gnome-desktop): Update to 3.32.2.
[build-system]: Use meson-build-system.
[arguments]: Add 'pre-check' phase.
[native-inputs]: Add glib:bin, glibc-locales and xorg-server-for-tests.
[inputs]: Move iso-codes, libseccomp, libx11 and xkeyboard-config...
[propagated-inputs]: ...here.
---
gnu/packages/gnome.scm | 36 ++++++++++++++++++++++++------------
1 file changed, 24 insertions(+), 12 deletions(-)

Toggle diff (75 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5b0448c87c..ae3a064334 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -470,7 +470,7 @@ commonly used macros.")
(define-public gnome-desktop
(package
(name "gnome-desktop")
- (version "3.30.2")
+ (version "3.32.2")
(source
(origin
(method url-fetch)
@@ -479,8 +479,8 @@ commonly used macros.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0k6iccfj9naw42dl2mgljfvk12dmvg06plg86qd81nksrf9ycxal"))))
- (build-system gnu-build-system)
+ "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"))))
+ (build-system meson-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
@@ -490,27 +490,39 @@ commonly used macros.")
(substitute* "libgnome-desktop/gnome-languages.c"
(("\"locale\"")
(string-append "\"" libc "/bin/locale\"")))
- #t))))))
+ #t)))
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Tests require a running X server and locales.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ (setenv "GUIX_LOCPATH"
+ (string-append (assoc-ref inputs "glibc-locales")
+ "/lib/locale"))
+ #t)))))
(native-inputs
- `(("gobject-introspection" ,gobject-introspection)
+ `(("glib:bin" ,glib "bin") ; for gdbus-codegen
+ ("glibc-locales" ,glibc-locales) ; for tests
+ ("gobject-introspection" ,gobject-introspection)
("itstool" ,itstool)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
- ("xmllint" ,libxml2)))
+ ("xmllint" ,libxml2)
+ ("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
;; Required by gnome-desktop-3.0.pc.
`(("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtk+" ,gtk+)))
- (inputs
- `(("gdk-pixbuf" ,gdk-pixbuf)
- ("glib" ,glib)
+ ("gtk+" ,gtk+)
("iso-codes" ,iso-codes)
("libseccomp" ,libseccomp)
("libx11" ,libx11)
+ ("xkeyboard-config" ,xkeyboard-config)))
+ (inputs
+ `(("gdk-pixbuf" ,gdk-pixbuf)
+ ("glib" ,glib)
("libxext" ,libxext)
("libxkbfile" ,libxkbfile)
- ("libxrandr" ,libxrandr)
- ("xkeyboard-config" ,xkeyboard-config)))
+ ("libxrandr" ,libxrandr)))
(home-page "https://www.gnome.org/")
(synopsis
"Libgnome-desktop, gnome-about, and desktop-wide documents")
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 13/80] gnu: gnome-online-accounts: Update to 3.32.0.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-4-kkebreau@posteo.net
* gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.32.0.
[native-inputs]: Add vala.
---
gnu/packages/gnome.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ae3a064334..1ec36d113c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5147,7 +5147,7 @@ window manager.")
(define-public gnome-online-accounts
(package
(name "gnome-online-accounts")
- (version "3.30.2")
+ (version "3.32.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -5155,7 +5155,7 @@ window manager.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1p1gdgryziklrgngn6m13xnvfx4gb01h723nndfi9944r24fbiq5"))))
+ "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w"))))
(outputs '("out" "lib"))
(build-system glib-or-gtk-build-system)
(arguments
@@ -5181,6 +5181,7 @@ window manager.")
("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
+ ("vala" ,vala)
("xsltproc" ,libxslt)))
(propagated-inputs
`(("glib" ,glib) ; required by goa-1.0.pc
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 14/80] gnu: gnome-settings-daemon: Update to 3.32.1.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-5-kkebreau@posteo.net
* gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.32.1.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1ec36d113c..195e9dd567 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3266,7 +3266,7 @@ services for numerous locations.")
(define-public gnome-settings-daemon
(package
(name "gnome-settings-daemon")
- (version "3.30.2")
+ (version "3.32.1")
(source
(origin
(method url-fetch)
@@ -3275,7 +3275,7 @@ services for numerous locations.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"))))
+ "02d0s0g2mmqfib44r3sf0499r08p61s8l2ndsjssbam1bi7x2dks"))))
(build-system meson-build-system)
(arguments
`(#:glib-or-gtk? #t
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 15/80] gnu: Add python-dbusmock.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-6-kkebreau@posteo.net
* gnu/packages/python-xyz.scm (python-dbusmock): New variable.
---
gnu/packages/python-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)

Toggle diff (64 lines)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 10fe5ee553..56b43c73cd 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -41,7 +41,7 @@
;;; Copyright © 2017, 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 José Miguel Sánchez García <jmi2k@openmailbox.org>
;;; Copyright © 2017 Roel Janssen <roel@gnu.org>
-;;; Copyright © 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
+;;; Copyright © 2017, 2018, 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;; Copyright © 2017, 2019 Brendan Tildesley <mail@brendan.scot>
@@ -102,6 +102,7 @@
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages graphics)
#:use-module (gnu packages gstreamer)
@@ -16487,3 +16488,40 @@ It is the recommended replacement for Python's original
@code{distro} also provides a command-line interface to output the platform
information in various formats.")
(license license:asl2.0)))
+
+(define-public python-dbusmock
+ (package
+ (name "python-dbusmock")
+ (version "0.18.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "python-dbusmock" version))
+ (sha256
+ (base32
+ "1hj02p65cic4jdc6a5xf1hx8j5icwy7dcrm5kg91lkjks4gwpg5h"))))
+ (build-system python-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-/bin/sh
+ (lambda _
+ (substitute* "tests/test_code.py"
+ (("/bin/sh") (which "sh")))
+ #t)))))
+ (native-inputs
+ `(;; For tests.
+ ("dbus" ,dbus) ; for dbus-daemon
+ ("python-nose" ,python-nose)
+ ("which" ,which)))
+ (propagated-inputs
+ `(("python-dbus" ,python-dbus)
+ ("python-pygobject" ,python-pygobject)))
+ (home-page "https://github.com/martinpitt/python-dbusmock")
+ (synopsis "Python library for mock D-Bus objects")
+ (description "python-dbusmock allows for the easy creation of mock objects on
+D-Bus. This is useful for writing tests for software which talks to D-Bus
+services such as upower, systemd, logind, gnome-session or others, and it is
+hard (or impossible without root privileges) to set the state of the real
+services to what you expect in your tests.")
+ (license license:lgpl3+)))
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 18/80] gnu: tracker: Update to 2.2.2.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-9-kkebreau@posteo.net
* gnu/packages/gnome.scm (tracker): Update to 2.2.2.
[build-system]: Use meson-build-system.
[arguments]: Set glib-or-gtk? flag; pass configure flag to add
$out/lib and $out/lib/tracker-2.0 to RUNPATH; adjust 'disable-broken-tests'
phase.
[native-inputs]: Add glib:bin and python-pygobject.
[inputs]: Remove gstreamer, gst-plugins-base, libgsf, libexif, libvorbis,
flac, totem-pl-parser, exempi, upower, giflib, libosinfo and libcue. Add
network-manager.
---
gnu/packages/gnome.scm | 56 ++++++++++++++----------------------------
1 file changed, 19 insertions(+), 37 deletions(-)

Toggle diff (109 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6ccbe28560..359cadd678 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6336,7 +6336,7 @@ easy, safe, and automatic.")
(define-public tracker
(package
(name "tracker")
- (version "2.0.4")
+ (version "2.2.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/tracker/"
@@ -6344,35 +6344,26 @@ easy, safe, and automatic.")
"tracker-" version ".tar.xz"))
(sha256
(base32
- "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf"))))
- (build-system glib-or-gtk-build-system)
+ "1rp2c6k7ajcm553p9kpni87zgi9aplm3s01rl7pk575az5i399y6"))))
+ (build-system meson-build-system)
(arguments
- `(#:phases
+ `(#:glib-or-gtk? #t
+ #:configure-flags
+ ;; Otherwise, the RUNPATH will lack the final path component.
+ (list (string-append "-Dc_link_args=-Wl,-rpath="
+ (assoc-ref %outputs "out") "/lib:"
+ (assoc-ref %outputs "out") "/lib/tracker-2.0"))
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'disable-broken-tests
(lambda _
- ;; FIXME: Most of these fail with GLib-GIO-FATAL-ERROR: Settings
- ;; schema 'org.freedesktop.Tracker.FTS' is not installed.
- (substitute* "tests/libtracker-miner/Makefile.in"
- (("tracker-file-notifier-test\\$\\(EXEEXT\\)") "")
- (("tracker-miner-fs-test\\$\\(EXEEXT\\)") "")
- (("tracker-monitor-test\\$\\(EXEEXT\\)") ""))
- (substitute* "tests/libtracker-fts/Makefile.in"
- (("tracker-fts-test\\$\\(EXEEXT\\)") ""))
- (substitute* "tests/libtracker-data/Makefile.in"
- (("tracker-ontology\\$\\(EXEEXT\\)") "")
- (("tracker-ontology-change\\$\\(EXEEXT\\)") "")
- (("tracker-backup\\$\\(EXEEXT\\)") "")
- (("tracker-sparql-blank\\$\\(EXEEXT\\)") "")
- (("tracker-sparql\\$\\(EXEEXT\\)") ""))
;; These fail because the SPARQL backend could not be loaded.
;; That's because /etc/machine-id is missing, but
;; DBUS_FATAL_WARNINGS does not help here.
- (substitute* "tests/libtracker-sparql/Makefile.in"
- (("tracker-gb-737023-test\\$\\(EXEEXT\\)") "")
- (("tracker-sparql-test\\$\\(EXEEXT\\)") ""))
- (substitute* "tests/tracker-steroids/Makefile.in"
- (("tracker-test\\$\\(EXEEXT\\)") ""))
+ (substitute* "tests/libtracker-sparql/meson.build"
+ (("'sparql',") ""))
+ (substitute* "tests/tracker-steroids/meson.build"
+ (("test\\(.*") ""))
#t))
;; Two tests fail if LANG is not set.
(add-before 'check 'pre-check
@@ -6382,39 +6373,30 @@ easy, safe, and automatic.")
(setenv "DBUS_FATAL_WARNINGS" "0")
#t)))))
(native-inputs
- `(("gnome-common" ,gnome-common)
+ `(("glib:bin" ,glib "bin")
+ ("gnome-common" ,gnome-common)
("gobject-introspection" ,gobject-introspection)
+ ("python-pygobject" ,python-pygobject)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
`(("gtk+" ,gtk+)
("dbus" ,dbus)
- ("gstreamer" ,gstreamer)
- ("gst-plugins-base" ,gst-plugins-base)
("sqlite" ,sqlite)
("python" ,python)
("poppler" ,poppler)
- ("libgsf" ,libgsf)
- ("libexif" ,libexif)
("libpng" ,libpng)
("libtiff" ,libtiff)
- ("libvorbis" ,libvorbis)
- ("flac" ,flac)
- ("totem-pl-parser" ,totem-pl-parser)
("zlib" ,zlib)
- ("exempi" ,exempi)
("libxml2" ,libxml2)
- ("upower" ,upower)
("libunistring" ,libunistring)
- ("giflib" ,giflib)
("json-glib" ,json-glib)
("openjpeg" ,openjpeg-1)
- ("libosinfo" ,libosinfo)
- ("libcue" ,libcue)
("libseccomp" ,libseccomp)
("libsoup" ,libsoup)
- ("libuuid" ,util-linux)))
+ ("libuuid" ,util-linux)
+ ("network-manager" ,network-manager)))
(synopsis "Metadata database, indexer and search tool")
(home-page "https://wiki.gnome.org/Projects/Tracker")
(description
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 16/80] gnu: gnome-control-center: Update to 3.32.2.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-7-kkebreau@posteo.net
* gnu/packages/gnome.scm (gnome-control-center): Update to 3.32.2.
[source]: Remove patch.
[arguments]: Adjust 'patch-paths' phase accordingly.
[native-inputs]: Add hicolor-icon-theme, python-dbusmock and
xorg-server-for-tests.
[inputs]: Add gnome-session and gsound.
* gnu/packages/patches/gnome-control-center-udisks.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove patch.
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 13 +-
.../patches/gnome-control-center-udisks.patch | 221 ------------------
3 files changed, 8 insertions(+), 227 deletions(-)
delete mode 100644 gnu/packages/patches/gnome-control-center-udisks.patch

Toggle diff (96 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 9f5bce3d2b..4b62f806ff 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -913,7 +913,6 @@ dist_patch_DATA = \
%D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \
- %D%/packages/patches/gnome-control-center-udisks.patch \
%D%/packages/patches/gnome-shell-theme.patch \
%D%/packages/patches/gnome-tweaks-search-paths.patch \
%D%/packages/patches/gnutls-skip-trust-store-test.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 195e9dd567..edb676de6a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6016,7 +6016,7 @@ devices using the GNOME desktop.")
(define-public gnome-control-center
(package
(name "gnome-control-center")
- (version "3.30.3")
+ (version "3.32.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -6024,9 +6024,7 @@ devices using the GNOME desktop.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0gih1cmqbv803kp30704sllghb0impa0mmv3j8pndfg4zr2mnq9r"))
- (patches
- (search-patches "gnome-control-center-udisks.patch"))))
+ "03np0mhfl9kkdw4cb711pda0cli9zgh2bq2gqn2zwbdi3qnhk9gs"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t
@@ -6073,7 +6071,11 @@ devices using the GNOME desktop.")
("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
("intltool" ,intltool)
("pkg-config" ,pkg-config)
- ("xsltproc" ,libxslt)))
+ ("xsltproc" ,libxslt)
+ ;; For tests
+ ("hicolor-icon-theme" ,hicolor-icon-theme)
+ ("python-dbusmock" ,python-dbusmock)
+ ("xorg-server" ,xorg-server-for-tests)))
(inputs
`(("accountsservice" ,accountsservice)
("clutter-gtk" ,clutter-gtk)
@@ -6089,6 +6091,7 @@ devices using the GNOME desktop.")
("gnome-session" ,gnome-session)
("gnome-settings-daemon" ,gnome-settings-daemon)
("grilo" ,grilo)
+ ("gsound" ,gsound)
("ibus" ,ibus)
("libcanberra" ,libcanberra)
("libgnomekbd" ,libgnomekbd)
diff --git a/gnu/packages/patches/gnome-control-center-udisks.patch b/gnu/packages/patches/gnome-control-center-udisks.patch
deleted file mode 100644
index 823684b2e9..0000000000
--- a/gnu/packages/patches/gnome-control-center-udisks.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-This patch is derived from upstream commit 2520aea6 and fixes upstream issues
-285 and 302. See https://gitlab.gnome.org/GNOME/gcr/merge_requests/387,
-https://gitlab.gnome.org/GNOME/gnome-control-center/issues/285 and
-https://gitlab.gnome.org/GNOME/gnome-control-center/issues/302.
-
-diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
-index e2276a295b3fd9de01b30fc3369069b5d33ba5b7..ff47c1fef2493bcc7ab34f9e8716d570d8d370ed 100644
---- a/panels/info/cc-info-overview-panel.c
-+++ b/panels/info/cc-info-overview-panel.c
-@@ -36,6 +36,7 @@
- #include <glibtop/mountlist.h>
- #include <glibtop/mem.h>
- #include <glibtop/sysinfo.h>
-+#include <udisks/udisks.h>
-
- #include <gdk/gdk.h>
-
-@@ -81,9 +82,7 @@ typedef struct
-
- GCancellable *cancellable;
-
-- /* Free space */
-- GList *primary_mounts;
-- guint64 total_bytes;
-+ UDisksClient *client;
-
- GraphicsData *graphics_data;
- } CcInfoOverviewPanelPrivate;
-@@ -96,8 +95,6 @@ struct _CcInfoOverviewPanel
- CcInfoOverviewPanelPrivate *priv;
- };
-
--static void get_primary_disc_info_start (CcInfoOverviewPanel *self);
--
- typedef struct
- {
- char *major;
-@@ -486,111 +483,51 @@ get_os_type (void)
- }
-
- static void
--query_done (GFile *file,
-- GAsyncResult *res,
-- CcInfoOverviewPanel *self)
-+get_primary_disc_info (CcInfoOverviewPanel *self)
- {
- CcInfoOverviewPanelPrivate *priv;
-- g_autoptr(GFileInfo) info = NULL;
-- g_autoptr(GError) error = NULL;
--
-- info = g_file_query_filesystem_info_finish (file, res, &error);
-- if (info != NULL)
-- {
-- priv = cc_info_overview_panel_get_instance_private (self);
-- priv->total_bytes += g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE);
-- }
-- else
-- {
-- if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-- return;
-- else
-- {
-- g_autofree char *path = NULL;
-- path = g_file_get_path (file);
-- g_warning ("Failed to get filesystem free space for '%s': %s", path, error->message);
-- }
-- }
-+ GDBusObjectManager *manager;
-+ g_autolist(GDBusObject) objects = NULL;
-+ GList *l;
-+ guint64 total_size;
-
-- /* And onto the next element */
-- get_primary_disc_info_start (self);
--}
--
--static void
--get_primary_disc_info_start (CcInfoOverviewPanel *self)
--{
-- GUnixMountEntry *mount;
-- g_autoptr(GFile) file = NULL;
-- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self);
-+ priv = cc_info_overview_panel_get_instance_private (self);
-+ total_size = 0;
-
-- if (priv->primary_mounts == NULL)
-+ if (!priv->client)
- {
-- g_autofree char *size = NULL;
--
-- size = g_format_size (priv->total_bytes);
-- gtk_label_set_text (GTK_LABEL (priv->disk_label), size);
--
-+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown"));
- return;
- }
-
-- mount = priv->primary_mounts->data;
-- priv->primary_mounts = g_list_remove (priv->primary_mounts, mount);
-- file = g_file_new_for_path (g_unix_mount_get_mount_path (mount));
-- g_unix_mount_free (mount);
--
-- g_file_query_filesystem_info_async (file,
-- G_FILE_ATTRIBUTE_FILESYSTEM_SIZE,
-- 0,
-- priv->cancellable,
-- (GAsyncReadyCallback) query_done,
-- self);
--}
--
--static void
--get_primary_disc_info (CcInfoOverviewPanel *self)
--{
-- GList *points;
-- GList *p;
-- GHashTable *hash;
-- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self);
--
-- hash = g_hash_table_new (g_str_hash, g_str_equal);
-- points = g_unix_mount_points_get (NULL);
--
-- /* If we do not have /etc/fstab around, try /etc/mtab */
-- if (points == NULL)
-- points = g_unix_mounts_get (NULL);
-+ manager = udisks_client_get_object_manager (priv->client);
-+ objects = g_dbus_object_manager_get_objects (manager);
-
-- for (p = points; p != NULL; p = p->next)
-+ for (l = objects; l != NULL; l = l->next)
- {
-- GUnixMountEntry *mount = p->data;
-- const char *mount_path;
-- const char *device_path;
--
-- mount_path = g_unix_mount_get_mount_path (mount);
-- device_path = g_unix_mount_get_device_path (mount);
--
-- /* Do not count multiple mounts with same device_path, because it is
-- * probably something like btrfs subvolume. Use only the first one in
-- * order to count the real size. */
-- if (gsd_should_ignore_unix_mount (mount) ||
-- gsd_is_removable_mount (mount) ||
-- g_str_has_prefix (mount_path, "/media/") ||
-- g_str_has_prefix (mount_path, g_get_home_dir ()) ||
-- g_hash_table_lookup (hash, device_path) != NULL)
-+ UDisksDrive *drive;
-+ drive = udisks_object_peek_drive (UDISKS_OBJECT (l->data));
-+
-+ /* Skip removable devices */
-+ if (drive == NULL ||
-+ udisks_drive_get_removable (drive) ||
-+ udisks_drive_get_ejectable (drive))
- {
-- g_unix_mount_free (mount);
- continue;
- }
-
-- priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount);
-- g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path);
-+ total_size += udisks_drive_get_size (drive);
- }
-- g_list_free (points);
-- g_hash_table_destroy (hash);
-
-- priv->cancellable = g_cancellable_new ();
-- get_primary_disc_info_start (self);
-+ if (total_size > 0)
-+ {
-+ g_autofree gchar *size = g_format_size (total_size);
-+ gtk_label_set_text (GTK_LABEL (priv->disk_label), size);
-+ }
-+ else
-+ {
-+ gtk_label_set_text (GTK_LABEL (priv->disk_label), _("Unknown"));
-+ }
- }
-
- static char *
-@@ -852,8 +789,7 @@ cc_info_overview_panel_finalize (GObject *object)
- g_clear_object (&priv->cancellable);
- }
-
-- if (priv->primary_mounts)
-- g_list_free_full (priv->primary_mounts, (GDestroyNotify) g_unix_mount_free);
-+ g_clear_object (&priv->client);
-
- g_free (priv->gnome_version);
- g_free (priv->gnome_date);
-@@ -895,6 +831,7 @@ static void
- cc_info_overview_panel_init (CcInfoOverviewPanel *self)
- {
- CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self);
-+ g_autoptr(GError) error = NULL;
-
- gtk_widget_init_template (GTK_WIDGET (self));
-
-@@ -907,6 +844,12 @@ cc_info_overview_panel_init (CcInfoOverviewPanel *self)
- else
- gtk_widget_destroy (priv->updates_button);
-
-+ priv->client = udisks_client_new_sync (NULL, &error);
-+
-+ if (error != NULL)
-+ g_warning ("Unable to get UDisks client: %s. Disk information will not be available.",
-+ error->message);
-+
- info_overview_panel_setup_overview (self);
- info_overview_panel_setup_virt (self);
- }
-diff --git a/panels/info/meson.build b/panels/info/meson.build
-index 03742551314f91b60e3ec1caad153ff314b93310..c54e5fdaff3c6ddb59cca8ee9a2bf5a0212bf196 100644
---- a/panels/info/meson.build
-+++ b/panels/info/meson.build
-@@ -61,6 +61,7 @@ sources += gnome.compile_resources(
-
- deps = common_deps + [
- polkit_gobject_dep,
-+ dependency('udisks2', version: '>= 2.1.8'),
- dependency('libgtop-2.0')
- ]
-
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 17/80] gnu: grilo: Update to 0.3.9.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-8-kkebreau@posteo.net
* gnu/packages/gnome.scm (grilo): Update to 0.3.9.
[build-system]: Use meson-build-system.
[arguments]: Remove 'fix-introspection-install-dir' phase.
[native-inputs]: Add gtk-doc and vala.
[home-page]: Follow permanent redirect.
---
gnu/packages/gnome.scm | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)

Toggle diff (62 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index edb676de6a..6ccbe28560 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3789,7 +3789,7 @@ as possible!")
(define-public grilo
(package
(name "grilo")
- (version "0.3.3")
+ (version "0.3.9")
(source
(origin
(method url-fetch)
@@ -3798,13 +3798,15 @@ as possible!")
name "-" version ".tar.xz"))
(sha256
(base32
- "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw"))))
- (build-system gnu-build-system)
+ "1wnabc69730jsv8dljj5ik8g7p581nw60mw1mkgamkzjcb6821bk"))))
+ (build-system meson-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums and glib-genmarshal
("intltool" ,intltool)
("pkg-config" ,pkg-config)
- ("gobject-introspection" ,gobject-introspection)))
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("vala" ,vala)))
(inputs
`(("cyrus-sasl" ,cyrus-sasl)
("glib" ,glib)
@@ -3813,26 +3815,12 @@ as possible!")
("liboauth" ,liboauth)
("libsoup" ,libsoup)
("totem-pl-parser" ,totem-pl-parser)))
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-introspection-install-dir
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (substitute* '("src/Makefile.in"
- "libs/pls/Makefile.in"
- "libs/net/Makefile.in")
- (("@INTROSPECTION_GIRDIR@")
- (string-append out "/share/gir-1.0/"))
- (("@INTROSPECTION_TYPELIBDIR@")
- (string-append out "/lib/girepository-1.0/")))
- #t))))))
(native-search-paths
(list (search-path-specification
(variable "GRL_PLUGIN_PATH")
(files (list (string-append "lib/grilo-"
(version-major+minor version)))))))
- (home-page "https://live.gnome.org/Grilo")
+ (home-page "https://wiki.gnome.org/action/show/Projects/Grilo")
(synopsis "Framework for discovering and browsing media")
(description
"Grilo is a framework focused on making media discovery and browsing easy
--
2.23.0
Kei Kebreau wrote 5 years ago
[PATCH 19/80] gnu: vala: Update to 0.44.6.
(address . 38029@debbugs.gnu.org)(name . Kei Kebreau)(address . kkebreau@posteo.net)
20191102014348.3191-10-kkebreau@posteo.net
* gnu/packages/gnome.scm (vala): Update to 0.44.6.
---
gnu/packages/gnome.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

Toggle diff (45 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 359cadd678..dc0a059f29 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2266,7 +2266,7 @@ passwords in the GNOME keyring.")
(define-public vala
(package
(name "vala")
- (version "0.44.5")
+ (version "0.44.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -2274,20 +2274,20 @@ passwords in the GNOME keyring.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0zy2kfcvhikczfzhk5l7pkw6mvn3d6vw8cv7g08iah85p22q33xv"))))
+ "0fkrrpnisgq3y816piyr7hm2b94jaj7ki9y974galq3lmxb1g7xb"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(modify-phases %standard-phases
(add-before 'check 'pre-check
- (lambda _
- (setenv "CC" "gcc")
- (substitute* "valadoc/tests/testrunner.sh"
- (("export PKG_CONFIG_PATH=" m)
- (string-append m "$PKG_CONFIG_PATH:")))
- ;; For missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t)))))
+ (lambda _
+ (setenv "CC" "gcc")
+ (substitute* "valadoc/tests/testrunner.sh"
+ (("export PKG_CONFIG_PATH=" m)
+ (string-append m "$PKG_CONFIG_PATH:")))
+ ;; For missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ #t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
("flex" ,flex)
--
2.23.0
Kei Kebreau wrote 5 years ago
Re: [bug#38029] GNOME 3.32 patches
(address . 38029@debbugs.gnu.org)
87eeyrujl5.fsf@posteo.net
Kei Kebreau <kkebreau@posteo.net> writes:

Toggle quote (5 lines)
> Hello all,
>
> This is a series of patches which updates some GNOME packages to their
> 3.32.* versions.

And already I've made a mistake. These patches are based on the last
generation of core-updates. Please allow me to get my bits in order!

Thanks,
Kei
Leo Famulari wrote 5 years ago
(name . Kei Kebreau)(address . kkebreau@posteo.net)(address . 38029@debbugs.gnu.org)
20191102020637.GB10946@jasmine.lan
On Fri, Nov 01, 2019 at 09:56:38PM -0400, Kei Kebreau wrote:
Toggle quote (10 lines)
> Kei Kebreau <kkebreau@posteo.net> writes:
>
> > Hello all,
> >
> > This is a series of patches which updates some GNOME packages to their
> > 3.32.* versions.
>
> And already I've made a mistake. These patches are based on the last
> generation of core-updates. Please allow me to get my bits in order!

Okay :)

Please feel free to push this as a wip-gnome-updates branch on Savannah
("wip" as a warning that you might rebase it and rewrite history on the
branch). That will be easier for reviewers.
Kei Kebreau wrote 5 years ago
(name . Leo Famulari)(address . leo@famulari.name)(address . 38029@debbugs.gnu.org)
87a79fuifr.fsf@posteo.net
Leo Famulari <leo@famulari.name> writes:

Toggle quote (17 lines)
> On Fri, Nov 01, 2019 at 09:56:38PM -0400, Kei Kebreau wrote:
>> Kei Kebreau <kkebreau@posteo.net> writes:
>>
>> > Hello all,
>> >
>> > This is a series of patches which updates some GNOME packages to their
>> > 3.32.* versions.
>>
>> And already I've made a mistake. These patches are based on the last
>> generation of core-updates. Please allow me to get my bits in order!
>
> Okay :)
>
> Please feel free to push this as a wip-gnome-updates branch on Savannah
> ("wip" as a warning that you might rebase it and rewrite history on the
> branch). That will be easier for reviewers.

Thanks, Leo. To all who see this message: please disregard the patches
listed here and check out the brand new wip-gnome-updates branch on
Savannah!
Kei Kebreau wrote 5 years ago
(address . 38029-done@debbugs.gnu.org)
87tv6a4r3n.fsf@posteo.net
Kei Kebreau <kkebreau@posteo.net> writes:

Toggle quote (5 lines)
> Hello all,
>
> This is a series of patches which updates some GNOME packages to their
> 3.32.* versions.

These patches have been pushed to master!
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 38029@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 38029
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help