diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-01-16 03:53:50 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-01-16 03:53:50 -0500 |
| commit | a5ff4d65170ccd8156489aa1741a85b94434fba3 (patch) | |
| tree | 7ec0760d130e53462d85601e5e734f2f5ce12b2f /gnu/packages/patches | |
| parent | 8afabb2eca954af6fbba8c6ae37e8f0bc3047840 (diff) | |
| parent | 2d5785adca393dcfb49150673565edbc354adec5 (diff) | |
| download | guix-a5ff4d65170ccd8156489aa1741a85b94434fba3.tar.gz | |
Merge branch 'gnome-updates'
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/totem-debug-format-fix.patch | 11 | ||||
| -rw-r--r-- | gnu/packages/patches/upower-builddir.patch | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/gnu/packages/patches/totem-debug-format-fix.patch b/gnu/packages/patches/totem-debug-format-fix.patch deleted file mode 100644 index 7ddd31ee10..0000000000 --- a/gnu/packages/patches/totem-debug-format-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- totem-3.20.1/src/backend/bacon-video-widget.c.orig 2016-03-22 12:45:32.000000000 -0400 -+++ totem-3.20.1/src/backend/bacon-video-widget.c 2016-05-11 02:49:55.299109551 -0400 -@@ -2334,7 +2334,7 @@ - if (!gst_toc_entry_get_start_stop_times (entry, &start, &stop)) { - GST_DEBUG ("Chapter #%d (couldn't get times)", i); - } else { -- GST_DEBUG ("Chapter #%d (start: %li stop: %li)", i, start, stop); -+ GST_DEBUG ("Chapter #%d (start: %li stop: %li)", i, (long) start, (long) stop); - } - } - diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch index 13cef5876a..d59d4364b8 100644 --- a/gnu/packages/patches/upower-builddir.patch +++ b/gnu/packages/patches/upower-builddir.patch @@ -37,7 +37,7 @@ Patch by Andy Wingo <wingo@igalia.com> - 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); +- g_setenv ("UPOWER_CONF_FILE_NAME", "../../../etc/UPower.conf", TRUE); - /* tests go here */ g_test_add_func ("/power/backend", up_test_backend_func); |