Date: Monday, December 16, 2019 @ 13:03:41 Author: eworm Revision: 537854
upgpkg: remmina 1:1.3.7-1 * use upstream source, not mirror * new upstream release Modified: remmina/trunk/PKGBUILD Deleted: remmina/trunk/fix-freerdp-name.patch ------------------------+ PKGBUILD | 12 ++++++------ fix-freerdp-name.patch | 20 -------------------- 2 files changed, 6 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-16 12:56:41 UTC (rev 537853) +++ PKGBUILD 2019-12-16 13:03:41 UTC (rev 537854) @@ -2,7 +2,7 @@ pkgname=remmina epoch=1 -pkgver=1.3.6 +pkgver=1.3.7 pkgrel=1 pkgdesc="remote desktop client written in GTK+" arch=(x86_64) @@ -21,17 +21,17 @@ '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') +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-${pkgver/rc/-rc} + 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-${pkgver/rc/-rc}/ + cd "$srcdir"/Remmina-v${pkgver/rc/-rc}/ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ @@ -40,6 +40,6 @@ } package() { - cd "$srcdir"/Remmina-${pkgver/rc/-rc}/ + cd "$srcdir"/Remmina-v${pkgver/rc/-rc}/ make DESTDIR="$pkgdir" install } Deleted: fix-freerdp-name.patch =================================================================== --- fix-freerdp-name.patch 2019-12-16 12:56:41 UTC (rev 537853) +++ fix-freerdp-name.patch 2019-12-16 13:03:41 UTC (rev 537854) @@ -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)