main/remmina: upgrade to 1.1.1

1 files changed, 26 insertions, 51 deletions

diff --git a/main/remmina/APKBUILD b/main/remmina/APKBUILD
index d50001d49e..2f62600ad1 100644
--- a/main/remmina/APKBUILD
+++ b/main/remmina/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=remmina
-pkgver=1.0.0
-pkgrel=10
+pkgver=1.1.1
+pkgrel=0
 pkgdesc="Remmina is a remote desktop client written in GTK+"
 url="http://remmina.sourceforge.net/"
 arch="all"
@@ -9,25 +9,19 @@ license="GPL"
 depends=
 makedepends="gtk+3.0-dev intltool zlib-dev libjpeg-turbo-dev gnutls-dev
 	vte3-dev libgcrypt-dev libssh-dev libxkbfile-dev freerdp-dev
-	avahi-ui-dev cmake"
+	avahi-ui-dev libvncserver-dev cmake"
 install=
 replaces="remmina-plugins"
 subpackages="$pkgname-dev $pkgname-lang"
-source="https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz
+source="Remmina-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v$pkgver.tar.gz
 	no-gnome-keyring.patch
-	remmina-1.0.0-add-clipboard-support.patch
-	remmina-1.0.0-clipboard-bugfix.patch
-	remmina-1.0.0-some-more-clipboard-fixes.patch
-	remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
-	remmina-1.0.0-fix-memory-leak.patch
-	remmina-1.0.0-linker-error.patch
 	remmina-1.0.0-dsofix.patch
-	remmina-1.0.0-fix-library-name.patch
 	libintl-underlink.patch
+	vte3.patch
 	"
 
 prepare() {
-	cd "$srcdir"/FreeRDP-Remmina-*
+	cd "$srcdir"/Remmina-$pkgver
         for patch in $source; do
                 case $patch in
                 *.patch)
@@ -39,59 +33,40 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir"/FreeRDP-Remmina-*
+	cd "$srcdir"/Remmina-$pkgver
 	cmake -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_PTHREAD=ON \
-		-DWITH_TELEPATHY=OFF \
+		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DWITH_APPINDICATOR=OFF \
 		-DWITH_AVAHI=ON \
