Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libsoup-gnome/files/
Date: Sun, 03 Jul 2016 13:29:44
Message-Id: 1467552564.ea33315e484f4236cb2e408fac8c4a0a2c369171.mgorny@gentoo
1 commit: ea33315e484f4236cb2e408fac8c4a0a2c369171
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 12:35:36 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 13:29:24 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea33315e
7
8 net-libs/libsoup-gnome: Drop obsolete patches
9
10 .../files/libsoup-gnome-2.44.2-system-lib.patch | 254 --------------------
11 .../files/libsoup-gnome-2.46.0-system-lib.patch | 258 ---------------------
12 2 files changed, 512 deletions(-)
13
14 diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
15 deleted file mode 100644
16 index 9c7a94a..0000000
17 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.44.2-system-lib.patch
18 +++ /dev/null
19 @@ -1,254 +0,0 @@
20 -From f8711d536d9605d3d9c773ccbba039a7828e026a Mon Sep 17 00:00:00 2001
21 -From: Priit Laes <plaes@×××××.org>
22 -Date: Tue, 20 Dec 2011 15:42:44 +0200
23 -Subject: [PATCH] Split support for libsoup-gnome
24 -
25 -https://bugzilla.gnome.org/show_bug.cgi?id=595065
26 -
27 -Original patch by Romain Perier.
28 ----
29 - Makefile.am | 12 +++++++++--
30 - configure.ac | 34 +++++++++++++++++++-----------
31 - libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
32 - 3 files changed, 76 insertions(+), 30 deletions(-)
33 -
34 -diff --git a/Makefile.am b/Makefile.am
35 -index 66992d9..046f945 100644
36 ---- a/Makefile.am
37 -+++ b/Makefile.am
38 -@@ -1,7 +1,11 @@
39 - ## Process this file with automake to produce Makefile.in
40 - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
41 -
42 --SUBDIRS = libsoup po tests examples docs
43 -+SUBDIRS = libsoup
44 -+
45 -+if BUILD_LIBSOUP
46 -+SUBDIRS += po tests docs
47 -+endif
48 -
49 - EXTRA_DIST = \
50 - data/effective_tld_names.dat \
51 -@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
52 -
53 - pkgconfigdir = $(libdir)/pkgconfig
54 -
55 --pkgconfig_DATA = libsoup-2.4.pc
56 -+pkgconfig_DATA =
57 -+
58 -+if BUILD_LIBSOUP
59 -+pkgconfig_DATA += libsoup-2.4.pc
60 -+endif
61 -
62 - if BUILD_LIBSOUP_GNOME
63 - pkgconfig_DATA += libsoup-gnome-2.4.pc
64 -diff --git a/configure.ac b/configure.ac
65 -index 4db8cd2..c1b17f4 100644
66 ---- a/configure.ac
67 -+++ b/configure.ac
68 -@@ -77,20 +77,26 @@ LT_INIT([win32-dll])
69 - dnl ***********************
70 - dnl *** Checks for glib ***
71 - dnl ***********************
72 -+PKG_PROG_PKG_CONFIG
73 -+enable_ssl=no
74 -+AC_ARG_WITH(libsoup-system,
75 -+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
76 -+ [with_libsoup_system=$withval], [with_libsoup_system=no])
77 -+if test "$with_libsoup_system" = "no"; then
78 -+ GLIB_REQUIRED=2.36.0
79 -+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
80 -+ if test "$GLIB_LIBS" = ""; then
81 -+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
82 -+ fi
83 -+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
84 -+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
85 -+ AC_SUBST(GLIB_MAKEFILE)
86 -
87 --GLIB_REQUIRED=2.36.0
88 --AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
89 --if test "$GLIB_LIBS" = ""; then
90 -- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
91 -+ PKG_CHECK_MODULES(XML, libxml-2.0)
92 -+ AC_SUBST(XML_CFLAGS)
93 -+ AC_SUBST(XML_LIBS)
94 - fi
95 --GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
96 --
97 --GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
98 --AC_SUBST(GLIB_MAKEFILE)
99 --
100 --PKG_CHECK_MODULES(XML, libxml-2.0)
101 --AC_SUBST(XML_CFLAGS)
102 --AC_SUBST(XML_LIBS)
103 -+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
104 -
105 - PKG_CHECK_MODULES(SQLITE, sqlite3)
106 - AC_SUBST(SQLITE_CFLAGS)
107 -@@ -139,6 +145,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
108 -
109 - if test $with_gnome != no; then
110 - AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
111 -+
112 -+ if test $with_libsoup_system != no; then
113 -+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
114 -+ fi
115 - fi
116 - AC_SUBST(HAVE_GNOME)
117 -
118 -diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
119 -index 60920bd..26c5616 100644
120 ---- a/libsoup/Makefile.am
121 -+++ b/libsoup/Makefile.am
122 -@@ -1,14 +1,19 @@
123 - ## Process this file with automake to produce Makefile.in
124 -
125 - EXTRA_DIST =
126 --
127 -+BUILT_SOURCES =
128 - include $(GLIB_MAKEFILE)
129 -
130 - if OS_WIN32
131 - LIBWS2_32 = -lws2_32
132 - endif
133 -
134 --AM_CPPFLAGS = \
135 -+AM_CPPFLAGS =
136 -+lib_LTLIBRARIES =
137 -+CLEANFILES =
138 -+
139 -+if BUILD_LIBSOUP
140 -+AM_CPPFLAGS += \
141 - -DG_LOG_DOMAIN=\"libsoup\" \
142 - -DLOCALEDIR=\"$(localedir)\" \
143 - -I$(top_srcdir) \
144 -@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
145 - nodist_libsoupinclude_HEADERS = \
146 - soup-version.h
147 -
148 --lib_LTLIBRARIES = libsoup-2.4.la
149 -+lib_LTLIBRARIES += libsoup-2.4.la
150 -
151 - libsoup_2_4_la_LDFLAGS = \
152 - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
153 -@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
154 - soup-version.c \
155 - soup-xmlrpc.c
156 -
157 --# TLD rules
158 --EXTRA_DIST += tld-parser.py
159 --
160 -+BUILT_SOURCES += tld_data.inc
161 - TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
162 -
163 - tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
164 -- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
165 -+ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
166 -+
167 -+# TLD rules
168 -+EXTRA_DIST += tld-parser.py
169 -+
170 -+endif
171 -
172 - if BUILD_LIBSOUP_GNOME
173 -
174 - libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
175 -
176 -+AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
177 -+
178 - libsoupgnomeinclude_HEADERS = \
179 - soup-cookie-jar-sqlite.h\
180 - soup-gnome.h \
181 -@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
182 -
183 - lib_LTLIBRARIES += libsoup-gnome-2.4.la
184 -
185 -+if BUILD_LIBSOUP
186 -+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
187 -+else
188 - libsoup_gnome_2_4_la_LDFLAGS = \
189 - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
190 - -no-undefined \
191 - -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
192 -+endif
193 -
194 - EXTRA_DIST += libsoup-gnome-2.4.sym
195 -
196 - libsoup_gnome_2_4_la_LIBADD = \
197 -- libsoup-2.4.la \
198 - $(GLIB_LIBS)
199 -
200 -+if BUILD_LIBSOUP
201 -+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
202 -+else
203 -+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
204 -+endif
205 -+
206 - libsoup_gnome_2_4_la_SOURCES = \
207 - soup-cookie-jar-sqlite.c \
208 - soup-gnome-features.c \
209 -@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
210 - endif
211 -
212 - GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
213 --BUILT_SOURCES = \
214 -- $(GLIB_GENERATED) \
215 -- tld_data.inc
216 -+BUILT_SOURCES += \
217 -+ $(GLIB_GENERATED)
218 -
219 - soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
220 - soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
221 -@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
222 -
223 - if HAVE_INTROSPECTION
224 -
225 -+if BUILD_LIBSOUP
226 -+
227 - # Core library
228 - gi_soup_files = \
229 - $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
230 -@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
231 -
232 - INTROSPECTION_GIRS += Soup-2.4.gir
233 -
234 -+endif
235 -+
236 - if BUILD_LIBSOUP_GNOME
237 -
238 -+if BUILD_LIBSOUP
239 -+SOUP_GIR = Soup-2.4.gir
240 -+else
241 -+SOUP_GIR =
242 -+endif
243 -+
244 - # GNOME extensions
245 - gi_soup_gnome_files = $(filter-out soup-gnome.h,\
246 - $(libsoupgnomeinclude_HEADERS) \
247 - $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
248 --SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
249 -+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
250 -+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
251 - SoupGNOME_2_4_gir_SCANNERFLAGS = \
252 - --identifier-prefix=Soup \
253 - --symbol-prefix=soup \
254 -- --c-include "libsoup/soup-gnome.h" \
255 -- --include-uninstalled=$(builddir)/Soup-2.4.gir
256 -+ --c-include "libsoup/soup-gnome.h"
257 - SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
258 --SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
259 -+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
260 - SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
261 - SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
262 -
263 -@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
264 - typelibdir = $(libdir)/girepository-1.0
265 - typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
266 -
267 --CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
268 -+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
269 -
270 - endif
271 ---
272 -1.8.3.2
273 -
274
275 diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
276 deleted file mode 100644
277 index 15f7724..0000000
278 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch
279 +++ /dev/null
280 @@ -1,258 +0,0 @@
281 -From 63db817bac0382f3f43947b8233bf4585ede0e0b Mon Sep 17 00:00:00 2001
282 -From: Priit Laes <plaes@×××××.org>
283 -Date: Tue, 20 Dec 2011 15:42:44 +0200
284 -Subject: [PATCH] Split support for libsoup-gnome
285 -
286 -https://bugzilla.gnome.org/show_bug.cgi?id=595065
287 -
288 -Original patch by Romain Perier.
289 ----
290 - Makefile.am | 12 +++++++++--
291 - configure.ac | 35 ++++++++++++++++++++-----------
292 - libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++--------------
293 - 3 files changed, 77 insertions(+), 30 deletions(-)
294 -
295 -diff --git a/Makefile.am b/Makefile.am
296 -index c8fa95c..fc09778 100644
297 ---- a/Makefile.am
298 -+++ b/Makefile.am
299 -@@ -1,7 +1,11 @@
300 - ## Process this file with automake to produce Makefile.in
301 - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
302 -
303 --SUBDIRS = libsoup po tests examples docs
304 -+SUBDIRS = libsoup
305 -+
306 -+if BUILD_LIBSOUP
307 -+SUBDIRS += po tests docs
308 -+endif
309 -
310 - EXTRA_DIST = \
311 - data/effective_tld_names.dat \
312 -@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection
313 -
314 - pkgconfigdir = $(libdir)/pkgconfig
315 -
316 --pkgconfig_DATA = libsoup-2.4.pc
317 -+pkgconfig_DATA =
318 -+
319 -+if BUILD_LIBSOUP
320 -+pkgconfig_DATA += libsoup-2.4.pc
321 -+endif
322 -
323 - if BUILD_LIBSOUP_GNOME
324 - pkgconfig_DATA += libsoup-gnome-2.4.pc
325 -diff --git a/configure.ac b/configure.ac
326 -index 96bb378..0153f10 100644
327 ---- a/configure.ac
328 -+++ b/configure.ac
329 -@@ -77,23 +77,30 @@ LT_INIT([win32-dll])
330 - dnl ***********************
331 - dnl *** Checks for glib ***
332 - dnl ***********************
333 -+PKG_PROG_PKG_CONFIG
334 -+enable_ssl=no
335 -+AC_ARG_WITH(libsoup-system,
336 -+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]),
337 -+ [with_libsoup_system=$withval], [with_libsoup_system=no])
338 -+if test "$with_libsoup_system" = "no"; then
339 -+ GLIB_REQUIRED=2.38.0
340 -+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
341 -+ if test "$GLIB_LIBS" = ""; then
342 -+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
343 -+ fi
344 -+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
345 -
346 --GLIB_REQUIRED=2.38.0
347 --AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
348 --if test "$GLIB_LIBS" = ""; then
349 -- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
350 --fi
351 --GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
352 -+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
353 -+ AC_SUBST(GLIB_MAKEFILE)
354 -
355 --GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
356 --AC_SUBST(GLIB_MAKEFILE)
357 -+ PKG_CHECK_MODULES(XML, libxml-2.0)
358 -+ AC_SUBST(XML_CFLAGS)
359 -+ AC_SUBST(XML_LIBS)
360 -+fi
361 -+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no)
362 -
363 - GLIB_TESTS
364 -
365 --PKG_CHECK_MODULES(XML, libxml-2.0)
366 --AC_SUBST(XML_CFLAGS)
367 --AC_SUBST(XML_LIBS)
368 --
369 - PKG_CHECK_MODULES(SQLITE, sqlite3)
370 - AC_SUBST(SQLITE_CFLAGS)
371 - AC_SUBST(SQLITE_LIBS)
372 -@@ -141,6 +148,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no)
373 -
374 - if test $with_gnome != no; then
375 - AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
376 -+
377 -+ if test $with_libsoup_system != no; then
378 -+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION)
379 -+ fi
380 - fi
381 - AC_SUBST(HAVE_GNOME)
382 -
383 -diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
384 -index 60920bd..26c5616 100644
385 ---- a/libsoup/Makefile.am
386 -+++ b/libsoup/Makefile.am
387 -@@ -1,14 +1,19 @@
388 - ## Process this file with automake to produce Makefile.in
389 -
390 - EXTRA_DIST =
391 --
392 -+BUILT_SOURCES =
393 - include $(GLIB_MAKEFILE)
394 -
395 - if OS_WIN32
396 - LIBWS2_32 = -lws2_32
397 - endif
398 -
399 --AM_CPPFLAGS = \
400 -+AM_CPPFLAGS =
401 -+lib_LTLIBRARIES =
402 -+CLEANFILES =
403 -+
404 -+if BUILD_LIBSOUP
405 -+AM_CPPFLAGS += \
406 - -DG_LOG_DOMAIN=\"libsoup\" \
407 - -DLOCALEDIR=\"$(localedir)\" \
408 - -I$(top_srcdir) \
409 -@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \
410 - nodist_libsoupinclude_HEADERS = \
411 - soup-version.h
412 -
413 --lib_LTLIBRARIES = libsoup-2.4.la
414 -+lib_LTLIBRARIES += libsoup-2.4.la
415 -
416 - libsoup_2_4_la_LDFLAGS = \
417 - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
418 -@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \
419 - soup-version.c \
420 - soup-xmlrpc.c
421 -
422 --# TLD rules
423 --EXTRA_DIST += tld-parser.py
424 --
425 -+BUILT_SOURCES += tld_data.inc
426 - TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat
427 -
428 - tld_data.inc: tld-parser.py $(TLD_DATA_FILE)
429 -- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
430 -+ $(AM_V_GEN) python $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc
431 -+
432 -+# TLD rules
433 -+EXTRA_DIST += tld-parser.py
434 -+
435 -+endif
436 -
437 - if BUILD_LIBSOUP_GNOME
438 -
439 - libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
440 -
441 -+AM_CPPFLAGS += $(LIBSOUP_CFLAGS)
442 -+
443 - libsoupgnomeinclude_HEADERS = \
444 - soup-cookie-jar-sqlite.h\
445 - soup-gnome.h \
446 -@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \
447 -
448 - lib_LTLIBRARIES += libsoup-gnome-2.4.la
449 -
450 -+if BUILD_LIBSOUP
451 -+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
452 -+else
453 - libsoup_gnome_2_4_la_LDFLAGS = \
454 - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \
455 - -no-undefined \
456 - -export-symbols $(srcdir)/libsoup-gnome-2.4.sym
457 -+endif
458 -
459 - EXTRA_DIST += libsoup-gnome-2.4.sym
460 -
461 - libsoup_gnome_2_4_la_LIBADD = \
462 -- libsoup-2.4.la \
463 - $(GLIB_LIBS)
464 -
465 -+if BUILD_LIBSOUP
466 -+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la
467 -+else
468 -+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS)
469 -+endif
470 -+
471 - libsoup_gnome_2_4_la_SOURCES = \
472 - soup-cookie-jar-sqlite.c \
473 - soup-gnome-features.c \
474 -@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \
475 - endif
476 -
477 - GLIB_GENERATED = soup-enum-types.c soup-enum-types.h
478 --BUILT_SOURCES = \
479 -- $(GLIB_GENERATED) \
480 -- tld_data.inc
481 -+BUILT_SOURCES += \
482 -+ $(GLIB_GENERATED)
483 -
484 - soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
485 - soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
486 -@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=.
487 -
488 - if HAVE_INTROSPECTION
489 -
490 -+if BUILD_LIBSOUP
491 -+
492 - # Core library
493 - gi_soup_files = \
494 - $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\
495 -@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \
496 -
497 - INTROSPECTION_GIRS += Soup-2.4.gir
498 -
499 -+endif
500 -+
501 - if BUILD_LIBSOUP_GNOME
502 -
503 -+if BUILD_LIBSOUP
504 -+SOUP_GIR = Soup-2.4.gir
505 -+else
506 -+SOUP_GIR =
507 -+endif
508 -+
509 - # GNOME extensions
510 - gi_soup_gnome_files = $(filter-out soup-gnome.h,\
511 - $(libsoupgnomeinclude_HEADERS) \
512 - $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
513 --SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
514 -+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR)
515 -+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
516 - SoupGNOME_2_4_gir_SCANNERFLAGS = \
517 - --identifier-prefix=Soup \
518 - --symbol-prefix=soup \
519 -- --c-include "libsoup/soup-gnome.h" \
520 -- --include-uninstalled=$(builddir)/Soup-2.4.gir
521 -+ --c-include "libsoup/soup-gnome.h"
522 - SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS)
523 --SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
524 -+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
525 - SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
526 - SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
527 -
528 -@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
529 - typelibdir = $(libdir)/girepository-1.0
530 - typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
531 -
532 --CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
533 -+CLEANFILES += $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES)
534 -
535 - endif
536 ---
537 -1.9.0
538 -