projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7a0ecb7)
Really adding needed patches, thanks Kaleb Elwert and Lars Wendler for reporting.
authorPacho Ramos <pacho@gentoo.org>
Sun, 13 Jun 2010 18:50:57 +0000 (18:50 +0000)
committerPacho Ramos <pacho@gentoo.org>
Sun, 13 Jun 2010 18:50:57 +0000 (18:50 +0000)
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

net-libs/libsoup-gnome/ChangeLog patch | blob | history
net-libs/libsoup-gnome/Manifest patch | blob | history
net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch [new file with mode: 0644] patch | blob
net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild patch | blob | history

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 772aca13814fc02a9c2d8e1f2fdfe19db7900dbd..2ee480aa7cd93e4206aed938bd2232b99e48e7bb 100644 (file)
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.24 2010/06/13 15:47:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.25 2010/06/13 18:50:57 pacho Exp $
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org>
+  +files/libsoup-gnome-system-lib.patch:
+  Really adding needed patches, thanks Kaleb Elwert and Lars Wendler for
+  reporting.
 
 *libsoup-gnome-2.30.1 (13 Jun 2010)
 
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest
index 1e39715f59776d83ac3c287844ef52b8def2f1de..9cd90b56108b836bcd3aab65e44247a243b4890f 100644 (file)
--- a/net-libs/libsoup-gnome/Manifest
+++ b/net-libs/libsoup-gnome/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX libsoup-gnome-2.26.3-system-lib.patch 5982 RMD160 6ceae5337d79ba8364f3c8c5fa590c498cfbe94e SHA1 90385b555110af18dec66b928f08ed0bf342c4f5 SHA256 76998bd549937f8060a97226513c445f0eb3a815a7ff982cf446c45bdfbf3521
 AUX libsoup-gnome-2.28.1-system-lib.patch 5256 RMD160 3665b178f82f71016a55e946119056bf781e4578 SHA1 1fad95b2e67210ef4c9a3edefb0c1e0374ca821a SHA256 f5a7b35e9b4e48bad44434c9fcd6b7c44d1a57fd21ac7ba6c6003a8331707c32
+AUX libsoup-gnome-system-lib.patch 5501 RMD160 548151e9742483201d5a9d4e0f9cd522c629390e SHA1 561db81dc549f95236dc224fceb62da5ba74f238 SHA256 97f81560c3f2cd45dc5f8ece5932f4456108d3139b20bd67d844f1f76a9747a0
 DIST libsoup-2.26.3.tar.bz2 686248 RMD160 adc6b621ecbe86bf9467ec610a670dbc6fcf31e6 SHA1 95e7c095c1059dc6f406f4bfd67a523b0f94cc61 SHA256 e6662e56e6987124891db62325622bc46fd5dcd42458285d5ead5afc6d5be1dc
 DIST libsoup-2.28.2.tar.bz2 721840 RMD160 8648fe507511f7c1c83b164ac0f5c86b995650f9 SHA1 91031a351ba260906a86e9f7155234dec524bff0 SHA256 9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
 DIST libsoup-2.30.1.tar.bz2 644401 RMD160 7de3ae172b3eff0a2d0aa26b0fa8e537b3431f4b SHA1 661d14ff2dde5a9ff04c3751711bfec11dfd0738 SHA256 6395c6e0bbcf4e822f1c5f3dd6f844116c571ed13cdf611d5c8f1dd4fe5777ed
 EBUILD libsoup-gnome-2.26.3-r1.ebuild 1296 RMD160 2394891f170242ec3d470f144c160d0f22cca1bf SHA1 7299d61e1c9eb548b4ab4075b110d21026313e0a SHA256 8b33cbb507a1ee8a9c73f1e0f88a800948103b7c76a8b5cc002b5756ae0f78a8
 EBUILD libsoup-gnome-2.28.2.ebuild 1316 RMD160 a5b4d6ba0e495006b016034328dc170cee8483fa SHA1 83250dd1df2e997c4fd6ddfe08891c8e38db1bed SHA256 6a13e0d4ebe2a372d36d3fd2473575308ce088bfd38d69092141f90efa8d753a
