From ae246cae33d56634f16cc68094f73b3d9821ebc7 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Wed, 21 May 2025 17:59:09 +0200
Subject: [PATCH] [packaging,flatpak] update build scripts

---
 packaging/flatpak/com.freerdp.FreeRDP.json | 12 ++++----
 packaging/flatpak/freerdp.sh               | 29 -------------------
 packaging/flatpak/legacy-openssl.cnf       | 12 ++++++++
 packaging/flatpak/modules/SDL2_image.json  | 33 ----------------------
 packaging/flatpak/modules/SDL2_ttf.json    | 33 ----------------------
 packaging/flatpak/modules/SDL3.json        |  6 ++--
 packaging/flatpak/modules/SDL3_image.json  |  6 ++--
 packaging/flatpak/modules/SDL3_ttf.json    |  6 ++--
 packaging/flatpak/modules/krb5.json        |  4 +--
 packaging/flatpak/modules/libusb.json      | 11 ++++++--
 packaging/flatpak/modules/opensc.json      |  2 +-
 packaging/flatpak/modules/openssl.json     | 11 ++++++--
 packaging/flatpak/modules/pcsc.json        |  6 ++--
 13 files changed, 52 insertions(+), 119 deletions(-)
 delete mode 100755 packaging/flatpak/freerdp.sh
 create mode 100644 packaging/flatpak/legacy-openssl.cnf
 delete mode 100644 packaging/flatpak/modules/SDL2_image.json
 delete mode 100644 packaging/flatpak/modules/SDL2_ttf.json

diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json
index ce6788ec6..cefaa8062 100644
--- a/packaging/flatpak/com.freerdp.FreeRDP.json
+++ b/packaging/flatpak/com.freerdp.FreeRDP.json
@@ -8,7 +8,7 @@
 		"org.freedesktop.Platform.openh264": {
 			"add-ld-path": ".",
 			"directory": "lib/openh264",
-			"version": "2.5.0"
+			"version": "2.5.1"
 		}
 	},
 	"app-id": "com.freerdp.FreeRDP",
@@ -27,7 +27,7 @@
 		"/share/examples",
 		"/share/man"
 	],
