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