| 1 |
eva 09/10/29 21:23:31 |
| 2 |
|
| 3 |
Added: libsoup-gnome-2.28.1-system-lib.patch |
| 4 |
Log: |
| 5 |
New version for GNOME 2.28. |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-libs/libsoup-gnome/files/libsoup-gnome-2.28.1-system-lib.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsoup-gnome/files/libsoup-gnome-2.28.1-system-lib.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsoup-gnome/files/libsoup-gnome-2.28.1-system-lib.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libsoup-gnome-2.28.1-system-lib.patch |
| 15 |
=================================================================== |
| 16 |
From 4367b1c2801a4158f53f910a89255737a1c23b73 Mon Sep 17 00:00:00 2001 |
| 17 |
From: Romain Perier <mrpouet@g.o> |
| 18 |
Date: Tue, 29 Sep 2009 11:19:43 +0200 |
| 19 |
Subject: [PATCH] Add --with-libsoup-system option in order to be able to build libsoup-gnome library without libsoup library |
| 20 |
|
| 21 |
--- |
| 22 |
Makefile.am | 13 +++++++--- |
| 23 |
configure.in | 59 ++++++++++++++++++++++++++++---------------------- |
| 24 |
libsoup/Makefile.am | 35 +++++++++++++++++++---------- |
| 25 |
3 files changed, 65 insertions(+), 42 deletions(-) |
| 26 |
|
| 27 |
diff --git a/Makefile.am b/Makefile.am |
| 28 |
index 686e2e6..a919d8d 100644 |
| 29 |
--- a/Makefile.am |
| 30 |
+++ b/Makefile.am |
| 31 |
@@ -2,7 +2,11 @@ |
| 32 |
AUTOMAKE_OPTIONS = 1.6 |
| 33 |
ACLOCAL_AMFLAGS = -I m4 |
| 34 |
|
| 35 |
-SUBDIRS = libsoup tests docs |
| 36 |
+SUBDIRS = libsoup |
| 37 |
+ |
| 38 |
+if BUILD_LIBSOUP |
| 39 |
+SUBDIRS += tests docs |
| 40 |
+endif |
| 41 |
|
| 42 |
EXTRA_DIST = \ |
| 43 |
libsoup-2.4.pc.in \ |
| 44 |
@@ -13,9 +17,10 @@ EXTRA_DIST = \ |
| 45 |
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc |
| 46 |
|
| 47 |
pkgconfigdir = $(libdir)/pkgconfig |
| 48 |
- |
| 49 |
-pkgconfig_DATA = libsoup-2.4.pc |
| 50 |
- |
| 51 |
+pkgconfig_DATA= |
| 52 |
+if BUILD_LIBSOUP |
| 53 |
+pkgconfig_DATA += libsoup-2.4.pc |
| 54 |
+endif |
| 55 |
if BUILD_LIBSOUP_GNOME |
| 56 |
pkgconfig_DATA += libsoup-gnome-2.4.pc |
| 57 |
endif |
| 58 |
diff --git a/configure.in b/configure.in |
| 59 |
index 24e0390..3f375d4 100644 |
| 60 |
--- a/configure.in |
| 61 |
+++ b/configure.in |
| 62 |
@@ -81,7 +81,13 @@ AC_FUNC_ALLOCA |
| 63 |
dnl *********************** |
| 64 |
dnl *** Checks for glib *** |
| 65 |
dnl *********************** |
| 66 |
- |
| 67 |
+PKG_PROG_PKG_CONFIG |
| 68 |
+enable_ssl=no |
| 69 |
+AC_ARG_WITH(libsoup-system, |
| 70 |
+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), |
| 71 |
+ [with_libsoup_system=$withval], [with_libsoup_system=no]) |
| 72 |
+ |
| 73 |
+if test "$with_libsoup_system" = "no"; then |
| 74 |
AM_PATH_GLIB_2_0(2.21.3,,,gobject gthread gio) |
| 75 |
if test "$GLIB_LIBS" = ""; then |
| 76 |
AC_MSG_ERROR(GLIB 2.21.3 or later is required to build libsoup) |
| 77 |
@@ -92,22 +98,6 @@ PKG_CHECK_MODULES(XML, libxml-2.0) |
| 78 |
AC_SUBST(XML_CFLAGS) |
| 79 |
AC_SUBST(XML_LIBS) |
| 80 |
|
| 81 |
-dnl *********************** |
| 82 |
-dnl *** Check for Win32 *** |
| 83 |
-dnl *********************** |
| 84 |
- |
| 85 |
-AC_MSG_CHECKING([for Win32]) |
| 86 |
-case "$host" in |
| 87 |
- *-*-mingw*) |
| 88 |
- os_win32=yes |
| 89 |
- ;; |
| 90 |
- *) |
| 91 |
- os_win32=no |
| 92 |
- ;; |
| 93 |
-esac |
| 94 |
-AC_MSG_RESULT([$os_win32]) |
| 95 |
-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) |
| 96 |
- |
| 97 |
dnl ******************* |
| 98 |
dnl *** Misc checks *** |
| 99 |
dnl ******************* |
| 100 |
@@ -169,10 +152,25 @@ fi |
| 101 |
AC_SUBST(LIBGNUTLS_CFLAGS) |
| 102 |
AC_SUBST(LIBGNUTLS_LIBS) |
| 103 |
AC_SUBST(SSL_REQUIREMENT) |
| 104 |
- |
| 105 |
+fi |
| 106 |
dnl This is not supposed to be conditional, but... |
| 107 |
AM_CONDITIONAL(HAVE_SSL, test $enable_ssl != no) |
| 108 |
+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) |
| 109 |
+dnl *********************** |
| 110 |
+dnl *** Check for Win32 *** |
| 111 |
+dnl *********************** |
| 112 |
|
| 113 |
+AC_MSG_CHECKING([for Win32]) |
| 114 |
+case "$host" in |
| 115 |
+ *-*-mingw*) |
| 116 |
+ os_win32=yes |
| 117 |
+ ;; |
| 118 |
+ *) |
| 119 |
+ os_win32=no |
| 120 |
+ ;; |
| 121 |
+esac |
| 122 |
+AC_MSG_RESULT([$os_win32]) |
| 123 |
+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) |
| 124 |
|
| 125 |
dnl ********************* |
| 126 |
dnl *** GNOME support *** |
| 127 |
@@ -197,7 +202,9 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) |
| 128 |
|
| 129 |
if test $with_gnome != no; then |
| 130 |
AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) |
| 131 |
- |
| 132 |
+ if test $with_libsoup_system != no; then |
| 133 |
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) |
| 134 |
+ fi |
| 135 |
PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl |
| 136 |
[Could not find libproxy: |
| 137 |
|
| 138 |
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am |
| 139 |
index c25b534..396c5f6 100644 |
| 140 |
--- a/libsoup/Makefile.am |
| 141 |
+++ b/libsoup/Makefile.am |
| 142 |
@@ -3,18 +3,16 @@ |
| 143 |
if OS_WIN32 |
| 144 |
LIBWS2_32 = -lws2_32 |
| 145 |
endif |
| 146 |
- |
| 147 |
-INCLUDES = \ |
| 148 |
+INCLUDES = |
| 149 |
+lib_LTLIBRARIES = |
| 150 |
+if BUILD_LIBSOUP |
| 151 |
+INCLUDES += \ |
| 152 |
-DG_LOG_DOMAIN=\"libsoup\" \ |
| 153 |
-I$(top_srcdir) \ |
| 154 |
$(SOUP_DEBUG_FLAGS) \ |
| 155 |
$(SOUP_MAINTAINER_FLAGS) \ |
| 156 |
$(GLIB_CFLAGS) \ |
| 157 |
$(XML_CFLAGS) \ |
| 158 |
- $(GCONF_CFLAGS) \ |
| 159 |
- $(LIBPROXY_CFLAGS) \ |
| 160 |
- $(SQLITE_CFLAGS) \ |
| 161 |
- $(GNOME_KEYRING_CFLAGS) \ |
| 162 |
$(LIBGCRYPT_CFLAGS) \ |
| 163 |
$(LIBGNUTLS_CFLAGS) |
| 164 |
|
| 165 |
@@ -90,7 +88,7 @@ libsoupinclude_HEADERS = \ |
| 166 |
$(soup_headers) \ |
| 167 |
soup-enum-types.h |
| 168 |
|
| 169 |
-lib_LTLIBRARIES = libsoup-2.4.la |
| 170 |
+lib_LTLIBRARIES += libsoup-2.4.la |
| 171 |
|
| 172 |
libsoup_2_4_la_LDFLAGS = \ |
| 173 |
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined |
| 174 |
@@ -163,9 +161,16 @@ libsoup_2_4_la_SOURCES = \ |
| 175 |
soup-uri.c \ |
| 176 |
soup-value-utils.c \ |
| 177 |
soup-xmlrpc.c |
| 178 |
+endif |
| 179 |
|
| 180 |
if BUILD_LIBSOUP_GNOME |
| 181 |
|
| 182 |
+INCLUDES += $(LIBSOUP_CFLAGS) \ |
| 183 |
+ $(GCONF_CFLAGS) \ |
| 184 |
+ $(LIBPROXY_CFLAGS) \ |
| 185 |
+ $(SQLITE_CFLAGS) \ |
| 186 |
+ $(GNOME_KEYRING_CFLAGS) |
| 187 |
+ |
| 188 |
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup |
| 189 |
|
| 190 |
libsoupgnomeinclude_HEADERS = \ |
| 191 |
@@ -174,17 +179,23 @@ libsoupgnomeinclude_HEADERS = \ |
| 192 |
soup-gnome-features.h |
| 193 |
|
| 194 |
lib_LTLIBRARIES += libsoup-gnome-2.4.la |
| 195 |
- |
| 196 |
-libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
| 197 |
- |
| 198 |
+if BUILD_LIBSOUP |
| 199 |
+ libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
| 200 |
+else |
| 201 |
+ libsoup_gnome_2_4_la_LDFLAGS = \ |
| 202 |
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined |
| 203 |
+endif |
| 204 |
libsoup_gnome_2_4_la_LIBADD = \ |
| 205 |
- libsoup-2.4.la \ |
| 206 |
$(GLIB_LIBS) \ |
| 207 |
$(GCONF_LIBS) \ |
| 208 |
$(LIBPROXY_LIBS) \ |
| 209 |
$(SQLITE_LIBS) \ |
| 210 |
$(GNOME_KEYRING_LIBS) |
| 211 |
- |
| 212 |
+if BUILD_LIBSOUP |
| 213 |
+ libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la |
| 214 |
+else |
| 215 |
+ libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) |
| 216 |
+endif |
| 217 |
libsoup_gnome_2_4_la_SOURCES = \ |
| 218 |
soup-cookie-jar-sqlite.c \ |
| 219 |
soup-gnome-features.c \ |
| 220 |
-- |
| 221 |
1.6.5.rc1 |
Archives