summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoan Figueras2017-11-28 11:20:08 +0100
committerJoan Figueras2017-11-28 11:20:08 +0100
commitf2d367f10e5a31d2b8081c0e587a97a0d251b342 (patch)
treeab8a596a1e4158eef105abe56b61bef37600dbef
parentd2dd820645a45279405e3275099b73ab247aaa41 (diff)
downloadaur-f2d367f10e5a31d2b8081c0e587a97a0d251b342.tar.gz
Removed fix-xfreerdp-synthax patch
-rw-r--r--.SRCINFO4
-rw-r--r--0000-fix-xfreerdp-synthax.patch15
-rw-r--r--PKGBUILD5
3 files changed, 2 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 225cc8f61d34..01f09a60b0e4 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 = 2
+ pkgrel = 3
url = https://github.com/asbru-cm/asbru-cm
arch = any
license = GPL3
@@ -23,10 +23,8 @@ 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
deleted file mode 100644
index b2705c5bd236..000000000000
--- a/0000-fix-xfreerdp-synthax.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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 4adaf7007cd9..72a1e37446d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=asbru-cm-git
_pkgname=${pkgname%-git}
pkgver=5.0.0_RC4
-pkgrel=2
+pkgrel=3
arch=('any')
license=('GPL3')
pkgdesc="A free and open-source connection manager. GIT version"
@@ -13,15 +13,12 @@ depends=('perl-gnome2-gconf' 'glade-perl' 'openssh' 'perl-crypt-blowfish' 'perl-
makedepends=('git')
#conflicts=()
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
}