public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Priit Laes" <plaes@plaes.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
Date: Tue, 20 Dec 2011 15:29:35 +0000 (UTC)	[thread overview]
Message-ID: <e71651437be59778489837c3639c66c2c18a5bc1.plaes@gentoo> (raw)

commit:     e71651437be59778489837c3639c66c2c18a5bc1
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Dec 20 15:26:43 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Dec 20 15:26:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e7165143

net-libs/libsoup{-gnome}: Added 2.37.3 to overlay

---
 ...patch => libsoup-gnome-2.37.3-system-lib.patch} |  130 +++++++++++---------
 ...ome-9999.ebuild => libsoup-gnome-2.37.3.ebuild} |   14 +--
 net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild   |    2 +-
 .../{libsoup-9999.ebuild => libsoup-2.37.3.ebuild} |   18 +---
 net-libs/libsoup/libsoup-9999.ebuild               |    2 +-
 5 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch
similarity index 73%
rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch
rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch
index a4e23eb..788107b 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch
@@ -1,31 +1,65 @@
-Split support for libsoup-gnome
+From 80addbb5745904d0cb822445e6181b8265f518ae 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
 
 Original patch by Romain Perier.
 ---
---- configure.ac
-+++ configure.ac
-@@ -72,15 +72,30 @@
+ Makefile.am         |   12 ++++++++++--
+ configure.ac        |   42 +++++++++++++++++++++++++++---------------
+ libsoup/Makefile.am |   50 +++++++++++++++++++++++++++++++++++++++-----------
+ 3 files changed, 76 insertions(+), 28 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bb94238..0562574 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 tests docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += tests docs
++endif
+ 
+ EXTRA_DIST =			\
+ 	libsoup-2.4.pc.in	\
+@@ -14,7 +18,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 5ce2fcf..9126e7c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,15 +72,30 @@ dnl ***********************
  dnl *** Checks for glib ***
  dnl ***********************
  
--AM_PATH_GLIB_2_0(2.30.0,,,gobject gthread gio)
+-AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
 -if test "$GLIB_LIBS" = ""; then
--   AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
--fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
--
--PKG_CHECK_MODULES(XML, libxml-2.0)
--AC_SUBST(XML_CFLAGS)
--AC_SUBST(XML_LIBS)
+-   AC_MSG_ERROR(GLIB 2.31.0 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
-+	AM_PATH_GLIB_2_0(2.30.0,,,gobject gthread gio)
++	AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
 +	if test "$GLIB_LIBS" = ""; then
-+	   AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
++	   AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
 +	fi
 +	GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 +
@@ -39,12 +73,17 @@ Original patch by Romain Perier.
 +	AC_CHECK_FUNCS(gmtime_r)
 +	AC_CHECK_FUNCS(mmap)
 +	AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
-+fi
+ fi
+-GLIB_CFLAGS="$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 = no)
  
  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 = yes])
  
@@ -58,7 +97,7 @@ Original patch by Romain Perier.
  dnl *********************
  dnl *** GNOME support ***
  dnl *********************
-@@ -130,6 +138,10 @@
+@@ -130,6 +138,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])
  
@@ -69,9 +108,11 @@ Original patch by Romain Perier.
  	PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
  [Could not find sqlite3 devel files:
  
---- libsoup/Makefile.am
-+++ libsoup/Makefile.am
-@@ -4,15 +4,18 @@
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 096f0fb..416e523 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -4,15 +4,18 @@ if OS_WIN32
  LIBWS2_32 = -lws2_32
  endif
  
@@ -94,7 +135,7 @@ Original patch by Romain Perier.
  
  MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
  MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-@@ -41,7 +44,7 @@
+@@ -41,7 +44,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS)
  
  BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
  
@@ -103,7 +144,7 @@ Original patch by Romain Perier.
  
  libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
  
-@@ -94,7 +97,7 @@
+@@ -94,7 +97,7 @@ libsoupinclude_HEADERS =	\
  	$(soup_headers)		\
  	soup-enum-types.h
  
@@ -112,15 +153,15 @@ Original patch by Romain Perier.
  
  libsoup_2_4_la_LDFLAGS =	\
  	-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -178,6 +181,7 @@
- 	soup-uri-private.h		\
+@@ -176,6 +179,7 @@ libsoup_2_4_la_SOURCES =		\
+ 	soup-uri.c			\
  	soup-value-utils.c		\
  	soup-xmlrpc.c
 +endif
  
  if BUILD_LIBSOUP_GNOME
  
-@@ -191,6 +195,10 @@
+@@ -189,6 +193,10 @@ endif
  
  libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
  
