From 2359e3ff6303f58072708e59f5a0885711c6f84d Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Wed, 20 Mar 2024 11:27:28 +0100
Subject: [PATCH] [flatpak] update permissions and dependencies

---
 packaging/flatpak/com.freerdp.FreeRDP.json    | 15 ++++----
 packaging/flatpak/modules/cJSON-1.7.16.json   | 19 ----------
 packaging/flatpak/modules/cJSON.json          | 18 +++++++++
 packaging/flatpak/modules/krb5-1.21.1.json    | 12 ------
 packaging/flatpak/modules/krb5.json           | 12 ++++++
 packaging/flatpak/modules/libusb.json         | 37 ++++++++++---------
 packaging/flatpak/modules/opensc-0.23.0.json  | 15 --------
 packaging/flatpak/modules/opensc.json         | 13 +++++++
 packaging/flatpak/modules/pcsc-1.9.9.json     | 22 -----------
 packaging/flatpak/modules/pcsc.json           | 23 ++++++++++++
 .../flatpak/modules/pkcs11-helper-1.29.0.json | 22 -----------
 packaging/flatpak/modules/pkcs11-helper.json  | 21 +++++++++++
 packaging/flatpak/modules/xprop-1.2.6.json    | 14 -------
 packaging/flatpak/modules/xprop.json          | 14 +++++++
 14 files changed, 129 insertions(+), 128 deletions(-)
 delete mode 100644 packaging/flatpak/modules/cJSON-1.7.16.json
 create mode 100644 packaging/flatpak/modules/cJSON.json
 delete mode 100644 packaging/flatpak/modules/krb5-1.21.1.json
 create mode 100644 packaging/flatpak/modules/krb5.json
 delete mode 100644 packaging/flatpak/modules/opensc-0.23.0.json
 create mode 100644 packaging/flatpak/modules/opensc.json
 delete mode 100644 packaging/flatpak/modules/pcsc-1.9.9.json
 create mode 100644 packaging/flatpak/modules/pcsc.json
 delete mode 100644 packaging/flatpak/modules/pkcs11-helper-1.29.0.json
 create mode 100644 packaging/flatpak/modules/pkcs11-helper.json
 delete mode 100644 packaging/flatpak/modules/xprop-1.2.6.json
 create mode 100644 packaging/flatpak/modules/xprop.json

diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json
index 9546d75a6..ea0c5b4c3 100644
--- a/packaging/flatpak/com.freerdp.FreeRDP.json
+++ b/packaging/flatpak/com.freerdp.FreeRDP.json
@@ -15,6 +15,7 @@
 		"/lib/pkgconfig"
 	],
 	"finish-args": [
+		"--device=dri",
 		/* X11 + XShm access */
 		"--share=ipc",
 		"--socket=x11",
@@ -36,19 +37,19 @@
 		},
 		"org.freedesktop.Platform.openh264": {
 			"directory": "lib/openh264",
-			"version": "2.3.1",
+			"version": "2.4.1",
 			"add-ld-path": "."
 		}
 	},
 	"modules": [
 		"modules/libusb.json",
 		"modules/uriparser.json",
-		"modules/cJSON-1.7.16.json",
-		"modules/xprop-1.2.6.json",
-		"modules/pcsc-1.9.9.json",
-		"modules/pkcs11-helper-1.29.0.json",
-		"modules/krb5-1.21.1.json",
-		"modules/opensc-0.23.0.json",
+		"modules/cJSON.json",
+		"modules/xprop.json",
+		"modules/pcsc.json",
+		"modules/pkcs11-helper.json",
+		"modules/krb5.json",
+		"modules/opensc.json",
 		{
 			"name": "freerdp",
 			"buildsystem": "cmake-ninja",
diff --git a/packaging/flatpak/modules/cJSON-1.7.16.json b/packaging/flatpak/modules/cJSON-1.7.16.json
deleted file mode 100644
index 8456bafd8..000000000
--- a/packaging/flatpak/modules/cJSON-1.7.16.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-      "name": "cjson",
-      "buildsystem": "cmake-ninja",
-      "cleanup": [
-      ],
-      "config-opts": [
-        "-DCMAKE_VERBOSE_MAKEFILE=ON",
-        "-DCMAKE_BUILD_TYPE:STRING=Release",
-        "-DCMAKE_INSTALL_LIBDIR:PATH=lib"
-      ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/DaveGamble/cJSON.git",
-          "tag": "v1.7.16",
-	  "commit": "cb8693b058ba302f4829ec6d03f609ac6f848546"
-        }
-      ]
-}
diff --git a/packaging/flatpak/modules/cJSON.json b/packaging/flatpak/modules/cJSON.json
new file mode 100644
index 000000000..603071751
--- /dev/null
+++ b/packaging/flatpak/modules/cJSON.json
@@ -0,0 +1,18 @@
+{
+	"name": "cjson",
+	"buildsystem": "cmake-ninja",
+	"cleanup": [],
+	"config-opts": [
+		"-DCMAKE_VERBOSE_MAKEFILE=ON",
+		"-DCMAKE_BUILD_TYPE:STRING=Release",
+		"-DCMAKE_INSTALL_LIBDIR:PATH=lib"
+	],
+	"sources": [
+		{
+			"type": "git",
+			"url": "https://github.com/DaveGamble/cJSON.git",
+			"tag": "v1.7.17",
+			"commit": "87d8f0961a01bf09bef98ff89bae9fdec42181ee"
+		}
+	]
+}
diff --git a/packaging/flatpak/modules/krb5-1.21.1.json b/packaging/flatpak/modules/krb5-1.21.1.json
deleted file mode 100644
index 3c477051d..000000000
--- a/packaging/flatpak/modules/krb5-1.21.1.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-      "name": "pkcs11-helper",
-      "buildsystem": "autotools",
-      "subdir": "src",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.1.tar.gz",
-          "sha256": "7881c3aaaa1b329bd27dbc6bf2bf1c85c5d0b6c7358aff2b35d513ec2d50fa1f"
-        }
-      ]
-}
diff --git a/packaging/flatpak/modules/krb5.json b/packaging/flatpak/modules/krb5.json
new file mode 100644
index 000000000..65ba410cd
--- /dev/null
+++ b/packaging/flatpak/modules/krb5.json
@@ -0,0 +1,12 @@
+{
+	"name": "pkcs11-helper",
+	"buildsystem": "autotools",
+	"subdir": "src",
+	"sources": [
+		{
+			"type": "archive",
+			"url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.2.tar.gz",
+			"sha256": "9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491"
+		}
+	]
+}
diff --git a/packaging/flatpak/modules/libusb.json b/packaging/flatpak/modules/libusb.json
index 21dddf80a..f0fffe7e2 100644
--- a/packaging/flatpak/modules/libusb.json
+++ b/packaging/flatpak/modules/libusb.json
@@ -1,19 +1,22 @@
 {
-    "name": "libusb",
-    "config-opts": [ "--disable-static" ],
-    "cleanup": [
-        "/lib/*.la",
-        "/lib/pkgconfig",
-        "/include"
-    ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2",
-            "sha256": "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5"
-        }
-    ],
-    "post-install": [
-        "install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
-    ]
+	"name": "libusb",
+	"config-opts": [
+		"--disable-static"
+	],
+	"cleanup": [
+		"/lib/*.la",
+		"/lib/pkgconfig",
+		"/include"
+	],
+	"sources": [
+		{
+			"type": "archive",
+			"url":
+			    "https://github.com/libusb/libusb/releases/download/v1.0.27/libusb-1.0.27.tar.bz2",
+			"sha256": "ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575"
+		}
+	],
+	"post-install": [
+		"install -Dm644 COPYING /app/share/licenses/libusb/COPYING"
+	]
 }
