diff options
Diffstat (limited to 'net-libs/libsoup-gnome/files')
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch | 242 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch | 259 | ||||
| -rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch (renamed from net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch) | 86 |
3 files changed, 45 insertions, 542 deletions
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch deleted file mode 100644 index 0c6259a..0000000 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.38.0-system-lib.patch +++ /dev/null @@ -1,242 +0,0 @@ -From b39aaca2ec6c551d7646bcb086afb8083492938b Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Tue, 20 Dec 2011 15:42:44 +0200 -Subject: [PATCH] Split support for libsoup-gnome - -Original patch by Romain Perier. ---- - Makefile.am | 12 ++++++++++-- - configure.ac | 47 +++++++++++++++++++++++++++++------------------ - libsoup/Makefile.am | 48 ++++++++++++++++++++++++++++++++++++++---------- - 3 files changed, 77 insertions(+), 30 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8b86fb7..7f628f4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,11 @@ - ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - --SUBDIRS = libsoup tests docs -+SUBDIRS = libsoup -+ -+if BUILD_LIBSOUP -+SUBDIRS += tests docs -+endif - - EXTRA_DIST = \ - libsoup-2.4.pc.in \ -@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection - - pkgconfigdir = $(libdir)/pkgconfig - --pkgconfig_DATA = libsoup-2.4.pc -+pkgconfig_DATA = -+ -+if BUILD_LIBSOUP -+pkgconfig_DATA += libsoup-2.4.pc -+endif - - if BUILD_LIBSOUP_GNOME - pkgconfig_DATA += libsoup-gnome-2.4.pc -diff --git a/configure.ac b/configure.ac -index eee8636..f9d6e47 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -72,19 +72,33 @@ dnl *********************** - dnl *** Checks for glib *** - dnl *********************** - --GLIB_REQUIRED=2.31.7 --AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) --if test "$GLIB_LIBS" = ""; then -- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) -+PKG_PROG_PKG_CONFIG -+AC_ARG_WITH(libsoup-system, -+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), -+ [with_libsoup_system=$withval], [with_libsoup_system=no]) -+if test "$with_libsoup_system" = "no"; then -+ GLIB_REQUIRED=2.31.7 -+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) -+ if test "$GLIB_LIBS" = ""; then -+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) -+ fi -+ GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' -+ AC_SUBST(GLIB_MAKEFILE) -+ -+ PKG_CHECK_MODULES(XML, libxml-2.0) -+ AC_SUBST(XML_CFLAGS) -+ AC_SUBST(XML_LIBS) -+ -+ dnl ******************* -+ dnl *** Misc checks *** -+ dnl ******************* -+ AC_CHECK_FUNCS(gmtime_r) -+ AC_CHECK_FUNCS(mmap) -+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) - fi --GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -- --GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' --AC_SUBST(GLIB_MAKEFILE) - --PKG_CHECK_MODULES(XML, libxml-2.0) --AC_SUBST(XML_CFLAGS) --AC_SUBST(XML_LIBS) -+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) - - dnl *********************** - dnl *** Check for Win32 *** -@@ -103,13 +117,6 @@ esac - AC_MSG_RESULT([$os_win32]) - AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) - --dnl ******************* --dnl *** Misc checks *** --dnl ******************* --AC_CHECK_FUNCS(gmtime_r) --AC_CHECK_FUNCS(mmap) --AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) -- - dnl ********************* - dnl *** GNOME support *** - dnl ********************* -@@ -134,6 +141,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) - if test $with_gnome != no; then - AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) - -+ if test $with_libsoup_system != no; then -+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) -+ fi -+ - PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl - [Could not find sqlite3 devel files: - -diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am -index aa13eec..ef0c870 100644 ---- a/libsoup/Makefile.am -+++ b/libsoup/Makefile.am -@@ -6,15 +6,18 @@ if OS_WIN32 - LIBWS2_32 = -lws2_32 - endif - --INCLUDES = \ -+INCLUDES = -+lib_LTLIBRARIES = -+CLEANFILES = -+ -+if BUILD_LIBSOUP -+INCLUDES += \ - -DG_LOG_DOMAIN=\"libsoup\" \ - -I$(top_srcdir) \ - $(SOUP_DEBUG_FLAGS) \ - $(SOUP_MAINTAINER_FLAGS) \ - $(GLIB_CFLAGS) \ -- $(XML_CFLAGS) \ -- $(SQLITE_CFLAGS) \ -- $(GNOME_KEYRING_CFLAGS) -+ $(XML_CFLAGS) - - libsoupincludedir = $(includedir)/libsoup-2.4/libsoup - -@@ -67,7 +70,7 @@ libsoupinclude_HEADERS = \ - $(soup_headers) \ - soup-enum-types.h - --lib_LTLIBRARIES = libsoup-2.4.la -+lib_LTLIBRARIES += libsoup-2.4.la - - libsoup_2_4_la_LDFLAGS = \ - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES = \ - soup-uri.c \ - soup-value-utils.c \ - soup-xmlrpc.c -+endif - - if BUILD_LIBSOUP_GNOME - -@@ -165,6 +169,10 @@ endif - - libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup - -+INCLUDES += $(LIBSOUP_CFLAGS) \ -+ $(SQLITE_CFLAGS) \ -+ $(GNOME_KEYRING_CFLAGS) -+ - libsoupgnomeinclude_HEADERS = \ - soup-cookie-jar-sqlite.h\ - soup-gnome.h \ -@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS = \ - - lib_LTLIBRARIES += libsoup-gnome-2.4.la - -+if BUILD_LIBSOUP - libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) -+else -+libsoup_gnome_2_4_la_LDFLAGS = \ -+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -+endif - - libsoup_gnome_2_4_la_LIBADD = \ -- libsoup-2.4.la \ - $(GLIB_LIBS) \ - $(SQLITE_LIBS) \ - $(GNOME_KEYRING_LIBS) - -+if BUILD_LIBSOUP -+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la -+else -+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) -+endif -+ - libsoup_gnome_2_4_la_SOURCES = \ - soup-cookie-jar-sqlite.c \ - soup-gnome-features.c \ -@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. - - if HAVE_INTROSPECTION - -+if BUILD_LIBSOUP -+ - # Core library - gi_soup_files = \ - $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\ -@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES = \ - - INTROSPECTION_GIRS += Soup-2.4.gir - -+endif -+ - if BUILD_LIBSOUP_GNOME - -+if BUILD_LIBSOUP -+SOUP_GIR = Soup-2.4.gir -+else -+SOUP_GIR = -+endif -+ - # GNOME extensions - gi_soup_gnome_files = $(filter-out soup-gnome.h,\ - $(libsoupgnomeinclude_HEADERS) \ - $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) --SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir -+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) -+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 - SoupGNOME_2_4_gir_SCANNERFLAGS = \ - --identifier-prefix=Soup \ - --symbol-prefix=soup \ -- --c-include "libsoup/soup-gnome.h" \ -- --include-uninstalled=$(builddir)/Soup-2.4.gir -+ --c-include "libsoup/soup-gnome.h" - SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) --SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la -+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la - SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) - SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 - --- -1.7.8.4 - diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch deleted file mode 100644 index d236e0c..0000000 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.40.2-system-lib.patch +++ /dev/null @@ -1,259 +0,0 @@ -From 41200f48909dbf48fd2c96f305b71797634aca3e Mon Sep 17 00:00:00 2001 -From: Priit Laes <plaes@plaes.org> -Date: Tue, 20 Dec 2011 15:42:44 +0200 -Subject: [PATCH] Split support for libsoup-gnome - -https://bugzilla.gnome.org/show_bug.cgi?id=595065 - -Original patch by Romain Perier. ---- - Makefile.am | 12 ++++++++-- - configure.ac | 35 +++++++++++++++++++---------- - libsoup/Makefile.am | 63 ++++++++++++++++++++++++++++++++++++++--------------- - 3 files changed, 79 insertions(+), 31 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 18bf80a..046f945 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,11 @@ - ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - --SUBDIRS = libsoup po tests docs -+SUBDIRS = libsoup -+ -+if BUILD_LIBSOUP -+SUBDIRS += po tests docs -+endif - - EXTRA_DIST = \ - data/effective_tld_names.dat \ -@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection - - pkgconfigdir = $(libdir)/pkgconfig - --pkgconfig_DATA = libsoup-2.4.pc -+pkgconfig_DATA = -+ -+if BUILD_LIBSOUP -+pkgconfig_DATA += libsoup-2.4.pc -+endif - - if BUILD_LIBSOUP_GNOME - pkgconfig_DATA += libsoup-gnome-2.4.pc -diff --git a/configure.ac b/configure.ac -index 95410de..1f00bdd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,20 +71,27 @@ LT_INIT([win32-dll]) - dnl *********************** - dnl *** Checks for glib *** - dnl *********************** -+PKG_PROG_PKG_CONFIG -+enable_ssl=no -+AC_ARG_WITH(libsoup-system, -+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), -+ [with_libsoup_system=$withval], [with_libsoup_system=no]) -+if test "$with_libsoup_system" = "no"; then -+ GLIB_REQUIRED=2.33.1 -+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) -+ if test "$GLIB_LIBS" = ""; then -+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) -+ fi -+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34" -+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' -+ AC_SUBST(GLIB_MAKEFILE) - --GLIB_REQUIRED=2.33.1 --AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) --if test "$GLIB_LIBS" = ""; then -- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) --fi --GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34" -- --GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' --AC_SUBST(GLIB_MAKEFILE) -+ PKG_CHECK_MODULES(XML, libxml-2.0) -+ AC_SUBST(XML_CFLAGS) -+ AC_SUBST(XML_LIBS) - --PKG_CHECK_MODULES(XML, libxml-2.0) --AC_SUBST(XML_CFLAGS) --AC_SUBST(XML_LIBS) -+fi -+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) - - dnl *********************** - dnl *** Check for Win32 *** -@@ -143,6 +150,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) - if test $with_gnome != no; then - AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) - -+ if test $with_libsoup_system != no; then -+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) -+ fi -+ - PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl - [Could not find sqlite3 devel files: - -diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am -index cc99e75..f9b25fc 100644 ---- a/libsoup/Makefile.am -+++ b/libsoup/Makefile.am -@@ -1,23 +1,26 @@ - ## Process this file with automake to produce Makefile.in - - EXTRA_DIST = -- -+BUILT_SOURCES = - include $(GLIB_MAKEFILE) - - if OS_WIN32 - LIBWS2_32 = -lws2_32 - endif - --INCLUDES = \ -+INCLUDES = -+lib_LTLIBRARIES = -+CLEANFILES = -+ -+if BUILD_LIBSOUP -+INCLUDES += \ - -DG_LOG_DOMAIN=\"libsoup\" \ - -DLOCALEDIR=\"$(localedir)\" \ - -I$(top_srcdir) \ - $(SOUP_DEBUG_FLAGS) \ - $(SOUP_MAINTAINER_FLAGS) \ - $(GLIB_CFLAGS) \ -- $(XML_CFLAGS) \ -- $(SQLITE_CFLAGS) \ -- $(GNOME_KEYRING_CFLAGS) -+ $(XML_CFLAGS) - - libsoupincludedir = $(includedir)/libsoup-2.4/libsoup - -@@ -72,7 +75,7 @@ libsoupinclude_HEADERS = \ - $(soup_headers) \ - soup-enum-types.h - --lib_LTLIBRARIES = libsoup-2.4.la -+lib_LTLIBRARIES += libsoup-2.4.la - - libsoup_2_4_la_LDFLAGS = \ - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -@@ -173,14 +176,17 @@ libsoup_2_4_la_SOURCES = \ - soup-value-utils.c \ - soup-xmlrpc.c - --# TLD rules --EXTRA_DIST += tld-parser.py -- -+BUILT_SOURCES = tld_data.inc - TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat - - tld_data.inc: tld-parser.py $(TLD_DATA_FILE) - $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc - -+# TLD rules -+EXTRA_DIST += tld-parser.py -+ -+endif -+ - if BUILD_LIBSOUP_GNOME - - if OS_WIN32 -@@ -193,6 +199,10 @@ endif - - libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup - -+INCLUDES += $(LIBSOUP_CFLAGS) \ -+ $(SQLITE_CFLAGS) \ -+ $(GNOME_KEYRING_CFLAGS) -+ - libsoupgnomeinclude_HEADERS = \ - soup-cookie-jar-sqlite.h\ - soup-gnome.h \ -@@ -200,14 +210,24 @@ libsoupgnomeinclude_HEADERS = \ - - lib_LTLIBRARIES += libsoup-gnome-2.4.la - -+if BUILD_LIBSOUP - libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) -+else -+libsoup_gnome_2_4_la_LDFLAGS = \ -+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -+endif - - libsoup_gnome_2_4_la_LIBADD = \ -- libsoup-2.4.la \ - $(GLIB_LIBS) \ - $(SQLITE_LIBS) \ - $(GNOME_KEYRING_LIBS) - -+if BUILD_LIBSOUP -+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la -+else -+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) -+endif -+ - libsoup_gnome_2_4_la_SOURCES = \ - soup-cookie-jar-sqlite.c \ - soup-gnome-features.c \ -@@ -219,9 +239,8 @@ endif - - GLIB_GENERATED = soup-marshal.c soup-marshal.h - GLIB_GENERATED += soup-enum-types.c soup-enum-types.h --BUILT_SOURCES = \ -- $(GLIB_GENERATED) \ -- tld_data.inc -+BUILT_SOURCES += \ -+ $(GLIB_GENERATED) - - soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES) - soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) -@@ -237,6 +256,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. - - if HAVE_INTROSPECTION - -+if BUILD_LIBSOUP -+ - # Core library - gi_soup_files = \ - $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\ -@@ -258,20 +279,28 @@ Soup_2_4_gir_FILES = \ - - INTROSPECTION_GIRS += Soup-2.4.gir - -+endif -+ - if BUILD_LIBSOUP_GNOME - -+if BUILD_LIBSOUP -+SOUP_GIR = Soup-2.4.gir -+else -+SOUP_GIR = -+endif -+ - # GNOME extensions - gi_soup_gnome_files = $(filter-out soup-gnome.h,\ - $(libsoupgnomeinclude_HEADERS) \ - $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) --SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir -+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) -+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 - SoupGNOME_2_4_gir_SCANNERFLAGS = \ - --identifier-prefix=Soup \ - --symbol-prefix=soup \ -- --c-include "libsoup/soup-gnome.h" \ -- --include-uninstalled=$(builddir)/Soup-2.4.gir -+ --c-include "libsoup/soup-gnome.h" - SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) --SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la -+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la - SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) - SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 - --- -1.7.12 - diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch index 383cfe4..15f7724 100644 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-2.42.2-system-lib.patch +++ b/net-libs/libsoup-gnome/files/libsoup-gnome-2.46.0-system-lib.patch @@ -1,4 +1,4 @@ -From 722a7d3935c5b3ec5c28e337247471821ede7c59 Mon Sep 17 00:00:00 2001 +From 63db817bac0382f3f43947b8233bf4585ede0e0b Mon Sep 17 00:00:00 2001 From: Priit Laes <plaes@plaes.org> Date: Tue, 20 Dec 2011 15:42:44 +0200 Subject: [PATCH] Split support for libsoup-gnome @@ -8,12 +8,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=595065 Original patch by Romain Perier. --- Makefile.am | 12 +++++++++-- - configure.ac | 34 +++++++++++++++++++----------- + configure.ac | 35 ++++++++++++++++++++----------- libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++-------------- - 3 files changed, 76 insertions(+), 30 deletions(-) + 3 files changed, 77 insertions(+), 30 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 66992d9..046f945 100644 +index c8fa95c..fc09778 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ @@ -29,7 +29,7 @@ index 66992d9..046f945 100644 EXTRA_DIST = \ data/effective_tld_names.dat \ -@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection +@@ -18,7 +22,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection pkgconfigdir = $(libdir)/pkgconfig @@ -43,10 +43,10 @@ index 66992d9..046f945 100644 if BUILD_LIBSOUP_GNOME pkgconfig_DATA += libsoup-gnome-2.4.pc diff --git a/configure.ac b/configure.ac -index 013deae..1c606df 100644 +index 96bb378..0153f10 100644 --- a/configure.ac +++ b/configure.ac -@@ -76,20 +76,26 @@ LT_INIT([win32-dll]) +@@ -77,23 +77,30 @@ LT_INIT([win32-dll]) dnl *********************** dnl *** Checks for glib *** dnl *********************** @@ -56,36 +56,40 @@ index 013deae..1c606df 100644 + AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), + [with_libsoup_system=$withval], [with_libsoup_system=no]) +if test "$with_libsoup_system" = "no"; then -+ GLIB_REQUIRED=2.36.0 ++ GLIB_REQUIRED=2.38.0 + AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) + if test "$GLIB_LIBS" = ""; then -+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) ++ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) + fi -+ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36" -+ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' -+ AC_SUBST(GLIB_MAKEFILE) ++ GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38" --GLIB_REQUIRED=2.36.0 +-GLIB_REQUIRED=2.38.0 -AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) -if test "$GLIB_LIBS" = ""; then - AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) +-fi +-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38" ++ GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' ++ AC_SUBST(GLIB_MAKEFILE) + +-GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' +-AC_SUBST(GLIB_MAKEFILE) + PKG_CHECK_MODULES(XML, libxml-2.0) + AC_SUBST(XML_CFLAGS) + AC_SUBST(XML_LIBS) - fi --GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36" -- --GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' --AC_SUBST(GLIB_MAKEFILE) -- ++fi ++AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) + + GLIB_TESTS + -PKG_CHECK_MODULES(XML, libxml-2.0) -AC_SUBST(XML_CFLAGS) -AC_SUBST(XML_LIBS) -+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) - +- PKG_CHECK_MODULES(SQLITE, sqlite3) AC_SUBST(SQLITE_CFLAGS) -@@ -138,6 +144,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) + AC_SUBST(SQLITE_LIBS) +@@ -141,6 +148,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) if test $with_gnome != no; then AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) @@ -97,7 +101,7 @@ index 013deae..1c606df 100644 AC_SUBST(HAVE_GNOME) diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am -index 508bf9c..dc3c5f2 100644 +index 60920bd..26c5616 100644 --- a/libsoup/Makefile.am +++ b/libsoup/Makefile.am @@ -1,14 +1,19 @@ @@ -112,17 +116,17 @@ index 508bf9c..dc3c5f2 100644 LIBWS2_32 = -lws2_32 endif --INCLUDES = \ -+INCLUDES = +-AM_CPPFLAGS = \ ++AM_CPPFLAGS = +lib_LTLIBRARIES = +CLEANFILES = + +if BUILD_LIBSOUP -+INCLUDES += \ ++AM_CPPFLAGS += \ -DG_LOG_DOMAIN=\"libsoup\" \ -DLOCALEDIR=\"$(localedir)\" \ - -DSOUP_COMPILATION \ -@@ -77,7 +82,7 @@ libsoupinclude_HEADERS = \ + -I$(top_srcdir) \ +@@ -76,7 +81,7 @@ libsoupinclude_HEADERS = \ nodist_libsoupinclude_HEADERS = \ soup-version.h @@ -131,7 +135,7 @@ index 508bf9c..dc3c5f2 100644 libsoup_2_4_la_LDFLAGS = \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ -@@ -187,18 +192,23 @@ libsoup_2_4_la_SOURCES = \ +@@ -184,18 +189,23 @@ libsoup_2_4_la_SOURCES = \ soup-version.c \ soup-xmlrpc.c @@ -154,12 +158,12 @@ index 508bf9c..dc3c5f2 100644 libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup -+INCLUDES += $(LIBSOUP_CFLAGS) ++AM_CPPFLAGS += $(LIBSOUP_CFLAGS) + libsoupgnomeinclude_HEADERS = \ soup-cookie-jar-sqlite.h\ soup-gnome.h \ -@@ -206,17 +216,26 @@ libsoupgnomeinclude_HEADERS = \ +@@ -203,17 +213,26 @@ libsoupgnomeinclude_HEADERS = \ lib_LTLIBRARIES += libsoup-gnome-2.4.la @@ -187,19 +191,19 @@ index 508bf9c..dc3c5f2 100644 libsoup_gnome_2_4_la_SOURCES = \ soup-cookie-jar-sqlite.c \ soup-gnome-features.c \ -@@ -229,9 +248,8 @@ endif +@@ -225,9 +244,8 @@ libsoup_gnome_2_4_la_SOURCES = \ + endif - GLIB_GENERATED = soup-marshal.c soup-marshal.h - GLIB_GENERATED += soup-enum-types.c soup-enum-types.h + GLIB_GENERATED = soup-enum-types.c soup-enum-types.h -BUILT_SOURCES = \ - $(GLIB_GENERATED) \ - tld_data.inc +BUILT_SOURCES += \ + $(GLIB_GENERATED) - soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES) soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) -@@ -247,6 +265,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. + soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API" +@@ -242,6 +260,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. if HAVE_INTROSPECTION @@ -207,8 +211,8 @@ index 508bf9c..dc3c5f2 100644 + # Core library gi_soup_files = \ - $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\ -@@ -268,20 +288,28 @@ Soup_2_4_gir_FILES = \ + $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\ +@@ -263,20 +283,28 @@ Soup_2_4_gir_FILES = \ INTROSPECTION_GIRS += Soup-2.4.gir @@ -235,13 +239,13 @@ index 508bf9c..dc3c5f2 100644 - --c-include "libsoup/soup-gnome.h" \ - --include-uninstalled=$(builddir)/Soup-2.4.gir + --c-include "libsoup/soup-gnome.h" - SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) + SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS) -SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la +SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 -@@ -295,6 +323,6 @@ gir_DATA = $(INTROSPECTION_GIRS) +@@ -290,6 +318,6 @@ gir_DATA = $(INTROSPECTION_GIRS) typelibdir = $(libdir)/girepository-1.0 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) @@ -250,5 +254,5 @@ index 508bf9c..dc3c5f2 100644 endif -- -1.8.3.2 +1.9.0 |