-	"command": "freerdp.sh",
+	"command": "sdl-freerdp",
 	"finish-args": [
 		"--device=dri",
 		"--share=ipc",
@@ -36,7 +36,8 @@
 		"--socket=pulseaudio",
 		"--socket=cups",
 		"--socket=wayland",
-		"--filesystem=xdg-download"
+		"--filesystem=xdg-download",
+		"--env=OPENSSL_CONF=/app/share/legacy-openssl.cnf"
 	],
 	"modules": [
 		"modules/openssl.json",
@@ -59,6 +60,7 @@
 				"-DCMAKE_VERBOSE_MAKEFILE=ON",
 				"-DCMAKE_BUILD_TYPE:STRING=Release",
 				"-DCMAKE_INSTALL_LIBDIR:PATH=lib",
+				"-DWITHOUT_FREERDP_3x_DEPRECATED=ON",
 				"-DWITH_FREERDP_DEPRECATED_COMMANDLINE=ON",
 				"-DCHANNEL_TSMF:BOOL=OFF",
 				"-DCHANNEL_URBDRC:BOOL=ON",
@@ -97,7 +99,7 @@
 		},
 		{
 			"build-commands": [
-				"install -D freerdp.sh /app/bin/freerdp.sh",
+				"install -D legacy-openssl.cnf $FLATPAK_DEST/share/legacy-openssl.cnf",
 				"mkdir -p /app/lib/ffmpeg",
 				"mkdir -p /app/lib/openh264"
 			],
@@ -105,7 +107,7 @@
 			"name": "wrapper",
 			"sources": [
 				{
-					"path": "freerdp.sh",
+					"path": "legacy-openssl.cnf",
 					"type": "file"
 				}
 			]
diff --git a/packaging/flatpak/freerdp.sh b/packaging/flatpak/freerdp.sh
deleted file mode 100755
index bf94dc5a3..000000000
--- a/packaging/flatpak/freerdp.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-if [ -z ${FREERDP_SDL_OFF} ]; then
-  echo "SDL $(which sdl-freerdp)"
-  sdl-freerdp $@
-  exit $rc
-else
-  if [ -z $XDG_SESSION_TYPE ]; then
-    echo "XDG_SESSION_TYPE undefined"
-    exit -1
-  elif [ "$XDG_SESSION_TYPE" = "wayland" ]; then
-    if [ -z $FREERDP_WAYLAND_OFF ]; then
-      echo "wayland $(which wlfreerdp)"
-      wlfreerdp $@
-      exit $rc
-    else
-      echo "X11 $(which xfreerdp)"
-      xfreerdp $@
-      exit $rc
-    fi
-  elif [ "$XDG_SESSION_TYPE" = "x11" ]; then
-    echo "X11 $(which xfreerdp)"
-    xfreerdp $@
-    exit $rc
-  else
-    echo "XDG_SESSION_TYPE $XDG_SESSION_TYPE not handled"
-    exit -1
-  fi
-fi
diff --git a/packaging/flatpak/legacy-openssl.cnf b/packaging/flatpak/legacy-openssl.cnf
new file mode 100644
index 000000000..7044ed42d
--- /dev/null
+++ b/packaging/flatpak/legacy-openssl.cnf
@@ -0,0 +1,12 @@
+[openssl_init]
+providers = provider_sect
+
+[provider_sect]
+default = default_sect
+legacy = legacy_sect
+
+[default_sect]
+activate = 1
+
+[legacy_sect]
+activate = 1
diff --git a/packaging/flatpak/modules/SDL2_image.json b/packaging/flatpak/modules/SDL2_image.json
deleted file mode 100644
index 0dfb9bc1a..000000000
--- a/packaging/flatpak/modules/SDL2_image.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"builddir": true,
-	"buildsystem": "cmake-ninja",
-	"cleanup": [
-		"/include",
-		"/lib/*.la",
-		"/lib/*.a",
-		"/lib/cmake",
-		"/share/aclocal",
-		"/lib/pkgconfig"
-	],
-	"config-opts": [
-		"-DCMAKE_VERBOSE_MAKEFILE=ON",
-		"-DCMAKE_BUILD_TYPE:STRING=Release",
-		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
-	],
-	"name": "SDL2_image",
-	"sources": [
-		{
-			"sha256": "f7c06a8783952cfe960adccdd3d8472b63ab31475b4390d10cfdcc1aea61238f",
-			"type": "archive",
-			"url":
-			    "https://github.com/libsdl-org/SDL_image/releases/download/release-2.8.4/SDL2_image-2.8.4.tar.gz",
-			"x-checker-data": {
-				"project-id": 4781,
-				"stable-only": true,
-				"type": "anitya",
-				"url-template":
-				    "https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL2_image-${version0}.${version1}.${version2}.tar.gz"
-			}
-		}
-	]
-}
diff --git a/packaging/flatpak/modules/SDL2_ttf.json b/packaging/flatpak/modules/SDL2_ttf.json
deleted file mode 100644
index 3568d732e..000000000
--- a/packaging/flatpak/modules/SDL2_ttf.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-	"builddir": true,
-	"buildsystem": "cmake-ninja",
-	"cleanup": [
-		"/include",
-		"/lib/*.la",
-		"/lib/*.a",
-		"/lib/cmake",
-		"/share/aclocal",
-		"/lib/pkgconfig"
-	],
-	"config-opts": [
-		"-DCMAKE_VERBOSE_MAKEFILE=ON",
-		"-DCMAKE_BUILD_TYPE:STRING=Release",
-		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
-	],
-	"name": "SDL2_ttf",
-	"sources": [
-		{
-			"sha256": "0b2bf1e7b6568adbdbc9bb924643f79d9dedafe061fa1ed687d1d9ac4e453bfd",
-			"type": "archive",
-			"url":
-			    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-2.24.0.tar.gz",
-			"x-checker-data": {
-				"project-id": 4784,
-				"stable-only": true,
-				"type": "anitya",
-				"url-template":
-				    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version0}.${version1}.${version2}/SDL2_ttf-${version0}.${version1}.${version2}.tar.gz"
-			}
-		}
-	]
-}
diff --git a/packaging/flatpak/modules/SDL3.json b/packaging/flatpak/modules/SDL3.json
index 1470eb3ef..a120a106f 100644
--- a/packaging/flatpak/modules/SDL3.json
+++ b/packaging/flatpak/modules/SDL3.json
@@ -17,16 +17,16 @@
 	"name": "SDL3",
 	"sources": [
 		{
-			"sha256": "2938328317301dfbe30176d79c251733aa5e7ec5c436c800b99ed4da7adcb0f0",
+			"sha256": "b7e7dc05011b88c69170fe18935487b2559276955e49113f8c1b6b72c9b79c1f",
 			"type": "archive",
 			"url":
-			    "https://github.com/libsdl-org/SDL/releases/download/release-3.2.4/SDL3-3.2.4.tar.gz",
+			    "https://github.com/libsdl-org/SDL/releases/download/release-3.2.14/SDL3-3.2.14.tar.gz",
 			"x-checker-data": {
 				"project-id": 4781,
 				"stable-only": true,
 				"type": "anitya",
 				"url-template":
-				    "https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL3-${version0}.${version1}.${version2}.tar.gz"
+				    "https://github.com/libsdl-org/SDL/releases/download/release-${version}/SDL3-${version}.tar.gz"
 			}
 		}
 	]