diff --git a/packaging/flatpak/modules/opensc-0.23.0.json b/packaging/flatpak/modules/opensc-0.23.0.json
deleted file mode 100644
index 3f5e72d1d..000000000
--- a/packaging/flatpak/modules/opensc-0.23.0.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-      "name": "opensc",
-      "buildsystem": "autotools",
-      "cleanup": [
-      ],
-      "config-opts": [
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/OpenSC/OpenSC/releases/download/0.23.0/opensc-0.23.0.tar.gz",
-          "sha256": "a4844a6ea03a522ecf35e49659716dacb6be03f7c010a1a583aaf3eb915ed2e0"
-        }
-      ]
-}
diff --git a/packaging/flatpak/modules/opensc.json b/packaging/flatpak/modules/opensc.json
new file mode 100644
index 000000000..fc39e77f0
--- /dev/null
+++ b/packaging/flatpak/modules/opensc.json
@@ -0,0 +1,13 @@
+{
+	"name": "opensc",
+	"buildsystem": "autotools",
+	"cleanup": [],
+	"config-opts": [],
+	"sources": [
+		{
+			"type": "archive",
+			"url": "https://github.com/OpenSC/OpenSC/releases/download/0.25.0/opensc-0.25.0.tar.gz",
+			"sha256": "e6d7b66e2a508a377ac9d67aa463025d3c54277227be10bd08872e3407d6622f"
+		}
+	]
+}
diff --git a/packaging/flatpak/modules/pcsc-1.9.9.json b/packaging/flatpak/modules/pcsc-1.9.9.json
deleted file mode 100644
index 2bc71d976..000000000
--- a/packaging/flatpak/modules/pcsc-1.9.9.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-      "name": "pcsc",
-      "config-opts": [
-        "--disable-libsystemd",
-        "--enable-pic",
-        "--disable-libusb",
-        "--enable-shared",
-        "--with-systemdsystemunitdir=/app/lib/systemd/"
-      ],
-      "sources": [
-        {
-          "type": "git",
-          "url": "https://github.com/LudovicRousseau/PCSC.git",
-          "tag": "1.9.9",
-          "commit": "15c16c7796607b1c8a2ce253d3f536918ab26b4a"
-        }
-      ],
-      "cleanup": [
-        "/share/doc",
-        "/share/man"
-      ]
-}
diff --git a/packaging/flatpak/modules/pcsc.json b/packaging/flatpak/modules/pcsc.json
new file mode 100644
index 000000000..f5181b235
--- /dev/null
+++ b/packaging/flatpak/modules/pcsc.json
@@ -0,0 +1,23 @@
+{
+	"name": "pcsc",
+	"config-opts": [
+		"--disable-libsystemd",
+		"--enable-pic",
+		"--disable-libusb",
+		"--disable-polkit",
+		"--enable-shared",
+		"--with-systemdsystemunitdir=/app/lib/systemd/"
+	],
+	"sources": [
+		{
+			"type": "git",
+			"url": "https://github.com/LudovicRousseau/PCSC.git",
+			"tag": "2.0.3",
+			"commit": "c4e7f6f9c6fe56fafd3f13c31fcc4f670ad6d022"
+		}
+	],
+	"cleanup": [
+		"/share/doc",
+		"/share/man"
+	]
+}
diff --git a/packaging/flatpak/modules/pkcs11-helper-1.29.0.json b/packaging/flatpak/modules/pkcs11-helper-1.29.0.json
deleted file mode 100644
index 9a0dba747..000000000
--- a/packaging/flatpak/modules/pkcs11-helper-1.29.0.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-      "name": "pkcs11-helper",
-      "buildsystem": "autotools",
-      "cleanup": [
-      ],
-      "config-opts": [
-      ],
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://github.com/OpenSC/pkcs11-helper/archive/refs/tags/pkcs11-helper-1.29.0.tar.gz",
-          "sha256": "f87c4ce596ccf6211c0de34923e2977c8892bd773ace75d1261a1908979fc9e8"
-        },
-	{
-            "type": "script",
-            "dest-filename": "autogen.sh",
-            "commands": [
-                "autoreconf -vfi"
-            ]
-        }
-      ]
-}
diff --git a/packaging/flatpak/modules/pkcs11-helper.json b/packaging/flatpak/modules/pkcs11-helper.json
new file mode 100644
index 000000000..d8456ad78
--- /dev/null
+++ b/packaging/flatpak/modules/pkcs11-helper.json
@@ -0,0 +1,21 @@
+{
+	"name": "pkcs11-helper",
+	"buildsystem": "autotools",
+	"cleanup": [],
+	"config-opts": [],
+	"sources": [
+		{
+			"type": "git",
+			"url": "https://github.com/OpenSC/pkcs11-helper.git",
+			"tag": "pkcs11-helper-1.30.0",
+			"commit": "8bed16034f629a0361fa8ff89deed2b43dc45d8b"
+		},
+		{
+			"type": "script",
+			"dest-filename": "autogen.sh",
+			"commands": [
+				"autoreconf -vfi"
+			]
+		}
+	]
+}
diff --git a/packaging/flatpak/modules/xprop-1.2.6.json b/packaging/flatpak/modules/xprop-1.2.6.json
deleted file mode 100644
index 0da60126e..000000000
--- a/packaging/flatpak/modules/xprop-1.2.6.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-      "name": "xprop",
-      "sources": [
-        {
-          "type": "archive",
-          "url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.6.tar.xz",
-          "sha256": "580b8525b12ecc0144aa16c88b0aafa76d2e799b44c8c6c50f9ce92788b5586e"
-        }
-      ],
-      "cleanup": [
-        "/share/doc",
-        "/share/man"
-      ]
-}
diff --git a/packaging/flatpak/modules/xprop.json b/packaging/flatpak/modules/xprop.json
new file mode 100644
index 000000000..c84451a61
--- /dev/null
+++ b/packaging/flatpak/modules/xprop.json
@@ -0,0 +1,14 @@
+{
+	"name": "xprop",
+	"sources": [
+		{
+			"type": "archive",
+			"url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.7.tar.xz",
+			"sha256": "4436e3148bb91a162406230d9f736a49ca8b50b74790015dc15d78d6ce8e825f"
+		}
+	],
+	"cleanup": [
+		"/share/doc",
+		"/share/man"
+	]
+}