summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKye Morton2019-10-21 12:22:26 +1000
committerKye Morton2019-10-21 12:22:26 +1000
commit95f901383bb05ed82dfe131e74a37ef52e7757f2 (patch)
tree2a7489c3e0808690a94af1d711de0d082f929fa3
parent6417b589f28504537318989fc967857d00a5fa6e (diff)
downloadaur-95f901383bb05ed82dfe131e74a37ef52e7757f2.tar.gz
Fixed naming issue from dirty env
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--qgroundcontrol-libicudata.patch18
3 files changed, 20 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7437f73d819..548babffc86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qgroundcontrol
pkgdesc = Micro air vehicle ground control station.
pkgver = 3.5.5
- pkgrel = 1
+ pkgrel = 2
url = http://qgroundcontrol.org/
arch = x86_64
license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 6729c5b41cb..f3fc376994f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Anselmo L. S. Melo <anselmo.melo@intel.com>
pkgname=qgroundcontrol
pkgver=3.5.5
-pkgrel=1
+pkgrel=2
pkgdesc="Micro air vehicle ground control station."
arch=('x86_64')
url="http://qgroundcontrol.org/"
diff --git a/qgroundcontrol-libicudata.patch b/qgroundcontrol-libicudata.patch
new file mode 100644
index 00000000000..213223db823
--- /dev/null
+++ b/qgroundcontrol-libicudata.patch
@@ -0,0 +1,18 @@
+diff --unified --recursive --text qgroundcontrol-3.5.0/QGCSetup.pri qgroundcontrol-3.5.0.new/QGCSetup.pri
+--- qgroundcontrol-3.5.0/QGCSetup.pri 2019-02-05 07:38:43.000000000 +1000
++++ qgroundcontrol-3.5.0.new/QGCSetup.pri 2019-04-18 18:35:13.792079826 +1000
+@@ -135,10 +135,11 @@
+ libQt5TextToSpeech.so.5
+
+ !contains(DEFINES, __rasp_pi2__) {
++ # Some Qt distributions link with *.so.56
+ QT_LIB_LIST += \
+- libicudata.so.56 \
+- libicui18n.so.56 \
+- libicuuc.so.56
++ libicudata.so.* \
++ libicui18n.so.* \
++ libicuuc.so.*
+ }
+
+ for(QT_LIB, QT_LIB_LIST) {