diff options
| author | Joan Figueras | 2017-08-23 14:03:09 +0200 |
|---|---|---|
| committer | Joan Figueras | 2017-08-23 14:03:09 +0200 |
| commit | 68166add56e4eb418f9797d3ba6f82bab91e5a90 (patch) | |
| tree | fae8591374d9783dd70e4c8cbdd1265720fcf60c | |
| parent | 1e8b8d65a8e6b21d506fcdecf2c43df0082b1018 (diff) | |
| download | aur-68166add56e4eb418f9797d3ba6f82bab91e5a90.tar.gz | |
Fix for https://github.com/perseo22/pacmanager/issues/25
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | fix-pacmanager-crash-getXWindowsList.patch | 15 |
3 files changed, 27 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = pacmanager-git pkgdesc = Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface. pkgver = 4.5.5.8 - pkgrel = 10 + pkgrel = 11 url = https://github.com/perseo22/pacmanager arch = any license = GPL3 @@ -25,8 +25,10 @@ pkgbase = pacmanager-git conflicts = pacmanager-bin source = git+https://github.com/perseo22/pacmanager.git source = fix_xfreerdp_embed_window.patch + source = fix-pacmanager-crash-getXWindowsList.patch sha256sums = SKIP sha256sums = 15c5208214c6ecc4b3a3525efa00dbef31402a59ad14c05f3f7af0135c781973 + sha256sums = b2bd4fcdc9e16869f990ae4be47f2a23e81e25fff8a7169a03792864caee1606 pkgname = pacmanager-git @@ -4,7 +4,7 @@ pkgname=pacmanager-git _pkgname=${pkgname%-git} pkgver=4.5.5.8 -pkgrel=10 +pkgrel=11 arch=('any') license=('GPL3') pkgdesc="Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface." @@ -13,15 +13,20 @@ depends=('perl-gnome2-gconf' 'glade-perl' 'openssh' 'perl-crypt-blowfish' 'perl- makedepends=('git') conflicts=(pacmanager-bin) source=("git+https://github.com/perseo22/pacmanager.git" - "fix_xfreerdp_embed_window.patch") + "fix_xfreerdp_embed_window.patch" + "fix-pacmanager-crash-getXWindowsList.patch") sha256sums=('SKIP' - '15c5208214c6ecc4b3a3525efa00dbef31402a59ad14c05f3f7af0135c781973') + '15c5208214c6ecc4b3a3525efa00dbef31402a59ad14c05f3f7af0135c781973' + 'b2bd4fcdc9e16869f990ae4be47f2a23e81e25fff8a7169a03792864caee1606') prepare() { cd ${srcdir}/${_pkgname} # Ugly fix to fix xfreerdp embed window - patch -Np1 -i $srcdir/fix_xfreerdp_embed_window.patch + patch -Np1 -i "$srcdir"/fix_xfreerdp_embed_window.patch + + # Fix for https://github.com/perseo22/pacmanager/issues/25 + patch -Np1 -i "$srcdir"/fix-pacmanager-crash-getXWindowsList.patch } build() { 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'; + } |