Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 7 insertions, 29 deletions

diff --git a/devel/libsoup/files/patch-libsoup_Makefile.in b/devel/libsoup/files/patch-libsoup_Makefile.in
index 880ab2fd7..f68a85cb8 100644
--- a/devel/libsoup/files/patch-libsoup_Makefile.in
+++ b/devel/libsoup/files/patch-libsoup_Makefile.in
@@ -1,6 +1,6 @@
---- libsoup/Makefile.in.orig	2013-03-30 07:53:47.000000000 +0000
-+++ libsoup/Makefile.in	2013-03-30 07:56:16.000000000 +0000
-@@ -146,7 +146,7 @@
+--- libsoup/Makefile.in.orig	2014-03-10 13:11:37.184605224 +0000
++++ libsoup/Makefile.in	2014-03-10 13:13:20.683597512 +0000
+@@ -176,7 +176,7 @@
  	$(AM_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) $(LDFLAGS) -o \
  	$@
  @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES =  \
@@ -9,7 +9,7 @@
  am__libsoup_gnome_2_4_la_SOURCES_DIST = soup-cookie-jar-sqlite.c \
  	soup-gnome-features.c soup-proxy-resolver-gnome.h \
  	soup-proxy-resolver-gnome.c soup-password-manager-gnome.h \
-@@ -582,7 +582,7 @@
+@@ -629,7 +629,7 @@
  @BUILD_LIBSOUP_GNOME_TRUE@	-export-symbols $(srcdir)/libsoup-gnome-2.4.sym
  
  @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \
@@ -18,12 +18,12 @@
  @BUILD_LIBSOUP_GNOME_TRUE@	$(GLIB_LIBS)
  
  @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_SOURCES = \
-@@ -637,7 +637,7 @@
+@@ -682,7 +682,7 @@
  @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@	--include-uninstalled=$(builddir)/Soup-2.4.gir
  
- @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
+ @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
 -@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
-+@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la -lsoup-2.4
++@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la soup-2.4
  @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
  @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
diff --git a/devel/libsoup/files/patch-libsoup_soup-message-io.c b/devel/libsoup/files/patch-libsoup_soup-message-io.c
deleted file mode 100644
index 76900f6b6..000000000
--- a/devel/libsoup/files/patch-libsoup_soup-message-io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsoup/soup-message-io.c.orig	2014-02-03 23:20:23.000000000 +0100
-+++ libsoup/soup-message-io.c	2014-02-03 23:23:10.000000000 +0100
-@@ -977,7 +977,7 @@ soup_message_io_run_until_finish (SoupMe
- 	g_object_ref (msg);
- 
- 	if (io) {
--		g_return_if_fail (io->mode == SOUP_MESSAGE_IO_CLIENT);
-+		g_return_val_if_fail (io->mode == SOUP_MESSAGE_IO_CLIENT, FALSE);
- 
- 		if (io->read_state < SOUP_MESSAGE_IO_STATE_BODY_DONE)
- 			io->read_state = SOUP_MESSAGE_IO_STATE_FINISHING;
diff --git a/devel/libsoup/files/patch-tests_coding-test.c b/devel/libsoup/files/patch-tests_coding-test.c
deleted file mode 100644
index 899c799bc..000000000
--- a/devel/libsoup/files/patch-tests_coding-test.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/coding-test.c.orig	2012-06-29 12:07:41.000000000 +0200
-+++ tests/coding-test.c	2012-06-29 12:47:16.000000000 +0200
-@@ -66,7 +66,7 @@
- 			}
- 		}
- 		if (file_path && encoding) {
--			file = g_strdup_printf (file_path, path);
-+			file = g_strdup_printf ("%s", path);
- 			if (g_file_test (file, G_FILE_TEST_EXISTS)) {
- 				soup_message_headers_append (msg->response_headers,
- 							     "Content-Encoding",