Skip to content
Snippets Groups Projects
Commit 23a25cba authored by Amin Bandali's avatar Amin Bandali Committed by Sébastien Blin
Browse files

packaging: use recent Qt version for snap

Change-Id: I309f31ba1d23a9cbc48e2936b7591ae4fba40a76
parent 7df82226
No related branches found
No related tags found
No related merge requests found
......@@ -140,17 +140,26 @@ apps:
- wayland
- x11
package-repositories:
- type: apt
ppa: beineri/opt-qt-5.15.2-bionic
# qt515base consists of:
# Qt5Concurrent, Qt5Core, Qt5DBus, Qt5EglFSDeviceIntegration,
# Qt5EglFsKmsSupport, Qt5Gui, Qt5Network, Qt5OpenGL,
# Qt5PrintSupport, Qt5Sql, Qt5Test, Qt5Widgets, Qt5XcbQpa,
# Qt5Xml
parts:
desktop-launch:
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
plugin: nil
build-packages:
- gcc-8
- qtbase5-dev
- dpkg-dev
- gcc-8
- qt515base
stage-packages:
- libqt5gui5
- libqt5svg5 # for loading icon themes which are svg
- qt515base
- qt515svg # for loading icon themes which are svg
- try: [appmenu-qt5] # not available on core18
override-pull: |
snapcraftctl pull
......@@ -204,6 +213,12 @@ parts:
source-type: local
plugin: nil
parse-info: [usr/share/metainfo/jami-gnome.appdata.xml]
build-environment:
- QT_BASE_DIR: "/opt/qt515"
- QTDIR: "$QT_BASE_DIR"
- PATH: "$QT_BASE_DIR/bin:$PATH"
- LD_LIBRARY_PATH: "$QT_BASE_DIR/lib:$LD_LIBRARY_PATH"
- PKG_CONFIG_PATH: "$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH"
override-pull: |
snapcraftctl pull
sed -i -E 's|(tmpName) << (PACKAGE_NAME << "_shm_")|\1 << "snap.jami." << \2|' daemon/src/media/video/sinkclient.cpp
......@@ -296,8 +311,7 @@ parts:
- libwebkit2gtk-4.0-dev
- libyaml-cpp-dev
- nasm # seems to be needed for building libvpx on an 18.04 base
- qtbase5-dev
- qttools5-dev
- qt515base
- uuid-dev
- yasm
stage-packages:
......@@ -320,11 +334,6 @@ parts:
- libopus0
- libpcre3
- libqrencode3
- libqt5core5a
- libqt5dbus5
- libqt5gui5
- libqt5sql5
- libqt5sql5-sqlite
- libsamplerate0
- libslang2
- libsndfile1
......@@ -340,4 +349,5 @@ parts:
- libva2
- libvdpau-va-gl1
- libvdpau1
- qt515base
- va-driver-all
......@@ -29,7 +29,7 @@ cd /opt/ring-project/packaging/rules/snap/
# set the version and tarball filename
sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" snapcraft.yaml
snapcraft
snapcraft --enable-experimental-package-repositories # requires snapcraft >= 4.4
# move the built snap to output
mv *.snap /opt/output/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment