summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/gnome.scm6
-rw-r--r--gnu/packages/patches/upower-builddir.patch24
2 files changed, 4 insertions, 26 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e1d2a65ccb..44ae693be0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3141,15 +3141,15 @@ faster results and to avoid unnecessary server load.")
(define-public upower
(package
(name "upower")
- (version "0.99.8")
+ (version "0.99.10")
(source (origin
(method url-fetch)
(uri (string-append "https://gitlab.freedesktop.org/upower/upower/"
- "uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/"
+ "uploads/c438511024b9bc5a904f8775cfc8e4c4/"
"upower-" version ".tar.xz"))
(sha256
(base32
- "00lzr0vyxz5lvmgya48gdb2cdgmfdim4b34jlfdyqakk1i9sl8xv"))
+ "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4"))
(patches (search-patches "upower-builddir.patch"))))
(build-system glib-or-gtk-build-system)
(arguments
diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch
index d59d4364b8..51295f2076 100644
--- a/gnu/packages/patches/upower-builddir.patch
+++ b/gnu/packages/patches/upower-builddir.patch
@@ -7,17 +7,10 @@ some things, so we patch the Makefile.in instead.
Also fix to not try to create /var/lib/upower if /var isn't writable.
Patch by Andy Wingo <wingo@igalia.com>
+Reduced to upower 0.99.10 by Tobias Geerinckx-Rice <me@tobias.gr>
--- upower-0.99.2.orig/src/Makefile.in 2014-12-18 10:32:01.000000000 +0100
+++ upower-0.99.2/src/Makefile.in 2015-04-04 19:49:28.020843678 +0200
-@@ -780,6 +780,7 @@
-
- @UP_BUILD_TESTS_TRUE@up_self_test_CFLAGS = $(AM_CFLAGS) $(WARNINGFLAGS_C)
- @UP_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = $(DBUS_LAUNCH)
-+@UP_BUILD_TESTS_TRUE@AM_TESTS_ENVIRONMENT = UPOWER_CONF_FILE_NAME=$(top_srcdir)/etc/UPower.conf
- dbusservicedir = $(datadir)/dbus-1/system-services
- dbusservice_in_files = org.freedesktop.UPower.service.in
- dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
@@ -1789,7 +1790,7 @@
@HAVE_SYSTEMDSYSTEMUNITDIR_TRUE@ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@@ -27,18 +20,3 @@ Patch by Andy Wingo <wingo@igalia.com>
mkdir -p $(DESTDIR)$(historydir); \
fi
---- upower-0.99.2.orig/src/up-self-test.c 2014-07-17 09:46:15.000000000 +0200
-+++ upower-0.99.2/src/up-self-test.c 2015-04-04 18:43:04.952741927 +0200
-@@ -295,12 +295,6 @@
- #endif
- g_test_init (&argc, &argv, NULL);
-
-- /* make check, vs. make distcheck */
-- if (g_file_test ("../etc/UPower.conf", G_FILE_TEST_EXISTS))
-- g_setenv ("UPOWER_CONF_FILE_NAME", "../etc/UPower.conf", TRUE);
-- else
-- g_setenv ("UPOWER_CONF_FILE_NAME", "../../../etc/UPower.conf", TRUE);
--
- /* tests go here */
- g_test_add_func ("/power/backend", up_test_backend_func);
- g_test_add_func ("/power/device", up_test_device_func);