Improve enhanced licensing support

Also contains some whitespace fixes.

Author: tytan652

elements/components/libdatachannel.bst

@@ -18,6 +18,14 @@ variables:
     -DNO_EXAMPLES=ON
     -DNO_TESTS=ON
 
+public:
+  bst:
+    split-rules:
+      # Put the examples licenses as extra
+      extra:
+      - "%{project_licensedir}/libdatachannel/examples"
+      - "%{project_licensedir}/libdatachannel/examples/**"
+
 sources:
 - kind: git_repo
   url: github:paullouisageneau/libdatachannel.git

elements/components/libvpl.bst

@@ -7,13 +7,21 @@ depends:
 - freedesktop-sdk.bst:public-stacks/runtime-minimal.bst
 
 variables:
+  license-files-extra: third-party-programs.txt
+
   cmake-local: >-
     -DBUILD_SHARED_LIBS=ON
     -DENABLE_LIBDIR_IN_RUNTIME_SEARCH=ON
     -DINSTALL_DEV=ON
     -DBUILD_EXPERIMENTAL=OFF
     -DBUILD_EXAMPLES=OFF
 
+config:
+  install-commands:
+    (>):
+    # Delete duplicate license files
+    - rm -rf "%{install-root}%{datadir}/vpl/licensing"
+
 public:
   bst:
     split-rules:
@@ -23,6 +31,8 @@ public:
       - "%{sysconfdir}/**"
       - "%{datadir}/vpl/examples"
       - "%{datadir}/vpl/examples/**"
+      - "%{project_licensedir}/libvpl/examples"
+      - "%{project_licensedir}/libvpl/examples/**"
       runtime:
         (>):
         - "%{datadir}"

elements/components/nlohmann-json.bst

@@ -6,6 +6,12 @@ build-depends:
 variables:
   cmake-local: -DJSON_BuildTests=OFF
 
+config:
+  install-commands:
+    (>):
+    # Delete documentation about licensing picked by install-extra
+    - rm -rf "%{install-root}%{project_licensedir}/nlohmann-json/docs"
+
 sources:
 - kind: git_repo
   url: github:nlohmann/json.git

elements/components/qt/base.bst

@@ -37,6 +37,8 @@ depends:
   - freedesktop-sdk.bst:components/zstd.bst
 
 variables:
+  qt-element-name: base
+
   qt-opts: >-
     -DBUILD_SHARED_LIBS=ON
     -DWARNINGS_ARE_ERRORS=OFF
@@ -260,6 +262,6 @@ variables:
 
 sources:
 - kind: tar
-  url: 
+  url:
     qt_archive:%{qt-api-version}/%{qt-version}/submodules/qtbase-everywhere-src-%{qt-version}.tar.xz
   ref: 012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05

elements/components/qt/imageformats.bst

@@ -13,6 +13,8 @@ depends:
   - components/qt/base.bst
 
 variables:
+  qt-element-name: imageformats
+
   cmake-local: >-
     -DFEATURE_jasper=OFF
     -DFEATURE_mng=OFF
@@ -23,6 +25,6 @@ variables:
 
 sources:
 - kind: tar
-  url: 
+  url:
     qt_archive:%{qt-api-version}/%{qt-version}/submodules/qtimageformats-everywhere-src-%{qt-version}.tar.xz
   ref: d2a1bbb84707b8a0aec29227b170be00f04383fbf2361943596d09e7e443c8e1

elements/components/qt/svg.bst

@@ -7,8 +7,11 @@ depends:
   (>):
   - components/qt/base.bst
 
+variables:
+  qt-element-name: svg
+
 sources:
 - kind: tar
-  url: 
+  url:
     qt_archive:%{qt-api-version}/%{qt-version}/submodules/qtsvg-everywhere-src-%{qt-version}.tar.xz
   ref: aa2579f21ca66d19cbcf31d87e9067e07932635d36869c8239d4decd0a9dc1fa

elements/components/qt/wayland.bst

@@ -13,6 +13,8 @@ depends:
   - components/qt/base.bst
 
 variables:
+  qt-element-name: wayland
+
   cmake-local: >-
     -DFEATURE_wayland_client=ON
     -DFEATURE_wayland_server=OFF

elements/components/rnnoise.bst

@@ -7,16 +7,22 @@ depends:
 - freedesktop-sdk.bst:public-stacks/runtime-minimal.bst
 
 variables:
+  license-files-extra: >-
+    README
+    AUTHORS
+
   conf-local: >-
     --disable-doc
     --disable-examples
 
 config:
   install-commands:
     (>):
-    # Delete the installed README
+    # Delete duplicate license files
     - |
-      rm -f '%{install-root}%{datadir}/doc/rnnoise/README'
+      set -euo pipefail # Force bash
+      rm -f "%{install-root}%{datadir}/doc/rnnoise/"{README,AUTHORS,COPYING}
+      rmdir --ignore-fail-on-non-empty "%{install-root}%{datadir}/doc"{/rnnoise,}
 
 public:
   bst:

elements/include/qt.yml

@@ -5,9 +5,14 @@ depends:
 - freedesktop-sdk.bst:public-stacks/runtime-minimal.bst
 
 variables:
+  qt-element-name: unknown
   qt-api-version: "6.8"
   qt-version: "6.8.2"
 
+  license-element-name: "qt-%{qt-element-name}"
+  # NOTE: This is similar to what KDE does for their runtime
+  license-files-final: "LICENSES/*.txt"
+
   qt-bindir: "%{bindir}"
   qt-includedir: "%{includedir}/qt"
   qt-libdir: "%{libdir}"

project.conf

@@ -36,6 +36,9 @@ variables:
   localstatedir: "%{appdir}/var"
   lib: "lib"
 
+  # Remove %{project-name} subfolder for licenses
+  project_licensedir: "%{licensedir}"
+
   # Modify Freedesktop SDK stripping options to be closer to Flatpak behavior
   optimize-debug: "false" # No dwz optimization
 
@@ -47,6 +50,9 @@ variables:
       rmdir %{install-root}%{debugdir}%{appdir}
     fi
 
+  license-files-extra: >-
+    LICENSES/*.txt
+
 environment:
   LC_ALL: en_US.UTF-8
   # Set Flatpak application and runtime paths