From de35b4d55950f7fd8ca4063a8f51bb8197e3e36ce57eb9d30fbce84f30825634 Mon Sep 17 00:00:00 2001 From: Johannes Weberhofer Date: Wed, 6 Oct 2021 11:08:00 +0000 Subject: [PATCH 1/2] Accepting request 923479 from home:frispete:test - Remove freerdp-fix-plugin-path.patch again, the problem was introduced/fixed by cmake changes OBS-URL: https://build.opensuse.org/request/show/923479 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=121 --- freerdp-fix-plugin-path.patch | 78 ----------------------------------- freerdp.changes | 6 +++ freerdp.spec | 2 - 3 files changed, 6 insertions(+), 80 deletions(-) delete mode 100644 freerdp-fix-plugin-path.patch diff --git a/freerdp-fix-plugin-path.patch b/freerdp-fix-plugin-path.patch deleted file mode 100644 index dfa8113..0000000 --- a/freerdp-fix-plugin-path.patch +++ /dev/null @@ -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; diff --git a/freerdp.changes b/freerdp.changes index 6447b03..541bb27 100644 --- a/freerdp.changes +++ b/freerdp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 6 10:43:11 UTC 2021 - Hans-Peter Jansen + +- 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 diff --git a/freerdp.spec b/freerdp.spec index 93dc788..fbc4d2b 100644 --- a/freerdp.spec +++ b/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 From 7986f81c2a1b55540d3a86a5cb2d5002701ae22d110e73cfea2cad5ad76ae67c Mon Sep 17 00:00:00 2001 From: Johannes Weberhofer Date: Fri, 8 Oct 2021 06:18:14 +0000 Subject: [PATCH 2/2] Accepting request 924062 from home:frispete:test Johannes, good news: - Finally nailed it: CMAKE_INSTALL_LIBDIR is absolute on Leaps and relative on TW, but freerdp requires the relative variant. Fixes boo#1190919 Really sorry for the churn! OBS-URL: https://build.opensuse.org/request/show/924062 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=122 --- freerdp.changes | 7 +++++++ freerdp.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/freerdp.changes b/freerdp.changes index 541bb27..f064241 100644 --- a/freerdp.changes +++ b/freerdp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 7 17:15:54 UTC 2021 - Hans-Peter Jansen + +- 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 diff --git a/freerdp.spec b/freerdp.spec index fbc4d2b..a93e033 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -201,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 \