* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2011-10-18 7:37 Alexandre Restovtsev
0 siblings, 0 replies; 7+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 69575c4713d2ccea30313c0d22da37b178cd5735
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 18 05:58:08 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 18 06:04:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=69575c47
net-libs/libsoup{,-gnome}: 2.36.0 → 2.36.1
Bump, fixes connections being assigned to multiple requests. Update
glib dependency (and the glib-networking patch).
---
...patch => libsoup-gnome-2.36.1-system-lib.patch} | 8 ++++----
...e-2.36.0.ebuild => libsoup-gnome-2.36.1.ebuild} | 2 +-
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 2 +-
...libsoup-2.36.0.ebuild => libsoup-2.36.1.ebuild} | 4 ++--
net-libs/libsoup/libsoup-9999.ebuild | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch
similarity index 96%
rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch
rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch
index ad12542..a4e23eb 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.1-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.36.1-system-lib.patch
@@ -8,9 +8,9 @@ Original patch by Romain Perier.
dnl *** Checks for glib ***
dnl ***********************
--AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio)
+-AM_PATH_GLIB_2_0(2.30.0,,,gobject gthread gio)
-if test "$GLIB_LIBS" = ""; then
-- AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup)
+- AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
-fi
-GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-
@@ -23,9 +23,9 @@ Original patch by Romain Perier.
+ 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.27.5,,,gobject gthread gio)
++ AM_PATH_GLIB_2_0(2.30.0,,,gobject gthread gio)
+ if test "$GLIB_LIBS" = ""; then
-+ AC_MSG_ERROR(GLIB 2.27.5 or later is required to build libsoup)
++ AC_MSG_ERROR(GLIB 2.30.0 or later is required to build libsoup)
+ fi
+ GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.36.0.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
similarity index 96%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.36.0.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
index 58ae7ed..e2706e2 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.36.0.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
@@ -60,6 +60,6 @@ src_prepare() {
gnome2_src_prepare
# Use lib present on the system
- epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch
+ epatch "${FILESDIR}"/${PN}-2.36.1-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 58ae7ed..e2706e2 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.34.1-system-lib.patch
+ epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch
eautoreconf
}
diff --git a/net-libs/libsoup/libsoup-2.36.0.ebuild b/net-libs/libsoup/libsoup-2.36.1.ebuild
similarity index 97%
rename from net-libs/libsoup/libsoup-2.36.0.ebuild
rename to net-libs/libsoup/libsoup-2.36.1.ebuild
index 423eb4f..af23e7e 100644
--- a/net-libs/libsoup/libsoup-2.36.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.36.1.ebuild
@@ -24,9 +24,9 @@ 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.27.5:2
+RDEPEND=">=dev-libs/glib-2.30.0:2
>=dev-libs/libxml2-2:2
- >=net-libs/glib-networking-2.29.18[ssl?]
+ >=net-libs/glib-networking-2.30.0[ssl?]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
samba? ( net-fs/samba )"
DEPEND="${RDEPEND}
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 423eb4f..af23e7e 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -24,9 +24,9 @@ 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.27.5:2
+RDEPEND=">=dev-libs/glib-2.30.0:2
>=dev-libs/libxml2-2:2
- >=net-libs/glib-networking-2.29.18[ssl?]
+ >=net-libs/glib-networking-2.30.0[ssl?]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
samba? ( net-fs/samba )"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2013-03-08 12:02 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2013-03-08 12:02 UTC (permalink / raw
To: gentoo-commits
commit: f28695720277898cb4335c8e5cf0b8128d38bb7d
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar 8 12:02:20 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar 8 12:02:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f2869572
net-libs/libsoup{,-gnome}: Add 2.41.91 to overlay
---
.../files/libsoup-gnome-system-lib.patch | 117 +++++++-------------
...me-9999.ebuild => libsoup-gnome-2.41.91.ebuild} | 17 +--
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 17 +--
...{libsoup-9999.ebuild => libsoup-2.41.91.ebuild} | 20 ++--
net-libs/libsoup/libsoup-9999.ebuild | 20 ++--
5 files changed, 75 insertions(+), 116 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 d236e0c..5ca3a94 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
@@ -1,4 +1,4 @@
-From 41200f48909dbf48fd2c96f305b71797634aca3e Mon Sep 17 00:00:00 2001
+From 1345959e285c8d2343d87121f5f3a17563f0cc1a 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
@@ -7,24 +7,24 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595065
Original patch by Romain Perier.
---
- Makefile.am | 12 ++++++++--
- configure.ac | 35 +++++++++++++++++++----------
- libsoup/Makefile.am | 63 ++++++++++++++++++++++++++++++++++++++---------------
- 3 files changed, 79 insertions(+), 31 deletions(-)
+ Makefile.am | 12 +++++++++--
+ configure.ac | 9 ++++++++
+ libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
+ 3 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index 18bf80a..046f945 100644
+index 66992d9..787b3d6 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 docs
+-SUBDIRS = libsoup po tests examples docs
+SUBDIRS = libsoup
+
+if BUILD_LIBSOUP
-+SUBDIRS += po tests docs
++SUBDIRS += po tests examples docs
+endif
EXTRA_DIST = \
@@ -43,65 +43,37 @@ index 18bf80a..046f945 100644
if BUILD_LIBSOUP_GNOME
pkgconfig_DATA += libsoup-gnome-2.4.pc
diff --git a/configure.ac b/configure.ac
-index 95410de..1f00bdd 100644
+index 34db367..c5a7075 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -71,20 +71,27 @@ LT_INIT([win32-dll])
+@@ -76,6 +76,11 @@ 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.33.1
-+ 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_34"
-+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
-+ AC_SUBST(GLIB_MAKEFILE)
-
--GLIB_REQUIRED=2.33.1
--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_34"
--
--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)
-
--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)
- dnl ***********************
- dnl *** Check for Win32 ***
-@@ -143,6 +150,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+ GLIB_REQUIRED=2.35.0
+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+@@ -138,6 +143,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
-+
- PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
- [Could not find sqlite3 devel files:
+ fi
+ AC_SUBST(HAVE_GNOME)
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index cc99e75..f9b25fc 100644
+index e99c8e6..6bebec8 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
-@@ -1,23 +1,26 @@
+@@ -1,18 +1,22 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST =
@@ -109,10 +81,6 @@ index cc99e75..f9b25fc 100644
+BUILT_SOURCES =
include $(GLIB_MAKEFILE)
- if OS_WIN32
- LIBWS2_32 = -lws2_32
- endif
-
-INCLUDES = \
+INCLUDES =
+lib_LTLIBRARIES =
@@ -123,27 +91,26 @@ index cc99e75..f9b25fc 100644
-DG_LOG_DOMAIN=\"libsoup\" \
-DLOCALEDIR=\"$(localedir)\" \
-I$(top_srcdir) \
+ -I$(top_builddir) \
$(SOUP_DEBUG_FLAGS) \
- $(SOUP_MAINTAINER_FLAGS) \
$(GLIB_CFLAGS) \
- $(XML_CFLAGS) \
-- $(SQLITE_CFLAGS) \
-- $(GNOME_KEYRING_CFLAGS)
+- $(SQLITE_CFLAGS)
+ $(XML_CFLAGS)
libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
-@@ -72,7 +75,7 @@ libsoupinclude_HEADERS = \
- $(soup_headers) \
- soup-enum-types.h
+@@ -72,7 +76,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) -no-undefined
-@@ -173,14 +176,17 @@ libsoup_2_4_la_SOURCES = \
- soup-value-utils.c \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+@@ -181,18 +185,24 @@ libsoup_2_4_la_SOURCES = \
+ soup-version.c \
soup-xmlrpc.c
-# TLD rules
@@ -162,34 +129,32 @@ index cc99e75..f9b25fc 100644
+
if BUILD_LIBSOUP_GNOME
- if OS_WIN32
-@@ -193,6 +199,10 @@ endif
-
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+INCLUDES += $(LIBSOUP_CFLAGS) \
-+ $(SQLITE_CFLAGS) \
-+ $(GNOME_KEYRING_CFLAGS)
++ $(SQLITE_CFLAGS)
+
libsoupgnomeinclude_HEADERS = \
soup-cookie-jar-sqlite.h\
soup-gnome.h \
-@@ -200,14 +210,24 @@ libsoupgnomeinclude_HEADERS = \
+@@ -200,17 +210,26 @@ libsoupgnomeinclude_HEADERS = \
lib_LTLIBRARIES += libsoup-gnome-2.4.la
+if BUILD_LIBSOUP
- libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++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
+ libsoup_gnome_2_4_la_LDFLAGS = \
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
+ -no-undefined \
+ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
+
+ EXTRA_DIST += libsoup-gnome-2.4.sym
+endif
libsoup_gnome_2_4_la_LIBADD = \
- libsoup-2.4.la \
- $(GLIB_LIBS) \
- $(SQLITE_LIBS) \
- $(GNOME_KEYRING_LIBS)
+ $(GLIB_LIBS)
+if BUILD_LIBSOUP
+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
@@ -200,7 +165,7 @@ index cc99e75..f9b25fc 100644
libsoup_gnome_2_4_la_SOURCES = \
soup-cookie-jar-sqlite.c \
soup-gnome-features.c \
-@@ -219,9 +239,8 @@ endif
+@@ -223,9 +242,8 @@ endif
GLIB_GENERATED = soup-marshal.c soup-marshal.h
GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
@@ -212,7 +177,7 @@ index cc99e75..f9b25fc 100644
soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
-@@ -237,6 +256,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+@@ -241,6 +259,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
if HAVE_INTROSPECTION
@@ -221,7 +186,7 @@ index cc99e75..f9b25fc 100644
# Core library
gi_soup_files = \
$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -258,20 +279,28 @@ Soup_2_4_gir_FILES = \
+@@ -262,20 +282,28 @@ Soup_2_4_gir_FILES = \
INTROSPECTION_GIRS += Soup-2.4.gir
@@ -255,5 +220,5 @@ index cc99e75..f9b25fc 100644
SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
--
-1.7.12
+1.8.1.5
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild
similarity index 84%
copy from net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
copy to net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild
index 13f4a77..0f30687 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild
@@ -29,7 +29,6 @@ else
fi
RDEPEND="~net-libs/libsoup-${PV}[introspection?]
- || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
dev-db/sqlite:3=
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
@@ -49,16 +48,14 @@ src_prepare() {
src_configure() {
# Disable apache tests until they are usable on Gentoo, bug #326957
- G2CONF="${G2CONF}
- --disable-static
- --disable-tls-check
- $(use_enable introspection)
- --with-libsoup-system
- --with-gnome
- --without-apache-httpd"
-
# FIXME: we need addpredict to workaround bug #324779 until
# root cause (bug #249496) is solved
addpredict /usr/share/snmp/mibs/.index
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index 13f4a77..0f30687 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
@@ -29,7 +29,6 @@ else
fi
RDEPEND="~net-libs/libsoup-${PV}[introspection?]
- || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
dev-db/sqlite:3=
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
@@ -49,16 +48,14 @@ src_prepare() {
src_configure() {
# Disable apache tests until they are usable on Gentoo, bug #326957
- G2CONF="${G2CONF}
- --disable-static
- --disable-tls-check
- $(use_enable introspection)
- --with-libsoup-system
- --with-gnome
- --without-apache-httpd"
-
# FIXME: we need addpredict to workaround bug #324779 until
# root cause (bug #249496) is solved
addpredict /usr/share/snmp/mibs/.index
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ $(use_enable introspection) \
+ --with-libsoup-system \
+ --with-gnome \
+ --without-apache-httpd
}
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-2.41.91.ebuild
similarity index 89%
copy from net-libs/libsoup/libsoup-9999.ebuild
copy to net-libs/libsoup/libsoup-2.41.91.ebuild
index f1d960d..a0efd38 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-2.41.91.ebuild
@@ -24,7 +24,9 @@ fi
IUSE="debug +introspection samba ssl test"
[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
-RDEPEND=">=dev-libs/glib-2.33.1:2
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.35.0:2
>=dev-libs/libxml2-2:2
>=net-libs/glib-networking-2.30.0[ssl?]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
@@ -74,16 +76,14 @@ src_prepare() {
src_configure() {
# Disable apache tests until they are usable on Gentoo, bug #326957
- G2CONF="${G2CONF}
- --disable-static
- --disable-tls-check
- --without-gnome
- --without-apache-httpd
- $(use_enable introspection)
- $(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-
# FIXME: we need addpredict to workaround bug #324779 until
# root cause (bug #249496) is solved
addpredict /usr/share/snmp/mibs/.index
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ --without-gnome \
+ --without-apache-httpd \
+ $(use_enable introspection) \
+ $(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
}
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index f1d960d..a0efd38 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -24,7 +24,9 @@ fi
IUSE="debug +introspection samba ssl test"
[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
-RDEPEND=">=dev-libs/glib-2.33.1:2
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.35.0:2
>=dev-libs/libxml2-2:2
>=net-libs/glib-networking-2.30.0[ssl?]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
@@ -74,16 +76,14 @@ src_prepare() {
src_configure() {
# Disable apache tests until they are usable on Gentoo, bug #326957
- G2CONF="${G2CONF}
- --disable-static
- --disable-tls-check
- --without-gnome
- --without-apache-httpd
- $(use_enable introspection)
- $(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-
# FIXME: we need addpredict to workaround bug #324779 until
# root cause (bug #249496) is solved
addpredict /usr/share/snmp/mibs/.index
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-static \
+ --disable-tls-check \
+ --without-gnome \
+ --without-apache-httpd \
+ $(use_enable introspection) \
+ $(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2012-07-17 7:53 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2012-07-17 7:53 UTC (permalink / raw
To: gentoo-commits
commit: b7540041767f91721ace7cbf23aa0723f57c2d44
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jul 17 07:52:14 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jul 17 07:52:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b7540041
net-libs/libsoup{,-gnome}: 2.39.3 → 2.39.4
---
.../files/libsoup-gnome-system-lib.patch | 37 +++++++++++---------
...e-2.39.3.ebuild => libsoup-gnome-2.39.4.ebuild} | 0
...libsoup-2.39.3.ebuild => libsoup-2.39.4.ebuild} | 1 +
3 files changed, 21 insertions(+), 17 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 c81aa42..43c5213 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
@@ -1,8 +1,11 @@
-From e09af88ff4b0eca56eda4b504e465430d3b6ec67 Mon Sep 17 00:00:00 2001
+From babf258fd91930cc9e1d200f0c6332526c4867a5 Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
-Date: Tue, 3 Jul 2012 13:59:03 +0300
-Subject: [PATCH] Split libsoup-gnome
+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 +++++++++++++++++++++++------------
@@ -40,7 +43,7 @@ index 18bf80a..046f945 100644
if BUILD_LIBSOUP_GNOME
pkgconfig_DATA += libsoup-gnome-2.4.pc
diff --git a/configure.ac b/configure.ac
-index 59ee43c..132ca89 100644
+index 1057f63..648afc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,20 +71,27 @@ LT_INIT([win32-dll])
@@ -95,10 +98,10 @@ index 59ee43c..132ca89 100644
[Could not find sqlite3 devel files:
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
-index c337b7f..4cf431d 100644
+index fdba1ef..b44ec8b 100644
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
-@@ -6,16 +6,19 @@ if OS_WIN32
+@@ -8,16 +8,19 @@ if OS_WIN32
LIBWS2_32 = -lws2_32
endif
@@ -122,7 +125,7 @@ index c337b7f..4cf431d 100644
libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
-@@ -69,7 +72,7 @@ libsoupinclude_HEADERS = \
+@@ -71,7 +74,7 @@ libsoupinclude_HEADERS = \
$(soup_headers) \
soup-enum-types.h
@@ -131,15 +134,15 @@ index c337b7f..4cf431d 100644
libsoup_2_4_la_LDFLAGS = \
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -182,6 +185,7 @@ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
-
- tld_data.inc: $(TLD_DATA_FILE)
- $(builddir)/tld-parser $(TLD_DATA_FILE) $(srcdir)/tld_data.inc
+@@ -170,6 +173,7 @@ libsoup_2_4_la_SOURCES = \
+ soup-uri.c \
+ soup-value-utils.c \
+ soup-xmlrpc.c
+endif
- if BUILD_LIBSOUP_GNOME
-
-@@ -195,6 +199,10 @@ endif
+ # TLD rules
+ EXTRA_DIST += tld-parser.py
+@@ -191,6 +195,10 @@ endif
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
@@ -150,7 +153,7 @@ index c337b7f..4cf431d 100644
libsoupgnomeinclude_HEADERS = \
soup-cookie-jar-sqlite.h\
soup-gnome.h \
-@@ -202,14 +210,24 @@ libsoupgnomeinclude_HEADERS = \
+@@ -198,14 +206,24 @@ libsoupgnomeinclude_HEADERS = \
lib_LTLIBRARIES += libsoup-gnome-2.4.la
@@ -176,7 +179,7 @@ index c337b7f..4cf431d 100644
libsoup_gnome_2_4_la_SOURCES = \
soup-cookie-jar-sqlite.c \
soup-gnome-features.c \
-@@ -239,6 +257,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+@@ -235,6 +253,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
if HAVE_INTROSPECTION
@@ -185,7 +188,7 @@ index c337b7f..4cf431d 100644
# Core library
gi_soup_files = \
$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
-@@ -260,20 +280,28 @@ Soup_2_4_gir_FILES = \
+@@ -256,20 +276,28 @@ Soup_2_4_gir_FILES = \
INTROSPECTION_GIRS += Soup-2.4.gir
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.39.4.ebuild
similarity index 100%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.39.3.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.39.4.ebuild
diff --git a/net-libs/libsoup/libsoup-2.39.3.ebuild b/net-libs/libsoup/libsoup-2.39.4.ebuild
similarity index 99%
rename from net-libs/libsoup/libsoup-2.39.3.ebuild
rename to net-libs/libsoup/libsoup-2.39.4.ebuild
index 110db63..1fe51d9 100644
--- a/net-libs/libsoup/libsoup-2.39.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.39.4.ebuild
@@ -30,6 +30,7 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
samba? ( net-fs/samba )"
DEPEND="${RDEPEND}
virtual/pkgconfig
+ dev-lang/python
>=dev-util/intltool-0.35
>=dev-util/gtk-doc-am-1.10
doc? ( >=dev-util/gtk-doc-1.10 )"
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2012-01-17 12:51 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2012-01-17 12:51 UTC (permalink / raw
To: gentoo-commits
commit: 1ee9237f12841b545724e2866bbd5580b501a61c
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Jan 17 12:38:08 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Jan 17 12:45:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1ee9237f
net-libs/libsoup{,-gnome}: 2.37.3 -> 2.37.4
---
...b.patch => libsoup-gnome-2.37-system-lib.patch} | 27 ++++++++++---------
...e-2.37.3.ebuild => libsoup-gnome-2.37.4.ebuild} | 2 +-
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 2 +-
...libsoup-2.37.3.ebuild => libsoup-2.37.4.ebuild} | 3 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
similarity index 90%
rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch
rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
index 788107b..101c906 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.37.3-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.37-system-lib.patch
@@ -1,4 +1,4 @@
-From 80addbb5745904d0cb822445e6181b8265f518ae Mon Sep 17 00:00:00 2001
+From 57588fea518799c2cb69d44772a4ee7799c24eca 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
@@ -6,9 +6,9 @@ Subject: [PATCH] Split support for libsoup-gnome
Original patch by Romain Perier.
---
Makefile.am | 12 ++++++++++--
- configure.ac | 42 +++++++++++++++++++++++++++---------------
+ configure.ac | 43 +++++++++++++++++++++++++++----------------
libsoup/Makefile.am | 50 +++++++++++++++++++++++++++++++++++++++-----------
- 3 files changed, 76 insertions(+), 28 deletions(-)
+ 3 files changed, 76 insertions(+), 29 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index bb94238..0562574 100644
@@ -41,25 +41,26 @@ index bb94238..0562574 100644
if BUILD_LIBSOUP_GNOME
pkgconfig_DATA += libsoup-gnome-2.4.pc
diff --git a/configure.ac b/configure.ac
-index 5ce2fcf..9126e7c 100644
+index 6394974..5229544 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -72,15 +72,30 @@ dnl ***********************
+@@ -72,16 +72,30 @@ dnl ***********************
dnl *** Checks for glib ***
dnl ***********************
--AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
+-GLIB_REQUIRED=2.31.7
+-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
-if test "$GLIB_LIBS" = ""; then
-- AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
+- 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
-+ AM_PATH_GLIB_2_0(2.31.0,,,gobject gio)
++ GLIB_REQUIRED=2.31.7
++ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
+ if test "$GLIB_LIBS" = ""; then
-+ AC_MSG_ERROR(GLIB 2.31.0 or later is required to build libsoup)
++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
+ fi
+ GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+
@@ -83,7 +84,7 @@ index 5ce2fcf..9126e7c 100644
dnl ***********************
dnl *** Check for Win32 ***
-@@ -99,13 +114,6 @@ esac
+@@ -100,13 +114,6 @@ esac
AC_MSG_RESULT([$os_win32])
AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
@@ -97,7 +98,7 @@ index 5ce2fcf..9126e7c 100644
dnl *********************
dnl *** GNOME support ***
dnl *********************
-@@ -130,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+@@ -131,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])
@@ -241,5 +242,5 @@ index 096f0fb..416e523 100644
SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
--
-1.7.8
+1.7.8.3
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild
similarity index 96%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild
index 230e389..3ce4451 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.37.3.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.37.4.ebuild
@@ -52,6 +52,6 @@ src_prepare() {
gnome2_src_prepare
# Use lib present on the system
- epatch "${FILESDIR}"/${PN}-2.37.3-system-lib.patch
+ epatch "${FILESDIR}"/${PN}-2.37-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 1a0fe16..a5a4a47 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.37.3-system-lib.patch
+ epatch "${FILESDIR}"/${PN}-2.37-system-lib.patch
eautoreconf
}
diff --git a/net-libs/libsoup/libsoup-2.37.3.ebuild b/net-libs/libsoup/libsoup-2.37.4.ebuild
similarity index 95%
rename from net-libs/libsoup/libsoup-2.37.3.ebuild
rename to net-libs/libsoup/libsoup-2.37.4.ebuild
index eaeac3e..198fc6f 100644
--- a/net-libs/libsoup/libsoup-2.37.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.37.4.ebuild
@@ -16,8 +16,7 @@ SLOT="2.4"
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.31.0:2
+RDEPEND=">=dev-libs/glib-2.31.7:2
>=dev-libs/libxml2-2:2
>=net-libs/glib-networking-2.30.0[ssl?]
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2011-12-20 15:29 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2011-12-20 15:29 UTC (permalink / raw
To: gentoo-commits
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 )
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2011-04-05 0:57 Nirbheek Chauhan
0 siblings, 0 replies; 7+ messages in thread
From: Nirbheek Chauhan @ 2011-04-05 0:57 UTC (permalink / raw
To: gentoo-commits
commit: 903af5b7b9a904a1cf8b936d3dd94d2227374553
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 4 19:04:55 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Apr 4 21:20:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=903af5b7
net-libs/libsoup{,-gnome}: 2.33.92 → 2.34.0
---
...patch => libsoup-gnome-2.34.0-system-lib.patch} | 130 +++++++++----------
...-2.33.92.ebuild => libsoup-gnome-2.34.0.ebuild} | 2 +-
...ibsoup-2.33.92.ebuild => libsoup-2.34.0.ebuild} | 0
3 files changed, 63 insertions(+), 69 deletions(-)
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.33.92-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch
similarity index 75%
rename from net-libs/libsoup-gnome/files/libsoup-gnome-2.33.92-system-lib.patch
rename to net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch
index 4b0c890..ff5da04 100644
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.33.92-system-lib.patch
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.34.0-system-lib.patch
@@ -1,56 +1,22 @@
-From 1cb947b6e1d3ecc8cf13d55034aa85bd161d4e82 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Tue, 22 Mar 2011 15:54:10 +0200
-Subject: [PATCH] Split support for libsoup-gnome
+Split support for libsoup-gnome
Original patch by Romain Perier.
---
- 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 = -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 @@ 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 8f37cec..d8daf9c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -72,15 +72,30 @@ dnl ***********************
+--- configure.ac
++++ configure.ac
+@@ -72,15 +72,30 @@
dnl *** Checks for glib ***
dnl ***********************
-AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio)
-if test "$GLIB_LIBS" = ""; then
- AC_MSG_ERROR(GLIB 2.27.5 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)
+PKG_PROG_PKG_CONFIG
+enable_ssl=no
+AC_ARG_WITH(libsoup-system,
@@ -73,17 +39,12 @@ index 8f37cec..d8daf9c 100644
+ AC_CHECK_FUNCS(gmtime_r)
+ AC_CHECK_FUNCS(mmap)
+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
- fi
--GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
--
--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)
dnl ***********************
dnl *** Check for Win32 ***
-@@ -99,13 +114,6 @@ esac
+@@ -99,13 +114,6 @@
AC_MSG_RESULT([$os_win32])
AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
@@ -97,7 +58,7 @@ index 8f37cec..d8daf9c 100644
dnl *********************
dnl *** GNOME support ***
dnl *********************
-@@ -130,6 +138,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
+@@ -130,6 +138,10 @@
if test $with_gnome != no; then
AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
@@ -108,11 +69,9 @@ index 8f37cec..d8daf9c 100644
PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
[Could not find sqlite3 devel files:
-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
+--- libsoup/Makefile.am
++++ libsoup/Makefile.am
+@@ -4,15 +4,18 @@
LIBWS2_32 = -lws2_32
endif
@@ -135,7 +94,7 @@ index 308c08f..0c78061 100644
MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-@@ -41,7 +44,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS)
+@@ -41,7 +44,7 @@
BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
@@ -144,7 +103,7 @@ index 308c08f..0c78061 100644
libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
-@@ -94,7 +97,7 @@ libsoupinclude_HEADERS = \
+@@ -94,7 +97,7 @@
$(soup_headers) \
soup-enum-types.h
@@ -153,7 +112,7 @@ index 308c08f..0c78061 100644
libsoup_2_4_la_LDFLAGS = \
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -178,10 +181,16 @@ libsoup_2_4_la_SOURCES = \
+@@ -178,10 +181,16 @@
soup-value-utils.c \
soup-xmlrpc.c
@@ -170,7 +129,7 @@ index 308c08f..0c78061 100644
libsoupgnomeinclude_HEADERS = \
soup-cookie-jar-sqlite.h\
soup-gnome.h \
-@@ -189,14 +198,24 @@ libsoupgnomeinclude_HEADERS = \
+@@ -189,14 +198,24 @@
lib_LTLIBRARIES += libsoup-gnome-2.4.la
@@ -196,7 +155,7 @@ index 308c08f..0c78061 100644
libsoup_gnome_2_4_la_SOURCES = \
soup-cookie-jar-sqlite.c \
soup-gnome-features.c \
-@@ -217,6 +236,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
+@@ -217,6 +236,8 @@
if HAVE_INTROSPECTION
@@ -205,7 +164,7 @@ index 308c08f..0c78061 100644
# Core library
gi_soup_files = \
$(filter-out soup.h soup-enum-types.% soup-marshal.%,\
-@@ -238,13 +259,21 @@ Soup_2_4_gir_FILES = \
+@@ -238,20 +259,28 @@
INTROSPECTION_GIRS += Soup-2.4.gir
@@ -225,9 +184,44 @@ index 308c08f..0c78061 100644
$(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_SCANNERFLAGS = --identifier-prefix=Soup --symbol-prefix=soup --c-include "libsoup/soup-gnome.h"
- SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
++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 = $(INCLUDES)
---
-1.7.4.1
-
+-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
+
+--- 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
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.33.92.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild
similarity index 96%
rename from net-libs/libsoup-gnome/libsoup-gnome-2.33.92.ebuild
rename to net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild
index 1123699..e249b66 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.33.92.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.34.0.ebuild
@@ -52,6 +52,6 @@ src_prepare() {
gnome2_src_prepare
# Use lib present on the system
- epatch "${FILESDIR}"/${PN}-2.33.92-system-lib.patch
+ epatch "${FILESDIR}"/${PN}-2.34.0-system-lib.patch
eautoreconf
}
diff --git a/net-libs/libsoup/libsoup-2.33.92.ebuild b/net-libs/libsoup/libsoup-2.34.0.ebuild
similarity index 100%
rename from net-libs/libsoup/libsoup-2.33.92.ebuild
rename to net-libs/libsoup/libsoup-2.34.0.ebuild
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/
@ 2011-03-22 15:27 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2011-03-22 15:27 UTC (permalink / raw
To: gentoo-commits
commit: c88639fe2abf5a8b0114fe3c6d4467a62293654d
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Tue Mar 22 15:21:22 2011 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Mar 22 15:25:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c88639fe
net-libs/libsoup{,-gnome}: Bump to 2.33.92
---
...atch => libsoup-gnome-2.33.92-system-lib.patch} | 129 +++++++++++---------
...2.33.90.ebuild => libsoup-gnome-2.33.92.ebuild} | 4 +-
...bsoup-2.33.90.ebuild => 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.patch
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.patch
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 <plaes@plaes.org>
+Date: Tue, 22 Mar 2011 15:54:10 +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 | 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 = -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 @@ 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 8f37cec..d8daf9c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,15 +72,30 @@ dnl ***********************
dnl *** Checks for glib ***
dnl ***********************
-AM_PATH_GLIB_2_0(2.27.5,,,gobject gthread gio)
-if test "$GLIB_LIBS" = ""; then
- AC_MSG_ERROR(GLIB 2.27.5 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)
+PKG_PROG_PKG_CONFIG
+enable_ssl=no
+AC_ARG_WITH(libsoup-system,
@@ -38,12 +73,17 @@ Split support for libsoup-gnome, 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])
@@ -57,7 +97,7 @@ Split support for libsoup-gnome, 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])
@@ -65,12 +105,14 @@ Split support for libsoup-gnome, original patch by Romain Perier.
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
+ fi
+
- PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl
- [Could not find libproxy:
-
---- 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:
+
+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 = -lws2_32
endif
@@ -87,15 +129,13 @@ Split support for libsoup-gnome, original patch by Romain Perier.
$(SOUP_MAINTAINER_FLAGS) \
$(GLIB_CFLAGS) \
- $(XML_CFLAGS) \
-- $(GCONF_CFLAGS) \
-- $(LIBPROXY_CFLAGS) \
- $(SQLITE_CFLAGS) \
- $(GNOME_KEYRING_CFLAGS)
+ $(XML_CFLAGS)
MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-@@ -43,7 +44,7 @@
+@@ -41,7 +44,7 @@ soup-enum-types.c: $(libsoupinclude_HEADERS)
BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
@@ -104,7 +144,7 @@ Split support for libsoup-gnome, original patch by Romain Perier.
libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
-@@ -95,7 +96,7 @@
+@@ -94,7 +97,7 @@ libsoupinclude_HEADERS = \
$(soup_headers) \
soup-enum-types.h
@@ -113,7 +153,7 @@ Split support for libsoup-gnome, original patch by Romain Perier.
libsoup_2_4_la_LDFLAGS = \
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
-@@ -178,10 +179,18 @@
+@@ -178,10 +181,16 @@ libsoup_2_4_la_SOURCES = \
soup-value-utils.c \
soup-xmlrpc.c
@@ -124,15 +164,13 @@ Split support for libsoup-gnome, original patch by Romain Perier.
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+INCLUDES += $(LIBSOUP_CFLAGS) \
-+ $(GCONF_CFLAGS) \
-+ $(LIBPROXY_CFLAGS) \
+ $(SQLITE_CFLAGS) \
+ $(GNOME_KEYRING_CFLAGS)
+
libsoupgnomeinclude_HEADERS = \
soup-cookie-jar-sqlite.h\
soup-gnome.h \
-@@ -189,16 +198,26 @@
+@@ -189,14 +198,24 @@ libsoupgnomeinclude_HEADERS = \
lib_LTLIBRARIES += libsoup-gnome-2.4.la
@@ -146,8 +184,6 @@ Split support for libsoup-gnome, original patch by Romain Perier.
libsoup_gnome_2_4_la_LIBADD = \
- libsoup-2.4.la \
$(GLIB_LIBS) \
- $(GCONF_LIBS) \
- $(LIBPROXY_LIBS) \
$(SQLITE_LIBS) \
$(GNOME_KEYRING_LIBS)
@@ -160,7 +196,7 @@ Split support for libsoup-gnome, original patch by Romain Perier.
libsoup_gnome_2_4_la_SOURCES = \
soup-cookie-jar-sqlite.c \
soup-gnome-features.c \
-@@ -219,6 +238,8 @@
+@@ -217,6 +236,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
if HAVE_INTROSPECTION
@@ -169,7 +205,7 @@ Split support for libsoup-gnome, original patch by Romain Perier.
# Core library
gi_soup_files = \
$(filter-out soup.h soup-enum-types.% soup-marshal.%,\
-@@ -240,13 +261,21 @@
+@@ -238,13 +259,21 @@ Soup_2_4_gir_FILES = \
INTROSPECTION_GIRS += Soup-2.4.gir
@@ -192,31 +228,6 @@ Split support for libsoup-gnome, original patch by Romain Perier.
SoupGNOME_2_4_gir_SCANNERFLAGS = --identifier-prefix=Soup --symbol-prefix=soup --c-include "libsoup/soup-gnome.h"
SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
---- 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.4.1
+
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.33.90.ebuild b/net-libs/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="debug doc +introspection"
RDEPEND="~net-libs/libsoup-${PV}
|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
- net-libs/libproxy
- >=gnome-base/gconf-2
dev-db/sqlite:3
introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
DEPEND="${RDEPEND}
@@ -54,6 +52,6 @@ src_prepare() {
gnome2_src_prepare
# 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/libsoup-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
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-03-08 12:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-18 7:37 [gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup-gnome/, net-libs/libsoup-gnome/files/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2013-03-08 12:02 Priit Laes
2012-07-17 7:53 Priit Laes
2012-01-17 12:51 Priit Laes
2011-12-20 15:29 Priit Laes
2011-04-05 0:57 Nirbheek Chauhan
2011-03-22 15:27 Priit Laes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox