From 7c34860985e3ad129e5b201ea784cf9e2cc55448 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 11 Dec 2025 09:26:51 +0100 Subject: [PATCH 1/2] [packaging,flatpak] remove xprop --- packaging/flatpak/com.freerdp.FreeRDP.json | 1 - packaging/flatpak/modules/xprop.json | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100644 packaging/flatpak/modules/xprop.json diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json index 14dd5b55c..f061dfab5 100644 --- a/packaging/flatpak/com.freerdp.FreeRDP.json +++ b/packaging/flatpak/com.freerdp.FreeRDP.json @@ -45,7 +45,6 @@ "modules/libusb.json", "modules/uriparser.json", "modules/cJSON.json", - "modules/xprop.json", "modules/pcsc.json", "modules/krb5.json", "modules/opensc.json", diff --git a/packaging/flatpak/modules/xprop.json b/packaging/flatpak/modules/xprop.json deleted file mode 100644 index 2a9003f58..000000000 --- a/packaging/flatpak/modules/xprop.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "cleanup": [ - "/share/doc", - "/share/man" - ], - "name": "xprop", - "sources": [ - { - "sha256": "d689e2adb7ef7b439f6469b51cda8a7daefc83243854c2a3b8f84d0f029d67ee", - "type": "archive", - "url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.8.tar.xz", - "x-checker-data": { - "project-id": 14958, - "stable-only": true, - "type": "anitya", - "url-template": - "https://xorg.freedesktop.org/releases/individual/app/xprop-${version0}.${version1}.${version2}.tar.xz" - } - } - ] -} From 4ed011381b3161f692a7f8ce317b039398d1752b Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Thu, 11 Dec 2025 09:33:24 +0100 Subject: [PATCH 2/2] [ci,packaging] drop pkcs11-helper no longer needed. --- .github/workflows/freebsd.yml | 1 - packaging/flatpak/com.freerdp.FreeRDP.json | 1 - packaging/flatpak/modules/pkcs11-helper.json | 26 -------------------- 3 files changed, 28 deletions(-) delete mode 100644 packaging/flatpak/modules/pkcs11-helper.json diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml index d305855bb..ac1d2ace8 100644 --- a/.github/workflows/freebsd.yml +++ b/.github/workflows/freebsd.yml @@ -39,7 +39,6 @@ jobs: v4l_compat \ libv4l \ uriparser \ - pkcs11-helper \ ffmpeg \ pulseaudio \ pcsc-lite \ diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json index f061dfab5..ab5314cd4 100644 --- a/packaging/flatpak/com.freerdp.FreeRDP.json +++ b/packaging/flatpak/com.freerdp.FreeRDP.json @@ -48,7 +48,6 @@ "modules/pcsc.json", "modules/krb5.json", "modules/opensc.json", - "modules/pkcs11-helper.json", "modules/SDL3.json", "modules/SDL3_image.json", "modules/SDL3_ttf.json", diff --git a/packaging/flatpak/modules/pkcs11-helper.json b/packaging/flatpak/modules/pkcs11-helper.json deleted file mode 100644 index 4190da67b..000000000 --- a/packaging/flatpak/modules/pkcs11-helper.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "buildsystem": "autotools", - "name": "pkcs11-helper", - "sources": [ - { - "sha256": "076c9f664812a45f2da25efc157338b0b8bb1949117f0144050fec176b6fdf78", - "type": "archive", - "url": - "https://github.com/OpenSC/pkcs11-helper/archive/refs/tags/pkcs11-helper-1.30.0.tar.gz", - "x-checker-data": { - "project-id": 91990, - "stable-only": true, - "type": "anitya", - "url-template": - "https://github.com/OpenSC/pkcs11-helper/archive/refs/tags/pkcs11-helper-$version.tar.gz" - } - }, - { - "commands": [ - "autoreconf -vfi" - ], - "dest-filename": "autogen.sh", - "type": "script" - } - ] -}