Added a couple of patches from pacmanager-git

4 files changed, 48 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index daae92ecd3b9..225cc8f61d34 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = asbru-cm-git
 	pkgdesc = A free and open-source connection manager. GIT version
 	pkgver = 5.0.0_RC4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/asbru-cm/asbru-cm
 	arch = any
 	license = GPL3
@@ -23,7 +23,11 @@ pkgbase = asbru-cm-git
 	depends = perl-socket6
 	depends = uuid
 	source = git+https://github.com/asbru-cm/asbru-cm.git
+	source = 0000-fix-xfreerdp-synthax.patch
+	source = fix-pacmanager-crash-getXWindowsList.patch
 	sha256sums = SKIP
+	sha256sums = 8a31936ff2aa9da31ea4abbff27582fbf583ce0ff7760e9096c4293312a1338e
+	sha256sums = b2bd4fcdc9e16869f990ae4be47f2a23e81e25fff8a7169a03792864caee1606
 
 pkgname = asbru-cm-git
 
diff --git a/0000-fix-xfreerdp-synthax.patch b/0000-fix-xfreerdp-synthax.patch
new file mode 100644
index 000000000000..b2705c5bd236
--- /dev/null
+++ b/0000-fix-xfreerdp-synthax.patch
@@ -0,0 +1,15 @@
+--- a/lib/pac_conn	2017-11-21 11:51:02.205259563 +0100
++++ b/lib/pac_conn	2017-11-21 12:00:22.504463543 +0100
+@@ -951,8 +951,10 @@
+ 			$connection_cmd = "$METHOD -X $$CFG{'tmp'}{'xid'} -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " $IP:$PORT";
+ 			$connection_txt = "$METHOD -X $$CFG{'tmp'}{'xid'} -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " $IP:$PORT";
+ 		} elsif ( defined $$CFG{'tmp'}{'xid'} ) {
+-			$connection_cmd = "$METHOD -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER" ) . " $IP:$PORT";
+-			$connection_txt = "$METHOD -g $$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER" ) . " $IP:$PORT";
++			$$CFG{'tmp'}{'width'}-=5;
++			$$CFG{'tmp'}{'height'}-=5;
++			$connection_cmd = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER /p:$PASS" ) . " /v:$IP:$PORT";
++			$connection_txt = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER /p:$PASS" ) . " /v:$IP:$PORT";
+ 		} elsif ( $METHOD eq 'rdesktop' ) {
+ 			$connection_cmd = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " -T \"$TITLE\" $IP:$PORT";
+ 			$connection_txt = "$METHOD $CONNECT_OPTS" . ( $MANUAL ? '' : " -u $USER -p -" ) . " -T \"$TITLE\" $IP:$PORT";
diff --git a/PKGBUILD b/PKGBUILD
index 27d23139133c..4adaf7007cd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=asbru-cm-git
 _pkgname=${pkgname%-git}
 pkgver=5.0.0_RC4
-pkgrel=1
+pkgrel=2
 arch=('any')
 license=('GPL3')
 pkgdesc="A free and open-source connection manager. GIT version"
@@ -12,8 +12,18 @@ 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"
+         0000-fix-xfreerdp-synthax.patch
+         fix-pacmanager-crash-getXWindowsList.patch)
+sha256sums=('SKIP'
+            '8a31936ff2aa9da31ea4abbff27582fbf583ce0ff7760e9096c4293312a1338e'
+            'b2bd4fcdc9e16869f990ae4be47f2a23e81e25fff8a7169a03792864caee1606')
+
+prepare() {
+	cd ${srcdir}/${_pkgname}
+	patch -Np1 -i ${srcdir}/0000-fix-xfreerdp-synthax.patch
+	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';
+ 		}