[arch-commits] Commit in remmina/trunk (PKGBUILD freerdp-1.2.patch)

[Sergej Pupykin]

    Date: Tuesday, March 3, 2015 @ 13:32:31
  Author: spupykin
Revision: 128617

upgpkg: remmina 1:1.1.2-1

upd

Added:
  remmina/trunk/freerdp-1.2.patch
Modified:
  remmina/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   22 ++++++++++++++++-----
 freerdp-1.2.patch |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 70 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-03 12:32:27 UTC (rev 128616)
+++ PKGBUILD	2015-03-03 12:32:31 UTC (rev 128617)
@@ -2,7 +2,8 @@
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=remmina
-pkgver=1.2.0rcgit.2
+epoch=1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc="remote desktop client written in GTK+"
 arch=(i686 x86_64)
@@ -22,11 +23,22 @@
 replaces=('remmina-plugins')
 provides=('remmina-plugins')
 install=remmina.install
-source=("$pkgname-${pkgver/rc/-rc}.tar.gz::https://github.com/FreeRDP/Remmina/archive/v${pkgver/rc/-rc}.tar.gz")
-md5sums=('049fc8d428e84bcbe7cac653e4447cd7')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/Remmina/archive/v$pkgver.tar.gz"
+	"freerdp-1.2.patch")
+md5sums=('825b4dbee7053a059ac314ca11714219'
+         '509ded89b6a2858b3091698d380da831')
 
+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/rc/-rc}/
+  cd ${srcdir}/Remmina-$pkgver/
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
@@ -35,7 +47,7 @@
 }
 
 package() {
-  cd ${srcdir}/Remmina-${pkgver/rc/-rc}/
+  cd ${srcdir}/Remmina-$pkgver/
   make DESTDIR=${pkgdir} install
   rm -rf $pkgdir/build
 }

Added: freerdp-1.2.patch
===================================================================
--- freerdp-1.2.patch	                        (rev 0)
+++ freerdp-1.2.patch	2015-03-03 12:32:31 UTC (rev 128617)
@@ -0,0 +1,53 @@
+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;
+ }