Removed fix-pacmanager-crash-getXWindowsList.patch. I can't reproduce it anymore

3 files changed, 8 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 98b8f75984bb..20d96e38d3dc 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 = 4
+	pkgrel = 6
 	url = https://github.com/asbru-cm/asbru-cm
 	arch = any
 	license = GPL3
@@ -23,9 +23,7 @@ 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 e0be8c1a3fee..0bb116e4fd57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=asbru-cm-git
 _pkgname=${pkgname%-git}
 pkgver=5.0.0_RC4
-pkgrel=4
+pkgrel=6
 arch=('any')
 license=('GPL3')
 pkgdesc="A free and open-source connection manager. GIT version"
@@ -12,24 +12,17 @@ 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"
-         fix-pacmanager-crash-getXWindowsList.patch)
-sha256sums=('SKIP'
-            'b2bd4fcdc9e16869f990ae4be47f2a23e81e25fff8a7169a03792864caee1606')
-
-prepare() {
-	cd ${srcdir}/${_pkgname}
-	patch -Np1 -i ${srcdir}/fix-pacmanager-crash-getXWindowsList.patch
-}
+source=("git+https://github.com/asbru-cm/asbru-cm.git")
+sha256sums=('SKIP')
 
 package() {
 	cd ${srcdir}/${_pkgname}
 	mkdir -p $pkgdir/{opt/asbru,usr/share/pixmaps,usr/share/man/man1,usr/share/applications,usr/bin,etc/bash_completion.d}
 	cp -rp res utils lib $pkgdir/opt/asbru/
-	cp -p res/pac_bash_completion $pkgdir/etc/bash_completion.d/asbru_bash_completion
-	cp res/asbru-logo-64.png $pkgdir/usr/share/pixmaps/asbru.png
-	cp res/asbru.desktop $pkgdir/usr/share/applications/
-	gzip -c res/pac.1 > $pkgdir/usr/share/man/man1/asbru.1.gz
+	cp -p res/asbru_bash_completion $pkgdir/etc/bash_completion.d/asbru_bash_completion
+	cp res/asbru-logo-64.png $pkgdir/usr/share/pixmaps/${_pkgname}.png
+	cp res/${_pkgname}.desktop $pkgdir/usr/share/applications/
+	gzip -c res/${_pkgname}.1 > $pkgdir/usr/share/man/man1/${_pkgname}.1.gz
 	cp -p ${_pkgname} $pkgdir/opt/asbru/${_pkgname}
 	chmod 755 $pkgdir/opt/asbru/${_pkgname}
 	ln -sf /opt/asbru/${_pkgname} $pkgdir/usr/bin/${_pkgname}
diff --git a/fix-pacmanager-crash-getXWindowsList.patch b/fix-pacmanager-crash-getXWindowsList.patch
deleted file mode 100644
index 3d5d7fa955d7..000000000000
--- a/fix-pacmanager-crash-getXWindowsList.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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';
- 		}