fix libsoup-gnome patch

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

3 files changed, 30 insertions, 35 deletions

diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 8af78a31..29309a63 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -1 +1 @@
-EBUILD vala-9999.ebuild 1322 RMD160 5c067daeabfb5d407287cda315f3672939907b86 SHA1 a18b0b44e1a4c50d4447ddd4232cccad411f0513 SHA256 c38ccc10798038aeb55070a686767183fb02daa0b27a5abfacb2b4c4d1d5a872
+EBUILD vala-9999.ebuild 1113 RMD160 72493362c3fa4911ccbb315893aab532a97ff1bd SHA1 2d1b9fefb3cf82c42571de3003404a773067e434 SHA256 70ebc4bc19aed5e6478eb2e2ec84cdaefc5787edff673b15b3a1dce7823c8b68
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index 230d474e..a8f622dd 100644
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -1,2 +1,2 @@
-AUX libsoup-gnome-9999-system-lib.patch 6819 RMD160 5b7c81031ba869716d7acbb6b786304c764cdd87 SHA1 161f4e67b6df6dcc438efa37fdc195864fadb36b SHA256 012aedd8606d62d2fab347d3e5d407fa9e1d998cae58b1ca7007a18b4090899e
+AUX libsoup-gnome-9999-system-lib.patch 6601 RMD160 5d99f85c066bf6b6c7bfa4fef7efc557d7cf9d75 SHA1 89e4ba001ab0053eb34070701128d023ab475bb3 SHA256 cb59e871a63a04cde58e138d06b2ba402508a36b8f641d9a08bf1b1f220952ee
 EBUILD libsoup-gnome-9999-r1.ebuild 1260 RMD160 b3992fd34fb1afebbda70d53de3ad014218ee821 SHA1 cd637dd029b5c538049708b1fdde381d1e5f8fe1 SHA256 7c174c9a6fdf1326464f7c6c1a277b298a240e7dec8e9ba4b2e3a7d0dab0f155
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
index 66f79cf3..5f0e13ea 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch
@@ -1,4 +1,4 @@
-From 3abe0e9a7370324ffb7a4cf70dd068c492f0d502 Mon Sep 17 00:00:00 2001
+From 7065d221ea10ba6b98768236f8d077c79515cc09 Mon Sep 17 00:00:00 2001
 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
 Date: Thu, 13 Oct 2011 12:03:04 +0200
 Subject: [PATCH] gentoo shit
@@ -6,12 +6,12 @@ Subject: [PATCH] gentoo shit
 Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
 ---
  Makefile.am         |   12 ++++++++++--
- configure.ac        |   42 +++++++++++++++++++++++++++---------------
- libsoup/Makefile.am |   50 +++++++++++++++++++++++++++++++++++++++-----------
- 3 files changed, 76 insertions(+), 28 deletions(-)
+ configure.ac        |   45 +++++++++++++++++++++++++++------------------
+ libsoup/Makefile.am |   48 ++++++++++++++++++++++++++++++++++++++----------
+ 3 files changed, 75 insertions(+), 30 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index bb94238..0562574 100644
+index 8b86fb7..7f628f4 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,11 @@
@@ -27,7 +27,7 @@ index bb94238..0562574 100644
  
  EXTRA_DIST =			\
  	libsoup-2.4.pc.in	\
-@@ -14,7 +18,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
  
  pkgconfigdir = $(libdir)/pkgconfig
  
@@ -41,25 +41,26 @@ index bb94238..0562574 100644
  if BUILD_LIBSOUP_GNOME
  pkgconfig_DATA += libsoup-gnome-2.4.pc
 diff --git a/configure.ac b/configure.ac
-index 899f7af..2a3e12c 100644
+index d2132c9..58c1dae 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -72,15 +72,30 @@ dnl ***********************
+@@ -72,19 +72,31 @@ dnl ***********************
  dnl *** Checks for glib ***
  dnl ***********************
  
--AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
--if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
 +PKG_PROG_PKG_CONFIG
