diff options
| -rw-r--r-- | net-libs/libsoup-gnome/Manifest | 11 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch | 283 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild | 62 |
3 files changed, 0 insertions, 356 deletions
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest deleted file mode 100644 index f2ec323e..00000000 --- a/net-libs/libsoup-gnome/Manifest +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEAREKAAYFAlSEod8ACgkQ1fmVwcYIWAaHoACfUFZTirwxw6ZLctDi6ar3Gy4H -hYkAnAzNwQhRDxn123h/MpZufpJkuVAP -=sUd9 ------END PGP SIGNATURE----- diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch deleted file mode 100644 index d731fc0c..00000000 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch +++ /dev/null @@ -1,283 +0,0 @@ -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 - diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild deleted file mode 100644 index 20f4e6c8..00000000 --- a/net-libs/libsoup-gnome/libsoup-gnome-2.48.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -MY_PN=${PN/-gnome} -MY_P=${MY_PN}-${PV} - -inherit autotools eutils gnome2 multilib-minimal - -DESCRIPTION="GNOME plugin for libsoup" -HOMEPAGE="https://wiki.gnome.org/LibSoup" -SRC_URI="${SRC_URI//-gnome}" - -LICENSE="LGPL-2+" -SLOT="2.4" -IUSE="debug +introspection" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - ~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}] - dev-db/sqlite:3=[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - >=net-libs/libsoup-2.42.2-r1[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.10 - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig[${MULTILIB_USEDEP}] -" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - # Use lib present on the system - epatch "${FILESDIR}"/${PN}-2.46.0-system-lib.patch - eautoreconf - gnome2_src_prepare -} - -multilib_src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - addpredict /usr/share/snmp/mibs/.index - - # Disable apache tests until they are usable on Gentoo, bug #326957 - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --disable-tls-check \ - $(multilib_native_use_enable introspection) \ - --with-libsoup-system \ - --with-gnome \ - --without-apache-httpd -} - -multilib_src_compile() { gnome2_src_compile; } -multilib_src_install() { gnome2_src_install; } |