Merge branch 'flatpak' into 'master'

Support for flatpak packaging

See merge request openlp/packaging!26

flatpak/openlp-vlc.yaml

@@ -604,14 +604,9 @@ modules:
     cleanup:
       - /share/macosx
     post-install:
-      - install -Dp -m 644 org.videolan.VLC.appdata.xml /app/share/appdata/vlc.appdata.xml
       - mv /app/bin/vlc /app/bin/vlc.bin
       - mv vlc.sh /app/bin/vlc
       - chmod +x /app/bin/vlc
-      - echo "StartupWMClass=VLC" >> /app/share/applications/vlc.desktop
-      - sed -i -e 's/Icon=vlc/Icon=org.videolan.VLC/g' /app/share/applications/vlc-*.desktop
-      - for s in openbd opendvd opencda openvcd; do mv /app/share/applications/vlc-$s.desktop
-        /app/share/applications/org.videolan.VLC-$s.desktop; done
       - tar xf chrpath-0.16.tar.gz && cd chrpath-0.16 && ./configure && make
       - ./chrpath-0.16/chrpath -d /app/lib/vlc/plugins/access/liblibbluray_plugin.so
       - /app/lib/vlc/vlc-cache-gen /app/lib/vlc/plugins/
@@ -626,12 +621,6 @@ modules:
             '>=': '3'
             <: '4'
           url-template: https://download.videolan.org/videolan/vlc/$version/vlc-$version.tar.xz
-      - type: file
-        path: org.videolan.VLC/org.videolan.VLC.appdata.xml
-      - type: patch
-        path: org.videolan.VLC/vlc-fix-appdata.patch
-      - type: patch
-        path: org.videolan.VLC/vlc-disc-shortcuts.patch
       - type: patch
         path: org.videolan.VLC/vlc-ignore-time-for-cache.patch
       - type: file

flatpak/org.openlp.OpenLP.yml

@@ -35,7 +35,10 @@ modules:
       - mkdir -p /app/share/applications && cp resources/openlp.desktop /app/share/applications/org.openlp.OpenLP.desktop && sed -ie s/Icon=openlp/Icon=org.openlp.OpenLP/ /app/share/applications/org.openlp.OpenLP.desktop
       - mkdir -p /app/share/icons/hicolor/256x256/apps/ && cp resources/images/openlp-logo-256x256.png /app/share/icons/hicolor/256x256/apps/org.openlp.OpenLP.png
       - mkdir -p /app/share/icons/hicolor/scalable/apps/ && cp resources/images/openlp-logo.svg /app/share/icons/hicolor/scalable/apps/org.openlp.OpenLP.svg
+      - install -Dm 644 -t /app/share/appdata/ org.openlp.OpenLP.appdata.xml
     sources:
       - type: archive
         url: https://gitlab.com/openlp/openlp/-/archive/3.1.0/openlp-3.1.0.tar.gz
         sha256: d40baf9698d84fbcaf1cc3624aca3c157de6e25dbf8b09f54037cd98632ec939
+      - type: file
+        path: org.openlp.OpenLP.appdata.xml