| 1 |
pacho 10/10/09 20:35:12 |
| 2 |
|
| 3 |
Added: libsoup-gnome-2.31.92-system-lib.patch |
| 4 |
Log: |
| 5 |
Version bump for Gnome 2.32 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.14/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-libs/libsoup-gnome/files/libsoup-gnome-2.31.92-system-lib.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libsoup-gnome/files/libsoup-gnome-2.31.92-system-lib.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libsoup-gnome/files/libsoup-gnome-2.31.92-system-lib.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libsoup-gnome-2.31.92-system-lib.patch |
| 16 |
=================================================================== |
| 17 |
Split support for libgnome-soup. |
| 18 |
|
| 19 |
Original patch by Romain Perier. |
| 20 |
|
| 21 |
--- |
| 22 |
--- configure.ac |
| 23 |
+++ configure.ac |
| 24 |
@@ -72,6 +72,14 @@ |
| 25 |
dnl *** Checks for glib *** |
| 26 |
dnl *********************** |
| 27 |
|
| 28 |
+PKG_PROG_PKG_CONFIG |
| 29 |
+enable_ssl=no |
| 30 |
+AC_ARG_WITH(libsoup-system, |
| 31 |
+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), |
| 32 |
+ [with_libsoup_system=$withval], [with_libsoup_system=no]) |
| 33 |
+ |
| 34 |
+if test "$with_libsoup_system" = "no"; then |
| 35 |
+ |
| 36 |
AM_PATH_GLIB_2_0(2.21.3,,,gobject gthread gio) |
| 37 |
if test "$GLIB_LIBS" = ""; then |
| 38 |
AC_MSG_ERROR(GLIB 2.21.3 or later is required to build libsoup) |
| 39 |
@@ -82,23 +90,6 @@ |
| 40 |
AC_SUBST(XML_CFLAGS) |
| 41 |
AC_SUBST(XML_LIBS) |
| 42 |
|
| 43 |
-dnl *********************** |
| 44 |
-dnl *** Check for Win32 *** |
| 45 |
-dnl *********************** |
| 46 |
- |
| 47 |
-AC_MSG_CHECKING([for Win32]) |
| 48 |
-case "$host" in |
| 49 |
- *-*-mingw*) |
| 50 |
- os_win32=yes |
| 51 |
- CFLAGS="$CFLAGS -D_REENTRANT" |
| 52 |
- ;; |
| 53 |
- *) |
| 54 |
- os_win32=no |
| 55 |
- ;; |
| 56 |
-esac |
| 57 |
-AC_MSG_RESULT([$os_win32]) |
| 58 |
-AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) |
| 59 |
- |
| 60 |
dnl ******************* |
| 61 |
dnl *** Misc checks *** |
| 62 |
dnl ******************* |
| 63 |
@@ -135,8 +126,28 @@ |
| 64 |
AC_SUBST(LIBGNUTLS_LIBS) |
| 65 |
AC_SUBST(SSL_REQUIREMENT) |
| 66 |
|
| 67 |
+fi |
| 68 |
+ |
| 69 |
dnl This is not supposed to be conditional, but... |
| 70 |
AM_CONDITIONAL(HAVE_SSL, test $enable_ssl != no) |
| 71 |
+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) |
| 72 |
+ |
| 73 |
+dnl *********************** |
| 74 |
+dnl *** Check for Win32 *** |
| 75 |
+dnl *********************** |
| 76 |
+ |
| 77 |
+AC_MSG_CHECKING([for Win32]) |
| 78 |
+case "$host" in |
| 79 |
+ *-*-mingw*) |
| 80 |
+ os_win32=yes |
| 81 |
+ CFLAGS="$CFLAGS -D_REENTRANT" |
| 82 |
+ ;; |
| 83 |
+ *) |
| 84 |
+ os_win32=no |
| 85 |
+ ;; |
| 86 |
+esac |
| 87 |
+AC_MSG_RESULT([$os_win32]) |
| 88 |
+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) |
| 89 |
|
| 90 |
|
| 91 |
dnl ********************* |
| 92 |
@@ -163,6 +174,10 @@ |
| 93 |
if test $with_gnome != no; then |
| 94 |
AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) |
| 95 |
|
| 96 |
+ if test $with_libsoup_system != no; then |
| 97 |
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) |
| 98 |
+ fi |
| 99 |
+ |
| 100 |
PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, :, [AC_MSG_ERROR(dnl |
| 101 |
[Could not find libproxy: |
| 102 |
|
| 103 |
--- libsoup/Makefile.am |
| 104 |
+++ libsoup/Makefile.am |
| 105 |
@@ -4,17 +4,18 @@ |
| 106 |
LIBWS2_32 = -lws2_32 |
| 107 |
endif |
| 108 |
|
| 109 |
-INCLUDES = \ |
| 110 |
+INCLUDES = |
| 111 |
+lib_LTLIBRARIES = |
| 112 |
+CLEANFILES = |
| 113 |
+ |
| 114 |
+if BUILD_LIBSOUP |
| 115 |
+INCLUDES += \ |
| 116 |
-DG_LOG_DOMAIN=\"libsoup\" \ |
| 117 |
-I$(top_srcdir) \ |
| 118 |
$(SOUP_DEBUG_FLAGS) \ |
| 119 |
$(SOUP_MAINTAINER_FLAGS) \ |
| 120 |
$(GLIB_CFLAGS) \ |
| 121 |
$(XML_CFLAGS) \ |
| 122 |
- $(GCONF_CFLAGS) \ |
| 123 |
- $(LIBPROXY_CFLAGS) \ |
| 124 |
- $(SQLITE_CFLAGS) \ |
| 125 |
- $(GNOME_KEYRING_CFLAGS) \ |
| 126 |
$(LIBGCRYPT_CFLAGS) \ |
| 127 |
$(LIBGNUTLS_CFLAGS) |
| 128 |
|
| 129 |
@@ -45,7 +46,7 @@ |
| 130 |
|
| 131 |
BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) |
| 132 |
|
| 133 |
-CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) |
| 134 |
+CLEANFILES += $(MARSHAL_GENERATED) $(MKENUMS_GENERATED) |
| 135 |
|
| 136 |
libsoupincludedir = $(includedir)/libsoup-2.4/libsoup |
| 137 |
|
| 138 |
@@ -91,7 +92,7 @@ |
| 139 |
$(soup_headers) \ |
| 140 |
soup-enum-types.h |
| 141 |
|
| 142 |
-lib_LTLIBRARIES = libsoup-2.4.la |
| 143 |
+lib_LTLIBRARIES += libsoup-2.4.la |
| 144 |
|
| 145 |
libsoup_2_4_la_LDFLAGS = \ |
| 146 |
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined |
| 147 |
@@ -171,10 +172,18 @@ |
| 148 |
soup-value-utils.c \ |
| 149 |
soup-xmlrpc.c |
| 150 |
|
| 151 |
+endif |
| 152 |
+ |
| 153 |
if BUILD_LIBSOUP_GNOME |
| 154 |
|
| 155 |
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup |
| 156 |
|
| 157 |
+INCLUDES += $(LIBSOUP_CFLAGS) \ |
| 158 |
+ $(GCONF_CFLAGS) \ |
| 159 |
+ $(LIBPROXY_CFLAGS) \ |
| 160 |
+ $(SQLITE_CFLAGS) \ |
| 161 |
+ $(GNOME_KEYRING_CFLAGS) |
| 162 |
+ |
| 163 |
libsoupgnomeinclude_HEADERS = \ |
| 164 |
soup-cookie-jar-sqlite.h\ |
| 165 |
soup-gnome.h \ |
| 166 |
@@ -182,16 +191,26 @@ |
| 167 |
|
| 168 |
lib_LTLIBRARIES += libsoup-gnome-2.4.la |
| 169 |
|
| 170 |
-libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
| 171 |
+if BUILD_LIBSOUP |
| 172 |
+ libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
| 173 |
+else |
| 174 |
+ libsoup_gnome_2_4_la_LDFLAGS = \ |
| 175 |
+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined |
| 176 |
+endif |
| 177 |
|
| 178 |
libsoup_gnome_2_4_la_LIBADD = \ |
| 179 |
- libsoup-2.4.la \ |
| 180 |
$(GLIB_LIBS) \ |
| 181 |
$(GCONF_LIBS) \ |
| 182 |
$(LIBPROXY_LIBS) \ |
| 183 |
$(SQLITE_LIBS) \ |
| 184 |
$(GNOME_KEYRING_LIBS) |
| 185 |
|
| 186 |
+if BUILD_LIBSOUP |
| 187 |
+ libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la |
| 188 |
+else |
| 189 |
+ libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) |
| 190 |
+endif |
| 191 |
+ |
| 192 |
libsoup_gnome_2_4_la_SOURCES = \ |
| 193 |
soup-cookie-jar-sqlite.c \ |
| 194 |
soup-gnome-features.c \ |
| 195 |
@@ -212,6 +231,8 @@ |
| 196 |
|
| 197 |
if HAVE_INTROSPECTION |
| 198 |
|
| 199 |
+if BUILD_LIBSOUP |
| 200 |
+ |
| 201 |
# Core library |
| 202 |
gi_soup_files = \ |
| 203 |
$(filter-out soup.h soup-enum-types.% soup-marshal.%,\ |
| 204 |
@@ -231,13 +252,21 @@ |
| 205 |
|
| 206 |
INTROSPECTION_GIRS += Soup-2.4.gir |
| 207 |
|
| 208 |
+endif |
| 209 |
+ |
| 210 |
if BUILD_LIBSOUP_GNOME |
| 211 |
|
| 212 |
+if BUILD_LIBSOUP |
| 213 |
+SOUP_GIR = Soup-2.4.gir |
| 214 |
+else |
| 215 |
+SOUP_GIR = |
| 216 |
+endif |
| 217 |
+ |
| 218 |
# GNOME extensions |
| 219 |
gi_soup_gnome_files = $(filter-out soup-gnome.h,\ |
| 220 |
$(libsoupgnomeinclude_HEADERS) \ |
| 221 |
$(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) |
| 222 |
-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir |
| 223 |
+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) |
| 224 |
SoupGNOME_2_4_gir_SCANNERFLAGS = --identifier-prefix=Soup --symbol-prefix=soup |
| 225 |
SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 |
| 226 |
SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) |
| 227 |
--- Makefile.am |
| 228 |
+++ Makefile.am |
| 229 |
@@ -1,7 +1,12 @@ |
| 230 |
## Process this file with automake to produce Makefile.in |
| 231 |
ACLOCAL_AMFLAGS = -I m4 |
| 232 |
|
| 233 |
-SUBDIRS = libsoup tests docs |
| 234 |
+SUBDIRS = libsoup |
| 235 |
+ |
| 236 |
+if BUILD_LIBSOUP |
| 237 |
+SUBDIRS += tests docs |
| 238 |
+endif |
| 239 |
+ |
| 240 |
|
| 241 |
EXTRA_DIST = \ |
| 242 |
libsoup-2.4.pc.in \ |
| 243 |
@@ -14,8 +19,10 @@ |
| 244 |
|
| 245 |
pkgconfigdir = $(libdir)/pkgconfig |
| 246 |
|
| 247 |
-pkgconfig_DATA = libsoup-2.4.pc |
| 248 |
- |
| 249 |
+pkgconfig_DATA= |
| 250 |
+if BUILD_LIBSOUP |
| 251 |
+pkgconfig_DATA += libsoup-2.4.pc |
| 252 |
+endif |
| 253 |
if BUILD_LIBSOUP_GNOME |
| 254 |
pkgconfig_DATA += libsoup-gnome-2.4.pc |
| 255 |
endif |
Archives