+		-DWITH_FREERDP=ON \
+		-DWITH_GCRYPT=ON \
+		-DWITH_LIBSSH=ON \
+		-DWITH_PTHREAD=ON \
+		-DWITH_TELEPATHY=OFF \
+		-DWITH_VTE=ON \
+		-DWITH_ZLIB=ON \
 		|| return 1
 	make || return 1
 }
 
 package() {
-	cd "$srcdir"/FreeRDP-Remmina-*
-	make DESTDIR="$pkgdir" install
-	# dirty hack
-	mkdir -p "$pkgdir"/usr/share/applications
-	sed 's,^_,,g' remmina/desktop/remmina.desktop.in \
-		> "$pkgdir"/usr/share/applications/remmina.desktop \
-		|| return 1
-	mv "$pkgdir"/usr/share/remmina/icons "$pkgdir"/usr/share/icons \
-		|| return 1
+	cd "$srcdir"/Remmina-$pkgver
+	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="701c540acaab961bc3adf130a2ddb8b1  Remmina-1.0.0.tar.gz
+md5sums="481dd96ebf7b14e4fd4df8648040b725  Remmina-1.1.1.tar.gz
 178d55f7aa59d6dc73b19e03201ad1e4  no-gnome-keyring.patch
-9312b5bf953a63e6203f0d0be6cb8134  remmina-1.0.0-add-clipboard-support.patch
-65bfcc39ae51343b90928ea329cc4900  remmina-1.0.0-clipboard-bugfix.patch
-42b971116f887657fc210da70c3afba5  remmina-1.0.0-some-more-clipboard-fixes.patch
-04b5bc1190b53211747e097897d1d19c  remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
-3bc1a4e50cdd864c0e2d7c91a1e02e32  remmina-1.0.0-fix-memory-leak.patch
-b23b424509e968332be1b83c1063a252  remmina-1.0.0-linker-error.patch
 144e8f4127ccec7282060800147a48ea  remmina-1.0.0-dsofix.patch
-82b5007ed3bcb57b4f98b16eb9725ba8  remmina-1.0.0-fix-library-name.patch
-e5af6b49e42462550f51843ef8326076  libintl-underlink.patch"
-sha256sums="7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731  Remmina-1.0.0.tar.gz
+e5af6b49e42462550f51843ef8326076  libintl-underlink.patch
+d1d0e9a581d53ca7f49ce47ffb3db0f8  vte3.patch"
+sha256sums="c96485a919848d9c1602c38075359b10417f4285659588b115b75d2cd5a4e884  Remmina-1.1.1.tar.gz
 fb6094af599b64a1944f9a13a767e846d8bf772470690073da76cfd5eed799c2  no-gnome-keyring.patch
-7a1b539d4fc72e1be0792855396f78b1f64faeb5ff05a8c21309e842a23ef6be  remmina-1.0.0-add-clipboard-support.patch
-a826dcd93f5fb38285389294c0097c76086cdd14b49ac05622a0c2d5b448c149  remmina-1.0.0-clipboard-bugfix.patch
-4e95f6404e937f5e24ee21620ee0700643b5f519796cc4ae8e78e24a4bdd5e68  remmina-1.0.0-some-more-clipboard-fixes.patch
-3319a85e0bd7dce27b02007b2030189f2fb9b67f4e76f7e51bf3bd12b8bf641d  remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
-79477964423c03b50663cae76035474c208989bb5c25b3b5c16afa0b0921ba0b  remmina-1.0.0-fix-memory-leak.patch
-199ba96f3a20f3679e53419eb4d5aa99ec16c80a4ddace6a9b2427a5cb0200d7  remmina-1.0.0-linker-error.patch
 701cf9b0d6560ae9eee375f3c2828e449666190664fb28c9ccd95627db5d92e4  remmina-1.0.0-dsofix.patch
-9a996b1c203089917711af9ec5c7b9f9af668afe226c84e1cfa8ddb007d1b66d  remmina-1.0.0-fix-library-name.patch
-a8065f8bef88417bdfd8631441da19c9f945e0cc7131382e33a9f2c26f4e6017  libintl-underlink.patch"
-sha512sums="585fff5eb4585978ee321e481fafa057052d39ca01690a4e3bb7e9add94bb968373ab30001ef18c7578bc98b24df25ff4ab7a0fc882d99770b2dce079c4d39a6  Remmina-1.0.0.tar.gz
+a8065f8bef88417bdfd8631441da19c9f945e0cc7131382e33a9f2c26f4e6017  libintl-underlink.patch
+43d6ae0141beafde8f1e40160f885ff465576c40effd9935d986b78d58da0392  vte3.patch"
+sha512sums="09bacd725522e0a57a1e387db778fe735d0f0d4ce62a63ad4f02799e225296509d075c56fb0c81d6b0c16ab2242889104271e1ecd508417e0aaeed7a35eea594  Remmina-1.1.1.tar.gz
 5e0d26e799c9b85ae0c5bd7b9e6f07fd4a2da15c12b2a649098603c84d7dda6bfa518b0295edecc7522ab06c1a84d444083634d9fedb7d44b65b86dfc2eef65b  no-gnome-keyring.patch
-e84de833b76b5796c21829a410e46287cd268ecdd34cf453a8b56afdab1e991390e0dbc54d3ea60a2378cfd5a43907b0901b8cd9bf362d9354619554cc5e9934  remmina-1.0.0-add-clipboard-support.patch
-8233f41a50f9e4ddd172af5644a34dc1e9c7675d678c1fcb5fb02f38ff7238ffabbebbe241aa3bbcad4429c93fa29d6ffcd78b85ddd0c63631d31230b95b13c9  remmina-1.0.0-clipboard-bugfix.patch
-d31b26006acc45da8fb4a785c67c1252c924cb39a3437d2b3893bdb25bface7ca05f63a00d07e1ce82afcf7c05d5d810caf9ffb06f0a658a7a5a5d4c1b643591  remmina-1.0.0-some-more-clipboard-fixes.patch
-5c103a73d7c16022b526c21d710fef189e8058010f0553cf2da1676f4992bb89a5003b2268903d4d28b64cf3a9fe5797dfa991863e4f24045942aeda6371aa40  remmina-1.0.0-disconnect-signal-handler-after-disconnect.patch
-b836a73cba79a7e8357066e84a1d751843867d858bcbb48c731308b222826f6cf82788462a8e95b07a2617c835fe57ac14e6b291919b85bd8a1e13281ac17902  remmina-1.0.0-fix-memory-leak.patch
-175b2538540fdf32cdf5b217852683a5ce3833fd5ec08a4e1c9a85145aeaada2c280afb2912476fb45e5283ca27ffdea73684c8e49650f7b809317fa948a2465  remmina-1.0.0-linker-error.patch
 4b8299c65b9a1bc529fd44fdb05033d5dfd7e5589daea7056d275011a6f01f4154141ae9b787581de646019c9f15b0493da39484850b2df052df33824c67dd91  remmina-1.0.0-dsofix.patch
-eb26b108b1cf27ac6c71200e121f0b3276f4aeb1e4938bd13f332a228fe5a001adafffa3297ac1cf545d8a302fdb6c3f9457de766d07b92347758ae4822184e1  remmina-1.0.0-fix-library-name.patch
-43fa8caf186bac447921aa13c89ebf378f72d00a2d9c6bc76b4408c70fea3205e450e8cc7b145f4d5b3c6719e667be983d6e9f5b52fda00e10ecf7a48696c88b  libintl-underlink.patch"
+43fa8caf186bac447921aa13c89ebf378f72d00a2d9c6bc76b4408c70fea3205e450e8cc7b145f4d5b3c6719e667be983d6e9f5b52fda00e10ecf7a48696c88b  libintl-underlink.patch
+46357e5e407db83704efd8270bd6a86d07aad17f6adf2183551ddd82efccb169124e3b85b146248dc74b6bdd360df606f346c557f36782e15838bedca3212340  vte3.patch"