JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #61612 from worldofpeace/geoclue/2.5.3

Browse Source 
geoclue: 2.5.2 -> 2.5.3
This commit is contained in:
worldofpeace 2019-05-19 03:36:43 -04:00 committed by GitHub
commit a8921b0ed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch
View File

@ -1,5 +1,5 @@
diff --git a/data/meson.build b/data/meson.build
index f826864..8b8a25e 100644
index c189753..12c10cb 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,7 +7,7 @@ if get_option('enable-backend')
@ -11,7 +11,16 @@ index f826864..8b8a25e 100644
configure_file(output: 'geoclue.conf',
input: 'geoclue.conf.in',
configuration: conf,
@@ -26,7 +26,7 @@ if get_option('enable-backend')
@@ -16,7 +16,7 @@ if get_option('enable-backend')
conf = configuration_data()
conf.set('libexecdir', libexecdir)
conf.set('dbus_srv_user', get_option('dbus-srv-user'))
- conf.set('sysconfdir', sysconfdir)
+ conf.set('sysconfdir', sysconfdir_install)
service_dir = join_paths(datadir, 'dbus-1', 'system-services')
configure_file(output: 'org.freedesktop.GeoClue2.service',
@@ -33,7 +33,7 @@ if get_option('enable-backend')
# DBus Service policy file
dbus_service_dir = get_option('dbus-sys-dir')
if dbus_service_dir == ''
@ -21,10 +30,10 @@ index f826864..8b8a25e 100644
configure_file(output: 'org.freedesktop.GeoClue2.conf',
input: 'org.freedesktop.GeoClue2.conf.in',
diff --git a/demo/meson.build b/demo/meson.build
index 99c094f..a29ca96 100644
index 1427fbe..2623f16 100644
--- a/demo/meson.build
+++ b/demo/meson.build
@@ -56,7 +56,7 @@ if get_option('demo-agent')
@@ -54,7 +54,7 @@ if get_option('demo-agent')
install_dir: desktop_dir)
# Also install in the autostart directory.
@ -34,7 +43,7 @@ index 99c094f..a29ca96 100644
desktop_file.full_path(),
autostart_dir)
diff --git a/meson.build b/meson.build
index d738ef6..c794a1d 100644
index fde6fa3..39b7b0a 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,11 @@ gclue_api_version='2.0'
@ -50,8 +59,8 @@ index d738ef6..c794a1d 100644
localedir = join_paths(datadir, 'locale')
header_dir = 'libgeoclue-' + gclue_api_version
@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'http://www.freedesktop.org/wiki/Software/GeoClue
conf.set_quoted('PACKAGE_BUGREPORT', 'http://bugs.freedesktop.org/enter_bug.cgi?product=GeoClue')
@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w
conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new')
conf.set_quoted('TEST_SRCDIR', meson.source_root() + '/data/')
conf.set_quoted('LOCALEDIR', localedir)
-conf.set_quoted('SYSCONFDIR', sysconfdir)

4
pkgs/development/libraries/geoclue/default.nix
View File

@ -7,14 +7,14 @@ with stdenv.lib;
stdenv.mkDerivation rec {
pname = "geoclue";
version = "2.5.2";
version = "2.5.3";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = pname;
repo = pname;
rev = version;
sha256 = "1zk6n28q030a9v03whad928b9zwq16d30ch369qv2c0994axdr5p";
sha256 = "1wbpi74dw3p7izxwd57irz2i1g55r7wzl5h2yf0ns0hgq2njdfsg";
};
patches = [