diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-12 06:34:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-12 06:39:08 +0000 |
| commit | 7116484c04e6c133b25ff1c9f8ebc8213dafd368 (patch) | |
| tree | 3f3b65f1aa1f14d1d3912d1f68472b96b61543c8 /main/spice-gtk | |
| parent | b522c17a47a568f9d5a162c796c58ca81c09f39b (diff) | |
| download | aports-7116484c04e6c133b25ff1c9f8ebc8213dafd368.tar.bz2 aports-7116484c04e6c133b25ff1c9f8ebc8213dafd368.tar.xz | |
main/spice-gtk: upgrade to 0.20 and switch to gtk3
Diffstat (limited to 'main/spice-gtk')
| -rw-r--r-- | main/spice-gtk/0001-build-fix-for-automake-1.13.patch | 28 | ||||
| -rw-r--r-- | main/spice-gtk/APKBUILD | 35 | ||||
| -rw-r--r-- | main/spice-gtk/codegendir.patch | 11 |
3 files changed, 12 insertions, 62 deletions
diff --git a/main/spice-gtk/0001-build-fix-for-automake-1.13.patch b/main/spice-gtk/0001-build-fix-for-automake-1.13.patch deleted file mode 100644 index e3c3e02f96..0000000000 --- a/main/spice-gtk/0001-build-fix-for-automake-1.13.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 54fb45d0c744edda68a5f4f0ea31ba059023d973 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 4 Feb 2013 13:45:55 +0100 -Subject: [PATCH] build: fix for automake-1.13 - -Use AC_CONFIG_HEADER instead of deprecated AM_CONFIG_HEADER. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e8a4ddd..2a5c72c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,7 @@ AC_INIT([spice-gtk], [m4_esyscmd(build-aux/git-version-gen .tarball-version)], - [spice-devel@lists.freedesktop.org]) - - AC_CONFIG_MACRO_DIR([m4]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADER([config.h]) - AC_CONFIG_AUX_DIR([build-aux]) - - AM_INIT_AUTOMAKE([foreign dist-bzip2 -Wall -Werror]) --- -1.8.1.2 - diff --git a/main/spice-gtk/APKBUILD b/main/spice-gtk/APKBUILD index 3a3ba1b28d..7400273e93 100644 --- a/main/spice-gtk/APKBUILD +++ b/main/spice-gtk/APKBUILD @@ -1,27 +1,24 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=spice-gtk -pkgver=0.16 -pkgrel=1 +pkgver=0.20 +pkgrel=0 pkgdesc="A GTK+ widget for SPICE clients" url="http://spice-space.org/page/Spice-Gtk" arch="all" license="LGPLv2+" depends="" -depends_dev="gtk+2.0-dev celt051-dev polkit-dev libxrandr-dev openssl-dev - cyrus-sasl-dev gst-plugins-base-dev jpeg-dev zlib-dev" -makedepends="$depends_dev bash usbutils py-gtk-dev python-dev udev-dev +depends_dev="gtk+3.0-dev celt051-dev polkit-dev libxrandr-dev openssl-dev + cyrus-sasl-dev gst-plugins-base-dev jpeg-dev zlib-dev acl-dev" +makedepends="$depends_dev bash usbutils python-dev udev-dev usbredir-dev - polkit-dev py-parsing py-gobject-dev gobject-introspection-dev - automake autoconf libtool + polkit-dev py-parsing gobject-introspection-dev " install="" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools - spice-glib:glib py-$pkgname:py" + spice-glib:glib" -source="http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2 - 0001-build-fix-for-automake-1.13.patch - codegendir.patch" +source="http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2" _builddir="$srcdir"/spice-gtk-$pkgver prepare() { @@ -32,8 +29,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - libtoolize --force && aclocal -I m4 && autoconf \ - && automake --add-missing || return 1 } build() { @@ -41,7 +36,7 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ - --with-gtk=2.0 \ + --with-gtk=3.0 \ --with-audio=gstreamer \ --enable-smartcard=no \ --enable-usbredir=yes \ @@ -75,12 +70,6 @@ glib() { done } -py() { - pkgdsec="" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib/ -} - -md5sums="1b61697d643f1acc0e2950834dfa78f4 spice-gtk-0.16.tar.bz2 -72970a1cd51f4a42332e38981fd70ccb 0001-build-fix-for-automake-1.13.patch -e267f9505d0be143a308fb3b574fd153 codegendir.patch" +md5sums="9ef6b7f2f368b7966029b7834b7c2bec spice-gtk-0.20.tar.bz2" +sha256sums="b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df spice-gtk-0.20.tar.bz2" +sha512sums="db07d05d93bf5639c193f374b6eb3fe9f6bb198f0146e64f8e6e6c03d12e931c1f18a353aed123fe28535a95eb8448ef8a8babc66bdd283f951b8433839d6b9e spice-gtk-0.20.tar.bz2" diff --git a/main/spice-gtk/codegendir.patch b/main/spice-gtk/codegendir.patch deleted file mode 100644 index 13b9e4077a..0000000000 --- a/main/spice-gtk/codegendir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./gtk/Makefile.in.orig -+++ ./gtk/Makefile.in -@@ -895,7 +895,7 @@ - @WITH_PYTHON_TRUE@SpiceClientGtk_la_LDFLAGS = -module -avoid-version -fPIC - @WITH_PYTHON_TRUE@SpiceClientGtk_la_SOURCES = spice-client-gtk-module.c - @WITH_PYTHON_TRUE@nodist_SpiceClientGtk_la_SOURCES = spice-client-gtk-module.defs.c --@WITH_PYTHON_TRUE@CODEGENDIR = `pkg-config --variable=codegendir pygtk-2.0` -+@WITH_PYTHON_TRUE@CODEGENDIR = `pkg-config --variable=codegendir pygobject-2.0` - @WITH_PYTHON_TRUE@DEFSDIR = `pkg-config --variable=defsdir pygtk-2.0` - @G_IR_SCANNER_SYMBOL_PREFIX_FALSE@PREFIX_ARGS = --strip-prefix=Spice - @G_IR_SCANNER_SYMBOL_PREFIX_TRUE@PREFIX_ARGS = --symbol-prefix=spice --identifier-prefix=Spice |