From d13de848e263a9c463ec14308b8c7abcf478bd02 Mon Sep 17 00:00:00 2001 From: chrysos349 Date: Tue, 17 Dec 2024 02:45:25 +0300 Subject: [PATCH] freerdp3: update to 3.10.3 --- srcpkgs/freerdp3/patches/fix-cross.patch | 27 +++++++-------- .../patches/warn-print-after-ssl-init.patch | 34 +++++++++++++++++++ srcpkgs/freerdp3/template | 17 ++++++---- 3 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 srcpkgs/freerdp3/patches/warn-print-after-ssl-init.patch diff --git a/srcpkgs/freerdp3/patches/fix-cross.patch b/srcpkgs/freerdp3/patches/fix-cross.patch index d7d5b8cfe5c..0bff5ce8356 100644 --- a/srcpkgs/freerdp3/patches/fix-cross.patch +++ b/srcpkgs/freerdp3/patches/fix-cross.patch @@ -1,27 +1,26 @@ diff --git a/client/common/man/CMakeLists.txt b/client/common/man/CMakeLists.txt -index 798957c78..c14d22319 100644 +index 40c7e3d8..68d18451 100644 --- a/client/common/man/CMakeLists.txt +++ b/client/common/man/CMakeLists.txt @@ -1,6 +1,3 @@ -if(CMAKE_CROSSCOMPILING) -- find_package(GenerateArgumentManpage) +- find_package(GenerateArgumentManpage) -else() - include_directories(${CMAKE_BINARY_DIR}/include/) + include_directories(${CMAKE_BINARY_DIR}/include/) - add_executable(generate_argument_manpage -@@ -9,14 +6,13 @@ else() - ) - export(TARGETS generate_argument_manpage FILE - "${CMAKE_BINARY_DIR}/GenerateArgumentManpageConfig.cmake") + add_executable(generate_argument_manpage generate_argument_manpage.c ../cmdline.h) +@@ -15,13 +12,12 @@ else() + endif() + + export(TARGETS generate_argument_manpage FILE "${CMAKE_BINARY_DIR}/GenerateArgumentManpageConfig.cmake") -endif() set(MAN_OPTIONS_FILE "${CMAKE_CURRENT_BINARY_DIR}/freerdp-global-options.1") set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${MAN_OPTIONS_FILE}) add_custom_command( - OUTPUT ${MAN_OPTIONS_FILE} -- COMMAND ${CMAKE_BINARY_DIR}/client/common/man/generate_argument_manpage "${MAN_OPTIONS_FILE}" -+ COMMAND generate_argument_manpage "${MAN_OPTIONS_FILE}" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS - generate_argument_manpage +- OUTPUT ${MAN_OPTIONS_FILE} COMMAND $ "${MAN_OPTIONS_FILE}" ++ OUTPUT ${MAN_OPTIONS_FILE} COMMAND generate_argument_manpage "${MAN_OPTIONS_FILE}" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS generate_argument_manpage + ) + add_custom_target( diff --git a/srcpkgs/freerdp3/patches/warn-print-after-ssl-init.patch b/srcpkgs/freerdp3/patches/warn-print-after-ssl-init.patch new file mode 100644 index 00000000000..9ae1dabc150 --- /dev/null +++ b/srcpkgs/freerdp3/patches/warn-print-after-ssl-init.patch @@ -0,0 +1,34 @@ +From 60ed73552ffdb499dddf06c119be9437da7f9261 Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Sun, 29 Dec 2024 10:22:56 +0100 +Subject: [PATCH 1/2] [core,connection] print SSL warnings after init + +--- + libfreerdp/core/connection.c | 1 + + libfreerdp/core/freerdp.c | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libfreerdp/core/connection.c b/libfreerdp/core/connection.c +index 979ccdf60a57..001b56944b8c 100644 +--- a/libfreerdp/core/connection.c ++++ b/libfreerdp/core/connection.c +@@ -319,6 +319,7 @@ BOOL rdp_client_connect(rdpRdp* rdp) + flags |= WINPR_SSL_INIT_ENABLE_FIPS; + + winpr_InitializeSSL(flags); ++ rdp_log_build_warnings(rdp); + + /* FIPS Mode forces the following and overrides the following(by happening later */ + /* in the command line processing): */ +diff --git a/libfreerdp/core/freerdp.c b/libfreerdp/core/freerdp.c +index 94dad20a0cd9..715da31d917b 100644 +--- a/libfreerdp/core/freerdp.c ++++ b/libfreerdp/core/freerdp.c +@@ -802,7 +802,6 @@ BOOL freerdp_context_new_ex(freerdp* instance, rdpSettings* settings) + if (!rdp) + goto fail; + +- rdp_log_build_warnings(rdp); + context->rdp = rdp; + context->pubSub = rdp->pubSub; + diff --git a/srcpkgs/freerdp3/template b/srcpkgs/freerdp3/template index 41fbe1551f4..f796bb464ee 100644 --- a/srcpkgs/freerdp3/template +++ b/srcpkgs/freerdp3/template @@ -1,13 +1,19 @@ # Template file for 'freerdp3' pkgname=freerdp3 -version=3.9.0 +version=3.10.3 revision=1 build_style=cmake build_helper=qemu -configure_args="-DCHANNEL_URBDRC_CLIENT=ON +configure_args="-Wno-dev -DCMAKE_BUILD_TYPE=Release + -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG + -DCMAKE_CXX_FLAGS_DEBUG=-DNDEBUG + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG + -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG + -DCMAKE_C_FLAGS_DEBUG=-DNDEBUG + -DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG -DPKG_CONFIG_RELOCATABLE=OFF -DPROXY_PLUGINDIR=/usr/lib/${pkgname}/server/proxy/plugins -DRDTK_FORCE_STATIC_BUILD=ON -DWAYLAND_SCANNER=/usr/bin/wayland-scanner - -DWITH_BINARY_VERSIONING=ON + -DCHANNEL_URBDRC_CLIENT=ON -DWITH_BINARY_VERSIONING=ON -DWITH_ALSA=ON -DWITH_CHANNELS=ON -DWITH_CLIENT_CHANNELS=ON -DWITH_CUPS=ON -DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON -DWITH_FUSE=ON -DWITH_GSTREAMER_1_0=OFF -DWITH_ICU=ON -DWITH_JPEG=ON -DWITH_LIBSYSTEMD=OFF -DWITH_PULSE=ON -DWITH_SAMPLE=OFF @@ -19,7 +25,7 @@ configure_args="-DCHANNEL_URBDRC_CLIENT=ON -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_CLIENT_SDL_VERSIONED=$(vopt_if sdl2 ON OFF)" + -DWITH_CLIENT_SDL_VERSIONED=$(vopt_if sdl2 ON OFF) -DWITH_VERBOSE_WINPR_ASSERT=OFF" hostmakedepends="pkg-config $(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 @@ -35,8 +41,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=a1d2946c67037bf6bb8aa2f0441c7cacd5e92c835d776cecffb4fcdbaa45ec4f -CFLAGS="-Wno-dev" +checksum=011b645e49401e59396ded91cccf9a0cdf68e6c43a3cb0bf6a9b6852c9c564a4 # wayland - deprecated, sdl2 - experimental build_options="aad ffmpeg sdl2 smartcard wayland webview"