From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q23Ue-0002ut-5M for garchives@archives.gentoo.org; Tue, 22 Mar 2011 15:27:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E2151C00A; Tue, 22 Mar 2011 15:27:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1D7A51C00A for ; Tue, 22 Mar 2011 15:27:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 52B771B4074 for ; Tue, 22 Mar 2011 15:27:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AFBB88006A for ; Tue, 22 Mar 2011 15:27:26 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/libsoup-gnome/files/libsoup-gnome-2.33.5-system-lib.patch net-libs/libsoup-gnome/files/libsoup-gnome-2.33.92-system-lib.patch net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild net-libs/libsoup-gnome/libsoup-gnome-2.33.92.ebuild net-libs/libsoup/libsoup-2.33.90.ebuild net-libs/libsoup/libsoup-2.33.92.ebuild X-VCS-Directories: net-libs/libsoup/ net-libs/libsoup-gnome/ net-libs/libsoup-gnome/files/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: c88639fe2abf5a8b0114fe3c6d4467a62293654d Date: Tue, 22 Mar 2011 15:27:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1b27bae6c363d5febe2ea78aeb564ea1 commit: c88639fe2abf5a8b0114fe3c6d4467a62293654d Author: Priit Laes plaes org> AuthorDate: Tue Mar 22 15:21:22 2011 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Mar 22 15:25:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc88639fe net-libs/libsoup{,-gnome}: Bump to 2.33.92 --- ...atch =3D> libsoup-gnome-2.33.92-system-lib.patch} | 129 +++++++++++-= -------- ...2.33.90.ebuild =3D> libsoup-gnome-2.33.92.ebuild} | 4 +- ...bsoup-2.33.90.ebuild =3D> libsoup-2.33.92.ebuild} | 0 3 files changed, 71 insertions(+), 62 deletions(-) diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.33.5-system-lib= .patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.33.92-system-lib.pa= tch similarity index 76% rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.33.5-system-lib.= patch rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.33.92-system-lib.p= atch index db974b1..4b0c890 100644 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.33.5-system-lib.patch +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.33.92-system-lib.patch @@ -1,21 +1,56 @@ -Split support for libsoup-gnome, original patch by Romain Perier. +From 1cb947b6e1d3ecc8cf13d55034aa85bd161d4e82 Mon Sep 17 00:00:00 2001 +From: Priit Laes +Date: Tue, 22 Mar 2011 15:54:10 +0200 +Subject: [PATCH] Split support for libsoup-gnome =20 +Original patch by Romain Perier. --- ---- configure.ac -+++ configure.ac -@@ -72,15 +72,30 @@ + Makefile.am | 12 ++++++++++-- + configure.ac | 42 +++++++++++++++++++++++++++--------------- + libsoup/Makefile.am | 45 +++++++++++++++++++++++++++++++++++++-------= - + 3 files changed, 74 insertions(+), 25 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 861daff..a6463fb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,11 @@ + ## Process this file with automake to produce Makefile.in + ACLOCAL_AMFLAGS =3D -I m4 +=20 +-SUBDIRS =3D libsoup tests docs ++SUBDIRS =3D libsoup ++ ++if BUILD_LIBSOUP ++SUBDIRS +=3D tests docs ++endif +=20 + EXTRA_DIST =3D \ + libsoup-2.4.pc.in \ +@@ -14,7 +18,11 @@ DISTCHECK_CONFIGURE_FLAGS =3D --enable-gtk-doc --enab= le-introspection +=20 + pkgconfigdir =3D $(libdir)/pkgconfig +=20 +-pkgconfig_DATA =3D libsoup-2.4.pc ++pkgconfig_DATA =3D ++ ++if BUILD_LIBSOUP ++pkgconfig_DATA +=3D libsoup-2.4.pc ++endif +=20 + if BUILD_LIBSOUP_GNOME + pkgconfig_DATA +=3D libsoup-gnome-2.4.pc +diff --git a/configure.ac b/configure.ac +index 8f37cec..d8daf9c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -72,15 +72,30 @@ dnl *********************** dnl *** Checks for glib *** dnl *********************** =20 -AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio) -if test "$GLIB_LIBS" =3D ""; then - AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup) --fi --GLIB_CFLAGS=3D"$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -- --PKG_CHECK_MODULES(XML, libxml-2.0) --AC_SUBST(XML_CFLAGS) --AC_SUBST(XML_LIBS) +PKG_PROG_PKG_CONFIG +enable_ssl=3Dno +AC_ARG_WITH(libsoup-system, @@ -38,12 +73,17 @@ Split support for libsoup-gnome, original patch by Ro= main Perier. + AC_CHECK_FUNCS(gmtime_r) + AC_CHECK_FUNCS(mmap) + AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) -+fi + fi +-GLIB_CFLAGS=3D"$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" +- +-PKG_CHECK_MODULES(XML, libxml-2.0) +-AC_SUBST(XML_CFLAGS) +-AC_SUBST(XML_LIBS) +AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system =3D no) =20 dnl *********************** dnl *** Check for Win32 *** -@@ -99,13 +114,6 @@ +@@ -99,13 +114,6 @@ esac AC_MSG_RESULT([$os_win32]) AM_CONDITIONAL(OS_WIN32, [test $os_win32 =3D yes]) =20 @@ -57,7 +97,7 @@ Split support for libsoup-gnome, original patch by Roma= in Perier. dnl ********************* dnl *** GNOME support *** dnl ********************* -@@ -130,6 +138,10 @@ +@@ -130,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnom= e !=3D no) if test $with_gnome !=3D no; then AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) =20 @@ -65,12 +105,14 @@ Split support for libsoup-gnome, original patch by R= omain Perier. + PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION =3D $VERSION) + fi + - PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl - [Could not find libproxy: -=20 ---- libsoup/Makefile.am -+++ libsoup/Makefile.am -@@ -4,17 +4,18 @@ + PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl + [Could not find sqlite3 devel files: +=20 +diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am +index 308c08f..0c78061 100644 +--- a/libsoup/Makefile.am ++++ b/libsoup/Makefile.am +@@ -4,15 +4,18 @@ if OS_WIN32 LIBWS2_32 =3D -lws2_32 endif =20 @@ -87,15 +129,13 @@ Split support for libsoup-gnome, original patch by R= omain Perier. $(SOUP_MAINTAINER_FLAGS) \ $(GLIB_CFLAGS) \ - $(XML_CFLAGS) \ -- $(GCONF_CFLAGS) \ -- $(LIBPROXY_CFLAGS) \ - $(SQLITE_CFLAGS) \ - $(GNOME_KEYRING_CFLAGS) + $(XML_CFLAGS) =20 MARSHAL_GENERATED =3D soup-marshal.c soup-marshal.h MKENUMS_GENERATED =3D soup-enum-types.c soup-enum-types.h -@@ -43,7 +44,7 @@ +@@ -41,7 +44,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS) =20 BUILT_SOURCES =3D $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) =20 @@ -104,7 +144,7 @@ Split support for libsoup-gnome, original patch by Ro= main Perier. =20 libsoupincludedir =3D $(includedir)/libsoup-2.4/libsoup =20 -@@ -95,7 +96,7 @@ +@@ -94,7 +97,7 @@ libsoupinclude_HEADERS =3D \ $(soup_headers) \ soup-enum-types.h =20 @@ -113,7 +153,7 @@ Split support for libsoup-gnome, original patch by Ro= main Perier. =20 libsoup_2_4_la_LDFLAGS =3D \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefin= ed -@@ -178,10 +179,18 @@ +@@ -178,10 +181,16 @@ libsoup_2_4_la_SOURCES =3D \ soup-value-utils.c \ soup-xmlrpc.c =20 @@ -124,15 +164,13 @@ Split support for libsoup-gnome, original patch by = Romain Perier. libsoupgnomeincludedir =3D $(includedir)/libsoup-gnome-2.4/libsoup =20 +INCLUDES +=3D $(LIBSOUP_CFLAGS) \ -+ $(GCONF_CFLAGS) \ -+ $(LIBPROXY_CFLAGS) \ + $(SQLITE_CFLAGS) \ + $(GNOME_KEYRING_CFLAGS) + libsoupgnomeinclude_HEADERS =3D \ soup-cookie-jar-sqlite.h\ soup-gnome.h \ -@@ -189,16 +198,26 @@ +@@ -189,14 +198,24 @@ libsoupgnomeinclude_HEADERS =3D \ =20 lib_LTLIBRARIES +=3D libsoup-gnome-2.4.la =20 @@ -146,8 +184,6 @@ Split support for libsoup-gnome, original patch by Ro= main Perier. libsoup_gnome_2_4_la_LIBADD =3D \ - libsoup-2.4.la \ $(GLIB_LIBS) \ - $(GCONF_LIBS) \ - $(LIBPROXY_LIBS) \ $(SQLITE_LIBS) \ $(GNOME_KEYRING_LIBS) =20 @@ -160,7 +196,7 @@ Split support for libsoup-gnome, original patch by Ro= main Perier. libsoup_gnome_2_4_la_SOURCES =3D \ soup-cookie-jar-sqlite.c \ soup-gnome-features.c \ -@@ -219,6 +238,8 @@ +@@ -217,6 +236,8 @@ INTROSPECTION_COMPILER_ARGS =3D --includedir=3D. =20 if HAVE_INTROSPECTION =20 @@ -169,7 +205,7 @@ Split support for libsoup-gnome, original patch by Ro= main Perier. # Core library gi_soup_files =3D \ $(filter-out soup.h soup-enum-types.% soup-marshal.%,\ -@@ -240,13 +261,21 @@ +@@ -238,13 +259,21 @@ Soup_2_4_gir_FILES =3D \ =20 INTROSPECTION_GIRS +=3D Soup-2.4.gir =20 @@ -192,31 +228,6 @@ Split support for libsoup-gnome, original patch by R= omain Perier. SoupGNOME_2_4_gir_SCANNERFLAGS =3D --identifier-prefix=3DSoup --symbol-= prefix=3Dsoup --c-include "libsoup/soup-gnome.h" SoupGNOME_2_4_gir_INCLUDES =3D Soup-2.4 SoupGNOME_2_4_gir_CFLAGS =3D $(INCLUDES) ---- Makefile.am -+++ Makefile.am -@@ -1,7 +1,11 @@ - ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS =3D -I m4 -=20 --SUBDIRS =3D libsoup tests docs -+SUBDIRS =3D libsoup -+ -+if BUILD_LIBSOUP -+SUBDIRS +=3D tests docs -+endif -=20 - EXTRA_DIST =3D \ - libsoup-2.4.pc.in \ -@@ -14,7 +18,11 @@ -=20 - pkgconfigdir =3D $(libdir)/pkgconfig -=20 --pkgconfig_DATA =3D libsoup-2.4.pc -+pkgconfig_DATA =3D -+ -+if BUILD_LIBSOUP -+pkgconfig_DATA +=3D libsoup-2.4.pc -+endif -=20 - if BUILD_LIBSOUP_GNOME - pkgconfig_DATA +=3D libsoup-gnome-2.4.pc +--=20 +1.7.4.1 + diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild b/net-li= bs/libsoup-gnome/libsoup-gnome-2.33.92.ebuild similarity index 93% rename from net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild rename to net-libs/libsoup-gnome/libsoup-gnome-2.33.92.ebuild index 0873142..1123699 100644 --- a/net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.33.92.ebuild @@ -22,8 +22,6 @@ IUSE=3D"debug doc +introspection" =20 RDEPEND=3D"~net-libs/libsoup-${PV} || ( gnome-base/libgnome-keyring =3Dgnome-base/gconf-2 dev-db/sqlite:3 introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )" DEPEND=3D"${RDEPEND} @@ -54,6 +52,6 @@ src_prepare() { gnome2_src_prepare =20 # Use lib present on the system - epatch "${FILESDIR}"/${PN}-2.33.5-system-lib.patch + epatch "${FILESDIR}"/${PN}-2.33.92-system-lib.patch eautoreconf } diff --git a/net-libs/libsoup/libsoup-2.33.90.ebuild b/net-libs/libsoup/l= ibsoup-2.33.92.ebuild similarity index 100% rename from net-libs/libsoup/libsoup-2.33.90.ebuild rename to net-libs/libsoup/libsoup-2.33.92.ebuild