[packaging/flatpak-kde-runtime/qt6.11] /: Test build with modified cleanup logic

Andrew Cooligan <[email protected]>
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git commit f7610c9a8948a7de5b3527dd1c774a075ed36e17 by Andrew Cooligan, on behalf of Cajus Pollmeier.
Committed on 20/07/2026 at 18:04.
Pushed by apol into branch 'qt6.11'.

Test build with modified cleanup logic

M  +1    -0    Makefile
A  +13   -0    patch/flatpak-builder-to-bst-recursive-cleanup.patch

https://invent.kde.org/packaging/flatpak-kde-runtime/-/commit/f7610c9a8948a7de5b3527dd1c774a075ed36e17

diff --git a/Makefile b/Makefile
index 590b884..748ba8c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,7 @@ all: $(REPO)/config $(foreach file, $(wildcard *.json.in), $(subst .json.in,.app
 
 freedesktop-sdk/utils/flatpak-builder-to-bst.py:
 	git clone https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
+	patch -d freedesktop-sdk -p1 < patch/flatpak-builder-to-bst-recursive-cleanup.patch
 
 elements/org.kde.Sdk.bst: org.kde.Sdk.json freedesktop-sdk/utils/flatpak-builder-to-bst.py
 	python freedesktop-sdk/utils/flatpak-builder-to-bst.py org.kde.Sdk.json --aliases include/aliases.yml --skip kf.skip.yaml
diff --git a/patch/flatpak-builder-to-bst-recursive-cleanup.patch b/patch/flatpak-builder-to-bst-recursive-cleanup.patch
new file mode 100644
index 0000000..b366a63
--- /dev/null
+++ b/patch/flatpak-builder-to-bst-recursive-cleanup.patch
@@ -0,0 +1,13 @@
+diff --git a/utils/flatpak-builder-to-bst.py b/utils/flatpak-builder-to-bst.py
+index e0e8c63f8..8033e68e5 100755
+--- a/utils/flatpak-builder-to-bst.py
++++ b/utils/flatpak-builder-to-bst.py
+@@ -64,8 +64,6 @@ def relativise_path(path):
+
+ def cleanup_platform_split_rules(pattern):
+     base = "%{prefix}" + pattern if pattern.startswith("/") else "**/" + pattern
+-    if any(char in pattern for char in "*?[]"):
+-        return [base]
+     return [base, f"{base}/**"]
+
+
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.