-EBUILD libsoup-gnome-2.30.1.ebuild 1289 RMD160 f9850acb4a8a2dfaf5cf75e174952032f60ce46b SHA1 f9865e41010c7c88b1ff26cb8144582d8de9a37c SHA256 112b88145cbfabec70b5f86492b3edf45cc021947bfc94b5ca842aa5bfeba8bf
-MISC ChangeLog 3761 RMD160 18ac1a4c405921afe21d86e059f5f85c48ac918e SHA1 0378fe744f6170ee34c184a06b2baae10000b2fd SHA256 730e448c066764dc84e3628cbf93529fe3920eee56fb9919c8f3dbf4e823a9ed
+EBUILD libsoup-gnome-2.30.1.ebuild 1315 RMD160 d6f71763ddf1b9de2b5fda09b828c62b91b95084 SHA1 26bb84bf9efa76c71769eeafd3a28b073d51c228 SHA256 ed4adc06a00fe661034d0617f4224f3bcedccf654190db198a3bfa894f317c8b
+MISC ChangeLog 3935 RMD160 033019586f7e953a90a98358bd1648f2f8195c41 SHA1 fab3ea56e193230f80223c5c8d60324012b2a8c4 SHA256 1ea3aead181e7e4e949983dbe7e29dd9e157541dda33034bdce81571742b163d
 MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwU/aYACgkQCaWpQKGI+9R1SQCfS54iayRNeosPG5AAgXUPxHkT
-g7wAn1yRXg+KNaXrag/wXY8Ezaw3eJSY
-=nrLL
+iEYEARECAAYFAkwVKJcACgkQCaWpQKGI+9TpRgCaAsVLFpJX33oGYp8Y3o9kd5AN
+g6UAn2v1wcWpLzz1dv1RyfFnaoRU6EVH
+=hb02
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
new file mode 100644 (file)
index 0000000..964b710
--- /dev/null
+++ b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch
@@ -0,0 +1,220 @@
+From 6ff741f0302bc0eddba20ed4445e68b6e71af594 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Tue, 23 Feb 2010 08:16:49 +0200
+Subject: [PATCH] Split support for libgnome-soup.
+
+Original patch by Romain Perier.
+---
+ Makefile.am         |   13 ++++++++++---
+ configure.ac        |   49 ++++++++++++++++++++++++++++++++-----------------
+ libsoup/Makefile.am |   36 +++++++++++++++++++++++++++---------
+ 3 files changed, 69 insertions(+), 29 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b845e29..21529dd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,12 @@
+ ## 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       \
+@@ -13,8 +18,10 @@ 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.ac b/configure.ac
+index eb45cfc..a8cd7ed 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,6 +72,14 @@ 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)
+@@ -82,23 +90,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
+-    CFLAGS="$CFLAGS -D_REENTRANT"
+-    ;;
+-  *)
+-    os_win32=no
+-    ;;
+-esac
+-AC_MSG_RESULT([$os_win32])
+-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+-
+ dnl *******************
+ dnl *** Misc checks ***
+ dnl *******************
+@@ -135,8 +126,28 @@ 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
++    CFLAGS="$CFLAGS -D_REENTRANT"
++    ;;
++  *)
++    os_win32=no
++    ;;
++esac
++AC_MSG_RESULT([$os_win32])
++AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+ 
+ 
+ dnl *********************
+@@ -163,6 +174,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(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl
+ [Could not find libproxy:
+ 
+diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
+index 284d85f..cfb89b4 100644
+--- a/libsoup/Makefile.am
++++ b/libsoup/Makefile.am
+@@ -4,17 +4,17 @@ 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)
+ 
+@@ -91,7 +91,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
+@@ -171,10 +171,18 @@ libsoup_2_4_la_SOURCES =         \
+       soup-value-utils.c              \
+       soup-xmlrpc.c
+ 
++endif
++
+ if BUILD_LIBSOUP_GNOME
+ 
+ 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            \
+@@ -182,16 +190,26 @@ libsoupgnomeinclude_HEADERS =    \
+ 
+ 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           \
+@@ -205,4 +223,4 @@ endif
+ EXTRA_DIST=                           \
+       soup-marshal.list               \
+       soup-enum-types.h.tmpl          \
+-      soup-enum-types.c.tmpl
+\ No newline at end of file
++      soup-enum-types.c.tmpl
+-- 
+1.7.0
+
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
index 7e042df7dfaab99da62f70126637211962a440d9..26b4b93e2f9a92a679e8ebe33888619dbf4fd6ee 100644 (file)
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.30.1.ebuild,v 1.1 2010/06/13 15:47:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.30.1.ebuild,v 1.2 2010/06/13 18:50:57 pacho Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@ SRC_URI="${SRC_URI//-gnome}"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
 # Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that
 IUSE="debug doc"
 
Unnamed repository; edit this file 'description' to name the repository.