diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2022-02-17 14:51:13 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-02-18 14:14:39 +0100 |
| commit | b3d7eae08ee71674ebcf6c6dc5ef575f35493240 (patch) | |
| tree | bf039ef6578040801d3cb356f21d96a043237a34 /gnu/packages/patches | |
| parent | 7168148abe08b5d21ab4d36ff2c2b8c99978e168 (diff) | |
| download | guix-patches-b3d7eae08ee71674ebcf6c6dc5ef575f35493240.tar guix-patches-b3d7eae08ee71674ebcf6c6dc5ef575f35493240.tar.gz | |
gnu: upower: Update to 0.99.15.
Upstream has removed the Autotools build system and now
only supports Meson, so the build system has been changed
to 'meson-build-system'.
The patch 'power-builddir.patch' has to be replaced to
adjust to the switch to Meson. This has been done by adding
an origin snippet.
The origin snippet has been simplified, and for consistency,
it has been made a gexp.
Some dependencies were Autotools-only and could be removed.
* gnu/packages/gnome.scm (upower): Update to 0.99.15.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/upower-builddir.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch deleted file mode 100644 index a61d387faf..0000000000 --- a/gnu/packages/patches/upower-builddir.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 27ae011b31d831752b97eb209bc2b2206fcf40f7 Mon Sep 17 00:00:00 2001 -From: Tobias Geerinckx-Rice <me@tobias.gr> -Date: Mon, 28 Jun 2021 11:58:47 +0200 -Subject: [PATCH] gnu: upower: Fix build directory. - -Remove explicit set of UPOWER_CONF_FILE_NAME in up-self-test.c; -instead the harness should set it. In Guix we set it explicitly; the -right thing is to use AM_TEST_ENVIRONMENT and regenerate the -makefiles, but we can't regenerate because current autotools carp on -some things, so we patch the Makefile.in instead. - -Also fix to not try to create /var/lib/upower if /var isn't writable. - -Based on a patch by Andy Wingo <wingo@igalia.com> ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3400139..f51ee89 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -181,7 +181,7 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile - endif - - install-data-hook: -- if test -w $(DESTDIR)$(prefix)/; then \ -+ if test -w $(DESTDIR)$(localstatedir)/; then \ - mkdir -p $(DESTDIR)$(historydir); \ - fi - --- -2.32.0 - |