[neon/snap-packaging/okular-snap] /: Add patch to fix invalid Licence in metadate.

[Scarlett Moore]

Git commit 3b471b1d07da63793d2feeb708a0e3372399b99a by Scarlett Moore.
Committed on 02/08/2024 at 09:16.
Pushed by scarlettmoore into branch 'master'.

Add patch to fix invalid Licence in metadate.

A  +24   -0    patches/fix_metadate_license.patch
A  +1    -0    patches/series
M  +6    -0    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/okular-snap/-/commit/3b471b1d07da63793d2feeb708a0e3372399b99a

diff --git a/patches/fix_metadate_license.patch b/patches/fix_metadate_license.patch
new file mode 100644
index 0000000..098eb38
--- /dev/null
+++ b/patches/fix_metadate_license.patch
@@ -0,0 +1,24 @@
+From 7b1432e6e81c33d37986404f384a8c10057c1814 Mon Sep 17 00:00:00 2001
+From: Scarlett Moore <sgmoore at debian.org>
+Date: Fri, 2 Aug 2024 02:05:28 -0700
+Subject: [PATCH] Use valid SPDX expression in metadata.
+
+---
+ shell/org.kde.okular.appdata.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml
+index 5deae3904..768c69044 100644
+--- a/shell/org.kde.okular.appdata.xml
++++ b/shell/org.kde.okular.appdata.xml
+@@ -2,7 +2,7 @@
+ <component type="desktop">
+   <id>org.kde.okular.desktop</id>
+   <metadata_license>CC0-1.0</metadata_license>
+-  <project_license>GPL-2.0+ and GFDL-1.3</project_license>
++  <project_license>GPL-2.0+ AND GFDL-1.3</project_license>
+   <developer_name translate="no">KDE</developer_name>
+   <name>Okular</name>
+   <name xml:lang="ar">اوكلار</name>
+--
+GitLab
diff --git a/patches/series b/patches/series
new file mode 100644
index 0000000..fc9958d
--- /dev/null
+++ b/patches/series
@@ -0,0 +1 @@
+fix_metadata_license.patch
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 42e7258..158a168 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -221,6 +221,7 @@ parts:
         - speech-dispatcher
         - espeak
         - libaudio2
+        - patch
         source: https://invent.kde.org/graphics/okular.git
         source-branch: release/24.05
         cmake-parameters:
@@ -240,6 +241,11 @@ parts:
         - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
         - --log-level=STATUS
         - -DCMAKE_LIBRARY_PATH=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+        override-pull: |
+            craftctl default
+            while read -r PATCHFILE ; do
+                patch -p1 < "$CRAFT_PROJECT_DIR/patches/$PATCHFILE"
+            done < $CRAFT_PROJECT_DIR/patches/series
         prime:
         - -usr/lib/*/cmake/*
         - -usr/include/*