r36728 - in /desktop/experimental/glib2.0/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Fri Feb 22 15:51:33 UTC 2013
Author: pochu
Date: Fri Feb 22 15:51:33 2013
New Revision: 36728
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36728
Log:
+ debian/patches/08_fix_closure_invalidation.patch:
- Removed, applied upstream.
+ debian/patches/*:
- Refreshed.
Removed:
desktop/experimental/glib2.0/debian/patches/08_fix_closure_invalidation.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
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/03_disble_glib_compile_schemas_warning.patch
desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.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=36728&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Feb 22 15:51:33 2013
@@ -31,6 +31,10 @@
[ Emilio Pozuelo Monfort ]
* New upstream release 2.35.8.
+ + debian/patches/08_fix_closure_invalidation.patch:
+ - Removed, applied upstream.
+ + debian/patches/*:
+ - Refreshed.
-- Iain Lane <laney at debian.org> Thu, 10 Jan 2013 13:00:54 +0000
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=36728&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] Fri Feb 22 15:51:33 2013
@@ -4,11 +4,9 @@
## Bug: bug URL
# Ubuntu: https://launchpad.net/bugs/3935
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
-Index: glib-2.33.12/glib/gkeyfile.c
-===================================================================
---- glib-2.33.12.orig/glib/gkeyfile.c 2012-08-29 13:27:51.000000000 +1200
-+++ glib-2.33.12/glib/gkeyfile.c 2012-09-04 14:42:46.956116941 +1200
-@@ -443,6 +443,7 @@
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -445,6 +445,7 @@
GKeyFileFlags flags;
gchar **locales;
@@ -16,7 +14,7 @@
volatile gint ref_count;
};
-@@ -567,6 +568,7 @@
+@@ -569,6 +570,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -24,7 +22,7 @@
}
static void
-@@ -586,6 +588,12 @@
+@@ -588,6 +590,12 @@
key_file->parse_buffer = NULL;
}
@@ -37,7 +35,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -801,6 +809,11 @@
+@@ -803,6 +811,11 @@
return FALSE;
}
@@ -49,7 +47,7 @@
return TRUE;
}
-@@ -906,6 +919,11 @@
+@@ -908,6 +921,11 @@
return FALSE;
}
@@ -61,7 +59,7 @@
return TRUE;
}
-@@ -2081,6 +2099,8 @@
+@@ -2083,6 +2101,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -70,7 +68,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -2102,6 +2122,24 @@
+@@ -2104,6 +2124,24 @@
free_languages = FALSE;
}
@@ -95,7 +93,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2118,6 +2156,39 @@
+@@ -2120,6 +2158,39 @@
translated_value = NULL;
}
@@ -135,11 +133,9 @@
/* Fallback to untranslated key
*/
if (!translated_value)
-Index: glib-2.33.12/glib/gkeyfile.h
-===================================================================
---- glib-2.33.12.orig/glib/gkeyfile.h 2012-03-12 13:42:41.000000000 +1300
-+++ glib-2.33.12/glib/gkeyfile.h 2012-09-04 14:42:46.956116941 +1200
-@@ -258,6 +258,9 @@
+--- a/glib/gkeyfile.h
++++ b/glib/gkeyfile.h
+@@ -305,6 +305,9 @@
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify"
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
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=36728&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] Fri Feb 22 15:51:33 2013
@@ -1,10 +1,8 @@
# 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: glib-2.33.12/glib/gkeyfile.c
-===================================================================
---- glib-2.33.12.orig/glib/gkeyfile.c 2012-09-04 14:42:46.956116941 +1200
-+++ glib-2.33.12/glib/gkeyfile.c 2012-09-04 14:42:50.160116830 +1200
-@@ -813,6 +813,16 @@
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -815,6 +815,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -21,7 +19,7 @@
return TRUE;
}
-@@ -923,6 +933,16 @@
+@@ -925,6 +935,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch?rev=36728&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch [utf-8] Fri Feb 22 15:51:33 2013
@@ -2,11 +2,9 @@
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
-@@ -1204,11 +1204,13 @@
+@@ -1208,11 +1208,13 @@
return;
}
Modified: desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch?rev=36728&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] Fri Feb 22 15:51:33 2013
@@ -11,10 +11,8 @@
gio/tests/Makefile.am | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
-Index: glib2.0-exp/Makefile.decl
-===================================================================
---- glib2.0-exp.orig/Makefile.decl 2013-01-15 11:11:03.091352736 +0100
-+++ glib2.0-exp/Makefile.decl 2013-01-15 11:11:03.087352736 +0100
+--- a/Makefile.decl
++++ b/Makefile.decl
@@ -1,7 +1,7 @@
# GLIB - Library of useful C routines
@@ -24,10 +22,8 @@
GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package
# initialize variables for unconditional += appending
-Index: glib2.0-exp/gio/tests/Makefile.am
-===================================================================
---- glib2.0-exp.orig/gio/tests/Makefile.am 2013-01-15 11:11:03.091352736 +0100
-+++ glib2.0-exp/gio/tests/Makefile.am 2013-01-15 11:11:03.087352736 +0100
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
@@ -6,6 +6,9 @@
SUBDIRS = gdbus-object-manager-example services
@@ -35,6 +31,6 @@
+# Some tests need a dbus session
+GTESTER_ENV = dbus-launch
+
- INCLUDES = \
- -DG_LOG_DOMAIN=\"GLib-GIO\" \
- $(gio_INCLUDES) \
+ AM_CPPFLAGS = \
+ -DG_LOG_DOMAIN=\"GLib-GIO\" \
+ $(gio_INCLUDES) \
Modified: desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch?rev=36728&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch [utf-8] Fri Feb 22 15:51:33 2013
@@ -2,11 +2,9 @@
Author: Martin Pitt <martin.pitt at ubuntu.com>
Forwarded: No
-Index: b/gio/tests/socket.c
-===================================================================
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.c
-@@ -826,7 +826,9 @@
+@@ -838,7 +838,9 @@
g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
#endif
g_test_add_func ("/socket/close_graceful", test_close_graceful);
@@ -16,11 +14,9 @@
g_test_add_func ("/socket/address", test_sockaddr);
#ifdef G_OS_UNIX
g_test_add_func ("/socket/unix-from-fd", test_unix_from_fd);
-Index: b/glib/tests/mainloop.c
-===================================================================
--- a/glib/tests/mainloop.c
+++ b/glib/tests/mainloop.c
-@@ -770,11 +770,15 @@
+@@ -1256,11 +1256,15 @@
g_test_add_func ("/maincontext/basic", test_maincontext_basic);
g_test_add_func ("/mainloop/basic", test_mainloop_basic);
@@ -36,8 +32,6 @@
g_test_add_func ("/mainloop/swapping_child_sources", test_swapping_child_sources);
g_test_add_func ("/mainloop/source_time", test_source_time);
g_test_add_func ("/mainloop/overflow", test_mainloop_overflow);
-Index: b/glib/tests/timeout.c
-===================================================================
--- a/glib/tests/timeout.c
+++ b/glib/tests/timeout.c
@@ -102,7 +102,9 @@
@@ -50,8 +44,6 @@
return g_test_run ();
}
-Index: b/gio/tests/gdbus-threading.c
-===================================================================
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
@@ -406,7 +406,9 @@
Modified: desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch?rev=36728&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] Fri Feb 22 15:51:33 2013
@@ -1,8 +1,6 @@
-Index: b/gio/giomodule.c
-===================================================================
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
-@@ -915,6 +915,8 @@
+@@ -1037,6 +1037,8 @@
/* Then load the compiled in path */
g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=36728&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Fri Feb 22 15:51:33 2013
@@ -5,6 +5,5 @@
05_run-gio-tests-with-a-dbus-session.patch
06_thread_test_ignore_prctl_fail.patch
07_disable_tests_on_slow_archs.patch
-08_fix_closure_invalidation.patch
61_glib-compile-binaries-path.patch
90_gio-modules-multiarch-compat.patch
More information about the pkg-gnome-commits
mailing list