From 4ed1c63df64878ebb0d3d2df3f4fa0ebbc332d4c Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 9 Nov 2016 16:02:05 +0100 Subject: [PATCH] spice-gtk: updated to 0.33. (#1917) --- mingw-w64-spice-gtk/003-python-linking.patch | 30 -------------------- mingw-w64-spice-gtk/PKGBUILD | 22 +++++++------- 2 files changed, 10 insertions(+), 42 deletions(-) delete mode 100644 mingw-w64-spice-gtk/003-python-linking.patch diff --git a/mingw-w64-spice-gtk/003-python-linking.patch b/mingw-w64-spice-gtk/003-python-linking.patch deleted file mode 100644 index 49764811b7..0000000000 --- a/mingw-w64-spice-gtk/003-python-linking.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- spice-gtk-0.27/m4/check_python.m4.orig 2015-01-15 22:23:32.249800000 +0300 -+++ spice-gtk-0.27/m4/check_python.m4 2015-01-15 22:27:08.513400000 +0300 -@@ -30,10 +30,13 @@ - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` - PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -+ PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -+ PYTHON_LIBS="-L${py_exec_prefix}/lib -lpython${PYTHON_VERSION}" - fi - AC_SUBST(PYTHON_INCLUDES) -+ AC_SUBST(PYTHON_LIBS) - dnl check if the headers exist: - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" ---- spice-gtk-0.27/src/Makefile.am.orig 2014-12-11 16:33:28.000000000 +0300 -+++ spice-gtk-0.27/src/Makefile.am 2015-01-15 22:26:03.273400000 +0300 -@@ -562,9 +562,9 @@ - install_pyexecLTLIBRARIES = install-pyexecLTLIBRARIES - $(install_pyexecLTLIBRARIES): install-libLTLIBRARIES - --SpiceClientGtk_la_LIBADD = libspice-client-gtk-2.0.la libspice-client-glib-2.0.la $(PYGTK_LIBS) -+SpiceClientGtk_la_LIBADD = libspice-client-gtk-2.0.la libspice-client-glib-2.0.la $(PYGTK_LIBS) $(PYTHON_LIBS) - SpiceClientGtk_la_CFLAGS = $(GTK_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(WARN_PYFLAGS) --SpiceClientGtk_la_LDFLAGS = -module -avoid-version -fPIC -+SpiceClientGtk_la_LDFLAGS = -module -avoid-version -no-undefined - SpiceClientGtk_la_SOURCES = spice-client-gtk-module.c - nodist_SpiceClientGtk_la_SOURCES = spice-client-gtk-module.defs.c - diff --git a/mingw-w64-spice-gtk/PKGBUILD b/mingw-w64-spice-gtk/PKGBUILD index 83df9a24fd..c11ac2a27c 100644 --- a/mingw-w64-spice-gtk/PKGBUILD +++ b/mingw-w64-spice-gtk/PKGBUILD @@ -3,7 +3,7 @@ _realname=spice-gtk pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.31 +pkgver=0.33 pkgrel=1 arch=('any') pkgdesc="GTK3 widget for SPICE clients (mingw-w64)" @@ -18,25 +18,23 @@ depends=("${MINGW_PACKAGE_PREFIX}-cyrus-sasl" "${MINGW_PACKAGE_PREFIX}-pixman" "${MINGW_PACKAGE_PREFIX}-spice-protocol" "${MINGW_PACKAGE_PREFIX}-usbredir" - "${MINGW_PACKAGE_PREFIX}-vala") + "${MINGW_PACKAGE_PREFIX}-vala" + "${MINGW_PACKAGE_PREFIX}-gstreamer" + "${MINGW_PACKAGE_PREFIX}-gst-plugins-base") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - #"${MINGW_PACKAGE_PREFIX}-python2-pygtk" "${MINGW_PACKAGE_PREFIX}-python2") options=('strip' 'staticlibs') license=("GPL 2") url="http://www.spice-space.org" source=(http://www.spice-space.org/download/gtk/${_realname}-${pkgver}.tar.bz2 - 001-win.patch - 003-python-linking.patch) -sha256sums=('c72b4d202b1c0b71d6e24ce5caf914d6dddbcf4010d10db9c2d8e73af728c1ca' - 'f2a623c7268ef7c5a0a2084a4698b0d7c7c0e6fd067f2419c21d95c5b3fdf2d6' - 'bd4f60a9ff6c00f588d36721b22f1abeb3edf91c9f81916c80aaa71bafc755a0') + 001-win.patch) +sha256sums=('7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39' + 'f2a623c7268ef7c5a0a2084a4698b0d7c7c0e6fd067f2419c21d95c5b3fdf2d6') prepare() { cd "${srcdir}"/${_realname}-${pkgver} patch -p1 -i ${srcdir}/001-win.patch - patch -p1 -i ${srcdir}/003-python-linking.patch autoreconf -isf } @@ -55,9 +53,7 @@ build() { --enable-introspection \ --enable-vala \ --enable-lz4 \ - --with-gtk=3.0 \ - --without-python \ - --with-audio=no + --with-gtk=3.0 make } @@ -65,4 +61,6 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" make DESTDIR=${pkgdir} install + + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" }