packages: spice-gtk/spice-gtk-builddir.patch, spice-gtk/spice-gtk-usbredir....

qboosh qboosh at pld-linux.org
Sat Feb 4 15:01:11 CET 2012 

Author: qboosh                       Date: Sat Feb  4 14:01:11 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 0.9
- updated builddir,usbredir patches (the first one now only changes python module extension)

---- Files affected:
packages/spice-gtk:
   spice-gtk-builddir.patch (1.1 -> 1.2) , spice-gtk-usbredir.patch (1.1 -> 1.2) , spice-gtk.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/spice-gtk/spice-gtk-builddir.patch
diff -u packages/spice-gtk/spice-gtk-builddir.patch:1.1 packages/spice-gtk/spice-gtk-builddir.patch:1.2
--- packages/spice-gtk/spice-gtk-builddir.patch:1.1	Fri Jan  6 11:22:59 2012
+++ packages/spice-gtk/spice-gtk-builddir.patch	Sat Feb  4 15:01:05 2012
@@ -1,15 +1,11 @@
---- spice-gtk-0.7.159/gtk/Makefile.am.orig	2011-12-22 13:48:49.000000000 +0100
-+++ spice-gtk-0.7.159/gtk/Makefile.am	2012-01-06 08:06:44.283333606 +0100
-@@ -563,10 +563,10 @@
+--- spice-gtk-0.9/gtk/Makefile.am.orig	2012-01-31 14:31:38.000000000 +0100
++++ spice-gtk-0.9/gtk/Makefile.am	2012-02-04 08:30:40.437278387 +0100
+@@ -549,7 +549,7 @@
  DEFSDIR = `pkg-config --variable=defsdir pygtk-2.0`
  
  spice-client-gtk.defs: $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS)
--	$(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.py -f spice-client-gtk-manual.defs $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) > $@
-+	$(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.pyc -f $(srcdir)/spice-client-gtk-manual.defs $$(for f in $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) ; do if test -f $$f ; then echo $$f ; else echo $(srcdir)/$$f ; fi ; done) > $@
+-	$(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.py \
++	$(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.pyc \
+ 		-f $(srcdir)/spice-client-gtk-manual.defs \
+ 		$^ > $@
  
- spice-client-gtk-module.defs.c: spice-client-gtk.override spice-client-gtk.defs spice-client-gtk-manual.defs
--	@cat $(srcdir)/spice-client-gtk.defs $(srcdir)/spice-client-gtk-manual.defs > tmp.defs
-+	@cat spice-client-gtk.defs $(srcdir)/spice-client-gtk-manual.defs > tmp.defs
- 	$(AM_V_GEN)pygobject-codegen-2.0 --prefix spice \
- 			  --register $(DEFSDIR)/gdk-types.defs \
- 			  --register $(DEFSDIR)/gtk-types.defs \

================================================================
Index: packages/spice-gtk/spice-gtk-usbredir.patch
diff -u packages/spice-gtk/spice-gtk-usbredir.patch:1.1 packages/spice-gtk/spice-gtk-usbredir.patch:1.2
--- packages/spice-gtk/spice-gtk-usbredir.patch:1.1	Wed Jan 18 17:38:16 2012
+++ packages/spice-gtk/spice-gtk-usbredir.patch	Sat Feb  4 15:01:05 2012
@@ -1,12 +1,12 @@
 For usbredirfilter_string_to_rules()
---- spice-gtk-0.8/configure.ac.orig	2012-01-18 16:57:54.759116620 +0100
-+++ spice-gtk-0.8/configure.ac	2012-01-18 17:20:01.155827699 +0100
-@@ -330,7 +330,7 @@
+--- spice-gtk-0.9/configure.ac.orig	2012-02-04 08:31:07.000000000 +0100
++++ spice-gtk-0.9/configure.ac	2012-02-04 12:03:50.651039985 +0100
+@@ -344,7 +344,7 @@
+   AM_CONDITIONAL(WITH_USBREDIR, false)
  else
-   PKG_CHECK_MODULES(GUDEV, gudev-1.0)
-   PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.9)
--  PKG_CHECK_MODULES(LIBUSBREDIRHOST, libusbredirhost >= 0.3.3)
-+  PKG_CHECK_MODULES(LIBUSBREDIRHOST, libusbredirhost >= 0.3.3 libusbredirparser >= 0.3.3)
-   AC_DEFINE(USE_USBREDIR, [1], [Define if supporting usbredir proxying])
-   AM_CONDITIONAL(WITH_USBREDIR, true)
-   if test "x$enable_polkit" = "xno"; then
+   PKG_CHECK_MODULES([USBREDIR],
+-                    [gudev-1.0 libusb-1.0 >= 1.0.9 libusbredirhost >= 0.3.3],
++                    [gudev-1.0 libusb-1.0 >= 1.0.9 libusbredirhost >= 0.3.3 libusbredirparser >= 0.3.3],
+                     [have_usbredir=yes],
+                     [have_usbredir=no])
+   if test "x$have_usbredir" = "xno" && test "x$enable_usbredir" = "xyes"; then

================================================================
Index: packages/spice-gtk/spice-gtk.spec
diff -u packages/spice-gtk/spice-gtk.spec:1.8 packages/spice-gtk/spice-gtk.spec:1.9
--- packages/spice-gtk/spice-gtk.spec:1.8	Wed Jan 18 17:38:16 2012
+++ packages/spice-gtk/spice-gtk.spec	Sat Feb  4 15:01:05 2012
@@ -9,12 +9,12 @@
 Summary:	A GTK+ client and libraries for SPICE remote desktop servers
 Summary(pl.UTF-8):	Klient i biblioteki GTK+ dla serwerów zdalnych pulpitów SPICE
 Name:		spice-gtk
-Version:	0.8
+Version:	0.9
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Applications
 Source0:	http://spice-space.org/download/gtk/%{name}-%{version}.tar.bz2
-# Source0-md5:	761b6c3d74d962d437bdd72f54292498
+# Source0-md5:	29dd7372ac099aedb4d024fc4eacd374
 Patch0:		%{name}-sh.patch
 Patch1:		%{name}-builddir.patch
 Patch2:		%{name}-usbredir.patch
@@ -24,6 +24,7 @@
 BuildRequires:	cairo-devel >= 1.2.0
 BuildRequires:	celt051-devel >= 0.5.1.1
 BuildRequires:	cyrus-sasl-devel >= 2.0
+BuildRequires:	gcc >= 5:3.0
 BuildRequires:	gettext-devel >= 0.17
 BuildRequires:	gobject-introspection-devel >= 0.9.4
 BuildRequires:	glib2-devel >= 1:2.22
@@ -246,7 +247,6 @@
 mkdir %{?with_gtk2:gtk2} %{?with_gtk3:gtk3}
 
 %build
-%{__gettextize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -400,6 +400,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2012/02/04 14:01:05  qboosh
+- updated to 0.9
+- updated builddir,usbredir patches (the first one now only changes python module extension)
+
 Revision 1.8  2012/01/18 16:38:16  qboosh
 - updated to 0.8
 - added usbredir patch to fix build with usbredir in PLD (.la killed, no-add-needed enforced)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-gtk/spice-gtk-builddir.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-gtk/spice-gtk-usbredir.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spice-gtk/spice-gtk.spec?r1=1.8&r2=1.9&f=u

More information about the pld-cvs-commit mailing list