main/spice-gtk: upgrade to 0.34; modernize

2 files changed, 64 insertions, 13 deletions

diff --git a/main/spice-gtk/APKBUILD b/main/spice-gtk/APKBUILD
index 3949b1c3e6..47938d7a9e 100644
--- a/main/spice-gtk/APKBUILD
+++ b/main/spice-gtk/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spice-gtk
-pkgver=0.33
-pkgrel=2
+pkgver=0.34
+pkgrel=0
 pkgdesc="A GTK+ widget for SPICE clients"
 url="http://spice-space.org/page/Spice-Gtk"
 arch="all"
@@ -15,12 +15,12 @@ makedepends="$depends_dev bash usbutils python2-dev eudev-dev phodav-dev
 	usbredir-dev libusb-dev libsoup-dev spice-protocol
 	polkit-dev py-parsing gobject-introspection-dev
 	"
-install=""
 options="suid"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-tools
 	spice-glib:glib"
-source="http://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.bz2"
-
+source="http://www.spice-space.org/download/gtk/$pkgname-$pkgver.tar.bz2
+	libressl.patch
+	"
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
@@ -34,14 +34,13 @@ build() {
 		--with-gtk=3.0 \
 		--with-audio=gstreamer \
 		--enable-smartcard=no \
-		--enable-usbredir=yes \
-		|| return 1
-	make || return 1
+		--enable-usbredir=yes
+	make
 }
 
 package() {
 	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	make -j1 DESTDIR="$pkgdir" install
 }
 
 tools() {
@@ -55,9 +54,8 @@ glib() {
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/*-glib-*.so* \
 		"$pkgdir"/usr/lib/*controller.so.* \
-		"$subpkgdir"/usr/lib/ || return 1
+		"$subpkgdir"/usr/lib/
 }
 
-md5sums="19e1b9aa6c59cab776ba5aa633491b7e  spice-gtk-0.33.tar.bz2"
-sha256sums="7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39  spice-gtk-0.33.tar.bz2"
-sha512sums="ee5750194057a7f568641f6382d6969b67dc7271b4d13037570b79cdecd70a7eeb457ad349d3ed8e576f1fbd9701fac7d24607d5cbde8af0e030433b347abc80  spice-gtk-0.33.tar.bz2"
+sha512sums="17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689  spice-gtk-0.34.tar.bz2
+3a5079767c29ee91d605faf2bbb3def052f285dc1e9999da16beb9b9e5307f580e5c6e5a01df6168eb2467ab9df32ea649a6a6cfd77a368f1868fcca84a097f5  libressl.patch"
diff --git a/main/spice-gtk/libressl.patch b/main/spice-gtk/libressl.patch
new file mode 100644
index 0000000000..be99f4b1fd
--- /dev/null
+++ b/main/spice-gtk/libressl.patch
@@ -0,0 +1,53 @@
+--- a/spice-common/common/ssl_verify.c
++++ b/spice-common/common/ssl_verify.c
+@@ -33,12 +33,10 @@
+ #include <string.h>
+ #include <gio/gio.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
+ {
+     return M_ASN1_STRING_data(asn1);
+ }
+-#endif
+ 
+ static int verify_pubkey(X509* cert, const char *key, size_t key_size)
+ {
+--- a/src/bio-gio.c
++++ b/src/bio-gio.c
+@@ -23,7 +23,6 @@
+ #include "spice-util.h"
+ #include "bio-gio.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static BIO_METHOD one_static_bio;
+ 
+ static int BIO_meth_set_read(BIO_METHOD *biom,
+@@ -89,8 +88,6 @@
+ static void BIO_meth_free(BIO_METHOD *biom)
+ {
+ }
+-
+-#endif
+ 
+ static long bio_gio_ctrl(G_GNUC_UNUSED BIO *b,
+                          int cmd,
+--- a/src/spice-channel.c
++++ b/src/spice-channel.c
+@@ -55,7 +55,6 @@
+ static void spice_channel_send_migration_handshake(SpiceChannel *channel);
+ static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
+ static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
+ {
+     if (pkey->type != EVP_PKEY_RSA) {
+@@ -63,7 +62,7 @@
+     }
+     return pkey->pkey.rsa;
+ }
+-#endif
++
+ /**
+  * SECTION:spice-channel
+  * @short_description: the base channel class