[arch-commits] Commit in vinagre/repos (6 files)
Jan de Groot
jgc at archlinux.org
Wed Jun 8 08:28:00 UTC 2016
Date: Wednesday, June 8, 2016 @ 10:27:58
Author: jgc
Revision: 269121
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
vinagre/repos/extra-i686/PKGBUILD
(from rev 269120, vinagre/trunk/PKGBUILD)
vinagre/repos/extra-i686/freerdp2.patch
(from rev 269120, vinagre/trunk/freerdp2.patch)
vinagre/repos/extra-x86_64/PKGBUILD
(from rev 269120, vinagre/trunk/PKGBUILD)
vinagre/repos/extra-x86_64/freerdp2.patch
(from rev 269120, vinagre/trunk/freerdp2.patch)
Deleted:
vinagre/repos/extra-i686/PKGBUILD
vinagre/repos/extra-x86_64/PKGBUILD
-----------------------------+
/PKGBUILD | 78 ++++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 32 -----------------
extra-i686/freerdp2.patch | 20 ++++++++++
extra-x86_64/PKGBUILD | 32 -----------------
extra-x86_64/freerdp2.patch | 20 ++++++++++
5 files changed, 118 insertions(+), 64 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-06-08 08:27:46 UTC (rev 269120)
+++ extra-i686/PKGBUILD 2016-06-08 08:27:58 UTC (rev 269121)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Allan McRae <mcrae_allan at hotmail.com>
-# Contributor: lp76 <l.peduto at gmail.com>
-
-pkgname=vinagre
-pkgver=3.20.2
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME desktop"
-url="https://wiki.gnome.org/Apps/Vinagre"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(libsecret gtk-vnc vte3 telepathy-glib avahi dconf spice-gtk3 gnutls freerdp)
-optdepends=('openssh: SSH plugin')
-makedepends=(docbook-xsl intltool openssh itstool spice-protocol)
-groups=(gnome-extra)
-options=(!emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5fc78ef9ab9ee7d4e3c50d38d82d9bcbd915191bcf0349d55a2fd56eaa87eaa0')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \
- --enable-rdp --enable-spice --enable-compile-warnings=minimum
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: vinagre/repos/extra-i686/PKGBUILD (from rev 269120, vinagre/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-06-08 08:27:58 UTC (rev 269121)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Allan McRae <mcrae_allan at hotmail.com>
+# Contributor: lp76 <l.peduto at gmail.com>
+
+pkgname=vinagre
+pkgver=3.20.2
+pkgrel=2
+pkgdesc="A VNC Client for the GNOME desktop"
+url="https://wiki.gnome.org/Apps/Vinagre"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(libsecret gtk-vnc vte3 telepathy-glib avahi dconf spice-gtk3 gnutls freerdp)
+optdepends=('openssh: SSH plugin')
+makedepends=(docbook-xsl intltool openssh itstool spice-protocol vala gnome-common appstream-glib)
+groups=(gnome-extra)
+options=(!emptydirs)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ freerdp2.patch)
+sha256sums=('5fc78ef9ab9ee7d4e3c50d38d82d9bcbd915191bcf0349d55a2fd56eaa87eaa0'
+ '17282b64a78f92f317d62c98a5650595745e9dec93b4b223f1bb89747094b75c')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../freerdp2.patch
+ autoreconf -fi
+}
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \
+ --enable-rdp --enable-spice --enable-compile-warnings=minimum
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: vinagre/repos/extra-i686/freerdp2.patch (from rev 269120, vinagre/trunk/freerdp2.patch)
===================================================================
--- extra-i686/freerdp2.patch (rev 0)
+++ extra-i686/freerdp2.patch 2016-06-08 08:27:58 UTC (rev 269121)
@@ -0,0 +1,20 @@
+--- vinagre-3.20.2/configure.ac.orig 2016-06-08 08:10:09.599068652 +0000
++++ vinagre-3.20.2/configure.ac 2016-06-08 08:10:37.428938533 +0000
+@@ -58,7 +58,7 @@
+ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
+
+ # Whether to enable support for RDP.
+-RDP_DEPS="freerdp x11"
++RDP_DEPS="freerdp2 x11"
+ AC_ARG_ENABLE([rdp],
+ [AS_HELP_STRING([--disable-rdp],
+ [Disable Remote Desktop Protocol (RDP) support])])
+@@ -66,7 +66,7 @@
+ AS_IF([test "x$enable_rdp" != "xno"],
+ [PKG_CHECK_EXISTS([$RDP_DEPS],
+ [have_rdp=yes
+- PKG_CHECK_EXISTS(freerdp >= 1.1,
++ PKG_CHECK_EXISTS(freerdp2 >= 1.1,
+ [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
+ [have_rdp=no])],
+ [have_rdp=no])
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-06-08 08:27:46 UTC (rev 269120)
+++ extra-x86_64/PKGBUILD 2016-06-08 08:27:58 UTC (rev 269121)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Allan McRae <mcrae_allan at hotmail.com>
-# Contributor: lp76 <l.peduto at gmail.com>
-
-pkgname=vinagre
-pkgver=3.20.2
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME desktop"
-url="https://wiki.gnome.org/Apps/Vinagre"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(libsecret gtk-vnc vte3 telepathy-glib avahi dconf spice-gtk3 gnutls freerdp)
-optdepends=('openssh: SSH plugin')
-makedepends=(docbook-xsl intltool openssh itstool spice-protocol)
-groups=(gnome-extra)
-options=(!emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5fc78ef9ab9ee7d4e3c50d38d82d9bcbd915191bcf0349d55a2fd56eaa87eaa0')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \
- --enable-rdp --enable-spice --enable-compile-warnings=minimum
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: vinagre/repos/extra-x86_64/PKGBUILD (from rev 269120, vinagre/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-06-08 08:27:58 UTC (rev 269121)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Allan McRae <mcrae_allan at hotmail.com>
+# Contributor: lp76 <l.peduto at gmail.com>
+
+pkgname=vinagre
+pkgver=3.20.2
+pkgrel=2
+pkgdesc="A VNC Client for the GNOME desktop"
+url="https://wiki.gnome.org/Apps/Vinagre"
+arch=(i686 x86_64)
+license=(GPL)
+depends=(libsecret gtk-vnc vte3 telepathy-glib avahi dconf spice-gtk3 gnutls freerdp)
+optdepends=('openssh: SSH plugin')
+makedepends=(docbook-xsl intltool openssh itstool spice-protocol vala gnome-common appstream-glib)
+groups=(gnome-extra)
+options=(!emptydirs)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ freerdp2.patch)
+sha256sums=('5fc78ef9ab9ee7d4e3c50d38d82d9bcbd915191bcf0349d55a2fd56eaa87eaa0'
+ '17282b64a78f92f317d62c98a5650595745e9dec93b4b223f1bb89747094b75c')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../freerdp2.patch
+ autoreconf -fi
+}
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \
+ --enable-rdp --enable-spice --enable-compile-warnings=minimum
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Copied: vinagre/repos/extra-x86_64/freerdp2.patch (from rev 269120, vinagre/trunk/freerdp2.patch)
===================================================================
--- extra-x86_64/freerdp2.patch (rev 0)
+++ extra-x86_64/freerdp2.patch 2016-06-08 08:27:58 UTC (rev 269121)
@@ -0,0 +1,20 @@
+--- vinagre-3.20.2/configure.ac.orig 2016-06-08 08:10:09.599068652 +0000
++++ vinagre-3.20.2/configure.ac 2016-06-08 08:10:37.428938533 +0000
+@@ -58,7 +58,7 @@
+ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
+
+ # Whether to enable support for RDP.
+-RDP_DEPS="freerdp x11"
++RDP_DEPS="freerdp2 x11"
+ AC_ARG_ENABLE([rdp],
+ [AS_HELP_STRING([--disable-rdp],
+ [Disable Remote Desktop Protocol (RDP) support])])
+@@ -66,7 +66,7 @@
+ AS_IF([test "x$enable_rdp" != "xno"],
+ [PKG_CHECK_EXISTS([$RDP_DEPS],
+ [have_rdp=yes
+- PKG_CHECK_EXISTS(freerdp >= 1.1,
++ PKG_CHECK_EXISTS(freerdp2 >= 1.1,
+ [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
+ [have_rdp=no])],
+ [have_rdp=no])
More information about the arch-commits
mailing list