From 935ea3eddc1dd703722ce520154aa0893be02083 Mon Sep 17 00:00:00 2001 From: chrysos349 Date: Thu, 4 Jul 2024 01:17:28 +0300 Subject: [PATCH] freerdp3: update to 3.6.0 --- srcpkgs/freerdp3/patches/fix-cross.patch | 30 ++++++------- .../patches/undo-fix-cross-compilation.patch | 43 +++++++++++++++++++ .../freerdp3/patches/use-webkit2gtk41.patch | 25 ----------- srcpkgs/freerdp3/template | 7 +-- 4 files changed, 62 insertions(+), 43 deletions(-) create mode 100644 srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch delete mode 100644 srcpkgs/freerdp3/patches/use-webkit2gtk41.patch diff --git a/srcpkgs/freerdp3/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch index 7aea0e91a92908..37bef15c804f1d 100644 --- a/srcpkgs/freerdp3/patches/fix-cross.patch +++ b/srcpkgs/freerdp3/patches/fix-cross.patch @@ -1,9 +1,22 @@ help cmake run executables when cross-compiling +diff --git a/client/SDL/common/res/CMakeLists.txt b/client/SDL/common/res/CMakeLists.txt +index fdb80b79b..08f922968 100644 +--- a/client/SDL/common/res/CMakeLists.txt ++++ b/client/SDL/common/res/CMakeLists.txt +@@ -51,7 +51,7 @@ list(APPEND FACTORY_CLASSES + add_custom_command( + OUTPUT ${FILE_BYPRODUCTS} + COMMAND ${CMAKE_COMMAND} -E make_directory ${FILE_BIN_DIR} +- COMMAND $ ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR} ++ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $ ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR} + COMMENT "create image resources" + DEPENDS sdl-common-res2bin + DEPENDS ${FILE} diff --git a/cmake/InstallFreeRDPMan.cmake b/cmake/InstallFreeRDPMan.cmake -index c333f6497..2dff84966 100644 +index 758d673d6..a00cdf5eb 100644 --- a/cmake/InstallFreeRDPMan.cmake +++ b/cmake/InstallFreeRDPMan.cmake -@@ -57,7 +57,7 @@ function(generate_and_install_freerdp_man_from_xml name_base section api depende +@@ -54,7 +54,7 @@ function(generate_and_install_freerdp_man_from_xml target section dependencies) add_custom_command( OUTPUT "${manpage}" @@ -12,16 +25,3 @@ index c333f6497..2dff84966 100644 COMMAND ${XSLTPROC_EXECUTABLE} --path "${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}" ${DOCBOOKXSL_DIR}/manpages/docbook.xsl ${manpage}.xml WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS -diff --git a/client/SDL/dialogs/res/CMakeLists.txt b/client/SDL/dialogs/res/CMakeLists.txt -index 5591e4af6..0b0946534 100644 ---- a/client/SDL/dialogs/res/CMakeLists.txt -+++ b/client/SDL/dialogs/res/CMakeLists.txt -@@ -33,7 +33,7 @@ macro(convert_to_bin FILE FILE_TYPE) - add_custom_command( - OUTPUT ${FILE_BYPRODUCTS} - COMMAND ${CMAKE_COMMAND} -E make_directory ${FILE_BIN_DIR} -- COMMAND $ ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR} -+ COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $ ${FILE} ${FILE_TYPE} ${TARGET_NAME} ${FILE_BIN_DIR} - COMMENT "create image resources" - DEPENDS freerdp-res2bin - DEPENDS ${FILE} diff --git a/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch b/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch new file mode 100644 index 00000000000000..34bed655824b71 --- /dev/null +++ b/srcpkgs/freerdp3/patches/undo-fix-cross-compilation.patch @@ -0,0 +1,43 @@ +undo commit '[cmake] fix cross compilation' because it requires native tools +https://github.com/FreeRDP/FreeRDP/commit/46bced61fb2f76d71b737349c851b8f9924278d5 +diff --git a/client/SDL/common/res/CMakeLists.txt b/client/SDL/common/res/CMakeLists.txt +index fdb80b79b..44edf0553 100644 +--- a/client/SDL/common/res/CMakeLists.txt ++++ b/client/SDL/common/res/CMakeLists.txt +@@ -15,16 +15,9 @@ + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +-if(CMAKE_CROSSCOMPILING) +- find_package(SdlCommonRes2bin) +-else() +- add_executable(sdl-common-res2bin +- convert_res_to_c.cpp +- ) +- export(TARGETS sdl-common-res2bin FILE +- "${CMAKE_BINARY_DIR}/SdlCommonRes2binConfig.cmake") +-endif() +- ++add_executable(sdl-common-res2bin ++ convert_res_to_c.cpp ++) + + set(FACTORY_SRCS "") + set(FACTORY_HDR "") +diff --git a/client/common/man/CMakeLists.txt b/client/common/man/CMakeLists.txt +index a611cc22e..b601f1dfd 100644 +--- a/client/common/man/CMakeLists.txt ++++ b/client/common/man/CMakeLists.txt +@@ -1,9 +1,3 @@ +-if(CMAKE_CROSSCOMPILING) +- find_package(GenerateArgumentDocbook) +-else() +- add_executable(generate_argument_docbook +- generate_argument_docbook.c +- ) +- export(TARGETS generate_argument_docbook FILE +- "${CMAKE_BINARY_DIR}/GenerateArgumentDocbookConfig.cmake") +-endif() ++add_executable(generate_argument_docbook ++ generate_argument_docbook.c ++) diff --git a/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch b/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch deleted file mode 100644 index 432d9fdf414c62..00000000000000 --- a/srcpkgs/freerdp3/patches/use-webkit2gtk41.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3de172e7da393e8d544b7eb38ce9db7d18c468b1 Mon Sep 17 00:00:00 2001 -From: Christian Hesse -Date: Mon, 25 Mar 2024 20:12:08 +0100 -Subject: [PATCH 1/1] Use webkit2gtk-4.1 - ---- - client/SDL/aad/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/SDL/aad/CMakeLists.txt b/client/SDL/aad/CMakeLists.txt -index 228654262..d13fb907e 100644 ---- a/client/SDL/aad/CMakeLists.txt -+++ b/client/SDL/aad/CMakeLists.txt -@@ -44,7 +44,7 @@ if (WITH_WEBVIEW) - ) - else() - find_package(PkgConfig REQUIRED) -- pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.0 REQUIRED) -+ pkg_check_modules(WEBVIEW_GTK webkit2gtk-4.1 REQUIRED) - include_directories(${WEBVIEW_GTK_INCLUDE_DIRS}) - list(APPEND LIBS - ${WEBVIEW_GTK_LIBRARIES} --- -2.44.0 - diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template index 864b2b207d3757..78955c03b54c20 100644 --- a/srcpkgs/freerdp3/template +++ b/srcpkgs/freerdp3/template @@ -1,6 +1,6 @@ # Template file for 'freerdp3' pkgname=freerdp3 -version=3.5.1 +version=3.6.0 revision=1 build_style=cmake build_helper=qemu @@ -18,7 +18,8 @@ configure_args="-DCHANNEL_URBDRC_CLIENT=ON -DDOCBOOKXSL_DIR=/usr/share/xsl/docbo -DWITH_CLIENT_SDL=$(vopt_if sdl2 ON OFF) -DWITH_DSP_FFMPEG=$(vopt_if ffmpeg ON OFF) -DWITH_FFMPEG=$(vopt_if ffmpeg ON OFF) -DWITH_PCSC=$(vopt_if smartcard ON OFF) -DWITH_PKCS11=$(vopt_if smartcard ON OFF) -DWITH_SWSCALE=$(vopt_if ffmpeg ON OFF) - -DWITH_WAYLAND=$(vopt_if wayland ON OFF) -DWITH_WEBVIEW=$(vopt_if webview ON OFF)" + -DWITH_WAYLAND=$(vopt_if wayland ON OFF) -DWITH_WEBVIEW=$(vopt_if webview ON OFF) + -DWITH_CLIENT_SDL_VERSIONED=$(vopt_if sdl2 ON OFF)" hostmakedepends="pkg-config xmlto $(vopt_if wayland wayland-devel)" makedepends="alsa-lib-devel cups-devel fuse3-devel icu-devel libXcursor-devel libXdamage-devel libXinerama-devel libXrandr-devel libXv-devel @@ -34,7 +35,7 @@ license="Apache-2.0" homepage="https://www.freerdp.com/" changelog="https://raw.githubusercontent.com/FreeRDP/FreeRDP/master/ChangeLog" distfiles="https://github.com/FreeRDP/FreeRDP/archive/${version}.tar.gz" -checksum=bb40028c90c156799bc26a8b5837754a62805ee371e988efc61903c7263843b1 +checksum=6676fdcc7774934a776120dd08337155888eb7e066b1263c7e96888ead04fc55 CFLAGS="-Wno-dev" # wayland - deprecated, sdl2 - experimental