Bumping libsoup version we are fixing a few deprecated warnings in our tests (SOUP_TYPE_PROXY_RESOLVER_GNOME -> SOUP_TYPE_PROXY_RESOLVER_DEFAULT) and as a side effect we don't need libsoup-gnome anymore. --- configure.ac | 3 +-- test/Makefile.am | 2 -- test/test-mediauris.c | 6 +----- test/test-treeuris.c | 6 +----- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 3fefdba..51aa5f5 100644 --- a/configure.ac +++ b/configure.ac @@ -39,8 +39,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) PKG_CHECK_MODULES([GOBJECT], [gobject-2.0]) PKG_CHECK_MODULES([GIO], [gio-2.0]) -PKG_CHECK_MODULES([SOUP], [libsoup-2.4]) -PKG_CHECK_MODULES([SOUP_GNOME], [libsoup-gnome-2.4]) +PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.41]) PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= 2.6.0]) PKG_CHECK_MODULES([LIBXSLT], [libxslt >= 1.0.0]) diff --git a/test/Makefile.am b/test/Makefile.am index 5c05162..ef63154 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -25,7 +25,6 @@ COMMON_LDADD = \ $(COVERAGE_LDFLAGS) \ $(GOBJECT_LIBS) \ $(SOUP_LIBS) \ - $(SOUP_GNOME_LIBS) \ $(CHECK_LIBS) \ ../osinfo/libosinfo-1.0.la COMMON_CFLAGS = \ @@ -33,7 +32,6 @@ COMMON_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(GOBJECT_CFLAGS) \ $(SOUP_CFLAGS) \ - $(SOUP_GNOME_CFLAGS) \ -I$(top_srcdir) \ -DSRCDIR="\"$(abs_top_srcdir)\"" \ -DBUILDDIR="\"$(abs_top_builddir)\"" \ diff --git a/test/test-mediauris.c b/test/test-mediauris.c index 191e8c6..8c3514d 100644 --- a/test/test-mediauris.c +++ b/test/test-mediauris.c @@ -26,8 +26,6 @@ #include <osinfo/osinfo.h> #include <check.h> #include <libsoup/soup.h> -#define HAVE_LIBSOUP_GNOME -#include <libsoup/soup-gnome.h> static void test_media(OsinfoMediaList *medialist, GError **error, SoupSession *session) { @@ -69,10 +67,8 @@ START_TEST(test_uris) gchar *debugstr; session = soup_session_async_new_with_options( -#ifdef HAVE_LIBSOUP_GNOME SOUP_SESSION_ADD_FEATURE_BY_TYPE, - SOUP_TYPE_PROXY_RESOLVER_GNOME, -#endif + SOUP_TYPE_PROXY_RESOLVER_DEFAULT, NULL); if ((debugstr = getenv("LIBOSINFO_TEST_DEBUG"))) { SoupLogger *logger; diff --git a/test/test-treeuris.c b/test/test-treeuris.c index 07f14bf..84ebc68 100644 --- a/test/test-treeuris.c +++ b/test/test-treeuris.c @@ -26,8 +26,6 @@ #include <osinfo/osinfo.h> #include <check.h> #include <libsoup/soup.h> -#define HAVE_LIBSOUP_GNOME -#include <libsoup/soup-gnome.h> static void test_tree(OsinfoTreeList *treelist, GError **error, SoupSession *session) { @@ -69,10 +67,8 @@ START_TEST(test_uris) gchar *debugstr; session = soup_session_async_new_with_options( -#ifdef HAVE_LIBSOUP_GNOME SOUP_SESSION_ADD_FEATURE_BY_TYPE, - SOUP_TYPE_PROXY_RESOLVER_GNOME, -#endif + SOUP_TYPE_PROXY_RESOLVER_DEFAULT, NULL); if ((debugstr = getenv("LIBOSINFO_TEST_DEBUG"))) { SoupLogger *logger; -- 1.8.1.4 _______________________________________________ Libosinfo mailing list Libosinfo@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libosinfo