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.77) (envelope-from ) id 1Sm0zz-0004lZ-4V for garchives@archives.gentoo.org; Tue, 03 Jul 2012 11:10:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7FD9E0660; Tue, 3 Jul 2012 11:10:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AA7DDE0660 for ; Tue, 3 Jul 2012 11:10:14 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC8961B404F for ; Tue, 3 Jul 2012 11:10:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 02A86E5440 for ; Tue, 3 Jul 2012 11:10:08 +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: <1341313724.9e047fc9f0eeeb502ad84b810a482f043d431cfc.plaes@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild X-VCS-Directories: net-libs/libsoup-gnome/ net-libs/libsoup-gnome/files/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 9e047fc9f0eeeb502ad84b810a482f043d431cfc X-VCS-Branch: master Date: Tue, 3 Jul 2012 11:10:08 +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: 90bbccb4-6e5f-45d4-a846-1b4a6be47c07 X-Archives-Hash: 0a50bebbf368d58a05d21794d668eb67 commit: 9e047fc9f0eeeb502ad84b810a482f043d431cfc Author: Priit Laes plaes org> AuthorDate: Tue Jul 3 11:08:44 2012 +0000 Commit: Priit Laes plaes org> CommitDate: Tue Jul 3 11:08:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D9e047fc9 net-libs/libsoup-gnome: Add 2.39.3 to overlay --- .../files/libsoup-gnome-system-lib.patch | 111 ++++++++------= ------ ...ome-9999.ebuild =3D> libsoup-gnome-2.39.3.ebuild} | 1 + net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 1 + 3 files changed, 48 insertions(+), 65 deletions(-) diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch = b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch index 0c6259a..c81aa42 100644 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch @@ -1,33 +1,32 @@ -From b39aaca2ec6c551d7646bcb086afb8083492938b Mon Sep 17 00:00:00 2001 +From e09af88ff4b0eca56eda4b504e465430d3b6ec67 Mon Sep 17 00:00:00 2001 From: Priit Laes -Date: Tue, 20 Dec 2011 15:42:44 +0200 -Subject: [PATCH] Split support for libsoup-gnome +Date: Tue, 3 Jul 2012 13:59:03 +0300 +Subject: [PATCH] Split libsoup-gnome =20 -Original patch by Romain Perier. --- Makefile.am | 12 ++++++++++-- - configure.ac | 47 +++++++++++++++++++++++++++++---------------= --- + configure.ac | 35 +++++++++++++++++++++++------------ libsoup/Makefile.am | 48 ++++++++++++++++++++++++++++++++++++++------= ---- - 3 files changed, 77 insertions(+), 30 deletions(-) + 3 files changed, 71 insertions(+), 24 deletions(-) =20 diff --git a/Makefile.am b/Makefile.am -index 8b86fb7..7f628f4 100644 +index 18bf80a..046f945 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 ${ACLOCAL_FLAGS} =20 --SUBDIRS =3D libsoup tests docs +-SUBDIRS =3D libsoup po tests docs +SUBDIRS =3D libsoup + +if BUILD_LIBSOUP -+SUBDIRS +=3D tests docs ++SUBDIRS +=3D po tests docs +endif =20 - EXTRA_DIST =3D \ - libsoup-2.4.pc.in \ -@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS =3D --enable-gtk-doc --enab= le-introspection + EXTRA_DIST =3D \ + data/effective_tld_names.dat \ +@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS =3D --enable-gtk-doc --enab= le-introspection =20 pkgconfigdir =3D $(libdir)/pkgconfig =20 @@ -41,69 +40,50 @@ index 8b86fb7..7f628f4 100644 if BUILD_LIBSOUP_GNOME pkgconfig_DATA +=3D libsoup-gnome-2.4.pc diff --git a/configure.ac b/configure.ac -index eee8636..f9d6e47 100644 +index 59ee43c..132ca89 100644 --- a/configure.ac +++ b/configure.ac -@@ -72,19 +72,33 @@ dnl *********************** +@@ -71,20 +71,27 @@ LT_INIT([win32-dll]) + dnl *********************** dnl *** Checks for glib *** dnl *********************** -=20 --GLIB_REQUIRED=3D2.31.7 --AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) --if test "$GLIB_LIBS" =3D ""; then -- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libso= up) +PKG_PROG_PKG_CONFIG ++enable_ssl=3Dno +AC_ARG_WITH(libsoup-system, + AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library = to build(default=3Dno)]), + [with_libsoup_system=3D$withval], [with_libsoup_system=3Dno]) +if test "$with_libsoup_system" =3D "no"; then -+ GLIB_REQUIRED=3D2.31.7 -+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) ++ GLIB_REQUIRED=3D2.33.1 ++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) + if test "$GLIB_LIBS" =3D ""; then -+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libs= oup) ++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build l= ibsoup) + fi -+ GLIB_CFLAGS=3D"$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -+ GLIB_MAKEFILE=3D'$(top_srcdir)/Makefile.glib' -+ AC_SUBST(GLIB_MAKEFILE) -+ -+ PKG_CHECK_MODULES(XML, libxml-2.0) -+ AC_SUBST(XML_CFLAGS) -+ AC_SUBST(XML_LIBS) -+ -+ dnl ******************* -+ dnl *** Misc checks *** -+ dnl ******************* -+ AC_CHECK_FUNCS(gmtime_r) -+ AC_CHECK_FUNCS(mmap) -+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) - fi --GLIB_CFLAGS=3D"$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" ++ GLIB_CFLAGS=3D"$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=3DGLIB_VERS= ION_2_34" ++ GLIB_MAKEFILE=3D'$(top_srcdir)/Makefile.glib' ++ AC_SUBST(GLIB_MAKEFILE) +=20 +-GLIB_REQUIRED=3D2.33.1 +-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) +-if test "$GLIB_LIBS" =3D ""; then +- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libso= up) +-fi +-GLIB_CFLAGS=3D"$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=3DGLIB_VERSION_= 2_34" - -GLIB_MAKEFILE=3D'$(top_srcdir)/Makefile.glib' -AC_SUBST(GLIB_MAKEFILE) ++ PKG_CHECK_MODULES(XML, libxml-2.0) ++ AC_SUBST(XML_CFLAGS) ++ AC_SUBST(XML_LIBS) =20 -PKG_CHECK_MODULES(XML, libxml-2.0) -AC_SUBST(XML_CFLAGS) -AC_SUBST(XML_LIBS) ++fi +AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system =3D no) =20 dnl *********************** dnl *** Check for Win32 *** -@@ -103,13 +117,6 @@ esac - AC_MSG_RESULT([$os_win32]) - AM_CONDITIONAL(OS_WIN32, [test $os_win32 =3D yes]) -=20 --dnl ******************* --dnl *** Misc checks *** --dnl ******************* --AC_CHECK_FUNCS(gmtime_r) --AC_CHECK_FUNCS(mmap) --AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) -- - dnl ********************* - dnl *** GNOME support *** - dnl ********************* -@@ -134,6 +141,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnom= e !=3D no) +@@ -143,6 +150,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 @@ -115,10 +95,10 @@ index eee8636..f9d6e47 100644 [Could not find sqlite3 devel files: =20 diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am -index aa13eec..ef0c870 100644 +index c337b7f..4cf431d 100644 --- a/libsoup/Makefile.am +++ b/libsoup/Makefile.am -@@ -6,15 +6,18 @@ if OS_WIN32 +@@ -6,16 +6,19 @@ if OS_WIN32 LIBWS2_32 =3D -lws2_32 endif =20 @@ -130,6 +110,7 @@ index aa13eec..ef0c870 100644 +if BUILD_LIBSOUP +INCLUDES +=3D \ -DG_LOG_DOMAIN=3D\"libsoup\" \ + -DLOCALEDIR=3D\"$(localedir)\" \ -I$(top_srcdir) \ $(SOUP_DEBUG_FLAGS) \ $(SOUP_MAINTAINER_FLAGS) \ @@ -141,7 +122,7 @@ index aa13eec..ef0c870 100644 =20 libsoupincludedir =3D $(includedir)/libsoup-2.4/libsoup =20 -@@ -67,7 +70,7 @@ libsoupinclude_HEADERS =3D \ +@@ -69,7 +72,7 @@ libsoupinclude_HEADERS =3D \ $(soup_headers) \ soup-enum-types.h =20 @@ -150,15 +131,15 @@ index aa13eec..ef0c870 100644 =20 libsoup_2_4_la_LDFLAGS =3D \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefin= ed -@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES =3D \ - soup-uri.c \ - soup-value-utils.c \ - soup-xmlrpc.c +@@ -182,6 +185,7 @@ TLD_DATA_FILE=3D$(top_srcdir)/data/effective_tld_nam= es.dat +=20 + tld_data.inc: $(TLD_DATA_FILE) + $(builddir)/tld-parser $(TLD_DATA_FILE) $(srcdir)/tld_data.inc +endif =20 if BUILD_LIBSOUP_GNOME =20 -@@ -165,6 +169,10 @@ endif +@@ -195,6 +199,10 @@ endif =20 libsoupgnomeincludedir =3D $(includedir)/libsoup-gnome-2.4/libsoup =20 @@ -169,7 +150,7 @@ index aa13eec..ef0c870 100644 libsoupgnomeinclude_HEADERS =3D \ soup-cookie-jar-sqlite.h\ soup-gnome.h \ -@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS =3D \ +@@ -202,14 +210,24 @@ libsoupgnomeinclude_HEADERS =3D \ =20 lib_LTLIBRARIES +=3D libsoup-gnome-2.4.la =20 @@ -195,7 +176,7 @@ index aa13eec..ef0c870 100644 libsoup_gnome_2_4_la_SOURCES =3D \ soup-cookie-jar-sqlite.c \ soup-gnome-features.c \ -@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS =3D --includedir=3D. +@@ -239,6 +257,8 @@ INTROSPECTION_COMPILER_ARGS =3D --includedir=3D. =20 if HAVE_INTROSPECTION =20 @@ -204,7 +185,7 @@ index aa13eec..ef0c870 100644 # Core library gi_soup_files =3D \ $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolv= er.h,\ -@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES =3D \ +@@ -260,20 +280,28 @@ Soup_2_4_gir_FILES =3D \ =20 INTROSPECTION_GIRS +=3D Soup-2.4.gir =20 @@ -238,5 +219,5 @@ index aa13eec..ef0c870 100644 SoupGNOME_2_4_gir_EXPORT_PACKAGES =3D libsoup-gnome-2.4 =20 --=20 -1.7.8.4 +1.7.8.6 =20 diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/= libsoup-gnome/libsoup-gnome-2.39.3.ebuild similarity index 98% copy from net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild copy to net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild index c5cde7c..0409b17 100644 --- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild +++ b/net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild @@ -34,6 +34,7 @@ RDEPEND=3D"~net-libs/libsoup-${PV} introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )" DEPEND=3D"${RDEPEND} virtual/pkgconfig + >=3Ddev-util/intltool-0.35 >=3Ddev-util/gtk-doc-am-1.10 doc? ( >=3Ddev-util/gtk-doc-1.10 )" =20 diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/= libsoup-gnome/libsoup-gnome-9999.ebuild index c5cde7c..0409b17 100644 --- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild +++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild @@ -34,6 +34,7 @@ RDEPEND=3D"~net-libs/libsoup-${PV} introspection? ( >=3Ddev-libs/gobject-introspection-0.9.5 )" DEPEND=3D"${RDEPEND} virtual/pkgconfig + >=3Ddev-util/intltool-0.35 >=3Ddev-util/gtk-doc-am-1.10 doc? ( >=3Ddev-util/gtk-doc-1.10 )" =20