aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-06-01 05:40:31 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-06-01 05:40:31 +0000
commitfbef762c3b3eebd9d328a9a63438ce48cd364777 (patch)
treea9a8859111282b0b9f4f105efd1afa43b0f9c47c
parent27297cacd8b9ebc96671f4db9e4ec4a511fed9f7 (diff)
downloadaports-fbef762c3b3eebd9d328a9a63438ce48cd364777.tar.bz2
aports-fbef762c3b3eebd9d328a9a63438ce48cd364777.tar.xz
community/remmina: upgrade to 1.2.30.1
-rw-r--r--community/remmina/APKBUILD23
-rw-r--r--community/remmina/libintl-underlink.patch4
-rw-r--r--community/remmina/no-execinfo.patch14
-rw-r--r--community/remmina/remmina-1.0.0-dsofix.patch4
4 files changed, 29 insertions, 16 deletions
diff --git a/community/remmina/APKBUILD b/community/remmina/APKBUILD
index 8a935e38c1..d1c19639ed 100644
--- a/community/remmina/APKBUILD
+++ b/community/remmina/APKBUILD
@@ -1,8 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=remmina
-pkgver=1.2.0
-_hash=b3e339ea5478c0941a6dfa0bf8fed9e7a1c70e0b
-pkgrel=2
+pkgver=1.2.30.1
+pkgrel=0
pkgdesc="Remmina is a remote desktop client written in GTK+"
url="http://www.remmina.org/wp/"
arch="all"
@@ -10,16 +9,16 @@ 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 libvncserver-dev cmake"
+ avahi-ui-dev libvncserver-dev cmake json-glib-dev libsoup-dev"
replaces="remmina-plugins"
-subpackages="$pkgname-dev $pkgname-lang"
-source="$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/$_hash.tar.gz
- no-gnome-keyring.patch
+subpackages="$pkgname-dev $pkgname-lang $pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v$pkgver.tar.gz
remmina-1.0.0-dsofix.patch
libintl-underlink.patch
+ no-execinfo.patch
"
-builddir="$srcdir"/Remmina-$_hash
+builddir="$srcdir"/Remmina-$pkgver
build() {
cd "$builddir"
cmake -DCMAKE_BUILD_TYPE=Release \
@@ -42,7 +41,7 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a323ed705a6f7e84488971eff00612807ae7c49fd547a7058ed4ac463d8ffecdb974e12e438c02fd45f25740431f32ba4733483ba9afac90f3fcab07834f2060 remmina-1.2.0.tar.gz
-5e0d26e799c9b85ae0c5bd7b9e6f07fd4a2da15c12b2a649098603c84d7dda6bfa518b0295edecc7522ab06c1a84d444083634d9fedb7d44b65b86dfc2eef65b no-gnome-keyring.patch
-4b8299c65b9a1bc529fd44fdb05033d5dfd7e5589daea7056d275011a6f01f4154141ae9b787581de646019c9f15b0493da39484850b2df052df33824c67dd91 remmina-1.0.0-dsofix.patch
-43fa8caf186bac447921aa13c89ebf378f72d00a2d9c6bc76b4408c70fea3205e450e8cc7b145f4d5b3c6719e667be983d6e9f5b52fda00e10ecf7a48696c88b libintl-underlink.patch"
+sha512sums="c160655dd05d3b7ae7b3545e7f41d5bed80cb39b103f906a51c27f4653c7a13919fc02928097747fd2cceff1adf50c36e4d0ecccf32efbea6e859f24bf1b4294 remmina-1.2.30.1.tar.gz
+4a45c366d02c4dbccad156a7d4f37f8d88bb92ef577a04bc892572eab7327a654c656ead110f515ef1d330a99e339cca97021cc33775a7d534bbe3a093c5ee99 remmina-1.0.0-dsofix.patch
+21fd8e27e70cea85d9fc8b649ed28b17e796604235d759ab5fe18b1fe52c23d9443b3a46e4ef544c5178d25c65967107f6f0aff134f7df9c722bbee1c7cc4e2b libintl-underlink.patch
+ea3700ac90519e2796d241775f61e695df15676d1542fb6637266415fd69f4296b5c737b38fd55c433e52b6714b2067d079eaf6c616c1dcff42920b441b93e83 no-execinfo.patch"
diff --git a/community/remmina/libintl-underlink.patch b/community/remmina/libintl-underlink.patch
index 6afba38dd3..925a1b26a3 100644
--- a/community/remmina/libintl-underlink.patch
+++ b/community/remmina/libintl-underlink.patch
@@ -1,5 +1,5 @@
---- ./remmina/CMakeLists.txt.orig
-+++ ./remmina/CMakeLists.txt
+--- ./src/CMakeLists.txt.orig
++++ ./src/CMakeLists.txt
@@ -91,7 +91,7 @@
add_executable(remmina ${REMMINA_SRCS})
diff --git a/community/remmina/no-execinfo.patch b/community/remmina/no-execinfo.patch
new file mode 100644
index 0000000000..76792e8b0a
--- /dev/null
+++ b/community/remmina/no-execinfo.patch
@@ -0,0 +1,14 @@
+diff --git a/plugins/rdp/rdp_event.c b/plugins/rdp/rdp_event.c
+index 15fef90..5aebae2 100644
+--- a/plugins/rdp/rdp_event.c
++++ b/plugins/rdp/rdp_event.c
+@@ -43,7 +43,9 @@
+ #include <gdk/gdkkeysyms.h>
+ #include <cairo/cairo-xlib.h>
+ #include <freerdp/locale/keyboard.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+
+ static void remmina_rdp_event_on_focus_in(GtkWidget* widget, GdkEventKey* event, RemminaProtocolWidget* gp)
+ {
diff --git a/community/remmina/remmina-1.0.0-dsofix.patch b/community/remmina/remmina-1.0.0-dsofix.patch
index f8e0c21cd8..e7592c13d2 100644
--- a/community/remmina/remmina-1.0.0-dsofix.patch
+++ b/community/remmina/remmina-1.0.0-dsofix.patch
@@ -1,5 +1,5 @@
---- a/remmina-plugins/vnc/CMakeLists.txt 2012-06-04 13:03:46.542093149 -0600
-+++ b/remmina-plugins/vnc/CMakeLists.txt 2012-06-04 13:03:34.112332497 -0600
+--- a/plugins/vnc/CMakeLists.txt 2012-06-04 13:03:46.542093149 -0600
++++ b/plugins/vnc/CMakeLists.txt 2012-06-04 13:03:34.112332497 -0600
@@ -28,7 +28,7 @@
set_target_properties(remmina-plugin-vnc PROPERTIES PREFIX "")