diff options
author | Joan Figueras | 2016-08-04 22:30:08 +0200 |
---|---|---|
committer | Joan Figueras | 2016-08-04 22:30:08 +0200 |
commit | 9a0a8cf2c69a36c4ea0a80122b8d1958ea18632d (patch) | |
tree | 8cb52ea60049b6b25cfcd931735b079f91def21b | |
parent | f66d27eb5f00b6f7134febc6bb4302027d50ba0e (diff) | |
download | aur-9a0a8cf2c69a36c4ea0a80122b8d1958ea18632d.tar.gz |
Fix: xfreerdp embed window
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | fix_xfreerdp_embed_window.patch | 11 |
3 files changed, 23 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Aug 4 19:42:56 UTC 2016 +# Thu Aug 4 20:29:04 UTC 2016 pkgbase = pacmanager-git pkgdesc = Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface. pkgver = 4.5.5.8 - pkgrel = 3 + pkgrel = 4 url = https://github.com/perseo22/pacmanager arch = any license = GPL3 @@ -30,11 +30,13 @@ pkgbase = pacmanager-git source = 0002-xfreerdp-new-interface.patch source = 0003-xfreerdp-new-interface.patch source = bugfix_ctrl-tab_in_last-focused_mode.patch + source = fix_xfreerdp_embed_window.patch md5sums = SKIP md5sums = d7350164daad682396c3278d6c40bb9d md5sums = cc4b26825efcf1d6c2aeea2b92531c40 md5sums = ac48e3d9ee6b0694a42c123498b06c64 md5sums = 731a8fb19105f0e0b05446ff8cabd311 + md5sums = 13fb87584b3fe9cf9f61565a9d570441 pkgname = pacmanager-git @@ -4,7 +4,7 @@ pkgname=pacmanager-git _pkgname=${pkgname%-git} pkgver=4.5.5.8 -pkgrel=3 +pkgrel=4 arch=('any') license=('GPL3') pkgdesc="Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface." @@ -16,12 +16,14 @@ source=("git+https://github.com/perseo22/pacmanager.git" "0001-xfreerdp-new-interface.patch" "0002-xfreerdp-new-interface.patch" "0003-xfreerdp-new-interface.patch" - "bugfix_ctrl-tab_in_last-focused_mode.patch") + "bugfix_ctrl-tab_in_last-focused_mode.patch" + "fix_xfreerdp_embed_window.patch") md5sums=('SKIP' 'd7350164daad682396c3278d6c40bb9d' 'cc4b26825efcf1d6c2aeea2b92531c40' 'ac48e3d9ee6b0694a42c123498b06c64' - '731a8fb19105f0e0b05446ff8cabd311') + '731a8fb19105f0e0b05446ff8cabd311' + '13fb87584b3fe9cf9f61565a9d570441') prepare() { cd ${srcdir}/${_pkgname} @@ -34,6 +36,9 @@ prepare() { # Patch to fix ctrl-tab in last-focused mode (thanks to merikz / https://github.com/merikz/pacmanager/commit/ec861a8ba1f35070ea70496dd9d18976cfa6cca3 ) patch -Np1 -i $srcdir/bugfix_ctrl-tab_in_last-focused_mode.patch + + # Ugly fix to fix xfreerdp embed window + patch -Np1 -i $srcdir/fix_xfreerdp_embed_window.patch } build() { diff --git a/fix_xfreerdp_embed_window.patch b/fix_xfreerdp_embed_window.patch new file mode 100644 index 000000000000..07acb0f8f66a --- /dev/null +++ b/fix_xfreerdp_embed_window.patch @@ -0,0 +1,11 @@ +--- a/lib/pac_conn 2016-08-04 21:43:47.000000000 +0200 ++++ b/lib/pac_conn 2016-08-04 22:24:13.287336297 +0200 +@@ -929,6 +929,8 @@ + $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'} ) { ++ $$CFG{'tmp'}{'width'}-=3; ++ $$CFG{'tmp'}{'height'}-=0; + $connection_cmd = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER" ) . " /v:$IP:$PORT"; + $connection_txt = "$METHOD /parent-window:$$CFG{'tmp'}{'xid'} /size:$$CFG{'tmp'}{'width'}x$$CFG{'tmp'}{'height'} $CONNECT_OPTS" . ( $MANUAL ? '' : " /u:$USER" ) . " /v:$IP:$PORT"; + } elsif ( $METHOD eq 'rdesktop' ) { |