+ GLIB_REQUIRED=2.31.7
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+-if test "$GLIB_LIBS" = ""; then
+-   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
 +enable_ssl=no
 +AC_ARG_WITH(libsoup-system,
 +   AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
 +   [with_libsoup_system=$withval], [with_libsoup_system=no])
 +if test "$with_libsoup_system" = "no"; then
-+	AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
++	AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
 +	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
++	   AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
 +	fi
 +	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 +
@@ -76,6 +77,9 @@ index 899f7af..2a3e12c 100644
  fi
 -GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 -
+-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
+-AC_SUBST(GLIB_MAKEFILE)
+-
 -PKG_CHECK_MODULES(XML, libxml-2.0)
 -AC_SUBST(XML_CFLAGS)
 -AC_SUBST(XML_LIBS)
@@ -83,7 +87,7 @@ index 899f7af..2a3e12c 100644
  
  dnl ***********************
  dnl *** Check for Win32 ***
-@@ -99,13 +114,6 @@ esac
+@@ -103,13 +115,6 @@ esac
  AC_MSG_RESULT([$os_win32])
  AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
  
@@ -97,7 +101,7 @@ index 899f7af..2a3e12c 100644
  dnl *********************
  dnl *** GNOME support ***
  dnl *********************
-@@ -130,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+@@ -134,6 +139,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
  if test $with_gnome != no; then
  	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
  
@@ -109,10 +113,10 @@ index 899f7af..2a3e12c 100644
  [Could not find sqlite3 devel files:
  
 diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index 096f0fb..416e523 100644
+index aa13eec..ef0c870 100644
 --- a/libsoup/Makefile.am
 +++ b/libsoup/Makefile.am
-@@ -4,15 +4,18 @@ if OS_WIN32
+@@ -6,15 +6,18 @@ if OS_WIN32
  LIBWS2_32 = -lws2_32
  endif
  
@@ -133,18 +137,9 @@ index 096f0fb..416e523 100644
 -	$(GNOME_KEYRING_CFLAGS)
 +	$(XML_CFLAGS)
  
- MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
- MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-@@ -41,7 +44,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS)
- 
- BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
--CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-+CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
- 
  libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
  
-@@ -94,7 +97,7 @@ libsoupinclude_HEADERS =	\
+@@ -67,7 +70,7 @@ libsoupinclude_HEADERS =	\
  	$(soup_headers)		\
  	soup-enum-types.h
  
@@ -153,7 +148,7 @@ index 096f0fb..416e523 100644
  
  libsoup_2_4_la_LDFLAGS =	\
  	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -176,6 +179,7 @@ libsoup_2_4_la_SOURCES =		\
+@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES =		\
  	soup-uri.c			\
  	soup-value-utils.c		\
  	soup-xmlrpc.c
@@ -161,7 +156,7 @@ index 096f0fb..416e523 100644
  
  if BUILD_LIBSOUP_GNOME
  
-@@ -189,6 +193,10 @@ endif
+@@ -165,6 +169,10 @@ endif
  
  libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
  
@@ -172,7 +167,7 @@ index 096f0fb..416e523 100644
  libsoupgnomeinclude_HEADERS =	\
  	soup-cookie-jar-sqlite.h\
  	soup-gnome.h		\
-@@ -196,14 +204,24 @@ libsoupgnomeinclude_HEADERS =	\
+@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS =	\
  
  lib_LTLIBRARIES += libsoup-gnome-2.4.la
  
@@ -198,7 +193,7 @@ index 096f0fb..416e523 100644
  libsoup_gnome_2_4_la_SOURCES =		\
  	soup-cookie-jar-sqlite.c	\
  	soup-gnome-features.c		\
-@@ -223,6 +241,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
  
  if HAVE_INTROSPECTION
  
@@ -207,7 +202,7 @@ index 096f0fb..416e523 100644
  # Core library
  gi_soup_files = \
  	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -244,20 +264,28 @@ Soup_2_4_gir_FILES = \
+@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES = \
  
  INTROSPECTION_GIRS += Soup-2.4.gir
  
@@ -241,5 +236,5 @@ index 096f0fb..416e523 100644
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
 -- 
-1.7.8.163.g9859a.dirty
+1.7.9.1.244.gb0d66b.dirty