[gentoo-commits] gentoo-x86 commit in net-misc/spice-gtk/files: spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch spice-gtk-0.25-missing_gio_libs.patch

[gentoo-commits] gentoo-x86 commit in net-misc/spice-gtk/files: spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch spice-gtk-0.25-missing_gio_libs.patch

[Tiziano Mueller (dev-zero)]

dev-zero    14/06/13 12:24:31

  Added:               
                        spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
                        spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
                        spice-gtk-0.25-missing_gio_libs.patch
  Log:
  Version bump (bug #492778), now depend on qemu[smartcard] for smartcard support (this obsoletes libcacard, see bug #491594), add WebDAV filesharing support via USE=webdav (and net-libs/phodav).
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!)

Revision  Changes    Path
1.1                  net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch?rev=1.1&content-type=text/plain

Index: spice-gtk-0.25-Do-not-depend-on-libsoup-directly.patch
===================================================================
From 1dcf7acb4288a27f125458bfa86cf614437657d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
Date: Tue, 20 May 2014 18:49:28 +0200
Subject: [PATCH 2/2] Do not depend on libsoup directly

The libsoup-dependency is not directly used but comes in as a dependency
of phodav and phodav has libsoup correctly recorded in its pkg-config
file.
---
 configure.ac | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 70ab75c..f47ee20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,9 +267,6 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > 2.0.0)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-PKG_CHECK_MODULES(SOUP, libsoup-2.4)
-AC_SUBST(SOUP_CFLAGS)
-AC_SUBST(SOUP_LIBS)
 AC_ARG_ENABLE([webdav],
   AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
                  [Enable webdav support @<:@default=auto@:>@]),
-- 
1.9.2




1.1                  net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch?rev=1.1&content-type=text/plain

Index: spice-gtk-0.25-Introduce-enable-disable-webdav-option.patch
===================================================================
From f25626a68a2fb83b02ee7a13dd4887d1305bc068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@stepping-stone.ch>
Date: Tue, 20 May 2014 18:48:05 +0200
Subject: [PATCH 1/2] Introduce --enable/disable-webdav option

This makes the phodav dependency configureable.
And name it after the corresponding channel.
---
 configure.ac | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index d89bd6f..70ab75c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,10 +270,23 @@ AC_SUBST(GTHREAD_LIBS)
 PKG_CHECK_MODULES(SOUP, libsoup-2.4)
 AC_SUBST(SOUP_CFLAGS)
 AC_SUBST(SOUP_LIBS)
+AC_ARG_ENABLE([webdav],
+  AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
+                 [Enable webdav support @<:@default=auto@:>@]),
+  [],
+  [enable_webdav="auto"])
+
+if test "x$enable_webdav" = "xno"; then
+  have_phodav="no"
+else
+  PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
+  AC_SUBST(PHODAV_CFLAGS)
+  AC_SUBST(PHODAV_LIBS)
 
-PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
-AC_SUBST(PHODAV_CFLAGS)
-AC_SUBST(PHODAV_LIBS)
+  if test "x$have_phodav" = "xno" && test "x$enable_webdav" = "xyes"; then
+    AC_MSG_ERROR([webdav support explicitly requested, but some required packages are not available])
+  fi
+fi
 AS_IF([test "x$have_phodav" = "xyes"],
        AC_DEFINE(USE_PHODAV, [1], [Define if supporting phodav]))
 
@@ -754,7 +767,7 @@ AC_MSG_NOTICE([
         Smartcard support:        ${have_smartcard}
         USB redirection support:  ${have_usbredir} ${with_usbredir_hotplug}
         DBus:                     ${have_dbus}
-        PhoDAV:                   ${have_phodav}
+        WebDAV support:           ${have_phodav}
 
         Now type 'make' to build $PACKAGE
 
-- 
1.9.2




1.1                  net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/spice-gtk/files/spice-gtk-0.25-missing_gio_libs.patch?rev=1.1&content-type=text/plain

Index: spice-gtk-0.25-missing_gio_libs.patch
===================================================================
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8da1a11..6332db9 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -189,6 +189,7 @@ libspice_client_glib_2_0_la_LIBADD =					\
 	$(top_builddir)/spice-common/common/libspice-common-client.la	\
 	$(GLIB2_LIBS)							\
 	$(SOUP_LIBS)							\
+	$(GIO_LIBS)								\
 	$(GOBJECT2_LIBS)						\
 	$(CELT051_LIBS)							\
 	$(OPUS_LIBS)							\