From: Uwe Hermann <redacted>
Date: Thu, 3 Oct 2019 13:06:22 +0000 (+0200)
Subject: sigrok-native-appimage: Bump to use Ubuntu 16.04 as base OS.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=bb8e5714d257e0ec426962e7c7f459bc7566a499;p=sigrok-util.git

sigrok-native-appimage: Bump to use Ubuntu 16.04 as base OS.

Until recently, the sigrok AppImages were built on Ubuntu 14.04
Trusty Tahr (originally released 2014, Canonical support ended 04/2019).

We're now building on Ubuntu 16.04 Xenial Xerus (originally released
2016, Canonical support will end 04/2021).

https://wiki.ubuntu.com/Releases

This release is still old enough so that the generated AppImages should
run on the majority of modern Linux distros, but also recent enough so
we somewhat recent versions of all libraries. In the case of Qt, we get
a recent enough version to be able to build PulseView (which currently
needs Qt >= 5.3) at all: Qt 5.5.1.
---

diff --git a/cross-compile/appimage/README b/cross-compile/appimage/README
index f4c7fa1..d8a3531 100644
--- a/cross-compile/appimage/README
+++ b/cross-compile/appimage/README
@@ -44,7 +44,7 @@ Temporary workaround for an AppImageKit issue:
  $ mkdir -p build/lib/appimagekit
  $ cp build/out/mksquashfs build/lib/appimagekit
 
-The AppImages are tested to build fine on Ubuntu 14.04 (32bit and 64bit).
+The AppImages are tested to build fine on Ubuntu 16.04 (32bit and 64bit).
 These older distros are used for the build so that the generated AppImages
 can run on as many different systems as possible.
 
diff --git a/cross-compile/appimage/sigrok-native-appimage b/cross-compile/appimage/sigrok-native-appimage
index a3ab9b5..01cf847 100755
--- a/cross-compile/appimage/sigrok-native-appimage
+++ b/cross-compile/appimage/sigrok-native-appimage
@@ -15,7 +15,7 @@ APPIMAGEKIT_OUTDIR=$HOME/AppImageKit/build/out
 # ARCH=i386
 ARCH=x86_64
 
-PYVER=3.4
+PYVER=3.5
 
 ########################################################################
 # You usually don't have to change anything below this line
@@ -96,12 +96,15 @@ if [ "x$1" != "xsigrok-cli" ]; then
 	# Get all Qt5 plugins (won't be copied automatically).
 	QT5PLUGINS=/usr/lib/$ARCH-linux-gnu/qt5/plugins # Host (+ AppRun) path.
 	mkdir -p .$QT5PLUGINS
-	cp -r $QT5PLUGINS/accessible .$QT5PLUGINS
+	cp -r $QT5PLUGINS/bearer .$QT5PLUGINS
+	cp -r $QT5PLUGINS/egldeviceintegrations .$QT5PLUGINS
 	cp -r $QT5PLUGINS/generic .$QT5PLUGINS
 	cp -r $QT5PLUGINS/iconengines .$QT5PLUGINS
 	cp -r $QT5PLUGINS/imageformats .$QT5PLUGINS
 	cp -r $QT5PLUGINS/platforminputcontexts .$QT5PLUGINS
 	cp -r $QT5PLUGINS/platforms .$QT5PLUGINS
+	cp -r $QT5PLUGINS/printsupport .$QT5PLUGINS
+	cp -r $QT5PLUGINS/xcbglintegrations .$QT5PLUGINS
 	
 	# Get some additional dependencies of the Qt5 plugins.
 	ldd .$QT5PLUGINS/platforms/libqxcb.so | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true