Date: Monday, April 9, 2018 @ 20:23:47 Author: eschwartz Revision: 315485
archrelease: copy trunk to community-x86_64 Added: remmina/repos/community-x86_64/PKGBUILD (from rev 315484, remmina/trunk/PKGBUILD) remmina/repos/community-x86_64/fix-freerdp-name.patch (from rev 315484, remmina/trunk/fix-freerdp-name.patch) Deleted: remmina/repos/community-x86_64/PKGBUILD remmina/repos/community-x86_64/fix-freerdp-name.patch ------------------------+ PKGBUILD | 92 +++++++++++++++++++++++++---------------------- fix-freerdp-name.patch | 40 ++++++++++---------- 2 files changed, 69 insertions(+), 63 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-09 20:23:25 UTC (rev 315484) +++ PKGBUILD 2018-04-09 20:23:47 UTC (rev 315485) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=remmina -epoch=1 -pkgver=1.2.0rcgit.27 -pkgrel=1 -pkgdesc="remote desktop client written in GTK+" -arch=(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' 'spice-protocol' 'spice-gtk3') -optdepends=('libxkbfile' - 'freerdp' - 'telepathy-glib' - 'gnome-keyring' - 'nxproxy' - 'spice-gtk3' - '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") -sha256sums=('5f96fc2b1013a12acada30991ec7f46b53b731e71f735e662d830d9083db9826') - -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 315484, remmina/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-09 20:23:47 UTC (rev 315485) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=remmina +epoch=1 +pkgver=1.2.0rcgit.27 +pkgrel=2 +pkgdesc="remote desktop client written in GTK+" +arch=(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' 'spice-protocol' 'spice-gtk3') +optdepends=('libxkbfile' + 'freerdp' + 'telepathy-glib' + 'gnome-keyring' + 'nxproxy' + 'spice-gtk3' + '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" + "https://github.com/FreeRDP/Remmina/commit/5d00c7920a4b8c7d781160b7188747b422f130a3.patch") +sha256sums=('5f96fc2b1013a12acada30991ec7f46b53b731e71f735e662d830d9083db9826' + '7df065f2243911c2f47e1bf91498c9494d19f1d3f154b3402b99d2572383126f') + +prepare() { + cd "$srcdir"/Remmina-${pkgver/rc/-rc}/ + patch -p1 < "$srcdir"/5d00c7920a4b8c7d781160b7188747b422f130a3.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 +} Deleted: fix-freerdp-name.patch =================================================================== --- fix-freerdp-name.patch 2018-04-09 20:23:25 UTC (rev 315484) +++ fix-freerdp-name.patch 2018-04-09 20:23:47 UTC (rev 315485) @@ -1,20 +0,0 @@ -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) Copied: remmina/repos/community-x86_64/fix-freerdp-name.patch (from rev 315484, remmina/trunk/fix-freerdp-name.patch) =================================================================== --- fix-freerdp-name.patch (rev 0) +++ fix-freerdp-name.patch 2018-04-09 20:23:47 UTC (rev 315485) @@ -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)