* [bug#38029] [PATCH 11/80] gnu: gnome-icon-theme: Update home page.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 12/80] gnu: gnome-desktop: Update to 3.32.2 Kei Kebreau
` (7 subsequent siblings)
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* gnu/packages/gnome.scm (gnome-icon-theme)[home-page]: Follow permanent
redirect.
---
gnu/packages/gnome.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 12/80] gnu: gnome-desktop: Update to 3.32.2.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 11/80] gnu: gnome-icon-theme: Update home page Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 13/80] gnu: gnome-online-accounts: Update to 3.32.0 Kei Kebreau
` (6 subsequent siblings)
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* 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(-)
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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 13/80] gnu: gnome-online-accounts: Update to 3.32.0.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 11/80] gnu: gnome-icon-theme: Update home page Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 12/80] gnu: gnome-desktop: Update to 3.32.2 Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 14/80] gnu: gnome-settings-daemon: Update to 3.32.1 Kei Kebreau
` (5 subsequent siblings)
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* 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(-)
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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 14/80] gnu: gnome-settings-daemon: Update to 3.32.1.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
` (2 preceding siblings ...)
2019-11-02 1:43 ` [bug#38029] [PATCH 13/80] gnu: gnome-online-accounts: Update to 3.32.0 Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 15/80] gnu: Add python-dbusmock Kei Kebreau
` (4 subsequent siblings)
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* gnu/packages/gnome.scm (gnome-settings-daemon): Update to 3.32.1.
---
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 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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 15/80] gnu: Add python-dbusmock.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
` (3 preceding siblings ...)
2019-11-02 1:43 ` [bug#38029] [PATCH 14/80] gnu: gnome-settings-daemon: Update to 3.32.1 Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 16/80] gnu: gnome-control-center: Update to 3.32.2 Kei Kebreau
` (3 subsequent siblings)
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* gnu/packages/python-xyz.scm (python-dbusmock): New variable.
---
gnu/packages/python-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 16/80] gnu: gnome-control-center: Update to 3.32.2.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
` (4 preceding siblings ...)
2019-11-02 1:43 ` [bug#38029] [PATCH 15/80] gnu: Add python-dbusmock Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 17/80] gnu: grilo: Update to 0.3.9 Kei Kebreau
` (2 subsequent siblings)
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* 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
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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 17/80] gnu: grilo: Update to 0.3.9.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
` (5 preceding siblings ...)
2019-11-02 1:43 ` [bug#38029] [PATCH 16/80] gnu: gnome-control-center: Update to 3.32.2 Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 18/80] gnu: tracker: Update to 2.2.2 Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 19/80] gnu: vala: Update to 0.44.6 Kei Kebreau
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* 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(-)
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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 18/80] gnu: tracker: Update to 2.2.2.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
` (6 preceding siblings ...)
2019-11-02 1:43 ` [bug#38029] [PATCH 17/80] gnu: grilo: Update to 0.3.9 Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
2019-11-02 1:43 ` [bug#38029] [PATCH 19/80] gnu: vala: Update to 0.44.6 Kei Kebreau
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* 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(-)
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
^ permalink raw reply related [flat|nested] 24+ messages in thread* [bug#38029] [PATCH 19/80] gnu: vala: Update to 0.44.6.
2019-11-02 1:43 ` [bug#38029] [PATCH 10/80] gnu: gsettings-desktop-schemas: Update to 3.32.0 Kei Kebreau
` (7 preceding siblings ...)
2019-11-02 1:43 ` [bug#38029] [PATCH 18/80] gnu: tracker: Update to 2.2.2 Kei Kebreau
@ 2019-11-02 1:43 ` Kei Kebreau
8 siblings, 0 replies; 24+ messages in thread
From: Kei Kebreau @ 2019-11-02 1:43 UTC (permalink / raw)
To: 38029; +Cc: Kei Kebreau
* gnu/packages/gnome.scm (vala): Update to 0.44.6.
---
gnu/packages/gnome.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
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
^ permalink raw reply related [flat|nested] 24+ messages in thread