1 |
eva 14/04/27 17:46:27 |
2 |
|
3 |
Added: libsoup-gnome-2.46.0-system-lib.patch |
4 |
Log: |
5 |
Version bump for Gnome 3.12. |
6 |
|
7 |
(Portage version: 2.2.10/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.46.0-system-lib.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-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.46.0-system-lib.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: libsoup-gnome-2.46.0-system-lib.patch |
16 |
=================================================================== |
17 |
From 63db817bac0382f3f43947b8233bf4585ede0e0b 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 | 35 ++++++++++++++++++++----------- |
28 |
libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++-------------- |
29 |
3 files changed, 77 insertions(+), 30 deletions(-) |
30 |
|
31 |
diff --git a/Makefile.am b/Makefile.am |
32 |
index c8fa95c..fc09778 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 |
@@ -18,7 +22,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 96bb378..0153f10 100644 |
63 |
--- a/configure.ac |
64 |
+++ b/configure.ac |
65 |
@@ -77,23 +77,30 @@ 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.38.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_38" |
81 |
|
82 |
-GLIB_REQUIRED=2.38.0 |
83 |
-AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) |
84 |
-if test "$GLIB_LIBS" = ""; then |
85 |
- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) |
86 |
-fi |
87 |
-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38" |
88 |
+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' |
89 |
+ AC_SUBST(GLIB_MAKEFILE) |
90 |
|
91 |
-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' |
92 |
-AC_SUBST(GLIB_MAKEFILE) |
93 |
+ PKG_CHECK_MODULES(XML, libxml-2.0) |
94 |
+ AC_SUBST(XML_CFLAGS) |
95 |
+ AC_SUBST(XML_LIBS) |
96 |
+fi |
97 |
+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) |
98 |
|
99 |
GLIB_TESTS |
100 |
|
101 |
-PKG_CHECK_MODULES(XML, libxml-2.0) |
102 |
-AC_SUBST(XML_CFLAGS) |
103 |
-AC_SUBST(XML_LIBS) |
104 |
- |
105 |
PKG_CHECK_MODULES(SQLITE, sqlite3) |
106 |
AC_SUBST(SQLITE_CFLAGS) |
107 |
AC_SUBST(SQLITE_LIBS) |
108 |
@@ -141,6 +148,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) |
109 |
|
110 |
if test $with_gnome != no; then |
111 |
AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) |
112 |
+ |
113 |
+ if test $with_libsoup_system != no; then |
114 |
+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) |
115 |
+ fi |
116 |
fi |
117 |
AC_SUBST(HAVE_GNOME) |
118 |
|
119 |
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am |
120 |
index 60920bd..26c5616 100644 |
121 |
--- a/libsoup/Makefile.am |
122 |
+++ b/libsoup/Makefile.am |
123 |
@@ -1,14 +1,19 @@ |
124 |
## Process this file with automake to produce Makefile.in |
125 |
|
126 |
EXTRA_DIST = |
127 |
- |
128 |
+BUILT_SOURCES = |
129 |
include $(GLIB_MAKEFILE) |
130 |
|
131 |
if OS_WIN32 |
132 |
LIBWS2_32 = -lws2_32 |
133 |
endif |
134 |
|
135 |
-AM_CPPFLAGS = \ |
136 |
+AM_CPPFLAGS = |
137 |
+lib_LTLIBRARIES = |
138 |
+CLEANFILES = |
139 |
+ |
140 |
+if BUILD_LIBSOUP |
141 |
+AM_CPPFLAGS += \ |
142 |
-DG_LOG_DOMAIN=\"libsoup\" \ |
143 |
-DLOCALEDIR=\"$(localedir)\" \ |
144 |
-I$(top_srcdir) \ |
145 |
@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \ |
146 |
nodist_libsoupinclude_HEADERS = \ |
147 |
soup-version.h |
148 |
|
149 |
-lib_LTLIBRARIES = libsoup-2.4.la |
150 |
+lib_LTLIBRARIES += libsoup-2.4.la |
151 |
|
152 |
libsoup_2_4_la_LDFLAGS = \ |
153 |
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ |
154 |
@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \ |
155 |
soup-version.c \ |
156 |
soup-xmlrpc.c |
157 |
|
158 |
-# TLD rules |
159 |
-EXTRA_DIST += tld-parser.py |
160 |
- |
161 |
+BUILT_SOURCES += tld_data.inc |
162 |
TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat |
163 |
|
164 |
tld_data.inc: tld-parser.py $(TLD_DATA_FILE) |
165 |
- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc |
166 |
+ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc |
167 |
+ |
168 |
+# TLD rules |
169 |
+EXTRA_DIST += tld-parser.py |
170 |
+ |
171 |
+endif |
172 |
|
173 |
if BUILD_LIBSOUP_GNOME |
174 |
|
175 |
libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup |
176 |
|
177 |
+AM_CPPFLAGS += $(LIBSOUP_CFLAGS) |
178 |
+ |
179 |
libsoupgnomeinclude_HEADERS = \ |
180 |
soup-cookie-jar-sqlite.h\ |
181 |
soup-gnome.h \ |
182 |
@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \ |
183 |
|
184 |
lib_LTLIBRARIES += libsoup-gnome-2.4.la |
185 |
|
186 |
+if BUILD_LIBSOUP |
187 |
+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
188 |
+else |
189 |
libsoup_gnome_2_4_la_LDFLAGS = \ |
190 |
-version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ |
191 |
-no-undefined \ |
192 |
-export-symbols $(srcdir)/libsoup-gnome-2.4.sym |
193 |
+endif |
194 |
|
195 |
EXTRA_DIST += libsoup-gnome-2.4.sym |
196 |
|
197 |
libsoup_gnome_2_4_la_LIBADD = \ |
198 |
- libsoup-2.4.la \ |
199 |
$(GLIB_LIBS) |
200 |
|
201 |
+if BUILD_LIBSOUP |
202 |
+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la |
203 |
+else |
204 |
+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) |
205 |
+endif |
206 |
+ |
207 |
libsoup_gnome_2_4_la_SOURCES = \ |
208 |
soup-cookie-jar-sqlite.c \ |
209 |
soup-gnome-features.c \ |
210 |
@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \ |
211 |
endif |
212 |
|
213 |
GLIB_GENERATED = soup-enum-types.c soup-enum-types.h |
214 |
-BUILT_SOURCES = \ |
215 |
- $(GLIB_GENERATED) \ |
216 |
- tld_data.inc |
217 |
+BUILT_SOURCES += \ |
218 |
+ $(GLIB_GENERATED) |
219 |
|
220 |
soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) |
221 |
soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API" |
222 |
@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. |
223 |
|
224 |
if HAVE_INTROSPECTION |
225 |
|
226 |
+if BUILD_LIBSOUP |
227 |
+ |
228 |
# Core library |
229 |
gi_soup_files = \ |
230 |
$(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\ |
231 |
@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \ |
232 |
|
233 |
INTROSPECTION_GIRS += Soup-2.4.gir |
234 |
|
235 |
+endif |
236 |
+ |
237 |
if BUILD_LIBSOUP_GNOME |
238 |
|
239 |
+if BUILD_LIBSOUP |
240 |
+SOUP_GIR = Soup-2.4.gir |
241 |
+else |
242 |
+SOUP_GIR = |
243 |
+endif |
244 |
+ |
245 |
# GNOME extensions |
246 |
gi_soup_gnome_files = $(filter-out soup-gnome.h,\ |
247 |
$(libsoupgnomeinclude_HEADERS) \ |
248 |
$(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) |
249 |
-SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir |
250 |
+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) |
251 |
+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 |
252 |
SoupGNOME_2_4_gir_SCANNERFLAGS = \ |
253 |
--identifier-prefix=Soup \ |
254 |
--symbol-prefix=soup \ |
255 |
- --c-include "libsoup/soup-gnome.h" \ |
256 |
- --include-uninstalled=$(builddir)/Soup-2.4.gir |
257 |
+ --c-include "libsoup/soup-gnome.h" |
258 |
SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS) |
259 |
-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la |
260 |
+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la |
261 |
SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) |
262 |
SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 |
263 |
|
264 |
@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS) |
265 |
typelibdir = $(libdir)/girepository-1.0 |
266 |
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) |
267 |
|
268 |
-CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES) |
269 |
+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES) |
270 |
|
271 |
endif |
272 |
-- |
273 |
1.9.0 |