summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2011-06-11 15:04:18 +0000
committerPacho Ramos <pacho@gentoo.org>2011-06-11 15:04:18 +0000
commit1b0584b3fe396dded3db515e59d32576cf4cf0ac (patch)
tree403308be4daa101815aba45bb8fbe7a384780646 /dev-libs/glib/files
parentChange HOMEPAGE thanks to David (bug #371111). (diff)
downloadhistorical-1b0584b3fe396dded3db515e59d32576cf4cf0ac.tar.gz
historical-1b0584b3fe396dded3db515e59d32576cf4cf0ac.tar.bz2
historical-1b0584b3fe396dded3db515e59d32576cf4cf0ac.zip
Remove old.
Package-Manager: portage-2.1.9.50/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/glib/files')
-rw-r--r--dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch22
-rw-r--r--dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch43
-rw-r--r--dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch21
-rw-r--r--dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch64
-rw-r--r--dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch33
5 files changed, 0 insertions, 183 deletions
diff --git a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
deleted file mode 100644
index baca1eca86fa..000000000000
--- a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300
-+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300
-@@ -1448,7 +1448,7 @@
-
- g_test_add_func ("/gdbus/peer-to-peer", test_peer);
- g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
-- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
-+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
- g_test_add_func ("/gdbus/credentials", test_credentials);
- g_test_add_func ("/gdbus/overflow", test_overflow);
-
---- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300
-+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300
-@@ -336,7 +336,7 @@
- /* all the tests rely on a shared main loop */
- loop = g_main_loop_new (NULL, FALSE);
-
-- g_test_add_func ("/gdbus/non-socket", test_non_socket);
-+ //g_test_add_func ("/gdbus/non-socket", test_non_socket);
-
- ret = g_test_run();
-
diff --git a/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch b/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch
deleted file mode 100644
index c4085aee7169..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-deprecation-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From cae0b1c57f0f8ce73f4f117f8abb61c68e34a0e7 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Tue, 30 Nov 2010 02:28:00 +0000
-Subject: Bug635093: Deprecation check in tests/testglib.c
-
-The Relation API in glib/grel.h has been marked as
-deprecated (G_DISABLE_DEPRECATED), so added check for
-that macro in this source file and added label to indicate
-deprecation
----
-diff --git a/tests/testglib.c b/tests/testglib.c
-index b4e29f0..158808a 100644
---- a/tests/testglib.c
-+++ b/tests/testglib.c
-@@ -1038,6 +1038,7 @@ hash_table_tests (void)
- g_hash_table_destroy (hash_table);
- }
-
-+#ifndef G_DISABLE_DEPRECATED
- static void
- relation_test (void)
- {
-@@ -1110,6 +1111,7 @@ relation_test (void)
-
- relation = NULL;
- }
-+#endif
-
- static void
- gstring_tests (void)
-@@ -1539,7 +1541,9 @@ main (int argc,
- g_test_add_func ("/testglib/GTree", binary_tree_test);
- g_test_add_func ("/testglib/Arrays", test_arrays);
- g_test_add_func ("/testglib/GHashTable", hash_table_tests);
-- g_test_add_func ("/testglib/Relation", relation_test);
-+#ifndef G_DISABLE_DEPRECATED
-+ g_test_add_func ("/testglib/Relation (deprecated)", relation_test);
-+#endif
- g_test_add_func ("/testglib/File Paths", test_paths);
- g_test_add_func ("/testglib/File Functions", test_file_functions);
- g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch b/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch
deleted file mode 100644
index 054f311f7535..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-gdatetime-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3f059a6a123dd62257f224b9af7701078783060e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 22 Jan 2011 04:41:12 +0000
-Subject: Remove a test that seems to fail depending on time of day
-
----
-diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c
-index 01f08de..619bb02 100644
---- a/glib/tests/gdatetime.c
-+++ b/glib/tests/gdatetime.c
-@@ -804,7 +804,7 @@ GDateTime *__dt = g_date_time_new_local (2009, 10, 24, 0, 0, 0);\
- TEST_PRINTF_TIME (13, 13, 13, "%r", "01:13:13 PM");
- TEST_PRINTF ("%R", "00:00");
- TEST_PRINTF_TIME (13, 13, 31, "%R", "13:13");
-- TEST_PRINTF ("%s", t_str);
-+ //TEST_PRINTF ("%s", t_str);
- TEST_PRINTF ("%S", "00");
- TEST_PRINTF ("%t", " ");
- TEST_PRINTF ("%W", "42");
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch b/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch
deleted file mode 100644
index 5ae2d72cf357..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-gdbus-flushes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b2315084cb21a1ef072a48b0238a2e614af78be3 Mon Sep 17 00:00:00 2001
-From: Ted Gould <ted@gould.cx>
-Date: Mon, 13 Dec 2010 18:33:15 +0000
-Subject: Bug 635626 – GDBus message idle can execute while flushes are pending
-
-https://bugzilla.gnome.org/show_bug.cgi?id=635626
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
-index dd9d58a..228c28c 100644
---- a/gio/gdbusprivate.c
-+++ b/gio/gdbusprivate.c
-@@ -431,6 +431,7 @@ struct GDBusWorker
- gint num_writes_pending;
- guint64 write_num_messages_written;
- GList *write_pending_flushes;
-+ gboolean flush_pending;
- };
-
- /* ---------------------------------------------------------------------------------------------------- */
-@@ -1158,6 +1159,12 @@ ostream_flush_cb (GObject *source_object,
- if (error != NULL)
- g_error_free (error);
-
-+ /* Make sure we tell folks that we don't have additional
-+ flushes pending */
-+ g_mutex_lock (data->worker->write_lock);
-+ data->worker->flush_pending = FALSE;
-+ g_mutex_unlock (data->worker->write_lock);
-+
- /* OK, cool, finally kick off the next write */
- maybe_write_next_message (data->worker);
-
-@@ -1210,6 +1217,10 @@ message_written (GDBusWorker *worker,
- worker->write_pending_flushes = g_list_delete_link (worker->write_pending_flushes, l);
- }
- }
-+ if (flushers != NULL)
-+ {
-+ worker->flush_pending = TRUE;
-+ }
- g_mutex_unlock (worker->write_lock);
-
- if (flushers != NULL)
-@@ -1344,7 +1355,7 @@ static gboolean
- write_message_in_idle_cb (gpointer user_data)
- {
- GDBusWorker *worker = user_data;
-- if (worker->num_writes_pending == 0)
-+ if (worker->num_writes_pending == 0 && !worker->flush_pending)
- maybe_write_next_message (worker);
- return FALSE;
- }
-@@ -1427,6 +1438,7 @@ _g_dbus_worker_new (GIOStream *stream,
- worker->stream = g_object_ref (stream);
- worker->capabilities = capabilities;
- worker->cancellable = g_cancellable_new ();
-+ worker->flush_pending = FALSE;
-
- worker->frozen = initially_frozen;
- worker->received_messages_while_frozen = g_queue_new ();
---
-cgit v0.8.3.1
diff --git a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch b/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch
deleted file mode 100644
index 01ce2265ecaf..000000000000
--- a/dev-libs/glib/files/glib-2.26.1-gsettings-rules.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 393834ac6f32633a31e52441b051dc7d3969a530 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Thu, 04 Nov 2010 19:23:22 +0000
-Subject: gsettings.m4: Fix rules to work when there are no schemas
-
-If there are no schemas, don't try to install "" at install time.
-(In particular, automake conditionals don't work properly with
-@-expanded rules, so if you conditionally build a schema, you'll
-still unconditionally get the install rule.)
-
-https://bugzilla.gnome.org/show_bug.cgi?id=633381
----
-diff --git a/m4macros/gsettings.m4 b/m4macros/gsettings.m4
-index 4e4352f..f0ed838 100644
---- a/m4macros/gsettings.m4
-+++ b/m4macros/gsettings.m4
-@@ -47,9 +47,11 @@ install-data-am: install-gsettings-schemas
-
- install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
- @$(NORMAL_INSTALL)
-- test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-- $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"
-- test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
-+ if test -n "$^"; then \
-+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
-+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
-+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
-+ fi
-
- uninstall-gsettings-schemas:
- @$(NORMAL_UNINSTALL)
---
-cgit v0.8.3.1