r50880 - in /desktop/unstable/glib2.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue Sep 20 11:21:56 UTC 2016
Author: biebl
Date: Tue Sep 20 11:21:56 2016
New Revision: 50880
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50880
Log:
Refresh patches.
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch
desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch
desktop/unstable/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
desktop/unstable/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=50880&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Tue Sep 20 11:21:56 2016
@@ -1,6 +1,7 @@
glib2.0 (2.50.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches.
-- Michael Biebl <biebl at debian.org> Tue, 20 Sep 2016 13:19:33 +0200
Modified: desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch?rev=50880&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/0001-Fix-trashing-on-overlayfs.patch [utf-8] Tue Sep 20 11:21:56 2016
@@ -24,7 +24,7 @@
===================================================================
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
-@@ -1907,7 +1907,7 @@
+@@ -1909,7 +1909,7 @@
char *basename, *trashname, *trashfile, *infoname, *infofile;
char *original_name, *original_name_escaped;
int i;
@@ -33,7 +33,7 @@
gboolean is_homedir_trash;
char delete_time[32];
int fd;
-@@ -1932,6 +1932,19 @@
+@@ -1933,6 +1933,19 @@
is_homedir_trash = FALSE;
trashdir = NULL;
Modified: desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=50880&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] Tue Sep 20 11:21:56 2016
@@ -61,7 +61,7 @@
return TRUE;
}
-@@ -2108,6 +2126,8 @@
+@@ -2138,6 +2156,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -70,7 +70,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -2129,6 +2149,24 @@
+@@ -2159,6 +2179,24 @@
free_languages = FALSE;
}
@@ -95,7 +95,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2145,6 +2183,39 @@
+@@ -2175,6 +2213,39 @@
translated_value = NULL;
}
@@ -139,7 +139,7 @@
===================================================================
--- a/glib/gkeyfile.h
+++ b/glib/gkeyfile.h
-@@ -310,6 +310,9 @@
+@@ -316,6 +316,9 @@
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
#define G_KEY_FILE_DESKTOP_KEY_ACTIONS "Actions"
Modified: desktop/unstable/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch?rev=50880&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch [utf-8] Tue Sep 20 11:21:56 2016
@@ -2,9 +2,11 @@
Author: Martin Pitt <martin.pitt at ubuntu.com>
Forwarded: No, Debian buildd specific
+Index: b/glib/tests/thread.c
+===================================================================
--- a/glib/tests/thread.c
+++ b/glib/tests/thread.c
-@@ -141,9 +141,11 @@
+@@ -145,9 +145,11 @@
getrlimit (RLIMIT_NPROC, &nl);
nl.rlim_cur = 1;
Modified: desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch?rev=50880&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] Tue Sep 20 11:21:56 2016
@@ -10,7 +10,7 @@
===================================================================
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -1086,6 +1086,9 @@
+@@ -1093,6 +1093,9 @@
g_io_module_scope_free (scope);
Modified: desktop/unstable/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch?rev=50880&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch [utf-8] Tue Sep 20 11:21:56 2016
@@ -57,7 +57,7 @@
===================================================================
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
-@@ -1071,6 +1071,13 @@
+@@ -1079,6 +1079,13 @@
goto out;
}
More information about the pkg-gnome-commits
mailing list