guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 486b322f3dfb92a1bfc640c0081fcc59bfcc8a62
Author: Efraim Flashner <[email protected]>
AuthorDate: Thu Jan 1 14:08:21 2026 +0200
gnu: freerdp: Update to 3.20.0.
Fixes: #5268.
* gnu/packages/rdesktop.scm (freerdp): Update to 3.20.0.
[source]: Remove patch.
[arguments]: Adjust test-exclude, configure-flags for new version.
* gnu/packages/patches/freerdp-3.16.0-rpath.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
Change-Id: If30bfff499cc57b2158c7be5dc9644f8898bb492
---
gnu/local.mk | 1 -
gnu/packages/patches/freerdp-3.16.0-rpath.patch | 21 ---------------------
gnu/packages/rdesktop.scm | 14 ++++----------
3 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 1cd704e443..2fcd1bb304 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1325,7 +1325,6 @@ dist_patch_DATA =
\
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/freeimage-CVE-2020-21428.patch \
%D%/packages/patches/freeimage-CVE-2020-22524.patch \
- %D%/packages/patches/freerdp-3.16.0-rpath.patch \
%D%/packages/patches/freesolid-automake.patch \
%D%/packages/patches/freesolid-autotools.patch \
%D%/packages/patches/freesolid-configure.patch \
diff --git a/gnu/packages/patches/freerdp-3.16.0-rpath.patch
b/gnu/packages/patches/freerdp-3.16.0-rpath.patch
deleted file mode 100644
index d40a33de29..0000000000
--- a/gnu/packages/patches/freerdp-3.16.0-rpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Author: Danny Milosavljevic <[email protected]>
-Date: 2025-07-17
-License: Apache Software License 2.0
-
-diff -ru orig/FreeRDP/cmake/ConfigureRPATH.cmake
FreeRDP/cmake/ConfigureRPATH.cmake
---- orig/FreeRDP/cmake/ConfigureRPATH.cmake 2025-07-17 10:42:17.557667810
+0200
-+++ FreeRDP/cmake/ConfigureRPATH.cmake 2025-07-17 11:32:13.692935801 +0200
-@@ -15,10 +15,10 @@
- option(WITH_ADD_PLUGIN_TO_RPATH "Add extension and plugin path to RPATH"
OFF)
- if(WITH_ADD_PLUGIN_TO_RPATH)
- set(CFG_INSTALL_RPATH
--
"\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/.."
-+
"\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../.."
- )
- else()
-- set(CFG_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
-+ set(CFG_INSTALL_RPATH
"\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../..")
- endif()
- endif()
- endif(APPLE)
-Only in FreeRDP/: LIBS
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 4ae6c471f4..d282119b37 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2015 Ludovic Courtès <[email protected]>
;;; Copyright © 2017 Thomas Danckaert <[email protected]>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <[email protected]>
-;;; Copyright © 2018, 2024 Efraim Flashner <[email protected]>
+;;; Copyright © 2018, 2024, 2026 Efraim Flashner <[email protected]>
;;; Copyright © 2019 Leo Famulari <[email protected]>
;;; Copyright © 2019 Eric Bavier <[email protected]>
;;; Copyright © 2023 Maxim Cournoyer <[email protected]>
@@ -178,7 +178,7 @@ of parts of the Windows API.")
(package
(inherit freerdp)
(name "freerdp")
- (version "3.17.2")
+ (version "3.20.0")
(source
(origin
(method git-fetch)
@@ -187,22 +187,16 @@ of parts of the Windows API.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "17jdr2fjfz2m81a32ka9ijb8n2kpg20s6wjvw72if86h1nsvxmmg"))
- (patches
- (search-patches "freerdp-3.16.0-rpath.patch"))))
+ (base32 "1fknj2ysm3nj7kz5k8wvxpny0a7bjbi290z9cs7fwrk3yqv454w4"))))
(inputs
(modify-inputs (package-inputs freerdp)
(replace "ffmpeg" ffmpeg)
(prepend fuse icu4c mit-krb5 sdl3 sdl3-gfx sdl3-ttf)))
(arguments
(list #:build-type "Release"
- #:test-exclude "TestFreeRDPCodecH264|TestClientRdpFile"
+ #:test-exclude "TestFreeRDPCodecInterleaved|TestClientRdpFile"
#:configure-flags
#~(list
- ;; Relax gcc-14's strictness.
- (string-append "-DCMAKE_C_FLAGS="
- " -Wno-error=incompatible-pointer-types"
- " -Wno-error=int-conversion")
"-DWITH_VERBOSE_WINPR_ASSERT=OFF"
"-DWITH_JPEG=ON"
#$@(if (target-x86-64?)
