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

[Christian Hesse]

    Date: Monday, December 16, 2019 @ 13:31:51
  Author: eworm
Revision: 537857

upgpkg: remmina 1:1.3.7-2

fix rdp plugin

Added:
  remmina/trunk/0001-freerdp-symbols.patch
Modified:
  remmina/trunk/PKGBUILD

----------------------------+
 0001-freerdp-symbols.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                   |    9 ++++++---
 2 files changed, 49 insertions(+), 3 deletions(-)

Added: 0001-freerdp-symbols.patch
===================================================================
--- 0001-freerdp-symbols.patch	                        (rev 0)
+++ 0001-freerdp-symbols.patch	2019-12-16 13:31:51 UTC (rev 537857)
@@ -0,0 +1,43 @@
+commit faa91915213d86b792d7fca491d199aea2243062
+Author: Antenore Gatta <antenore at simbiosi.org>
+Date:   Tue Dec 10 14:18:07 2019 +0100
+
+    Adding cmake option to cuse latest FreeRDP symbols when compiling. Fixes #2024
+
+diff --git a/plugins/rdp/CMakeLists.txt b/plugins/rdp/CMakeLists.txt
+index 90c8966b7..866a015fd 100644
+--- a/plugins/rdp/CMakeLists.txt
++++ b/plugins/rdp/CMakeLists.txt
+@@ -60,6 +60,12 @@ add_definitions(-DFREERDP_REQUIRED_MAJOR=${FREERDP_REQUIRED_MAJOR})
+ add_definitions(-DFREERDP_REQUIRED_MINOR=${FREERDP_REQUIRED_MINOR})
+ add_definitions(-DFREERDP_REQUIRED_REVISION=${FREERDP_REQUIRED_REVISION})
+ 
++option(WITH_FREERDP_MASTER "Compile the RDP plugin using symbols from FreeRDP master branch." OFF)
++if(WITH_FREERDP_MASTER)
++	message(STATUS "Compiling the RDP plugin using symbols from FreeRDP master branch.")
++	add_definitions(-DWITH_FREERDP_MASTER=ON)
++endif()
++
+ add_library(remmina-plugin-rdp MODULE ${REMMINA_PLUGIN_RDP_SRCS})
+ set_target_properties(remmina-plugin-rdp PROPERTIES PREFIX "")
+ set_target_properties(remmina-plugin-rdp PROPERTIES NO_SONAME 1)
+diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c
+index 836823afd..ca57f6c30 100644
+--- a/plugins/rdp/rdp_plugin.c
++++ b/plugins/rdp/rdp_plugin.c
+@@ -1172,8 +1172,15 @@ static gboolean remmina_rdp_main(RemminaProtocolWidget *gp)
+ 		freerdp_set_gateway_usage_method(rfi->settings,
+ 						 remmina_plugin_service->file_get_int(remminafile, "gateway_usage", FALSE) ? TSC_PROXY_MODE_DETECT : TSC_PROXY_MODE_DIRECT);
+ 
++#ifdef WITH_FREERDP_MASTER
++#pragma message  "Using FreeRDP master branch!"
++	/* TODO: As soon as FreeRDP 2.0.0-rc5 will be available, implement an ifdef with that version */
+ 	freerdp_settings_set_string(rfi->settings, (size_t)FreeRDP_GatewayAccessToken,
+ 				    remmina_plugin_service->file_get_string(remminafile, "gatewayaccesstoken"));
++#else
++	rfi->settings->GatewayAccessToken = g_strdup(
++			remmina_plugin_service->file_get_string(remminafile, "gatewayaccesstoken"));
++#endif
+ 
+ 	rfi->settings->AuthenticationLevel = remmina_plugin_service->file_get_int(
+ 		remminafile, "authentication level", rfi->settings->AuthenticationLevel);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-16 13:24:03 UTC (rev 537856)
+++ PKGBUILD	2019-12-16 13:31:51 UTC (rev 537857)
@@ -3,7 +3,7 @@
 pkgname=remmina
 epoch=1
 pkgver=1.3.7
-pkgrel=1
+pkgrel=2
 pkgdesc="remote desktop client written in GTK+"
 arch=(x86_64)
 url="https://www.remmina.org/"
@@ -21,13 +21,16 @@
             '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')
+source=("$pkgname-$pkgver.tar.bz2::https://gitlab.com/Remmina/Remmina/-/archive/v${pkgver/rc/-rc}/Remmina-v${pkgver/rc/-rc}.tar.bz2"
+        '0001-freerdp-symbols.patch')
+sha256sums=('0412dd8d405a52c644a2465c261e333471079c9b5645b84942752a09cbedeb4b'
+            'f5958941dfc1e1907a9c5d4744a0da3dfa321e8d0ac63021dd1f13a04a8c2e21')
 
 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
+  patch -Np1 < ../0001-freerdp-symbols.patch
 }
 
 build() {