diff --git a/packaging/flatpak/modules/SDL3_image.json b/packaging/flatpak/modules/SDL3_image.json
index a68cb7616..931278e9d 100644
--- a/packaging/flatpak/modules/SDL3_image.json
+++ b/packaging/flatpak/modules/SDL3_image.json
@@ -17,16 +17,16 @@
 	"name": "SDL3_image",
 	"sources": [
 		{
-			"sha256": "1690baea71b2b4ded9895126cddbc03a1000b027d099a4fb4669c4d23d73b19f",
+			"sha256": "a725bd6d04261fdda0dd8d950659e1dc15a8065d025275ef460d32ae7dcfc182",
 			"type": "archive",
 			"url":
-			    "https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.0/SDL3_image-3.2.0.tar.gz",
+			    "https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.4/SDL3_image-3.2.4.tar.gz",
 			"x-checker-data": {
 				"project-id": 4781,
 				"stable-only": true,
 				"type": "anitya",
 				"url-template":
-				    "https://github.com/libsdl-org/SDL_image/releases/download/release-${version0}.${version1}.${version2}/SDL3_image-${version0}.${version1}.${version2}.tar.gz"
+				    "https://github.com/libsdl-org/SDL_image/releases/download/release-${version}/SDL3_image-${version}.tar.gz"
 			}
 		}
 	]
diff --git a/packaging/flatpak/modules/SDL3_ttf.json b/packaging/flatpak/modules/SDL3_ttf.json
index b9eed39cc..85b078918 100644
--- a/packaging/flatpak/modules/SDL3_ttf.json
+++ b/packaging/flatpak/modules/SDL3_ttf.json
@@ -17,16 +17,16 @@
 	"name": "SDL3_ttf",
 	"sources": [
 		{
-			"sha256": "0ac7c23d9a037d3e3922ea1027fd8e923f03b0840042a49cca7652d2b49989a6",
+			"sha256": "63547d58d0185c833213885b635a2c0548201cc8f301e6587c0be1a67e1e045d",
 			"type": "archive",
 			"url":
-			    "https://github.com/libsdl-org/SDL_ttf/releases/download/prerelease-3.1.2/SDL3_ttf-3.1.2.tar.gz",
+			    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-3.2.2/SDL3_ttf-3.2.2.tar.gz",
 			"x-checker-data": {
 				"project-id": 4784,
 				"stable-only": true,
 				"type": "anitya",
 				"url-template":
-				    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version0}.${version1}.${version2}/SDL3_ttf-${version0}.${version1}.${version2}.tar.gz"
+				    "https://github.com/libsdl-org/SDL_ttf/releases/download/release-${version}/SDL3_ttf-${version}.tar.gz"
 			}
 		}
 	]
