diff options
| author | Joan Figueras | 2016-08-04 19:27:23 +0200 |
|---|---|---|
| committer | Joan Figueras | 2016-08-04 19:27:23 +0200 |
| commit | 432e302656391ceeb367307f20927019c9afc9cc (patch) | |
| tree | 96f2611ba77771f6059a8290deb58fcfe5734815 | |
| parent | 082e3a76352f5a0c563a37aac7c95772c06fd890 (diff) | |
| download | aur-432e302656391ceeb367307f20927019c9afc9cc.tar.gz | |
New patch, fix embed xfreerdp
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 0003-xfreerdp-new-interface.patch | 13 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
3 files changed, 24 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Aug 4 15:58:18 UTC 2016 +# Thu Aug 4 17:26:59 UTC 2016 pkgbase = pacmanager-git pkgdesc = Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface. pkgver = 4.5.5.8 - pkgrel = 1 + pkgrel = 2 url = https://github.com/perseo22/pacmanager arch = any license = GPL3 @@ -28,9 +28,11 @@ pkgbase = pacmanager-git source = git+https://github.com/perseo22/pacmanager.git source = 0001-xfreerdp-new-interface.patch source = 0002-xfreerdp-new-interface.patch + source = 0003-xfreerdp-new-interface.patch md5sums = SKIP md5sums = d7350164daad682396c3278d6c40bb9d md5sums = cc4b26825efcf1d6c2aeea2b92531c40 + md5sums = ac48e3d9ee6b0694a42c123498b06c64 pkgname = pacmanager-git diff --git a/0003-xfreerdp-new-interface.patch b/0003-xfreerdp-new-interface.patch new file mode 100644 index 000000000000..843cb8f741b4 --- /dev/null +++ b/0003-xfreerdp-new-interface.patch @@ -0,0 +1,13 @@ +--- a/lib/pac_conn 2016-08-04 19:23:57.264676225 +0200 ++++ b/lib/pac_conn 2016-08-04 19:24:46.645082365 +0200 +@@ -929,8 +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'} ) { +- $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"; ++ $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' ) { + $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"; @@ -4,7 +4,7 @@ pkgname=pacmanager-git _pkgname=${pkgname%-git} pkgver=4.5.5.8 -pkgrel=1 +pkgrel=2 arch=('any') license=('GPL3') pkgdesc="Perl Auto Connector PAC Manager. GIT version with fixed FreeRDP interface." @@ -14,16 +14,20 @@ makedepends=('git') conflicts=(pacmanager-bin) source=("git+https://github.com/perseo22/pacmanager.git" "0001-xfreerdp-new-interface.patch" - "0002-xfreerdp-new-interface.patch") + "0002-xfreerdp-new-interface.patch" + "0003-xfreerdp-new-interface.patch") md5sums=('SKIP' 'd7350164daad682396c3278d6c40bb9d' - 'cc4b26825efcf1d6c2aeea2b92531c40') + 'cc4b26825efcf1d6c2aeea2b92531c40' + 'ac48e3d9ee6b0694a42c123498b06c64') prepare() { cd ${srcdir}/${_pkgname} # Apply patches for new FreeRDP interface patch -Np1 -i $srcdir/0001-xfreerdp-new-interface.patch patch -Np1 -i $srcdir/0002-xfreerdp-new-interface.patch + # The third patch is done by me + patch -Np1 -i $srcdir/0003-xfreerdp-new-interface.patch } build() { |