commit: 96f051197156152dc283c014747c56b693f52eb9 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Nov 19 14:17:55 2015 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Nov 19 14:19:10 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f05119
net-libs/libsoup-gnome: Bump to 2.52.2 Commit the 2.52.2 version bump on behalf of Pacho Ramos. Bug: https://bugs.gentoo.org/565796 net-libs/libsoup-gnome/Manifest | 1 + .../files/libsoup-gnome-2.52.2-system-lib.patch | 263 +++++++++++++++++++++ net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild | 62 +++++ 3 files changed, 326 insertions(+) diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest index 88b8d07..4b4d8d7 100644 --- a/net-libs/libsoup-gnome/Manifest +++ b/net-libs/libsoup-gnome/Manifest @@ -1,2 +1,3 @@ DIST libsoup-2.48.1.tar.xz 1707612 SHA256 9b0d14b36e36a3131a06c6e3aa7245716e6904e3e636df81c0b6c8bd3f646f9a SHA512 c0f652189c9a72bc2110ae1bb54dc7b26a437b3c7055795ec203081efaa97244731459cc115aadaba2c832689f3a4e839200be59453ec26f09202214ff50c19a WHIRLPOOL 10b3f3ff7fc1ded3e66a8b9b14359a50661bd61ecfe16e8bcb93baef5f22f905b20bd67fa1bbeca875f7bf698a7ee16857b1280b5f92916b2d94a1f075ff806c DIST libsoup-2.50.0.tar.xz 1755052 SHA256 1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b SHA512 5004baac41feb2c4a7c4f8e68e0a2aac91ae115518e5bb7b58bc7f85dc7675611de82ad21d6a2f779daf2fc7496ab802e7d6dcd5eca91186b221664db37819e2 WHIRLPOOL 09f2cdc9804a4785e1f6a8d9e8adefab549fcb6de1506e2c0fa7af9ee3af531a26a55909ab917c7f08076e99bff3f992516125d12baeb5fce22c918e81a4636e +DIST libsoup-2.52.2.tar.xz 1764308 SHA256 db55628b5c7d952945bb71b236469057c8dfb8dea0c271513579c6273c2093dc SHA512 866942d8db43a19630f39db12b22058cf31ef0c56f337e6c5790f5b881aaa768d4dbece1d2fe0d9560a82ae0f362365c19aa9b0d05afeb45bc5774f6713f51b2 WHIRLPOOL f0f7ac95d49f21d0bb92968d6d3de596a08aea0519db82089b6c476916d96c3c44e0871a8d3102f5f0b176294ce6f1582d52e6cfcd65bb74ad0c7c4ab8f020a4 diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch new file mode 100644 index 0000000..54b6014 --- /dev/null +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.52.2-system-lib.patch @@ -0,0 +1,263 @@ +diff -ur libsoup-2.52.2/configure.ac libsoup-2.52.2.new/configure.ac +--- libsoup-2.52.2/configure.ac 2015-11-09 21:23:00.000000000 +0100 ++++ libsoup-2.52.2.new/configure.ac 2015-11-17 10:32:25.562815235 +0100 +@@ -77,23 +77,28 @@ + dnl *********************** + dnl *** Checks for glib *** + dnl *********************** +- +-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) ++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_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 +-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38" +- +-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' +-AC_SUBST(GLIB_MAKEFILE) ++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) +@@ -148,6 +153,9 @@ + + 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) + +Sólo en libsoup-2.52.2.new/: configure.ac~ +diff -ur libsoup-2.52.2/libsoup/Makefile.am libsoup-2.52.2.new/libsoup/Makefile.am +--- libsoup-2.52.2/libsoup/Makefile.am 2015-11-09 21:21:48.000000000 +0100 ++++ libsoup-2.52.2.new/libsoup/Makefile.am 2015-11-19 12:11:19.743369476 +0100 +@@ -3,14 +3,19 @@ + EXTRA_DIST = + CLEANFILES = + +- ++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\" \ + -DLIBSOUP_COMPILATION \ + -DLOCALEDIR=\"$(localedir)\" \ +@@ -84,7 +89,7 @@ + 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) \ +@@ -202,18 +207,23 @@ + soup-xmlrpc.c \ + soup-xmlrpc-old.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 \ +@@ -221,17 +231,26 @@ + + 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 \ +@@ -243,9 +262,8 @@ + 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" +@@ -260,6 +278,8 @@ + + if HAVE_INTROSPECTION + ++if BUILD_LIBSOUP ++ + # Core library + gi_soup_files = \ + $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\ +@@ -292,20 +312,28 @@ + + EXTRA_DIST += Soup-2.4.metadata Soup-2.4-custom.vala libsoup-2.4.deps + ++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 + +@@ -319,12 +347,13 @@ + 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 + + # 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 +@@ -334,3 +363,16 @@ + env LC_ALL=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 +Sólo en libsoup-2.52.2.new/libsoup: Makefile.am~ +diff -ur libsoup-2.52.2/Makefile.am libsoup-2.52.2.new/Makefile.am +--- libsoup-2.52.2/Makefile.am 2015-10-29 16:08:21.000000000 +0100 ++++ libsoup-2.52.2.new/Makefile.am 2015-11-17 10:25:54.034816211 +0100 +@@ -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 @@ + + 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 +Sólo en libsoup-2.52.2.new/: Makefile.am~ diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild new file mode 100644 index 0000000..32d532a --- /dev/null +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="+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:= ) +" +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.52.2-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 \ + --disable-vala +} + +multilib_src_compile() { gnome2_src_compile; } +multilib_src_install() { gnome2_src_install; }
