Date: Wednesday, February 1, 2017 @ 15:49:05
Author: spupykin
Revision: 209654
archrelease: copy trunk to community-i686, community-x86_64
Added:
remmina/repos/community-i686/PKGBUILD
(from rev 209653, remmina/trunk/PKGBUILD)
remmina/repos/community-i686/fix-freerdp-name.patch
(from rev 209653, remmina/trunk/fix-freerdp-name.patch)
remmina/repos/community-x86_64/PKGBUILD
(from rev 209653, remmina/trunk/PKGBUILD)
remmina/repos/community-x86_64/fix-freerdp-name.patch
(from rev 209653, remmina/trunk/fix-freerdp-name.patch)
Deleted:
remmina/repos/community-i686/PKGBUILD
remmina/repos/community-x86_64/PKGBUILD
-----------------------------------------+
/PKGBUILD | 98 ++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 42 ------------
community-i686/fix-freerdp-name.patch | 20 ++++++
community-x86_64/PKGBUILD | 42 ------------
community-x86_64/fix-freerdp-name.patch | 20 ++++++
5 files changed, 138 insertions(+), 84 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-02-01 15:48:49 UTC (rev 209653)
+++ community-i686/PKGBUILD 2017-02-01 15:49:05 UTC (rev 209654)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-
-pkgname=remmina
-epoch=1
-pkgver=1.2.0rcgit.16
-pkgrel=2
-pkgdesc="remote desktop client written in GTK+"
-arch=(i686 x86_64)
-url="http://www.remmina.org/";
-license=('GPL')
-depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'avahi' 'vte3'
- 'libgcrypt' 'libxdmcp' 'libsecret' 'webkit2gtk')
-makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
- 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
- 'libvncserver')
-optdepends=('libxkbfile'
- 'freerdp'
- 'telepathy-glib'
- 'gnome-keyring'
- 'nxproxy'
- 'xorg-server-xephyr: XDMCP support'
- 'libvncserver: VNC client/server support')
-replaces=('remmina-plugins')
-provides=('remmina-plugins')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz";)
-md5sums=('0868d084bcb7e4053a6e8c9abd1f93b0')
-
-build() {
- cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DWITH_APPINDICATOR=OFF .
- make
-}
-
-package() {
- cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
- make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/build
-}
Copied: remmina/repos/community-i686/PKGBUILD (from rev 209653,
remmina/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-02-01 15:49:05 UTC (rev 209654)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+
+pkgname=remmina
+epoch=1
+pkgver=1.2.0rcgit.17
+pkgrel=1
+pkgdesc="remote desktop client written in GTK+"
+arch=(i686 x86_64)
+url="http://www.remmina.org/";
+license=('GPL')
+depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'avahi' 'vte3'
+ 'libgcrypt' 'libxdmcp' 'libsecret' 'webkit2gtk')
+makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
+ 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
+ 'libvncserver')
+optdepends=('libxkbfile'
+ 'freerdp'
+ 'telepathy-glib'
+ 'gnome-keyring'
+ 'nxproxy'
+ 'xorg-server-xephyr: XDMCP support'
+ 'libvncserver: VNC client/server support')
+replaces=('remmina-plugins')
+provides=('remmina-plugins')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz";
+ "fix-freerdp-name.patch")
+sha256sums=('b4c7a8ee46b6ed323a2d70f6e8a3b6e2a9c9025eced85b57aacc00f484cadcb1'
+ '70ada2cd680678ccaadf2c4e1e726e7d286550dc3cef19cf653f3e9908224a99')
+
+prepare() {
+ cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
+ patch -p1 <"$srcdir"/fix-freerdp-name.patch
+}
+
+build() {
+ cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DWITH_APPINDICATOR=OFF .
+ make
+}
+
+package() {
+ cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
+ make DESTDIR="$pkgdir" install
+ rm -rf "$pkgdir"/build
+}
Copied: remmina/repos/community-i686/fix-freerdp-name.patch (from rev 209653,
remmina/trunk/fix-freerdp-name.patch)
===================================================================
--- community-i686/fix-freerdp-name.patch (rev 0)
+++ community-i686/fix-freerdp-name.patch 2017-02-01 15:49:05 UTC (rev
209654)
@@ -0,0 +1,20 @@
+diff -wbBur Remmina-1.2.0-rcgit.17/cmake/FindFREERDP.cmake
Remmina-1.2.0-rcgit.17.my/cmake/FindFREERDP.cmake
+--- Remmina-1.2.0-rcgit.17/cmake/FindFREERDP.cmake 2016-12-22
11:59:08.000000000 +0300
++++ Remmina-1.2.0-rcgit.17.my/cmake/FindFREERDP.cmake 2017-02-01
18:28:39.771764112 +0300
+@@ -30,13 +30,13 @@
+ find_path(WINPR_INCLUDE_DIR NAMES winpr/winpr.h
+ HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS}
${CMAKE_PREFIX_PATH}/include/winpr2/)
+
+-find_library(FREERDP_LIBRARY NAMES freerdp
++find_library(FREERDP_LIBRARY NAMES freerdp2
+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+
+-find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client
++find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client2
+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+
+-find_library(FREERDP_WINPR_LIBRARY NAMES winpr
++find_library(FREERDP_WINPR_LIBRARY NAMES winpr2
+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+
+ include(FindPackageHandleStandardArgs)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-02-01 15:48:49 UTC (rev 209653)
+++ community-x86_64/PKGBUILD 2017-02-01 15:49:05 UTC (rev 209654)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-
-pkgname=remmina
-epoch=1
-pkgver=1.2.0rcgit.16
-pkgrel=2
-pkgdesc="remote desktop client written in GTK+"
-arch=(i686 x86_64)
-url="http://www.remmina.org/";
-license=('GPL')
-depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'avahi' 'vte3'
- 'libgcrypt' 'libxdmcp' 'libsecret' 'webkit2gtk')
-makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
- 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
- 'libvncserver')
-optdepends=('libxkbfile'
- 'freerdp'
- 'telepathy-glib'
- 'gnome-keyring'
- 'nxproxy'
- 'xorg-server-xephyr: XDMCP support'
- 'libvncserver: VNC client/server support')
-replaces=('remmina-plugins')
-provides=('remmina-plugins')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz";)
-md5sums=('0868d084bcb7e4053a6e8c9abd1f93b0')
-
-build() {
- cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DWITH_APPINDICATOR=OFF .
- make
-}
-
-package() {
- cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
- make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir"/build
-}
Copied: remmina/repos/community-x86_64/PKGBUILD (from rev 209653,
remmina/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-02-01 15:49:05 UTC (rev 209654)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+
+pkgname=remmina
+epoch=1
+pkgver=1.2.0rcgit.17
+pkgrel=1
+pkgdesc="remote desktop client written in GTK+"
+arch=(i686 x86_64)
+url="http://www.remmina.org/";
+license=('GPL')
+depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'avahi' 'vte3'
+ 'libgcrypt' 'libxdmcp' 'libsecret' 'webkit2gtk')
+makedepends=('intltool' 'pkgconfig' 'cmake' 'libgnome-keyring'
+ 'avahi' 'libxkbfile' 'freerdp' 'telepathy-glib'
+ 'libvncserver')
+optdepends=('libxkbfile'
+ 'freerdp'
+ 'telepathy-glib'
+ 'gnome-keyring'
+ 'nxproxy'
+ 'xorg-server-xephyr: XDMCP support'
+ 'libvncserver: VNC client/server support')
+replaces=('remmina-plugins')
+provides=('remmina-plugins')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz";
+ "fix-freerdp-name.patch")
+sha256sums=('b4c7a8ee46b6ed323a2d70f6e8a3b6e2a9c9025eced85b57aacc00f484cadcb1'
+ '70ada2cd680678ccaadf2c4e1e726e7d286550dc3cef19cf653f3e9908224a99')
+
+prepare() {
+ cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
+ patch -p1 <"$srcdir"/fix-freerdp-name.patch
+}
+
+build() {
+ cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+ -DWITH_APPINDICATOR=OFF .
+ make
+}
+
+package() {
+ cd "$srcdir"/Remmina-${pkgver/rc/-rc}/
+ make DESTDIR="$pkgdir" install
+ rm -rf "$pkgdir"/build
+}
Copied: remmina/repos/community-x86_64/fix-freerdp-name.patch (from rev 209653,
remmina/trunk/fix-freerdp-name.patch)
===================================================================
--- community-x86_64/fix-freerdp-name.patch (rev 0)
+++ community-x86_64/fix-freerdp-name.patch 2017-02-01 15:49:05 UTC (rev
209654)
@@ -0,0 +1,20 @@
+diff -wbBur Remmina-1.2.0-rcgit.17/cmake/FindFREERDP.cmake
Remmina-1.2.0-rcgit.17.my/cmake/FindFREERDP.cmake
+--- Remmina-1.2.0-rcgit.17/cmake/FindFREERDP.cmake 2016-12-22
11:59:08.000000000 +0300
++++ Remmina-1.2.0-rcgit.17.my/cmake/FindFREERDP.cmake 2017-02-01
18:28:39.771764112 +0300
+@@ -30,13 +30,13 @@
+ find_path(WINPR_INCLUDE_DIR NAMES winpr/winpr.h
+ HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS}
${CMAKE_PREFIX_PATH}/include/winpr2/)
+
+-find_library(FREERDP_LIBRARY NAMES freerdp
++find_library(FREERDP_LIBRARY NAMES freerdp2
+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+
+-find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client
++find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client2
+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+
+-find_library(FREERDP_WINPR_LIBRARY NAMES winpr
++find_library(FREERDP_WINPR_LIBRARY NAMES winpr2
+ HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
+
+ include(FindPackageHandleStandardArgs)
