Accepting request 924155 from X11:RemoteDesktop

OBS-URL: https://build.opensuse.org/request/show/924155
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/freerdp?expand=0&rev=51

freerdp-fix-plugin-path.patch

@@ -1,78 +0,0 @@
-Index: b/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -948,11 +948,28 @@ set(FREERDP_EXTENSION_PATH "${CMAKE_INST
- # Proxy plugins path
- if(NOT DEFINED PROXY_PLUGINDIR)
- 	message("using default plugins location")
--  	set(FREERDP_PROXY_PLUGINDIR "${CMAKE_BINARY_DIR}/server/proxy/plugins")
-+  	set(FREERDP_PROXY_PLUGINDIR "${FREERDP_PLUGIN_PATH}/server/proxy/plugins")
- else()
- 	set(FREERDP_PROXY_PLUGINDIR "${PROXY_PLUGINDIR}")
- endif()
- 
-+function(dump_cmake_variables)
-+    get_cmake_property(_variableNames VARIABLES)
-+    list (SORT _variableNames)
-+    foreach (_variableName ${_variableNames})
-+        if (ARGV0)
-+            unset(MATCHED)
-+            string(REGEX MATCH ${ARGV0} MATCHED ${_variableName})
-+            if (NOT MATCHED)
-+                continue()
-+            endif()
-+        endif()
-+        message(STATUS "${_variableName}=${${_variableName}}")
-+    endforeach()
-+endfunction()
-+
-+dump_cmake_variables("^FREERDP")
-+
- # Declare we have config.h, generated later on.
- add_definitions("-DHAVE_CONFIG_H")
- 
-Index: b/channels/client/addin.c
-===================================================================
---- a/channels/client/addin.c
-+++ b/channels/client/addin.c
-@@ -157,7 +157,7 @@ static FREERDP_ADDIN** freerdp_channels_
- 	LPSTR pszPattern;
- 	size_t cchPattern;
- 	LPCSTR pszAddinPath = FREERDP_ADDIN_PATH;
--	LPCSTR pszInstallPrefix = FREERDP_INSTALL_PREFIX;
-+	LPCSTR pszInstallPrefix = "";
- 	LPCSTR pszExtension;
- 	LPSTR pszSearchPath;
- 	size_t cchSearchPath;
-@@ -166,7 +166,7 @@ static FREERDP_ADDIN** freerdp_channels_
- 	FREERDP_ADDIN** ppAddins;
- 	WIN32_FIND_DATAA FindData;
- 	cchAddinPath = strnlen(pszAddinPath, sizeof(FREERDP_ADDIN_PATH));
--	cchInstallPrefix = strnlen(pszInstallPrefix, sizeof(FREERDP_INSTALL_PREFIX));
-+	cchInstallPrefix = strnlen(pszInstallPrefix, 0);
- 	pszExtension = PathGetSharedLibraryExtensionA(0);
- 	cchPattern = 128 + strnlen(pszExtension, MAX_PATH) + 2;
- 	pszPattern = (LPSTR)malloc(cchPattern + 1);
-Index: b/libfreerdp/common/addin.c
-===================================================================
---- a/libfreerdp/common/addin.c
-+++ b/libfreerdp/common/addin.c
-@@ -55,7 +55,7 @@ LPSTR freerdp_get_library_install_path(v
- 	size_t cchInstallPrefix;
- 	BOOL needLibPath, needInstallPath;
- 	LPCSTR pszLibraryPath = FREERDP_LIBRARY_PATH;
--	LPCSTR pszInstallPrefix = FREERDP_INSTALL_PREFIX;
-+	LPCSTR pszInstallPrefix = "";
- 	cchLibraryPath = strlen(pszLibraryPath) + 1;
- 	cchInstallPrefix = strlen(pszInstallPrefix) + 1;
- 	cchPath = cchInstallPrefix + cchLibraryPath;
-@@ -96,7 +96,7 @@ LPSTR freerdp_get_dynamic_addin_install_
- 	size_t cchInstallPrefix;
- 	BOOL needLibPath, needInstallPath;
- 	LPCSTR pszAddinPath = FREERDP_ADDIN_PATH;
--	LPCSTR pszInstallPrefix = FREERDP_INSTALL_PREFIX;
-+	LPCSTR pszInstallPrefix = "";
- 	cchAddinPath = strlen(pszAddinPath) + 1;
- 	cchInstallPrefix = strlen(pszInstallPrefix) + 1;
- 	cchPath = cchInstallPrefix + cchAddinPath;

freerdp.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Oct  7 17:15:54 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Finally nailed it: CMAKE_INSTALL_LIBDIR is absolute on Leaps and
+  relative on TW, but freerdp requires the relative variant.
+  Fixes boo#1190919
+
+-------------------------------------------------------------------
+Wed Oct  6 10:43:11 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
+
+- Remove freerdp-fix-plugin-path.patch again, the problem was 
+  introduced/fixed by cmake changes
+
 -------------------------------------------------------------------
 Sat Sep 18 10:21:29 UTC 2021 - Hans-Peter Jansen <hpj@urpla.net>
 

freerdp.spec

@@ -48,8 +48,6 @@ Source0:        https://github.com/FreeRDP/FreeRDP/archive/%{version}.tar.gz#/Fr
 Source1:        freerdp-rpmlintrc
 # PATCH-FIX-UPSTREAM freerdp-channels-off-link-fix.diff -- based on https://github.com/FreeRDP/FreeRDP/pull/7235
 Patch0:         freerdp-builtin-channels-off-link-fix.diff
-# PATCH-FIX-SUSE freerdp-fix-plugin-path.patch -- preliminary fix addin loading
-Patch1:         freerdp-fix-plugin-path.patch
 BuildRequires:  chrpath
 BuildRequires:  cmake >= 2.8
 BuildRequires:  cups-devel
@@ -203,6 +201,7 @@ export CFLAGS="%{optflags} -fPIE -pie"
 
 %cmake \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
+	-DCMAKE_INSTALL_LIBDIR=%{_lib} \
 	-DCMAKE_SKIP_RPATH=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
         -DWITH_ALSA=ON \