[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
20/181: gnu: geoclue: Update to 2.6.0 and remove input labels.
From: |
guix-commits |
Subject: |
20/181: gnu: geoclue: Update to 2.6.0 and remove input labels. |
Date: |
Tue, 13 Sep 2022 02:25:08 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit bbe444bcc176b07033c9711a4d3718dcf8720ea8
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Aug 22 21:14:16 2022 -0400
gnu: geoclue: Update to 2.6.0 and remove input labels.
* gnu/packages/gnome.scm (geoclue): Update to 2.6.0.
[native-inputs]: Replace intltool with gettext-minimal. Add vala.
[inputs]: Delete labels.
* gnu/packages/patches/geoclue-config.patch: Refresh patch.
---
gnu/packages/gnome.scm | 17 +++++++++--------
gnu/packages/patches/geoclue-config.patch | 30 +++++++++++++++---------------
2 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f5b0a4d1f3..0c5257241d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5393,7 +5393,7 @@ output devices.")
(define-public geoclue
(package
(name "geoclue")
- (version "2.5.7")
+ (version "2.6.0")
(source
(origin
(method url-fetch)
@@ -5401,7 +5401,7 @@ output devices.")
(string-append
"https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/"
version "/geoclue-" version ".tar.bz2"))
(sha256
- (base32 "09ww26a76kanldhgwnn5sqy9ly2940k45zpp68spykkv2zjdpivc"))
+ (base32 "1854i8lih1jkks5w38xv8k5gs7s8629qjg3cg96ji0ffk35yzjfd"))
(patches (search-patches "geoclue-config.patch"))))
(build-system meson-build-system)
(arguments
@@ -5412,13 +5412,14 @@ output devices.")
modem-manager
libnotify
gtk-doc/stable
- intltool))
+ gettext-minimal
+ vala))
(inputs
- `(("avahi" ,avahi)
- ("glib:bin" ,glib "bin")
- ("glib-networking" ,glib-networking)
- ("json-glib" ,json-glib)
- ("libsoup" ,libsoup-minimal-2)))
+ (list avahi
+ `(,glib "bin")
+ glib-networking
+ json-glib
+ libsoup-minimal-2))
(home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home")
(synopsis "Geolocation service")
(description "Geoclue is a D-Bus service that provides location
diff --git a/gnu/packages/patches/geoclue-config.patch
b/gnu/packages/patches/geoclue-config.patch
index dd35b90be5..a3a6694cf7 100644
--- a/gnu/packages/patches/geoclue-config.patch
+++ b/gnu/packages/patches/geoclue-config.patch
@@ -1,25 +1,25 @@
-Allow the configuration file to be specified via an environment variable.
-
---- geoclue-2.1.10/src/gclue-config.c 2015-04-07 09:50:07.721074380 +0200
-+++ geoclue-2.1.10/src/gclue-config.c 2015-04-07 10:27:26.613171960 +0200
-@@ -235,6 +235,11 @@
+diff --git a/src/gclue-config.c b/src/gclue-config.c
+index 7ab2a67..e41f3df 100644
+--- a/src/gclue-config.c
++++ b/src/gclue-config.c
+@@ -332,6 +332,11 @@ static void
gclue_config_init (GClueConfig *config)
{
GError *error = NULL;
+ const char *config_file_path;
+
+ config_file_path = g_getenv ("GEOCLUE_CONFIG_FILE");
-+ if (config_file_path == NULL)
-+ config_file_path = CONFIG_FILE_PATH;
++ if (!config_file_path)
++ config_file_path = CONFIG_FILE_PATH;
- config->priv =
- G_TYPE_INSTANCE_GET_PRIVATE (config,
-@@ -242,7 +247,7 @@
- GClueConfigPrivate);
+ config->priv = gclue_config_get_instance_private(config);
config->priv->key_file = g_key_file_new ();
- g_key_file_load_from_file (config->priv->key_file,
-- CONFIG_FILE_PATH,
-+ config_file_path,
- 0,
+@@ -341,7 +346,7 @@ gclue_config_init (GClueConfig *config)
&error);
if (error != NULL) {
+ g_critical ("Failed to load configuration file '%s': %s",
+- CONFIG_FILE_PATH, error->message);
++ config_file_path, error->message);
+ g_error_free (error);
+
+ return;
- 08/181: gnu: sysprof: Update to 3.44.0, enable tests and remove labels., (continued)
- 08/181: gnu: sysprof: Update to 3.44.0, enable tests and remove labels., guix-commits, 2022/09/13
- 03/181: gnu: libmbim: Update to 1.26.4., guix-commits, 2022/09/13
- 07/181: gnu: libdazzle: Update to 3.44.0., guix-commits, 2022/09/13
- 09/181: gnu: egl-wayland: Update to 1.1.10., guix-commits, 2022/09/13
- 12/181: gnu: gtk: Update to 4.8.0 and use gexps., guix-commits, 2022/09/13
- 13/181: gnu: gcr: Update to 3.41.1, delete trailing #t and input labels., guix-commits, 2022/09/13
- 11/181: gnu: Add gi-docgen., guix-commits, 2022/09/13
- 18/181: gnu: libqmi: Update to 1.30.8., guix-commits, 2022/09/13
- 16/181: gnu: libhandy: Update to 1.7.90., guix-commits, 2022/09/13
- 19/181: gnu: modem-manager: Update to 1.18.10 and remove input labels., guix-commits, 2022/09/13
- 20/181: gnu: geoclue: Update to 2.6.0 and remove input labels.,
guix-commits <=
- 24/181: gnu: Add gsettings-desktop-schemas-next., guix-commits, 2022/09/13
- 25/181: gnu: gnome-settings-daemon: Update to 42.2., guix-commits, 2022/09/13
- 21/181: gnu: geocode-glib: Update to 3.26.4 and build with libsoup 3., guix-commits, 2022/09/13
- 23/181: gnu: network-manager: Update to 1.40.0, use gexps and remove input labels., guix-commits, 2022/09/13
- 26/181: gnu: umockdev: Update to 0.17.13., guix-commits, 2022/09/13
- 14/181: gnu: Add python-libevdev., guix-commits, 2022/09/13
- 38/181: gnu: accountsservice: Propagate glib., guix-commits, 2022/09/13
- 32/181: gnu: ibus: Update to 1.5.27, use gexps and remove input labels., guix-commits, 2022/09/13
- 37/181: gnu: mutter: Update to 42.4, use gexps and remove input labels., guix-commits, 2022/09/13
- 33/181: gnu: evolution-data-server: Update to 3.44.4 and remove input labels., guix-commits, 2022/09/13