summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/freerdp-3.16.0-rpath.patch21
-rw-r--r--gnu/packages/rdesktop.scm14
3 files changed, 4 insertions, 32 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 048932f28ca..bafc7e71351 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1323,7 +1323,6 @@ dist_patch_DATA = \
1323 %D%/packages/patches/freeimage-unbundle.patch \ 1323 %D%/packages/patches/freeimage-unbundle.patch \
1324 %D%/packages/patches/freeimage-CVE-2020-21428.patch \ 1324 %D%/packages/patches/freeimage-CVE-2020-21428.patch \
1325 %D%/packages/patches/freeimage-CVE-2020-22524.patch \ 1325 %D%/packages/patches/freeimage-CVE-2020-22524.patch \
1326 %D%/packages/patches/freerdp-3.16.0-rpath.patch \
1327 %D%/packages/patches/freesolid-automake.patch \ 1326 %D%/packages/patches/freesolid-automake.patch \
1328 %D%/packages/patches/freesolid-autotools.patch \ 1327 %D%/packages/patches/freesolid-autotools.patch \
1329 %D%/packages/patches/freesolid-configure.patch \ 1328 %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 d40a33de29b..00000000000
--- a/gnu/packages/patches/freerdp-3.16.0-rpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Author: Danny Milosavljevic <dannym@friendly-machines.com>
2Date: 2025-07-17
3License: Apache Software License 2.0
4
5diff -ru orig/FreeRDP/cmake/ConfigureRPATH.cmake FreeRDP/cmake/ConfigureRPATH.cmake
6--- orig/FreeRDP/cmake/ConfigureRPATH.cmake 2025-07-17 10:42:17.557667810 +0200
7+++ FreeRDP/cmake/ConfigureRPATH.cmake 2025-07-17 11:32:13.692935801 +0200
8@@ -15,10 +15,10 @@
9 option(WITH_ADD_PLUGIN_TO_RPATH "Add extension and plugin path to RPATH" OFF)
10 if(WITH_ADD_PLUGIN_TO_RPATH)
11 set(CFG_INSTALL_RPATH
12- "\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/.."
13+ "\$ORIGIN/../${FREERDP_EXTENSION_REL_PATH}:\$ORIGIN/../${FREERDP_PLUGIN_PATH}:\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../.."
14 )
15 else()
16- set(CFG_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..")
17+ set(CFG_INSTALL_RPATH "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:\$ORIGIN/..:\$ORIGIN/../..")
18 endif()
19 endif()
20 endif(APPLE)
21Only in FreeRDP/: LIBS
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 4ae6c471f47..d282119b371 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -2,7 +2,7 @@
2;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> 2;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
3;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> 3;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
4;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> 4;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
5;;; Copyright © 2018, 2024 Efraim Flashner <efraim@flashner.co.il> 5;;; Copyright © 2018, 2024, 2026 Efraim Flashner <efraim@flashner.co.il>
6;;; Copyright © 2019 Leo Famulari <leo@famulari.name> 6;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
7;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org> 7;;; Copyright © 2019 Eric Bavier <bavier@member.fsf.org>
8;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop> 8;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop>
@@ -178,7 +178,7 @@ of parts of the Windows API.")
178 (package 178 (package
179 (inherit freerdp) 179 (inherit freerdp)
180 (name "freerdp") 180 (name "freerdp")
181 (version "3.17.2") 181 (version "3.20.0")
182 (source 182 (source
183 (origin 183 (origin
184 (method git-fetch) 184 (method git-fetch)
@@ -187,22 +187,16 @@ of parts of the Windows API.")
187 (commit version))) 187 (commit version)))
188 (file-name (git-file-name name version)) 188 (file-name (git-file-name name version))
189 (sha256 189 (sha256
190 (base32 "17jdr2fjfz2m81a32ka9ijb8n2kpg20s6wjvw72if86h1nsvxmmg")) 190 (base32 "1fknj2ysm3nj7kz5k8wvxpny0a7bjbi290z9cs7fwrk3yqv454w4"))))
191 (patches
192 (search-patches "freerdp-3.16.0-rpath.patch"))))
193 (inputs 191 (inputs
194 (modify-inputs (package-inputs freerdp) 192 (modify-inputs (package-inputs freerdp)
195 (replace "ffmpeg" ffmpeg) 193 (replace "ffmpeg" ffmpeg)
196 (prepend fuse icu4c mit-krb5 sdl3 sdl3-gfx sdl3-ttf))) 194 (prepend fuse icu4c mit-krb5 sdl3 sdl3-gfx sdl3-ttf)))
197 (arguments 195 (arguments
198 (list #:build-type "Release" 196 (list #:build-type "Release"
199 #:test-exclude "TestFreeRDPCodecH264|TestClientRdpFile" 197 #:test-exclude "TestFreeRDPCodecInterleaved|TestClientRdpFile"
200 #:configure-flags 198 #:configure-flags
201 #~(list 199 #~(list
202 ;; Relax gcc-14's strictness.
203 (string-append "-DCMAKE_C_FLAGS="
204 " -Wno-error=incompatible-pointer-types"
205 " -Wno-error=int-conversion")
206 "-DWITH_VERBOSE_WINPR_ASSERT=OFF" 200 "-DWITH_VERBOSE_WINPR_ASSERT=OFF"
207 "-DWITH_JPEG=ON" 201 "-DWITH_JPEG=ON"
208 #$@(if (target-x86-64?) 202 #$@(if (target-x86-64?)