diff --git a/packaging/flatpak/modules/krb5.json b/packaging/flatpak/modules/krb5.json
index 84fe0a67f..1bb27c2a0 100644
--- a/packaging/flatpak/modules/krb5.json
+++ b/packaging/flatpak/modules/krb5.json
@@ -3,9 +3,9 @@
 	"name": "krb5",
 	"sources": [
 		{
-			"sha256": "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35",
+			"sha256": "6a516fd180bdfe11c0c0ad774999e1a66295253390475cbfa88835983cf39559",
 			"type": "archive",
-			"url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.3.tar.gz",
+			"url": "https://kerberos.org/dist/krb5/1.22/krb5-1.22-beta1.tar.gz",
 			"x-checker-data": {
 				"project-id": 13287,
 				"stable-only": true,
diff --git a/packaging/flatpak/modules/libusb.json b/packaging/flatpak/modules/libusb.json
index 5338987d6..2d9060041 100644
--- a/packaging/flatpak/modules/libusb.json
+++ b/packaging/flatpak/modules/libusb.json
@@ -13,10 +13,17 @@
 	],
 	"sources": [
 		{
-			"sha256": "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575",
+			"sha256": "966bb0d231f94a474eaae2e67da5ec844d3527a1f386456394ff432580634b29",
 			"type": "archive",
 			"url":
-			    "https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2"
+			    "https://github.com/libusb/libusb/releases/download/v1.0.28/libusb-1.0.28.tar.bz2",
+			"x-checker-data": {
+				"project-id": 13287,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/libusb/libusb/releases/download/v${version}/libusb-${version}.tar.bz2"
+			}
 		}
 	]
 }
diff --git a/packaging/flatpak/modules/opensc.json b/packaging/flatpak/modules/opensc.json
index 9a0d50f9f..90f045258 100644
--- a/packaging/flatpak/modules/opensc.json
+++ b/packaging/flatpak/modules/opensc.json
@@ -18,7 +18,7 @@
 				"stable-only": true,
 				"type": "anitya",
 				"url-template":
-				    "https://github.com/OpenSC/OpenSC/tags/${version0}.${version1}.${version2}"
+				    "https://github.com/OpenSC/OpenSC/releases/download/${version}/opensc-${version}.tar.gz"
 			}
 		}
 	]
diff --git a/packaging/flatpak/modules/openssl.json b/packaging/flatpak/modules/openssl.json
index b458aa94d..9d4e7a61c 100644
--- a/packaging/flatpak/modules/openssl.json
+++ b/packaging/flatpak/modules/openssl.json
@@ -9,10 +9,17 @@
 	"name": "openssl",
 	"sources": [
 		{
-			"sha256": "002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3",
+			"sha256": "344d0a79f1a9b08029b0744e2cc401a43f9c90acd1044d09a530b4885a8e9fc0",
 			"type": "archive",
 			"url":
-			    "https://github.com/openssl/openssl/releases/download/openssl-3.4.1/openssl-3.4.1.tar.gz"
+			    "https://github.com/openssl/openssl/releases/download/openssl-3.5.0/openssl-3.5.0.tar.gz",
+			"x-checker-data": {
+				"project-id": 13287,
+				"stable-only": true,
+				"type": "anitya",
+				"url-template":
+				    "https://github.com/openssl/openssl/releases/download/openssl-${version}/openssl-${version}.tar.gz"
+			}
 		}
 	]
 }
diff --git a/packaging/flatpak/modules/pcsc.json b/packaging/flatpak/modules/pcsc.json
index 884fb1c1d..fdce2069e 100644
--- a/packaging/flatpak/modules/pcsc.json
+++ b/packaging/flatpak/modules/pcsc.json
@@ -14,15 +14,15 @@
 	"name": "pcsc",
 	"sources": [
 		{
-			"sha256": "7fcb59f66a323f63cf1ab492579a57d899806835c52ba377af9ac57df68bf39b",
+			"sha256": "00b667aa71504ed1d39a48ad377de048c70dbe47229e8c48a3239ab62979c70f",
 			"type": "archive",
-			"url": "https://github.com/LudovicRousseau/PCSC/archive/refs/tags/2.3.1.tar.gz",
+			"url": "https://github.com/LudovicRousseau/PCSC/archive/refs/tags/2.3.3.tar.gz",
 			"x-checker-data": {
 				"project-id": 2611,
 				"stable-only": true,
 				"type": "anitya",
 				"url-template":
-				    "https://github.com/LudovicRousseau/PCSC/tags/${version0}.${version1}.${version2}"
+				    "https://github.com/LudovicRousseau/PCSC/archive/refs/tags/${version0}.${version1}.${version2}"
 			}
 		}
 	]