Fix unintended patch change for 2.46, bug #533544.
authorGilles Dartiguelongue <eva@gentoo.org>
Thu, 25 Dec 2014 23:04:30 +0000 (23:04 +0000)
committerGilles Dartiguelongue <eva@gentoo.org>
Thu, 25 Dec 2014 23:04:30 +0000 (23:04 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

net-libs/libsoup-gnome/ChangeLog
net-libs/libsoup-gnome/Manifest
net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch [new file with mode: 0644]
net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild

index 1da36f2cf857c8a72fe52b4653c22f85c495ab4d..d3176aa61cb359c90e25d138ace45660fd8f1974 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.117 2014/12/23 23:04:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.118 2014/12/25 23:04:27 eva Exp $
+
+  25 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  libsoup-gnome-2.48.1.ebuild, files/libsoup-gnome-2.46.0-system-lib.patch,
+  +files/libsoup-gnome-2.48.0-system-lib.patch:
+  Fix unintended patch change for 2.46, bug #533544.
 
 *libsoup-gnome-2.48.1 (23 Dec 2014)
 
index f41ad7c2f88b9b387c4757374629ba11cccc95d5..174b9ea6d320daad52683c3b7f4740749678895a 100644 (file)
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX libsoup-gnome-2.44.2-system-lib.patch 7077 SHA256 bcd0fab809dafdc4492bc629c68c63427339870b9562c5c124cf5485bd946769 SHA512 508e9c358e2f84415a7c3f2a778be9cc25e3af0568d9883a1712106fbec68b1f78040e4abc711c49c92d2397732028bece0ddd5c6a6f47c6104afbfd8dbc52ea WHIRLPOOL 8c6651d42d39e94d16dc016ed4ed633cc69c6da4ea4652641dfadf8ef7c8ba69c4a65ffa862a5e7e997c725d7805b48c048d2b312ffe6458e40168379a3fc386
-AUX libsoup-gnome-2.46.0-system-lib.patch 7754 SHA256 561ea02047588dd3f8162df0f83d3037d261e83458f9e524c00a49c2ce8c0111 SHA512 32cd92fbf95521ff2ac1d1bd0d7f9c73da9620a7bf598fb204d75d14f3bfce570923bd1a26f85e75a9db9f1a495c6789d4442d23c7be20fca3f242aaae5fd643 WHIRLPOOL b85c419825aa94adc26c9d3d4973dc372bef86400c5e64bbc93fe1340fa5a27b720b1fb1ec8b16a42b5158e953390faec8111dea2e2988384a78eef0a22dbaa7
+AUX libsoup-gnome-2.46.0-system-lib.patch 7116 SHA256 4cea6b79912fcde4b8362a9ad2f5f4007785d49d6414948e6656195a441ec1f0 SHA512 ba0f13c4eaf20d2e671d996b75ea2dac6316f1ba2545e0a820ce5b47dba8d6eb777981232ad89aa0aaf8c497b010d31d5b46c87da71ea0f188954928f32c7dda WHIRLPOOL 8d7f1a6dc05d7d69e23123dd5392c07a046d2ef98bdf8d1bdd61b95af128776bd2bc9ac4152a3864deee84ba4ebdadfb0b7670aaaa8818662319514f9198b102
+AUX libsoup-gnome-2.48.0-system-lib.patch 7754 SHA256 561ea02047588dd3f8162df0f83d3037d261e83458f9e524c00a49c2ce8c0111 SHA512 32cd92fbf95521ff2ac1d1bd0d7f9c73da9620a7bf598fb204d75d14f3bfce570923bd1a26f85e75a9db9f1a495c6789d4442d23c7be20fca3f242aaae5fd643 WHIRLPOOL b85c419825aa94adc26c9d3d4973dc372bef86400c5e64bbc93fe1340fa5a27b720b1fb1ec8b16a42b5158e953390faec8111dea2e2988384a78eef0a22dbaa7
 DIST libsoup-2.46.0.tar.xz 1693772 SHA256 fa3d5574c1a2df521242e2ca624a2b3057121798cab9f8f40525aa186a7b15a3 SHA512 a538fbb7c21b2e5d0f53ae917a7ebff21f74490c1ae55222b6dd31932ede5f872da06d544b7ab2e91dbf03682dd53c0fdaf3ba9aed24b3b1f1405f7e65785c0d WHIRLPOOL 3a82f4c4d5fa2543c055b801c6b15cc6faa6db8632de00113a087a0ea8f13e174b3434b58bc97449047be2a7dcc110c0d3604b4f04c874877effda7492c2e4d6
 DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c
 EBUILD libsoup-gnome-2.46.0-r1.ebuild 1735 SHA256 530a4d0a7de97130e2ec7374319a6651aee0b5c5900a3afd3ec1d37dc838ed6f SHA512 79384378f54ff28662d9306c9904b73efd12e84b59b401db4617239df845fe66c52b8db07cea7beca9a7b1d8c9da6e4256a29d5bdefab9b0e048816444b1640b WHIRLPOOL 375477a2720a8d92555f2a1d66c4633ae15b97a9e0924024c61141193e7f2c960d5d1fae1961aab33d5d53918607fac90ce111f8a4d47d6925e23bdbfef167b9
 EBUILD libsoup-gnome-2.46.0.ebuild 1487 SHA256 a07aee9803e5d6625d47a20ea6808f4c220fd53dde07355d6d5fdf80ebceea09 SHA512 415ccdb2beb0548995aea6ce5f1f2b85da306b2d591491b829e3e6ee2a613656517cf624248f6b62637e8359b7cfa836e50590a953d9ba97c70c8cbd6969a40c WHIRLPOOL b7a5893b23970678d9c3fb3b18bb19aaef2f40ad2ddaf6466149cfd51420b1ff3021d5a4c0a768595b9510bcd83d85c6f2362f6a440fd2474ce554a1e7ea252e
-EBUILD libsoup-gnome-2.48.1.ebuild 1729 SHA256 c9e3875fe00a3429e4a86ec069a5bacd6bc40081aa0bcbf808e3e4752046b7f4 SHA512 a1553b4b7a66cb91468000836de435018b9f842d067f2cd76d2b588bdfc5c705d6b2e46112fb129e9ef48f364749f6c0acbe33f728bc85e56f42cd679c1455e4 WHIRLPOOL 2ec968e6286d48bb68e74d32b03a373b8a8aa159d4d25da61d6425f330a321631bdeec67f3a5acf47e2f9740a266fe9d1258651f3f60d070c7bbdc46d07cecc6
-MISC ChangeLog 18143 SHA256 580f122cdf9058b923cc1731ea1f95803ed3b57f38928b2119b6a6bd0f6fcb01 SHA512 e4d0d345580f2996d252d2d4f2c773d180417fb17ac7743f4ed2632c6bcde42979ec1a7bccd73df55b987b42f284101d566e310c558d378661ab51bf1cc3ee12 WHIRLPOOL 5570f022191433437a4f0431f26ef10cabd018e48e390856d73e00b6daef768a32ef9b23d9759e64007be6b51d94c3e7531d8848c4691201684046578855ece6
+EBUILD libsoup-gnome-2.48.1.ebuild 1729 SHA256 dedf898f860bbb960fa319f8306fb64f13d89c97d8a9f796d72e4f4a4de19131 SHA512 68184327d7777c3fca11d20b3adb087a10397b7eb9daa3203f6da6e90da67a0c6a44c7c9eb09f03137253b6f771c5e25539db2a999e81fbd6a0ad36da242f194 WHIRLPOOL b8cc763a27193b444e4f064650f46fba297f37dc178587c6588e769dc6b433c5ef91d5736d818e33593d10172f08e172ffc4b04a7de5b54a35d83332c039c1df
+MISC ChangeLog 18375 SHA256 7c3e440bda5673349b0c633adbd69cd0cd37eaef3ac1e0a45c4ac1a393431f29 SHA512 0782d1aabfa47b5d295030638a1b9a2daa08164896965bae540dc09c1fb8facd2fb59e95c738ce4d1f8280738f611019feb4377594d5f86d08754cba28b0ff83 WHIRLPOOL f3f28883051698bd4d8ca9090246e0902ad30153be4424c69aa4401e3fb69c382ac697dcc90566eb66796457f135a611aaaa7becad67137c1a56444ee2b116e7
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSZ9RMACgkQ1fmVwcYIWAY3owCgwXnckQwG1De96wLsFGhTQZMJ
-wKcAoKYr+YSLP0mts3NXkRDuaMGJMhLE
-=7x8K
+iEYEAREIAAYFAlScl/wACgkQ1fmVwcYIWAYTkwCffYKR4niME/0+xxl9vLEwlrFZ
+b1cAnR88ANlR1euF+z1yhnud9f6HMFdY
+=SAAq
 -----END PGP SIGNATURE-----
index d731fc0c733a5f0b67da1c9400e96e023e30c644..15f7724dd5cda0dba2e29b807fb41b55cd7ef187 100644 (file)
@@ -253,31 +253,6 @@ index 60920bd..26c5616 100644
 +CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
  
  endif
-@@ -326,6 +326,7 @@
- 
- # We only do this check on Linux, so we don't have to worry about
- # different "nm" output on other platforms
-+if BUILD_LIBSOUP
- if OS_LINUX
- check-local:
-       @echo Checking libsoup-2.4.so symbols
-@@ -335,3 +336,16 @@
-               env LANG=C sort -u | \
-               diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
- endif
-+endif
-+
-+if BUILD_LIBSOUP_GNOME
-+if OS_LINUX
-+check-local:
-+      @echo Checking libsoup-gnome-2.4.so symbols
-+      @nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
-+              grep "^[[:xdigit:]]\+ [BTR] " | \
-+              sed "s/^[[:xdigit:]]\+ [BTR] //" | \
-+              env LANG=C sort -u | \
-+              diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
-+endif
-+endif
 -- 
 1.9.0
 
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.48.0-system-lib.patch
new file mode 100644 (file)
index 0000000..d731fc0
--- /dev/null
@@ -0,0 +1,283 @@
+From 63db817bac0382f3f43947b8233bf4585ede0e0b Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 20 Dec 2011 15:42:44 +0200
+Subject: [PATCH] Split support for libsoup-gnome
+
+https://bugzilla.gnome.org/show_bug.cgi?id=595065
+
+Original patch by Romain Perier.
+---
+ Makefile.am         | 12 +++++++++--
+ configure.ac        | 35 ++++++++++++++++++++-----------
+ libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 77 insertions(+), 30 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c8fa95c..fc09778 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,11 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = libsoup po tests examples docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += po tests docs
++endif
+ 
+ EXTRA_DIST =                          \
+       data/effective_tld_names.dat    \
+@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ 
+-pkgconfig_DATA = libsoup-2.4.pc
++pkgconfig_DATA =
++
++if BUILD_LIBSOUP
++pkgconfig_DATA += libsoup-2.4.pc
++endif
+ 
+ if BUILD_LIBSOUP_GNOME
+ pkgconfig_DATA += libsoup-gnome-2.4.pc
+diff --git a/configure.ac b/configure.ac
+index 96bb378..0153f10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
+ dnl ***********************
+ dnl *** Checks for glib ***
+ dnl ***********************
++PKG_PROG_PKG_CONFIG
++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
++    GLIB_REQUIRED=2.38.0
++    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)
++    fi
++    GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
+ 
+-GLIB_REQUIRED=2.38.0
+-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)
+-fi
+-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
++    GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
++    AC_SUBST(GLIB_MAKEFILE)
+ 
+-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)
++fi
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
+ 
+ GLIB_TESTS
+ 
+-PKG_CHECK_MODULES(XML, libxml-2.0)
+-AC_SUBST(XML_CFLAGS)
+-AC_SUBST(XML_LIBS)
+-
+ PKG_CHECK_MODULES(SQLITE, sqlite3)
+ AC_SUBST(SQLITE_CFLAGS)
+ AC_SUBST(SQLITE_LIBS)
+@@ -141,6 +148,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])
++
++      if test $with_libsoup_system != no; then
++              PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
++      fi
+ fi
+ AC_SUBST(HAVE_GNOME)
+ 
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 60920bd..26c5616 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -1,14 +1,19 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ EXTRA_DIST =
+-
++BUILT_SOURCES =
+ include $(GLIB_MAKEFILE)
+ 
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+ 
+-AM_CPPFLAGS =                                 \
++AM_CPPFLAGS =
++lib_LTLIBRARIES =
++CLEANFILES =
++
++if BUILD_LIBSOUP
++AM_CPPFLAGS +=                                \
+       -DG_LOG_DOMAIN=\"libsoup\"      \
+       -DLOCALEDIR=\"$(localedir)\"    \
+       -I$(top_srcdir)                 \
+@@ -76,7 +81,7 @@ libsoupinclude_HEADERS =     \
+ nodist_libsoupinclude_HEADERS =       \
+       soup-version.h
+ 
+-lib_LTLIBRARIES = libsoup-2.4.la
++lib_LTLIBRARIES += libsoup-2.4.la
+ 
+ libsoup_2_4_la_LDFLAGS =      \
+       -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES =         \
+       soup-version.c                  \
+       soup-xmlrpc.c
+ 
+-# TLD rules
+-EXTRA_DIST += tld-parser.py
+-
++BUILT_SOURCES += tld_data.inc
+ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
+ 
+ tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
+-      $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++      $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
++
++# TLD rules
++EXTRA_DIST += tld-parser.py
++
++endif
+ 
+ if BUILD_LIBSOUP_GNOME
+ 
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+ 
++AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
++
+ libsoupgnomeinclude_HEADERS = \
+       soup-cookie-jar-sqlite.h\
+       soup-gnome.h            \
+@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS =    \
+ 
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+ 
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
+ libsoup_gnome_2_4_la_LDFLAGS =        \
+       -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+       -no-undefined \
+       -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
++endif
+ 
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+ 
+ libsoup_gnome_2_4_la_LIBADD =         \
+-      libsoup-2.4.la                  \
+       $(GLIB_LIBS)
+ 
++if BUILD_LIBSOUP
++libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
++
+ libsoup_gnome_2_4_la_SOURCES =                \
+       soup-cookie-jar-sqlite.c        \
+       soup-gnome-features.c           \
+@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES =             \
+ endif
+ 
+ GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
+-BUILT_SOURCES = \
+-      $(GLIB_GENERATED)   \
+-      tld_data.inc
++BUILT_SOURCES += \
++      $(GLIB_GENERATED)
+ 
+ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+ soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+ 
+ if HAVE_INTROSPECTION
+ 
++if BUILD_LIBSOUP
++
+ # Core library
+ gi_soup_files = \
+       $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
+@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
+ 
+ INTROSPECTION_GIRS += Soup-2.4.gir
+ 
++endif
++
+ if BUILD_LIBSOUP_GNOME
+ 
++if BUILD_LIBSOUP
++SOUP_GIR = Soup-2.4.gir
++else
++SOUP_GIR =
++endif
++
+ # GNOME extensions
+ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
+                         $(libsoupgnomeinclude_HEADERS) \
+                         $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
+-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
++SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
++SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+ SoupGNOME_2_4_gir_SCANNERFLAGS =                      \
+       --identifier-prefix=Soup                        \
+       --symbol-prefix=soup                            \
+-      --c-include "libsoup/soup-gnome.h"              \
+-      --include-uninstalled=$(builddir)/Soup-2.4.gir
++      --c-include "libsoup/soup-gnome.h"
+ SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
+-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
++SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
+ SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
+ SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
+ 
+@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
+ typelibdir = $(libdir)/girepository-1.0
+ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ 
+-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
++CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
+ 
+ endif
+@@ -326,6 +326,7 @@
+ 
+ # We only do this check on Linux, so we don't have to worry about
+ # different "nm" output on other platforms
++if BUILD_LIBSOUP
+ if OS_LINUX
+ check-local:
+       @echo Checking libsoup-2.4.so symbols
+@@ -335,3 +336,16 @@
+               env LANG=C sort -u | \
+               diff -U0 $(srcdir)/libsoup-2.4.sym - >&2
+ endif
++endif
++
++if BUILD_LIBSOUP_GNOME
++if OS_LINUX
++check-local:
++      @echo Checking libsoup-gnome-2.4.so symbols
++      @nm $(builddir)/.libs/libsoup-gnome-2.4.so | \
++              grep "^[[:xdigit:]]\+ [BTR] " | \
++              sed "s/^[[:xdigit:]]\+ [BTR] //" | \
++              env LANG=C sort -u | \
++              diff -U0 $(srcdir)/libsoup-gnome-2.4.sym - >&2
++endif
++endif
+-- 
+1.9.0
+
index a9dd7de444da55ae75af01f191a8542f7ce1bc3d..0a0fc38f08f45ea74dff1d3020db8d2492e4c59f 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild,v 1.1 2014/12/23 23:04:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild,v 1.2 2014/12/25 23:04:27 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -37,7 +37,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
        # Use lib present on the system
-       epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch
+       epatch "${FILESDIR}"/${PN}-2.48.0-system-lib.patch
        eautoreconf
        gnome2_src_prepare
 }