5.1.0

3 files changed, 28 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 550f49914c86..2eb9e2487558 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = asbru-cm-git
 	pkgdesc = A free and open-source connection manager. GIT version
-	pkgver = 5.0.1
+	pkgver = 5.1.0
 	pkgrel = 1
 	url = https://github.com/asbru-cm/asbru-cm
 	arch = any
@@ -23,7 +23,9 @@ pkgbase = asbru-cm-git
 	depends = perl-socket6
 	depends = uuid
 	source = git+https://github.com/asbru-cm/asbru-cm.git
+	source = fix-pacmanager-crash-getXWindowsList.patch
 	sha256sums = SKIP
+	sha256sums = b2bd4fcdc9e16869f990ae4be47f2a23e81e25fff8a7169a03792864caee1606
 
 pkgname = asbru-cm-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d7693e9c8058..ca9432f960fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=asbru-cm-git
 _pkgname=${pkgname%-git}
-pkgver=5.0.1
+pkgver=5.1.0
 pkgrel=1
 arch=('any')
 license=('GPL3')
@@ -12,8 +12,15 @@ url="https://github.com/asbru-cm/asbru-cm"
 depends=('perl-gnome2-gconf' 'glade-perl' 'openssh' 'perl-crypt-blowfish' 'perl-gnome2-vte' 'perl-expect' 'perl-crypt-rijndael' 'perl-gtk2-ex-simple-list' 'perl-io-stty' 'perl-io-tty' 'perl-net-arp' 'perl-yaml' 'perl-crypt-cbc' 'perl-gtk2-unique' 'perl-socket6' 'uuid')
 makedepends=('git')
 #conflicts=()
-source=("git+https://github.com/asbru-cm/asbru-cm.git")
-sha256sums=('SKIP')
+source=("git+https://github.com/asbru-cm/asbru-cm.git"
+         fix-pacmanager-crash-getXWindowsList.patch)
+sha256sums=('SKIP'
+            'b2bd4fcdc9e16869f990ae4be47f2a23e81e25fff8a7169a03792864caee1606')
+
+prepare() {
+	cd ${srcdir}/${_pkgname}
+	patch -Np1 -i ${srcdir}/fix-pacmanager-crash-getXWindowsList.patch
+}
 
 package() {
 	cd ${srcdir}/${_pkgname}
diff --git a/fix-pacmanager-crash-getXWindowsList.patch b/fix-pacmanager-crash-getXWindowsList.patch
new file mode 100644
index 000000000000..3d5d7fa955d7
--- /dev/null
+++ b/fix-pacmanager-crash-getXWindowsList.patch
@@ -0,0 +1,15 @@
+--- a/lib/PACTerminal.pm	2017-08-23 13:57:41.352826565 +0200
++++ b/lib/PACTerminal.pm	2017-08-23 13:58:42.379341866 +0200
+@@ -1060,9 +1060,9 @@
+ 				$title = $$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'RDP (xfreerdp)' ?
+ 					"FreeRDP: $$self{_CFG}{environments}{$$self{_UUID}}{ip}" . ( $$self{_CFG}{environments}{$$self{_UUID}}{port} == 3389 ? '' : ":$$self{_CFG}{environments}{$$self{_UUID}}{port}" ) :
+ 					"TightVNC: $$self{_CFG}{environments}{$$self{_UUID}}{user}";
+-				my $list = _getXWindowsList;
+-				return 1 unless grep( { $_ =~ /$title/ and $title = $_; } keys %{ $$list{'by_name'} } );
+-				$$self{_GUI}{_SOCKET} -> add_id( $$list{'by_name'}{$title}{'xid'} );
++#				my $list = _getXWindowsList;
++#				return 1 unless grep( { $_ =~ /$title/ and $title = $_; } keys %{ $$list{'by_name'} } );
++#				$$self{_GUI}{_SOCKET} -> add_id( $$list{'by_name'}{$title}{'xid'} );
+ 				return 0;
+ 			} ) if $$self{EMBED} && $$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'RDP (xfreerdp)' || $$self{_CFG}{environments}{$$self{_UUID}}{method} eq 'VNC';
+ 		}