r30039 - in /desktop/experimental/glib2.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Thu Oct 6 01:36:25 UTC 2011
Author: biebl
Date: Thu Oct 6 01:36:25 2011
New Revision: 30039
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30039
Log:
- Remove 60_wait-longer-for-threads-to-die.patch, fixed upstream using a
counter.
- Refresh remaining patches.
Removed:
desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch
desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
desktop/experimental/glib2.0/debian/patches/series
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=30039&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Oct 6 01:36:25 2011
@@ -27,6 +27,9 @@
* Update patches
- Remove 03_blacklist-directories.patch, merged upstream.
- Remove 10_gdesktopappinfo_set_last_used.patch, fixed upstream.
+ - Remove 60_wait-longer-for-threads-to-die.patch, fixed upstream using a
+ counter.
+ - Refresh remaining patches.
-- Michael Biebl <biebl at debian.org> Thu, 06 Oct 2011 00:09:17 +0200
Modified: desktop/experimental/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch?rev=30039&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/0001-Run-gio-tests-with-a-dbus-session.patch [utf-8] Thu Oct 6 01:36:25 2011
@@ -11,10 +11,10 @@
gio/tests/Makefile.am | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
-diff --git a/Makefile.decl b/Makefile.decl
-index 163fd8b..6bf9281 100644
---- a/Makefile.decl
-+++ b/Makefile.decl
+Index: glib-2.30.0/Makefile.decl
+===================================================================
+--- glib-2.30.0.orig/Makefile.decl 2011-09-15 02:01:00.000000000 +0200
++++ glib-2.30.0/Makefile.decl 2011-10-06 03:28:05.378828199 +0200
@@ -1,7 +1,7 @@
# GLIB - Library of useful C routines
@@ -24,13 +24,13 @@
GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package
# initialize variables for unconditional += appending
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
-index 46b0efa..e775180 100644
---- a/gio/tests/Makefile.am
-+++ b/gio/tests/Makefile.am
-@@ -2,6 +2,9 @@ NULL =
+Index: glib-2.30.0/gio/tests/Makefile.am
+===================================================================
+--- glib-2.30.0.orig/gio/tests/Makefile.am 2011-09-26 22:54:58.000000000 +0200
++++ glib-2.30.0/gio/tests/Makefile.am 2011-10-06 03:28:05.382828149 +0200
+@@ -6,6 +6,9 @@
- include $(top_srcdir)/Makefile.decl
+ SUBDIRS = gdbus-object-manager-example
+# Some tests need a dbus session
+GTESTER_ENV = dbus-launch
@@ -38,6 +38,3 @@
INCLUDES = \
-g \
$(gio_INCLUDES) \
---
-1.7.4.1
-
Modified: desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=30039&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] Thu Oct 6 01:36:25 2011
@@ -1,8 +1,10 @@
# Description: If a .desktop file does not have inline translations, fall back to calling gettext.
# Ubuntu: https://launchpad.net/bugs/3935
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
+Index: glib-2.30.0/glib/gkeyfile.c
+===================================================================
+--- glib-2.30.0.orig/glib/gkeyfile.c 2011-09-26 22:54:50.000000000 +0200
++++ glib-2.30.0/glib/gkeyfile.c 2011-10-06 03:28:09.442777108 +0200
@@ -88,6 +88,7 @@
GKeyFileFlags flags;
@@ -11,7 +13,7 @@
};
typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
-@@ -214,6 +215,7 @@
+@@ -217,6 +218,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -19,7 +21,7 @@
}
static void
-@@ -233,6 +235,12 @@
+@@ -236,6 +238,12 @@
key_file->parse_buffer = NULL;
}
@@ -32,7 +34,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -452,6 +460,11 @@
+@@ -455,6 +463,11 @@
return FALSE;
}
@@ -44,7 +46,7 @@
return TRUE;
}
-@@ -558,6 +571,11 @@
+@@ -561,6 +574,11 @@
return FALSE;
}
@@ -56,7 +58,7 @@
return TRUE;
}
-@@ -1666,6 +1684,8 @@
+@@ -1698,6 +1716,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -65,7 +67,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -1687,6 +1707,23 @@
+@@ -1719,6 +1739,23 @@
free_languages = FALSE;
}
@@ -89,7 +91,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -1703,6 +1740,39 @@
+@@ -1735,6 +1772,39 @@
translated_value = NULL;
}
@@ -129,8 +131,10 @@
/* Fallback to untranslated key
*/
if (!translated_value)
---- a/glib/gkeyfile.h
-+++ b/glib/gkeyfile.h
+Index: glib-2.30.0/glib/gkeyfile.h
+===================================================================
+--- glib-2.30.0.orig/glib/gkeyfile.h 2011-09-09 21:58:10.000000000 +0200
++++ glib-2.30.0/glib/gkeyfile.h 2011-10-06 03:28:09.442777108 +0200
@@ -256,6 +256,7 @@
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify"
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
Modified: desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch?rev=30039&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] Thu Oct 6 01:36:25 2011
@@ -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
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
-@@ -464,6 +464,16 @@
+Index: glib-2.30.0/glib/gkeyfile.c
+===================================================================
+--- glib-2.30.0.orig/glib/gkeyfile.c 2011-10-06 03:28:09.442777108 +0200
++++ glib-2.30.0/glib/gkeyfile.c 2011-10-06 03:28:36.222440443 +0200
+@@ -467,6 +467,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -19,7 +21,7 @@
return TRUE;
}
-@@ -575,6 +585,16 @@
+@@ -578,6 +588,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch?rev=30039&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Thu Oct 6 01:36:25 2011
@@ -4,8 +4,10 @@
Author: Josselin Mouette <joss at debian.org>
Origin: vendor
---- a/docs/reference/glib/running.sgml
-+++ b/docs/reference/glib/running.sgml
+Index: glib-2.30.0/docs/reference/glib/running.sgml
+===================================================================
+--- glib-2.30.0.orig/docs/reference/glib/running.sgml 2011-09-09 21:58:10.000000000 +0200
++++ glib-2.30.0/docs/reference/glib/running.sgml 2011-10-06 03:28:39.730396342 +0200
@@ -213,6 +213,22 @@
</para>
</formalpara>
@@ -29,9 +31,11 @@
</refsect2>
<refsect2 id="setlocale">
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -1626,11 +1626,14 @@
+Index: glib-2.30.0/glib/gutils.c
+===================================================================
+--- glib-2.30.0.orig/glib/gutils.c 2011-09-26 22:54:50.000000000 +0200
++++ glib-2.30.0/glib/gutils.c 2011-10-06 03:28:39.734396292 +0200
+@@ -1725,11 +1725,14 @@
}
#endif /* !G_OS_WIN32 */
@@ -47,7 +51,7 @@
/* Only believe HOME if it is an absolute path and exists */
if (g_home_dir)
-@@ -1926,6 +1929,11 @@
+@@ -2025,6 +2028,11 @@
* homedir = g_get_home_dir (<!-- -->);
* ]|
*
@@ -58,4 +62,4 @@
+ *
* Returns: the current user's home directory
*/
- G_CONST_RETURN gchar*
+ const gchar *
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=30039&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Thu Oct 6 01:36:25 2011
@@ -2,5 +2,4 @@
01_gettext-desktopfiles.patch
02_gettext-desktopfiles-ubuntu.patch
04_homedir_env.patch
-60_wait-longer-for-threads-to-die.patch
61_glib-compile-schemas-path.patch
More information about the pkg-gnome-commits
mailing list