Date: Thursday, January 7, 2016 @ 13:41:11
Author: spupykin
Revision: 155641
upgpkg: remmina 1:1.2.0rcgit.8-1
upd
Modified:
remmina/trunk/PKGBUILD
Deleted:
remmina/trunk/freerdp-1.2.patch
-------------------+
PKGBUILD | 21 ++++----------------
freerdp-1.2.patch | 53 ----------------------------------------------------
2 files changed, 5 insertions(+), 69 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-01-07 12:41:07 UTC (rev 155640)
+++ PKGBUILD 2016-01-07 12:41:11 UTC (rev 155641)
@@ -3,7 +3,7 @@
pkgname=remmina
epoch=1
-pkgver=1.1.2
+pkgver=1.2.0rcgit.8
pkgrel=1
pkgdesc="remote desktop client written in GTK+"
arch=(i686 x86_64)
@@ -23,22 +23,11 @@
replaces=('remmina-plugins')
provides=('remmina-plugins')
install=remmina.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/_/-}.tar.gz";
- "freerdp-1.2.patch")
-md5sums=('72138b37165b8f96b1a45c87bc248eef'
- '509ded89b6a2858b3091698d380da831')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/${pkgver/rc/-rc}.tar.gz";)
+md5sums=('8010dd04dee689d77e7b7c3e956b0205')
-prepare() {
- cd ${srcdir}/Remmina-${pkgver/_/-}/
- for i in "${source[@]}"; do
- if [[ $i == *.patch ]]; then
- patch -F100 -p1 -i "${srcdir}/${i}"
- fi
- done
-}
-
build() {
- cd ${srcdir}/Remmina-${pkgver/_/-}/
+ cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
@@ -47,7 +36,7 @@
}
package() {
- cd ${srcdir}/Remmina-${pkgver/_/-}/
+ cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
make DESTDIR=${pkgdir} install
rm -rf $pkgdir/build
}
Deleted: freerdp-1.2.patch
===================================================================
--- freerdp-1.2.patch 2016-01-07 12:41:07 UTC (rev 155640)
+++ freerdp-1.2.patch 2016-01-07 12:41:11 UTC (rev 155641)
@@ -1,53 +0,0 @@
-diff -wbBur Remmina-1.1.1/cmake/FindFREERDP.cmake
Remmina-1.1.1.my/cmake/FindFREERDP.cmake
---- Remmina-1.1.1/cmake/FindFREERDP.cmake 2014-10-10 16:25:23.000000000
+0400
-+++ Remmina-1.1.1.my/cmake/FindFREERDP.cmake 2014-11-19 19:32:40.112459977
+0300
-@@ -24,19 +24,7 @@
- find_path(FREERDP_INCLUDE_DIR NAMES freerdp/freerdp.h
- HINTS ${PC_FREERDP_INCLUDEDIR} ${PC_FREERDP_INCLUDE_DIRS})
-
--find_library(FREERDP_LIBRARY NAMES freerdp-core
-- HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_GDI_LIBRARY NAMES freerdp-gdi
-- HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_LOCALE_LIBRARY NAMES freerdp-locale
-- HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_RAIL_LIBRARY NAMES freerdp-rail
-- HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
--
--find_library(FREERDP_CODEC_LIBRARY NAMES freerdp-codec
-+find_library(FREERDP_LIBRARY NAMES freerdp
- HINTS ${PC_FREERDP_LIBDIR} ${PC_FREERDP_LIBRARY_DIRS})
-
- find_library(FREERDP_CLIENT_LIBRARY NAMES freerdp-client
-@@ -46,7 +34,7 @@
-
- find_package_handle_standard_args(FREERDP DEFAULT_MSG FREERDP_LIBRARY
FREERDP_INCLUDE_DIR)
-
--set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_GDI_LIBRARY}
${FREERDP_LOCALE_LIBRARY} ${FREERDP_RAIL_LIBRARY} ${FREERDP_CODEC_LIBRARY}
${FREERDP_CLIENT_LIBRARY})
-+set(FREERDP_LIBRARIES ${FREERDP_LIBRARY} ${FREERDP_CLIENT_LIBRARY})
- set(FREERDP_INCLUDE_DIRS ${FREERDP_INCLUDE_DIR})
-
- mark_as_advanced(FREERDP_INCLUDE_DIR FREERDP_LIBRARY)
-diff -wbBur Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c
Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c
---- Remmina-1.1.1/remmina-plugins/rdp/rdp_plugin.c 2014-10-10
16:25:23.000000000 +0400
-+++ Remmina-1.1.1.my/remmina-plugins/rdp/rdp_plugin.c 2014-11-19
19:36:32.241877093 +0300
-@@ -257,7 +257,7 @@
- settings->LargePointerFlag = True;
- settings->PerformanceFlags = PERF_FLAG_NONE;
-
-- rfi->rfx_context = rfx_context_new();
-+ rfi->rfx_context = rfx_context_new(FALSE);
- }
-
- freerdp_client_load_addins(instance->context->channels,
instance->settings);
-@@ -1198,7 +1198,6 @@
-
- remmina_rdp_settings_init();
- freerdp_handle_signals();
-- freerdp_channels_global_init();
-
- return TRUE;
- }
