bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 20:15:25 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: freerdp: Update to 3.20.0.

Browse source 
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
This commit is contained in:
Efraim Flashner 2026-01-01 14:08:21 +02:00
parent 7169d247bf
commit 486b322f3d
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 4 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -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 \

21
gnu/packages/patches/freerdp-3.16.0-rpath.patch
View file

@ -1,21 +0,0 @@
Author: Danny Milosavljevic <dannym@friendly-machines.com>
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

14
gnu/packages/rdesktop.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2024 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2024, 2026 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
@ -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?)