@@ -131,7 +172,7 @@ Original patch by Romain Perier.
  libsoupgnomeinclude_HEADERS =	\
  	soup-cookie-jar-sqlite.h\
  	soup-gnome.h		\
-@@ -198,14 +206,24 @@
+@@ -196,14 +204,24 @@ libsoupgnomeinclude_HEADERS =	\
  
  lib_LTLIBRARIES += libsoup-gnome-2.4.la
  
@@ -157,7 +198,7 @@ Original patch by Romain Perier.
  libsoup_gnome_2_4_la_SOURCES =		\
  	soup-cookie-jar-sqlite.c	\
  	soup-gnome-features.c		\
-@@ -225,6 +243,8 @@
+@@ -223,6 +241,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
  
  if HAVE_INTROSPECTION
  
@@ -165,8 +206,8 @@ Original patch by Romain Perier.
 +
  # Core library
  gi_soup_files = \
- 	$(filter-out soup.h soup-enum-types.% soup-marshal.%,\
-@@ -246,20 +266,28 @@
+ 	$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
+@@ -244,20 +264,28 @@ Soup_2_4_gir_FILES = \
  
  INTROSPECTION_GIRS += Soup-2.4.gir
  
@@ -199,31 +240,6 @@ Original patch by Romain Perier.
  SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
  SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
  
---- Makefile.am
-+++ Makefile.am
-@@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS = -I m4
- 
--SUBDIRS = libsoup tests docs
-+SUBDIRS = libsoup
-+
-+if BUILD_LIBSOUP
-+SUBDIRS += tests docs
-+endif
- 
- EXTRA_DIST =			\
- 	libsoup-2.4.pc.in	\
-@@ -14,7 +18,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
+-- 
+1.7.8
+

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild
similarity index 77%
copy from net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
copy to net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild
index e2706e2..230e389 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild,v 1.1 2011/10/30 02:38:34 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -10,10 +10,6 @@ MY_PN=${PN/-gnome}
 MY_P=${MY_PN}-${PV}
 
 inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	GNOME_LIVE_MODULE=${MY_PN}
-	inherit gnome2-live
-fi
 
 DESCRIPTION="GNOME plugin for libsoup"
 HOMEPAGE="http://live.gnome.org/LibSoup"
@@ -21,11 +17,7 @@ SRC_URI="${SRC_URI//-gnome}"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
 IUSE="debug doc +introspection"
 
 RDEPEND="~net-libs/libsoup-${PV}
@@ -60,6 +52,6 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch
+	epatch "${FILESDIR}"/${PN}-2.37.3-system-lib.patch
 	eautoreconf
 }

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index e2706e2..1a0fe16 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
@@ -60,6 +60,6 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch
+	epatch "${FILESDIR}"/${PN}-2.37.3-system-lib.patch
 	eautoreconf
 }

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-2.37.3.ebuild
similarity index 78%
copy from net-libs/libsoup/libsoup-9999.ebuild
copy to net-libs/libsoup/libsoup-2.37.3.ebuild
index af23e7e..eaeac3e 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-2.37.3.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuild,v 1.1 2011/10/30 02:33:50 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="debug doc +introspection samba ssl test"
 
 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
-RDEPEND=">=dev-libs/glib-2.30.0:2
+RDEPEND=">=dev-libs/glib-2.31.0:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
@@ -62,11 +55,6 @@ src_configure() {
 src_prepare() {
 	gnome2_src_prepare
 
-	if [[ ${PV} = 9999 ]]; then
-		# prevent SOUP_MAINTAINER_FLAGS from getting set
-		mv .git .git-bck || die
-	fi
-
 	if ! use test; then
 		# don't waste time building tests (bug #226271)
 		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index af23e7e..c5b21b7 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -24,7 +24,7 @@ fi
 IUSE="debug doc +introspection samba ssl test"
 
 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
-RDEPEND=">=dev-libs/glib-2.30.0:2
+RDEPEND=">=dev-libs/glib-2.31.0:2
 	>=dev-libs/libxml2-2:2
 	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )



             reply	other threads:[~2011-12-20 15:29 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-20 15:29 Priit Laes [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-03-08 12:02 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/ Priit Laes
2012-07-17  7:53 Priit Laes
2012-01-17 12:51 Priit Laes
2011-10-18  7:37 Alexandre Restovtsev
2011-04-05  0:57 Nirbheek Chauhan
2011-03-22 15:27 Priit Laes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e71651437be59778489837c3639c66c2c18a5bc1.plaes@gentoo \
    --to=plaes@plaes.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox