[vlc-commits] snap: manually build desktop-qt5 snap part.

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Sat Apr 14 22:26:55 2018 +0300| [cd7459624fd267adb6819b1b4e2fca272e21cd71] | committer: Konstantin Pavlov

snap: manually build desktop-qt5 snap part.

We're using KDE Neon Qt5 & friends that fix the UI look and feel for
desktop environments Canonical does not care about, but unfortunately
those packages are not compatible with appmenu-qt5 package from Xenial,
required by desktop-qt5.  The fix here is to replicate the desktop-qt5
snap build proccess, dropping appmenu-qt5 dependency.

(cherry picked from commit f42518006571ad0fca588638022054d0b6d7003b)
Signed-off-by: Konstantin Pavlov <thresh at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=cd7459624fd267adb6819b1b4e2fca272e21cd71
---

 extras/package/snap/snapcraft.yaml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/extras/package/snap/snapcraft.yaml b/extras/package/snap/snapcraft.yaml
index 847a396d5f..f60611299b 100644
--- a/extras/package/snap/snapcraft.yaml
+++ b/extras/package/snap/snapcraft.yaml
@@ -33,8 +33,27 @@ apps:
       - mpris
 
 parts:
+  desktop-qt5-vlc:
+    source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
+    source-commit: 3a6209d90bcec218618348f7f41c873bdacc723f
+    source-subdir: qt/
+    plugin: make
+    make-parameters: ["FLAVOR=qt5"]
+    build-packages:
+      - qtbase5-dev
+      - dpkg-dev
+    stage-packages:
+      - libxkbcommon0
+      - ttf-ubuntu-font-family
+      - dmz-cursor-theme
+      - light-themes
+      - shared-mime-info
+      - libqt5gui5
+      - libgdk-pixbuf2.0-0
+      - libqt5svg5
+      - locales-all
   vlc:
-    after: [desktop-qt5]
+    after: [desktop-qt5-vlc]
     source: ../../../
     source-type: git
     plugin: autotools