[arch-commits] Commit in remmina/repos/community-x86_64 (3 files)

[Christian Hesse]

    Date: Monday, December 16, 2019 @ 13:03:43
  Author: eworm
Revision: 537855

archrelease: copy trunk to community-x86_64

Added:
  remmina/repos/community-x86_64/PKGBUILD
    (from rev 537854, remmina/trunk/PKGBUILD)
Deleted:
  remmina/repos/community-x86_64/PKGBUILD
  remmina/repos/community-x86_64/fix-freerdp-name.patch

------------------------+
 PKGBUILD               |   90 +++++++++++++++++++++++------------------------
 fix-freerdp-name.patch |   20 ----------
 2 files changed, 45 insertions(+), 65 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-16 13:03:41 UTC (rev 537854)
+++ PKGBUILD	2019-12-16 13:03:43 UTC (rev 537855)
@@ -1,45 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=remmina
-epoch=1
-pkgver=1.3.6
-pkgrel=1
-pkgdesc="remote desktop client written in GTK+"
-arch=(x86_64)
-url="https://www.remmina.org/"
-license=('GPL')
-depends=('avahi' 'libgcrypt' 'libssh' 'vte3' 'libsodium')
-makedepends=('cmake' 'freerdp' 'libvncserver' 'spice-gtk' 'spice-protocol' 'telepathy-glib'
-	     'harfbuzz')
-optdepends=('freerdp: RDP plugin'
-            'libsecret: Secret plugin'
-            'libvncserver: VNC plugin'
-            'libxkbfile: NX plugin'
-            'nxproxy: NX plugin'
-            'spice-gtk: Spice plugin'
-            'telepathy-glib: Telepathy plugin'
-            'xorg-server-xephyr: XDMCP plugin')
-replaces=('remmina-plugins')
-provides=('remmina-plugins')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz")
-sha256sums=('c9a2327d02285cec78ef6eab8154d88d78d2d6a874e17681fcc6cb1aff20c40d')
-
-prepare() {
-  cd Remmina-${pkgver/rc/-rc}
-  sed -e 's|ssh_threads|ssh|' -i cmake/FindLIBSSH.cmake # Fix build with libssh 0.8
-  sed -i 's|include_directories(.)|include_directories(.)\ninclude_directories(/usr/include/harfbuzz)|' CMakeLists.txt
-}
-
-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
-}

Copied: remmina/repos/community-x86_64/PKGBUILD (from rev 537854, remmina/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-16 13:03:43 UTC (rev 537855)
@@ -0,0 +1,45 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=remmina
+epoch=1
+pkgver=1.3.7
+pkgrel=1
+pkgdesc="remote desktop client written in GTK+"
+arch=(x86_64)
+url="https://www.remmina.org/"
+license=('GPL')
+depends=('avahi' 'libgcrypt' 'libssh' 'vte3' 'libsodium')
+makedepends=('cmake' 'freerdp' 'libvncserver' 'spice-gtk' 'spice-protocol' 'telepathy-glib'
+	     'harfbuzz')
+optdepends=('freerdp: RDP plugin'
+            'libsecret: Secret plugin'
+            'libvncserver: VNC plugin'
+            'libxkbfile: NX plugin'
+            'nxproxy: NX plugin'
+            'spice-gtk: Spice plugin'
+            'telepathy-glib: Telepathy plugin'
+            'xorg-server-xephyr: XDMCP plugin')
+replaces=('remmina-plugins')
+provides=('remmina-plugins')
+source=("$pkgname-$pkgver.tar.bz2::https://gitlab.com/Remmina/Remmina/-/archive/v${pkgver/rc/-rc}/Remmina-v${pkgver/rc/-rc}.tar.bz2")
+sha256sums=('0412dd8d405a52c644a2465c261e333471079c9b5645b84942752a09cbedeb4b')
+
+prepare() {
+  cd Remmina-v${pkgver/rc/-rc}
+  sed -e 's|ssh_threads|ssh|' -i cmake/FindLIBSSH.cmake # Fix build with libssh 0.8
+  sed -i 's|include_directories(.)|include_directories(.)\ninclude_directories(/usr/include/harfbuzz)|' CMakeLists.txt
+}
+
+build() {
+  cd "$srcdir"/Remmina-v${pkgver/rc/-rc}/
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DWITH_APPINDICATOR=OFF .
+  make
+}
+
+package() {
+  cd "$srcdir"/Remmina-v${pkgver/rc/-rc}/
+  make DESTDIR="$pkgdir" install
+}

Deleted: fix-freerdp-name.patch
===================================================================
--- fix-freerdp-name.patch	2019-12-16 13:03:41 UTC (rev 537854)
+++ fix-freerdp-name.patch	2019-12-16 13:03:43 UTC (rev 537855)
@@ -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)