r42548 - in /desktop/experimental/glib2.0/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sat Sep 6 12:33:14 UTC 2014
Author: sjoerd
Date: Sat Sep 6 12:33:14 2014
New Revision: 42548
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42548
Log:
New upstream release
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control
desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch
desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch
desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch
desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch
desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Sat Sep 6 12:33:14 2014
@@ -1,3 +1,9 @@
+glib2.0 (2.41.4-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sat, 06 Sep 2014 14:27:19 +0200
+
glib2.0 (2.41.3-1) experimental; urgency=medium
* New upstream release 2.41.3
Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Sat Sep 6 12:33:14 2014
@@ -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>, Emilio Pozuelo Monfort <pochu at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Iain Lane <laney at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 9),
cdbs (>= 0.4.93),
dh-autoreconf,
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=42548&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] Sat Sep 6 12:33:14 2014
@@ -4,7 +4,7 @@
--- a/gio/tests/socket.c
+++ b/gio/tests/socket.c
-@@ -984,7 +984,9 @@
+@@ -1086,7 +1086,9 @@
g_test_add_func ("/socket/ipv6_v4mapped", test_ipv6_v4mapped);
#endif
g_test_add_func ("/socket/close_graceful", test_close_graceful);
@@ -16,7 +16,7 @@
g_test_add_func ("/socket/unix-from-fd", test_unix_from_fd);
--- a/glib/tests/mainloop.c
+++ b/glib/tests/mainloop.c
-@@ -1524,11 +1524,15 @@
+@@ -1572,11 +1572,15 @@
g_test_add_func ("/maincontext/basic", test_maincontext_basic);
g_test_add_func ("/mainloop/basic", test_mainloop_basic);
Modified: desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch [utf-8] Sat Sep 6 12:33:14 2014
@@ -1,6 +1,6 @@
--- a/glib/gutils.c
+++ b/glib/gutils.c
-@@ -2322,6 +2322,12 @@
+@@ -2320,6 +2320,12 @@
#endif
Modified: desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch [utf-8] Sat Sep 6 12:33:14 2014
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -960,6 +960,9 @@
+@@ -966,6 +966,9 @@
AC_CHECK_FUNCS(getmntent_r setmntent endmntent hasmntopt getfsstat getvfsstat fallocate)
case $host_os in aix*) ac_cv_func_splice=no ;; esac # AIX splice() is something else
AC_CHECK_FUNCS(splice)
Modified: desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/gdbus-Let-the-pending-read-finish-before-closing-the.patch [utf-8] Sat Sep 6 12:33:14 2014
@@ -27,7 +27,7 @@
struct GDBusWorker
{
volatile gint ref_count;
-@@ -576,7 +578,10 @@
+@@ -577,7 +579,10 @@
/* If already stopped, don't even process the reply */
if (g_atomic_int_get (&worker->stopped))
@@ -39,7 +39,7 @@
error = NULL;
if (worker->socket == NULL)
-@@ -671,21 +676,16 @@
+@@ -672,21 +677,16 @@
* if the GDBusConnection tells us to close (either via
* _g_dbus_worker_stop, which is called on last-unref, or directly),
* so a cancelled read must mean our connection was closed locally.
@@ -69,7 +69,7 @@
g_error_free (error);
goto out;
-@@ -814,6 +814,13 @@
+@@ -815,6 +815,13 @@
out:
g_mutex_unlock (&worker->read_lock);
@@ -83,7 +83,7 @@
/* gives up the reference acquired when calling g_input_stream_read_async() */
_g_dbus_worker_unref (worker);
}
-@@ -822,8 +829,8 @@
+@@ -823,8 +830,8 @@
static void
_g_dbus_worker_do_read_unlocked (GDBusWorker *worker)
{
@@ -94,7 +94,7 @@
*/
/* if bytes_wanted is zero, it means start reading a message */
-@@ -1144,8 +1151,6 @@
+@@ -1145,8 +1152,6 @@
}
/* ---------------------------------------------------------------------------------------------------- */
@@ -103,7 +103,7 @@
typedef struct
{
GDBusWorker *worker;
-@@ -1444,12 +1449,15 @@
+@@ -1445,12 +1450,15 @@
/* if we want to close the connection, that takes precedence */
if (worker->pending_close_attempts != NULL)
{
@@ -124,15 +124,15 @@
}
else
{
-@@ -1557,7 +1565,6 @@
- /*
+@@ -1558,7 +1566,6 @@
+ /**
* @write_data: (transfer full) (allow-none):
* @flush_data: (transfer full) (allow-none):
- * @close_data: (transfer full) (allow-none):
*
* Can be called from any thread
*
-@@ -1567,8 +1574,7 @@
+@@ -1568,8 +1575,7 @@
static void
schedule_writing_unlocked (GDBusWorker *worker,
MessageToWriteData *write_data,
@@ -142,7 +142,7 @@
{
if (write_data != NULL)
g_queue_push_tail (worker->write_queue, write_data);
-@@ -1576,10 +1582,6 @@
+@@ -1577,10 +1583,6 @@
if (flush_data != NULL)
worker->write_pending_flushes = g_list_prepend (worker->write_pending_flushes, flush_data);
@@ -153,7 +153,7 @@
/* If we had output pending, the next bit of output will happen
* automatically when it finishes, so we only need to do this
* if nothing was pending.
-@@ -1627,7 +1629,7 @@
+@@ -1629,7 +1631,7 @@
data->blob_size = blob_len;
g_mutex_lock (&worker->write_lock);
@@ -162,7 +162,7 @@
g_mutex_unlock (&worker->write_lock);
}
-@@ -1707,13 +1709,12 @@
+@@ -1710,13 +1712,12 @@
(cancellable == NULL ? NULL : g_object_ref (cancellable));
close_data->result = (result == NULL ? NULL : g_object_ref (result));
@@ -180,7 +180,7 @@
}
/* This can be called from any thread - frees worker. Note that
-@@ -1783,7 +1784,7 @@
+@@ -1786,7 +1787,7 @@
data->number_to_wait_for = worker->write_num_messages_written + pending_writes;
g_mutex_lock (&data->mutex);
Modified: desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch [utf-8] Sat Sep 6 12:33:14 2014
@@ -19,11 +19,9 @@
gio/tests/gdbus-threading.c | 8 +-----
4 files changed, 56 insertions(+), 9 deletions(-)
-diff --git a/gio/tests/gdbus-connection-loss.c b/gio/tests/gdbus-connection-loss.c
-index d807193..8ebb870 100644
--- a/gio/tests/gdbus-connection-loss.c
+++ b/gio/tests/gdbus-connection-loss.c
-@@ -124,8 +124,7 @@ main (int argc,
+@@ -124,8 +124,7 @@
g_assert (g_spawn_command_line_async (path, NULL));
g_free (path);
@@ -33,11 +31,9 @@
/* Create the connection in the main thread */
error = NULL;
-diff --git a/gio/tests/gdbus-tests.c b/gio/tests/gdbus-tests.c
-index 8b64e85..8237dd0 100644
--- a/gio/tests/gdbus-tests.c
+++ b/gio/tests/gdbus-tests.c
-@@ -77,6 +77,58 @@ _g_assert_property_notify_run (gpointer object,
+@@ -77,6 +77,58 @@
return data.timed_out;
}
@@ -96,11 +92,9 @@
/* ---------------------------------------------------------------------------------------------------- */
typedef struct
-diff --git a/gio/tests/gdbus-tests.h b/gio/tests/gdbus-tests.h
-index 538b265..6e31d7b 100644
--- a/gio/tests/gdbus-tests.h
+++ b/gio/tests/gdbus-tests.h
-@@ -114,6 +114,8 @@ GDBusConnection *_g_bus_get_priv (GBusType bus_type,
+@@ -114,6 +114,8 @@
GCancellable *cancellable,
GError **error);
@@ -109,11 +103,9 @@
G_END_DECLS
#endif /* __TESTS_H__ */
-diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
-index ee9dbe9..96ddba6 100644
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
-@@ -419,7 +419,6 @@ test_method_calls_in_thread (void)
+@@ -421,7 +421,6 @@
GDBusProxy *proxy;
GDBusConnection *connection;
GError *error;
@@ -121,7 +113,7 @@
error = NULL;
connection = g_bus_get_sync (G_BUS_TYPE_SESSION,
-@@ -437,10 +436,6 @@ test_method_calls_in_thread (void)
+@@ -439,10 +438,6 @@
&error);
g_assert_no_error (error);
@@ -132,7 +124,7 @@
test_method_calls_on_proxy (proxy);
g_object_unref (proxy);
-@@ -596,8 +591,7 @@ main (int argc,
+@@ -598,8 +593,7 @@
g_assert (g_spawn_command_line_async (path, NULL));
g_free (path);
@@ -142,6 +134,3 @@
/* Create the connection in the main thread */
error = NULL;
---
-1.9.1
-
Modified: desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-allows-P-1.patch [utf-8] Sat Sep 6 12:33:14 2014
@@ -11,11 +11,9 @@
glib/tests/regex.c | 3 +++
1 file changed, 3 insertions(+)
-diff --git a/glib/tests/regex.c b/glib/tests/regex.c
-index 95b2360..b317501 100644
--- a/glib/tests/regex.c
+++ b/glib/tests/regex.c
-@@ -2632,8 +2632,11 @@ main (int argc, char *argv[])
+@@ -2569,8 +2569,11 @@
TEST_EXPAND("a", "a", "\\0130", FALSE, "X");
TEST_EXPAND("a", "a", "\\\\\\0", FALSE, "\\a");
TEST_EXPAND("a(?P<G>.)c", "xabcy", "X\\g<G>X", FALSE, "XbX");
@@ -27,6 +25,3 @@
TEST_EXPAND(".", EURO, "\\0", FALSE, EURO);
TEST_EXPAND("(.)", EURO, "\\1", FALSE, EURO);
TEST_EXPAND("(?P<G>.)", EURO, "\\g<G>", FALSE, EURO);
---
-2.0.1
-
Modified: desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/regex-test-do-not-assert-that-system-PCRE-still-has-.patch [utf-8] Sat Sep 6 12:33:14 2014
@@ -11,11 +11,9 @@
glib/tests/regex.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/glib/tests/regex.c b/glib/tests/regex.c
-index 833e585..95b2360 100644
--- a/glib/tests/regex.c
+++ b/glib/tests/regex.c
-@@ -2446,8 +2446,12 @@ main (int argc, char *argv[])
+@@ -2387,8 +2387,12 @@
/* Test that othercasing in our pcre/glib integration is bug-for-bug compatible
* with pcre's internal tables. Bug #678273 */
TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "DŽ", -1, 0, 0, TRUE);
@@ -29,6 +27,3 @@
/* TEST_MATCH_NEXT#(pattern, string, string_len, start_position, ...) */
TEST_MATCH_NEXT0("a", "x", -1, 0);
---
-2.0.1
-
Modified: desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch?rev=42548&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/skip-brokwn-dbus-appinfo-test.patch [utf-8] Sat Sep 6 12:33:14 2014
@@ -4,7 +4,7 @@
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
-@@ -388,7 +388,6 @@
+@@ -385,7 +385,6 @@
test_programs += \
actions \
More information about the pkg-gnome-commits
mailing list