r48571 - in /desktop/unstable/glib2.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Tue May 10 22:12:15 UTC 2016
Author: biebl
Date: Tue May 10 22:12:15 2016
New Revision: 48571
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48571
Log:
Refresh patches.
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/control
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/02_gettext-desktopfiles-ubuntu.patch
desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch
desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
desktop/unstable/glib2.0/debian/patches/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch
desktop/unstable/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=48571&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Tue May 10 22:12:15 2016
@@ -1,6 +1,7 @@
glib2.0 (2.48.1-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches.
-- Michael Biebl <biebl at debian.org> Wed, 11 May 2016 00:01:17 +0200
Modified: desktop/unstable/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control?rev=48571&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control [utf-8] Tue May 10 22:12:15 2016
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 9),
cdbs (>= 0.4.93),
dh-autoreconf,
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=48571&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 May 10 22:12:15 2016
@@ -20,11 +20,11 @@
gio/glocalfile.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
-diff --git a/gio/glocalfile.c b/gio/glocalfile.c
-index 327fe6f..19ebb76 100644
+Index: b/gio/glocalfile.c
+===================================================================
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
-@@ -1900,7 +1900,7 @@ g_local_file_trash (GFile *file,
+@@ -1907,7 +1907,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;
-@@ -1925,6 +1925,19 @@ g_local_file_trash (GFile *file,
+@@ -1932,6 +1932,19 @@
is_homedir_trash = FALSE;
trashdir = NULL;
@@ -53,6 +53,3 @@
if (file_stat.st_dev == home_stat.st_dev)
{
is_homedir_trash = TRUE;
---
-2.1.4
-
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=48571&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 May 10 22:12:15 2016
@@ -4,9 +4,11 @@
## Bug: bug URL
# Ubuntu: https://launchpad.net/bugs/3935
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
+Index: b/glib/gkeyfile.c
+===================================================================
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
-@@ -442,6 +442,7 @@
+@@ -460,6 +460,7 @@
GKeyFileFlags flags;
gchar **locales;
@@ -14,7 +16,7 @@
volatile gint ref_count;
};
-@@ -566,6 +567,7 @@
+@@ -584,6 +585,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -22,7 +24,7 @@
}
static void
-@@ -585,6 +587,12 @@
+@@ -603,6 +605,12 @@
key_file->parse_buffer = NULL;
}
@@ -35,7 +37,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -800,6 +808,11 @@
+@@ -818,6 +826,11 @@
return FALSE;
}
@@ -47,7 +49,7 @@
return TRUE;
}
-@@ -905,6 +918,11 @@
+@@ -923,6 +936,11 @@
return FALSE;
}
@@ -59,7 +61,7 @@
return TRUE;
}
-@@ -2080,6 +2098,8 @@
+@@ -2108,6 +2126,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -68,7 +70,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -2101,6 +2121,24 @@
+@@ -2129,6 +2149,24 @@
free_languages = FALSE;
}
@@ -93,7 +95,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2117,6 +2155,39 @@
+@@ -2145,6 +2183,39 @@
translated_value = NULL;
}
@@ -133,6 +135,8 @@
/* Fallback to untranslated key
*/
if (!translated_value)
+Index: b/glib/gkeyfile.h
+===================================================================
--- a/glib/gkeyfile.h
+++ b/glib/gkeyfile.h
@@ -310,6 +310,9 @@
Modified: desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch?rev=48571&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] Tue May 10 22:12:15 2016
@@ -1,8 +1,10 @@
# Description: Provide backwards compatibility for 01_gettext-desktopfiles.patch for X-{Debian,Ubuntu}-Gettext-Domain
# UbuntuSpecific: 01_gettext-desktopfiles.patch was changed to use X-GNOME-, so this is necessary until all our .desktop files are converted
+Index: b/glib/gkeyfile.c
+===================================================================
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
-@@ -812,6 +812,16 @@
+@@ -830,6 +830,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -19,7 +21,7 @@
return TRUE;
}
-@@ -922,6 +932,16 @@
+@@ -940,6 +950,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch?rev=48571&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch [utf-8] Tue May 10 22:12:15 2016
@@ -2,9 +2,11 @@
Author: Iain Lane <iain.lane at canonical.com>
Forwarded: not-needed
+Index: b/gio/glib-compile-schemas.c
+===================================================================
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
-@@ -1202,11 +1202,13 @@
+@@ -1216,11 +1216,13 @@
return;
}
Modified: desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch?rev=48571&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Tue May 10 22:12:15 2016
@@ -4,6 +4,8 @@
Author: Josselin Mouette <joss at debian.org>
Origin: vendor
+Index: b/docs/reference/glib/running.xml
+===================================================================
--- a/docs/reference/glib/running.xml
+++ b/docs/reference/glib/running.xml
@@ -244,6 +244,24 @@
@@ -31,9 +33,11 @@
</refsect2>
<refsect2 id="setlocale">
+Index: b/glib/gutils.c
+===================================================================
--- a/glib/gutils.c
+++ b/glib/gutils.c
-@@ -806,6 +806,12 @@
+@@ -807,6 +807,12 @@
* should either directly check the `HOME` environment variable yourself
* or unset it before calling any functions in GLib.
*
@@ -46,7 +50,7 @@
* Returns: the current user's home directory
*/
const gchar *
-@@ -818,7 +824,9 @@
+@@ -819,7 +825,9 @@
gchar *tmp;
/* We first check HOME and use it if it is set */
Modified: desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch?rev=48571&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] Tue May 10 22:12:15 2016
@@ -6,7 +6,7 @@
===================================================================
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.c
-@@ -1452,7 +1452,9 @@
+@@ -1636,7 +1636,9 @@
g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
#endif
g_test_add_func ("/socket/close_graceful", test_close_graceful);
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=48571&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 May 10 22:12:15 2016
@@ -53,9 +53,11 @@
gio/gdbusaddress.c | 7 +++++++
1 file changed, 7 insertions(+)
+Index: b/gio/gdbusaddress.c
+===================================================================
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
-@@ -1036,6 +1036,13 @@
+@@ -1071,6 +1071,13 @@
goto out;
}
Modified: desktop/unstable/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch?rev=48571&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch [utf-8] Tue May 10 22:12:15 2016
@@ -2,9 +2,11 @@
Author: Iain Lane <laney at debian.org>
Forwarded: yes (desrt)
+Index: b/gio/tests/Makefile.am
+===================================================================
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -385,7 +385,6 @@
+@@ -397,7 +397,6 @@
test_programs += \
actions \
More information about the pkg-gnome-commits
mailing list