[weasel-commit] Source: libsoup-gnome=2.28.2-1 libsoup=2.28.2-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Sun, 06 Jun 2010 19:41:09 -0400
================================
libsoup-gnome:source=2.28.2-1 (previous: 2.26.3-1)
cvc rdiff libsoup-gnome -1 /weasel.rpath.org@wgl:3-devel/2.28.2-1
================================
2.28.2-1 Filip Brcic (brcha@xxxxxxxxxxxx) Sun Jun 6 19:38:22 2010
version bump to 2.28.2
libsoup-2.28.2.tar.bz2: new
libsoup-gnome.recipe: changed
Index: libsoup-gnome.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libsoup-gnome.recipe /weasel.rpath.org@wgl:3-devel/2.26.3-1
+++ libsoup-gnome.recipe /weasel.rpath.org@wgl:3-devel/2.28.2-1
@@ -6,12 +6,13 @@
loadSuperClass('gnomepackage')
class LibsoupGnome(GnomePackageRecipe):
name = 'libsoup-gnome'
- version = '2.26.3'
+ version = '2.28.2'
buildRequires = [
'GConf:devel', 'gnutls:devel', 'libgcrypt:devel',
'libgpg-error:devel', 'libproxy:devel', 'libsoup:devel',
- 'libxml2:devel', 'sqlite:devel',
+ 'libxml2:devel', 'sqlite:devel', 'curl:runtime',
+ 'gnome-keyring:devel',
]
shortDesc = 'GNOME plugin for libsoup'
@@ -20,7 +21,7 @@
categories = [ 'Gnome' ]
patches = [
- 'libsoup-gnome-2.26.3-system-lib.patch',
+ 'libsoup-gnome-2.28.1-system-lib.patch',
]
def unpack(r):
libsoup-gnome-2.28.1-system-lib.patch: new
--- /dev/null
+++ libsoup-gnome-2.28.1-system-lib.patch
@@ -0,0 +207 @@
+From 4367b1c2801a4158f53f910a89255737a1c23b73 Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@xxxxxxxxxx>
+Date: Tue, 29 Sep 2009 11:19:43 +0200
+Subject: [PATCH] Add --with-libsoup-system option in order to be able to build
libsoup-gnome library without libsoup library
+
+---
+ Makefile.am | 13 +++++++---
+ configure.in | 59 ++++++++++++++++++++++++++++----------------------
+ libsoup/Makefile.am | 35 +++++++++++++++++++----------
+ 3 files changed, 65 insertions(+), 42 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 686e2e6..a919d8d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,11 @@
+ AUTOMAKE_OPTIONS = 1.6
+ ACLOCAL_AMFLAGS = -I m4
+
+-SUBDIRS = libsoup tests docs
++SUBDIRS = libsoup
++
++if BUILD_LIBSOUP
++SUBDIRS += tests docs
++endif
+
+ EXTRA_DIST = \
+ libsoup-2.4.pc.in \
+@@ -13,9 +17,10 @@ EXTRA_DIST = \
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
+ 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
+ endif
+diff --git a/configure.in b/configure.in
+index 24e0390..3f375d4 100644
+--- a/configure.in
++++ b/configure.in
+@@ -81,7 +81,13 @@ AC_FUNC_ALLOCA
+ 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
+ AM_PATH_GLIB_2_0(2.21.3,,,gobject gthread gio)
+ if test "$GLIB_LIBS" = ""; then
+ AC_MSG_ERROR(GLIB 2.21.3 or later is required to build libsoup)
+@@ -92,22 +98,6 @@ PKG_CHECK_MODULES(XML, libxml-2.0)
+ AC_SUBST(XML_CFLAGS)
+ AC_SUBST(XML_LIBS)
+
+-dnl ***********************
+-dnl *** Check for Win32 ***
+-dnl ***********************
+-
+-AC_MSG_CHECKING([for Win32])
+-case "$host" in
+- *-*-mingw*)
+- os_win32=yes
+- ;;
+- *)
+- os_win32=no
+- ;;
+-esac
+-AC_MSG_RESULT([$os_win32])
+-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+-
+ dnl *******************
+ dnl *** Misc checks ***
+ dnl *******************
+@@ -169,10 +152,25 @@ fi
+ AC_SUBST(LIBGNUTLS_CFLAGS)
+ AC_SUBST(LIBGNUTLS_LIBS)
+ AC_SUBST(SSL_REQUIREMENT)
+-
++fi
+ dnl This is not supposed to be conditional, but...
+ AM_CONDITIONAL(HAVE_SSL, test $enable_ssl != no)
++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
++dnl ***********************
++dnl *** Check for Win32 ***
++dnl ***********************
+
++AC_MSG_CHECKING([for Win32])
++case "$host" in
++ *-*-mingw*)
++ os_win32=yes
++ ;;
++ *)
++ os_win32=no
++ ;;
++esac
++AC_MSG_RESULT([$os_win32])
++AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+
+ dnl *********************
+ dnl *** GNOME support ***
+@@ -197,7 +202,9 @@ 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(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl
+ [Could not find libproxy:
+
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index c25b534..396c5f6 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -3,18 +3,16 @@
+ if OS_WIN32
+ LIBWS2_32 = -lws2_32
+ endif
+-
+-INCLUDES = \
++INCLUDES =
++lib_LTLIBRARIES =
++if BUILD_LIBSOUP
++INCLUDES += \
+ -DG_LOG_DOMAIN=\"libsoup\" \
+ -I$(top_srcdir) \
+ $(SOUP_DEBUG_FLAGS) \
+ $(SOUP_MAINTAINER_FLAGS) \
+ $(GLIB_CFLAGS) \
+ $(XML_CFLAGS) \
+- $(GCONF_CFLAGS) \
+- $(LIBPROXY_CFLAGS) \
+- $(SQLITE_CFLAGS) \
+- $(GNOME_KEYRING_CFLAGS) \
+ $(LIBGCRYPT_CFLAGS) \
+ $(LIBGNUTLS_CFLAGS)
+
+@@ -90,7 +88,7 @@ libsoupinclude_HEADERS = \
+ $(soup_headers) \
+ soup-enum-types.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
+@@ -163,9 +161,16 @@ libsoup_2_4_la_SOURCES = \
+ soup-uri.c \
+ soup-value-utils.c \
+ soup-xmlrpc.c
++endif
+
+ if BUILD_LIBSOUP_GNOME
+
++INCLUDES += $(LIBSOUP_CFLAGS) \
++ $(GCONF_CFLAGS) \
++ $(LIBPROXY_CFLAGS) \
++ $(SQLITE_CFLAGS) \
++ $(GNOME_KEYRING_CFLAGS)
++
+ libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
+
+ libsoupgnomeinclude_HEADERS = \
+@@ -174,17 +179,23 @@ libsoupgnomeinclude_HEADERS = \
+ soup-gnome-features.h
+
+ lib_LTLIBRARIES += libsoup-gnome-2.4.la
+-
+-libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
+-
++if BUILD_LIBSOUP
++ libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
++else
++ libsoup_gnome_2_4_la_LDFLAGS = \
++ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined
++endif
+ libsoup_gnome_2_4_la_LIBADD = \
+- libsoup-2.4.la \
+ $(GLIB_LIBS) \
+ $(GCONF_LIBS) \
+ $(LIBPROXY_LIBS) \
+ $(SQLITE_LIBS) \
+ $(GNOME_KEYRING_LIBS)
+-
++if BUILD_LIBSOUP
++ libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
++else
++ libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
++endif
+ libsoup_gnome_2_4_la_SOURCES = \
+ soup-cookie-jar-sqlite.c \
+ soup-gnome-features.c \
+--
+1.6.5.rc1
+
libsoup-2.26.3.tar.bz2: removed
libsoup-gnome-2.26.3-system-lib.patch: removed
================================
libsoup:source=2.28.2-1 (previous: 2.26.3-2)
cvc rdiff libsoup -1 /weasel.rpath.org@wgl:3-devel/2.28.2-1
================================
2.28.2-1 Filip Brcic (brcha@xxxxxxxxxxxx) Sun Jun 6 19:40:33 2010
version bump to 2.28.2
libsoup-2.28.2.tar.bz2: new
libsoup-2.26.3-fix-build-without-gnome-with-doc.patch: new
--- /dev/null
+++ libsoup-2.26.3-fix-build-without-gnome-with-doc.patch
@@ -0,0 +52 @@
+Fix Gentoo Bug 268592, patch adapted from upstream patch.
+
+Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in)
+Hence, to be applied ONLY when !gnome && doc
+
+---
+--- docs/reference/Makefile.am
++++ docs/reference/Makefile.am
+@@ -13,7 +13,7 @@
+ DOC_SOURCE_DIR=../../libsoup
+
+ # Extra options to supply to gtkdoc-scan.
+-SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED
++SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED --rebuild-types
+
+ # Extra options to supply to gtkdoc-scangobj.
+ SCANGOBJ_OPTIONS=--type-init-func 'g_type_init(); g_thread_init(NULL)'
+@@ -38,6 +38,9 @@
+ soup-proxy-resolver-libproxy.h soup-proxy-resolver-gconf.h \
+ soup-proxy-resolver-static.h
+
++IGNORE_HFILES += soup-cookie-jar-sqlite.h \
++ soup-gnome.h soup-gnome-features.h
++
+ # Images to copy into HTML directory.
+ HTML_IMAGES =
+
+@@ -61,7 +61,7 @@
+ $(GNUTLS_CFLAGS) \
+ $(LIBPROXY_LIBS)
+
+-GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
++GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la
+
+ # include common portion ...
+ include $(top_srcdir)/gtk-doc.make
+--- docs/reference/libsoup-2.4-docs.sgml
++++ docs/reference/libsoup-2.4-docs.sgml
+@@ -47,11 +47,13 @@
+ <xi:include href="xml/soup-value-utils.xml"/>
+ </chapter>
+
++ <!--
+ <chapter>
+ <title>GNOME integration</title>
+ <xi:include href="xml/soup-gnome-features.xml"/>
+ <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
+ </chapter>
++ -->
+
+ <chapter>
+ <title>Low-level Networking API</title>
libsoup.recipe: changed
Index: libsoup.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- libsoup.recipe /weasel.rpath.org@wgl:3-devel/2.26.3-2
+++ libsoup.recipe /weasel.rpath.org@wgl:3-devel/2.28.2-1
@@ -6,11 +6,11 @@
loadSuperClass('gnomepackage')
class Libsoup(GnomePackageRecipe):
name = 'libsoup'
- version = '2.26.3'
+ version = '2.28.2'
buildRequires = [
'gnutls:devel', 'libgcrypt:devel', 'libgpg-error:devel',
- 'libxml2:devel',
+ 'libxml2:devel', 'curl:runtime',
]
shortDesc = 'An HTTP library implementation in C'
@@ -18,9 +18,15 @@
licenses = [ 'LGPL-2' ]
categories = [ 'Network/Libraries' ]
- patches = [
- 'libsoup-2.26.3-gnutls-strict.patch',
- ]
+ if Use.builddocs:
+ patches = [
+ 'libsoup-2.26.3-fix-build-without-gnome-with-doc.patch',
+ ]
+
+ def unpack(r):
+ GnomePackageRecipe.unpack(r)
+
+ r.Autoreconf()
extraConfig = (
' --disable-static'
libsoup-2.26.3-gnutls-strict.patch: removed
libsoup-2.26.3.tar.bz2: removed
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: libsoup-gnome=2.28.2-1 libsoup=2.28.2-1 - rbuilder
