1 |
eva 13/08/29 22:08:34 |
2 |
|
3 |
Added: libsoup-gnome-2.42.2-system-lib.patch |
4 |
Log: |
5 |
Version bump. Re-split libsoup for easier upgrade path, etc. |
6 |
|
7 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key C6085806) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-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.42.2-system-lib.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: libsoup-gnome-2.42.2-system-lib.patch |
16 |
=================================================================== |
17 |
From 722a7d3935c5b3ec5c28e337247471821ede7c59 Mon Sep 17 00:00:00 2001 |
18 |
From: Priit Laes <plaes@×××××.org> |
19 |
Date: Tue, 20 Dec 2011 15:42:44 +0200 |
20 |
Subject: [PATCH] Split support for libsoup-gnome |
21 |
|
22 |
https://bugzilla.gnome.org/show_bug.cgi?id=595065 |
23 |
|
24 |
Original patch by Romain Perier. |
25 |
--- |
26 |
Makefile.am | 12 +++++++++-- |
27 |
configure.ac | 34 +++++++++++++++++++----------- |
28 |
libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++-------------- |
29 |
3 files changed, 76 insertions(+), 30 deletions(-) |
30 |
|
31 |
diff --git a/Makefile.am b/Makefile.am |
32 |
index 66992d9..046f945 100644 |
33 |
--- a/Makefile.am |
34 |
+++ b/Makefile.am |
35 |
@@ -1,7 +1,11 @@ |
36 |
## Process this file with automake to produce Makefile.in |
37 |
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
38 |
|
39 |
-SUBDIRS = libsoup po tests examples docs |
40 |
+SUBDIRS = libsoup |
41 |
+ |
42 |
+if BUILD_LIBSOUP |
43 |
+SUBDIRS += po tests docs |
44 |
+endif |
45 |
|
46 |
EXTRA_DIST = \ |
47 |
data/effective_tld_names.dat \ |
48 |
@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection |
49 |
|
50 |
pkgconfigdir = $(libdir)/pkgconfig |
51 |
|
52 |
-pkgconfig_DATA = libsoup-2.4.pc |
53 |
+pkgconfig_DATA = |
54 |
+ |
55 |
+if BUILD_LIBSOUP |
56 |
+pkgconfig_DATA += libsoup-2.4.pc |
57 |
+endif |
58 |
|
59 |
if BUILD_LIBSOUP_GNOME |
60 |
pkgconfig_DATA += libsoup-gnome-2.4.pc |
61 |
diff --git a/configure.ac b/configure.ac |
62 |
index 013deae..1c606df 100644 |
63 |
--- a/configure.ac |
64 |
+++ b/configure.ac |
65 |
@@ -76,20 +76,26 @@ LT_INIT([win32-dll]) |
66 |
dnl *********************** |
67 |
dnl *** Checks for glib *** |
68 |
dnl *********************** |
69 |
+PKG_PROG_PKG_CONFIG |
70 |
+enable_ssl=no |
71 |
+AC_ARG_WITH(libsoup-system, |
72 |
+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), |
73 |
+ [with_libsoup_system=$withval], [with_libsoup_system=no]) |
74 |
+if test "$with_libsoup_system" = "no"; then |
75 |
+ GLIB_REQUIRED=2.36.0 |
76 |
+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) |
77 |
+ if test "$GLIB_LIBS" = ""; then |
78 |
+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) |
79 |
+ fi |
80 |
+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36" |
81 |
+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' |
82 |
+ AC_SUBST(GLIB_MAKEFILE) |
83 |
|
84 |
-GLIB_REQUIRED=2.36.0 |
85 |
-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) |
86 |
-if test "$GLIB_LIBS" = ""; then |
87 |
- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) |
88 |
+ PKG_CHECK_MODULES(XML, libxml-2.0) |
89 |
+ AC_SUBST(XML_CFLAGS) |
90 |
+ AC_SUBST(XML_LIBS) |
91 |
fi |
92 |
-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36" |
93 |
- |
94 |
-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' |
95 |
-AC_SUBST(GLIB_MAKEFILE) |
96 |
- |
97 |
-PKG_CHECK_MODULES(XML, libxml-2.0) |
98 |
-AC_SUBST(XML_CFLAGS) |
99 |
-AC_SUBST(XML_LIBS) |
100 |
+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) |
101 |
|
102 |
PKG_CHECK_MODULES(SQLITE, sqlite3) |
103 |
AC_SUBST(SQLITE_CFLAGS) |
104 |
@@ -138,6 +144,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) |
105 |
|
106 |
if test $with_gnome != no; then |
107 |
AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) |
108 |
+ |
109 |
+ if test $with_libsoup_system != no; then |
110 |
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) |
111 |
+ fi |
112 |
fi |
113 |
AC_SUBST(HAVE_GNOME) |
114 |
|
115 |
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am |
116 |
index 508bf9c..dc3c5f2 100644 |
117 |
--- a/libsoup/Makefile.am |
118 |
+++ b/libsoup/Makefile.am |
119 |
@@ -1,14 +1,19 @@ |
120 |
## Process this file with automake to produce Makefile.in |
121 |
|
122 |
EXTRA_DIST = |
123 |
- |
124 |
+BUILT_SOURCES = |
125 |
include $(GLIB_MAKEFILE) |
126 |
|
127 |
if OS_WIN32 |
128 |
LIBWS2_32 = -lws2_32 |
129 |
endif |
130 |
|
131 |
-INCLUDES = \ |
132 |
+INCLUDES = |
133 |
+lib_LTLIBRARIES = |
134 |
+CLEANFILES = |
135 |
+ |
136 |
+if BUILD_LIBSOUP |
137 |
+INCLUDES += \ |
138 |
-DG_LOG_DOMAIN=\"libsoup\" \ |
139 |
-DLOCALEDIR=\"$(localedir)\" \ |
140 |
-DSOUP_COMPILATION \ |
141 |
@@ -77,7 +82,7 @@ libsoupinclude_HEADERS = \ |
142 |
nodist_libsoupinclude_HEADERS = \ |
143 |
soup-version.h |
144 |
|
145 |
-lib_LTLIBRARIES = libsoup-2.4.la |
146 |
+lib_LTLIBRARIES += libsoup-2.4.la |
147 |
|
148 |
libsoup_2_4_la_LDFLAGS = \ |
149 |
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ |
150 |
@@ -187,18 +192,23 @@ libsoup_2_4_la_SOURCES = \ |
151 |
soup-version.c \ |
152 |
soup-xmlrpc.c |
153 |
|
154 |
-# TLD rules |
155 |
-EXTRA_DIST += tld-parser.py |
156 |
- |
157 |
+BUILT_SOURCES += tld_data.inc |
158 |
TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat |
159 |
|
160 |
tld_data.inc: tld-parser.py $(TLD_DATA_FILE) |
161 |
- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc |
162 |
+ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc |
163 |
+ |
164 |
+# TLD rules |
165 |
+EXTRA_DIST += tld-parser.py |
166 |
+ |
167 |
+endif |
168 |
|
169 |
if BUILD_LIBSOUP_GNOME |
170 |
|
171 |
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup |
172 |
|
173 |
+INCLUDES += $(LIBSOUP_CFLAGS) |
174 |
+ |
175 |
libsoupgnomeinclude_HEADERS = \ |
176 |
soup-cookie-jar-sqlite.h\ |
177 |
soup-gnome.h \ |
178 |
@@ -206,17 +216,26 @@ libsoupgnomeinclude_HEADERS = \ |
179 |
|
180 |
lib_LTLIBRARIES += libsoup-gnome-2.4.la |
181 |
|
182 |
+if BUILD_LIBSOUP |
183 |
+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
184 |
+else |
185 |
libsoup_gnome_2_4_la_LDFLAGS = \ |
186 |
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ |
187 |
-no-undefined \ |
188 |
-export-symbols $(srcdir)/libsoup-gnome-2.4.sym |
189 |
+endif |
190 |
|
191 |
EXTRA_DIST += libsoup-gnome-2.4.sym |
192 |
|
193 |
libsoup_gnome_2_4_la_LIBADD = \ |
194 |
- libsoup-2.4.la \ |
195 |
$(GLIB_LIBS) |
196 |
|
197 |
+if BUILD_LIBSOUP |
198 |
+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la |
199 |
+else |
200 |
+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) |
201 |
+endif |
202 |
+ |
203 |
libsoup_gnome_2_4_la_SOURCES = \ |
204 |
soup-cookie-jar-sqlite.c \ |
205 |
soup-gnome-features.c \ |
206 |
@@ -229,9 +248,8 @@ endif |
207 |
|
208 |
GLIB_GENERATED = soup-marshal.c soup-marshal.h |
209 |
GLIB_GENERATED += soup-enum-types.c soup-enum-types.h |
210 |
-BUILT_SOURCES = \ |
211 |
- $(GLIB_GENERATED) \ |
212 |
- tld_data.inc |
213 |
+BUILT_SOURCES += \ |
214 |
+ $(GLIB_GENERATED) |
215 |
|
216 |
soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES) |
217 |
soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) |
218 |
@@ -247,6 +265,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. |
219 |
|
220 |
if HAVE_INTROSPECTION |
221 |
|
222 |
+if BUILD_LIBSOUP |
223 |
+ |
224 |
# Core library |
225 |
gi_soup_files = \ |
226 |
$(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\ |
227 |
@@ -268,20 +288,28 @@ Soup_2_4_gir_FILES = \ |
228 |
|
229 |
INTROSPECTION_GIRS += Soup-2.4.gir |
230 |
|
231 |
+endif |
232 |
+ |
233 |
if BUILD_LIBSOUP_GNOME |
234 |
|
235 |
+if BUILD_LIBSOUP |
236 |
+SOUP_GIR = Soup-2.4.gir |
237 |
+else |
238 |
+SOUP_GIR = |
239 |
+endif |
240 |
+ |
241 |
# GNOME extensions |
242 |
gi_soup_gnome_files = $(filter-out soup-gnome.h,\ |
243 |
$(libsoupgnomeinclude_HEADERS) \ |
244 |
$(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) |
245 |
-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir |
246 |
+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) |
247 |
+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 |
248 |
SoupGNOME_2_4_gir_SCANNERFLAGS = \ |
249 |
--identifier-prefix=Soup \ |
250 |
--symbol-prefix=soup \ |
251 |
- --c-include "libsoup/soup-gnome.h" \ |
252 |
- --include-uninstalled=$(builddir)/Soup-2.4.gir |
253 |
+ --c-include "libsoup/soup-gnome.h" |
254 |
SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) |
255 |
-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la |
256 |
+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la |
257 |
SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) |
258 |
SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 |
259 |
|
260 |
@@ -295,6 +323,6 @@ gir_DATA = $(INTROSPECTION_GIRS) |
261 |
typelibdir = $(libdir)/girepository-1.0 |
262 |
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) |
263 |
|
264 |
-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES) |
265 |
+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES) |
266 |
|
267 |
endif |
268 |
-- |
269 |
1.8.3.2 |