summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Bazile2020-07-02 23:54:04 +0200
committerRomain Bazile2020-07-02 23:54:04 +0200
commitab098e9e8d2227d40c52b266ab7a2687214cf621 (patch)
treec8727ad3164ee8ffcdbad6f88c96c1ec2147311c
parent1f2bd3be0bfeb6c61f9097893adb3a1346a6f223 (diff)
downloadaur-ab098e9e8d2227d40c52b266ab7a2687214cf621.tar.gz
fix GCC10 compilation bug
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--skewt.patch12
-rw-r--r--xygrib.install6
4 files changed, 22 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b5ec2ffdd8c..fc1c5a093316 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,8 +19,10 @@ pkgbase = xygrib
conflicts = xygrib-git
source = https://github.com/opengribs/XyGrib/archive/v1.2.6.1.tar.gz
source = xygrib.install
+ source = skewt.patch
sha1sums = 8e3431ed6a5ef114d77ac57029129a26a381f696
- sha1sums = 58925746bf6ac941ab34e268517581f1e01e9cff
+ sha1sums = 97eec7e40bd2d4f44986ffbf5096ac4ba37ebbfe
+ sha1sums = 1fa4cf6b72863c9f33a80946d9f4afe7f855df6a
pkgname = xygrib
diff --git a/PKGBUILD b/PKGBUILD
index 90977b230bfa..6ff2cef5f158 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,13 +13,15 @@ conflicts=('xygrib-git')
depends=('libnova' 'qwt' 'proj' 'qt5-base' 'openjpeg2')
makedepends=('cmake' 'zlib' 'bzip2' 'libpng')
url="https://opengribs.org/"
-source=("https://github.com/opengribs/XyGrib/archive/v$pkgver.tar.gz" "xygrib.install")
+source=("https://github.com/opengribs/XyGrib/archive/v$pkgver.tar.gz" "xygrib.install" "skewt.patch")
sha1sums=('8e3431ed6a5ef114d77ac57029129a26a381f696'
- '58925746bf6ac941ab34e268517581f1e01e9cff')
+ '97eec7e40bd2d4f44986ffbf5096ac4ba37ebbfe'
+ '1fa4cf6b72863c9f33a80946d9f4afe7f855df6a')
build() {
cd $srcdir/XyGrib-$pkgver
+ patch --strip=1 -i $srcdir/skewt.patch
mkdir -p build
cd build
cmake ../
diff --git a/skewt.patch b/skewt.patch
new file mode 100644
index 000000000000..7cddef86e103
--- /dev/null
+++ b/skewt.patch
@@ -0,0 +1,12 @@
+diff --git a/src/SkewT.h b/src/SkewT.h
+index c9a23ce..0916681 100644
+--- a/src/SkewT.h
++++ b/src/SkewT.h
+@@ -31,6 +31,7 @@
+ #include <QCheckBox>
+ #include <QThread>
+ #include <QMessageBox>
++#include <QPainterPath>
+
+ class SkewT;
+
diff --git a/xygrib.install b/xygrib.install
index 0a039b4dd254..94973cb92191 100644
--- a/xygrib.install
+++ b/xygrib.install
@@ -1,15 +1,15 @@
post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ gtk-update-icon-cache -q -t -f /usr/share/pixmaps
update-desktop-database -q
}
post_upgrade() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ gtk-update-icon-cache -q -t -f /usr/share/pixmaps
update-desktop-database -q
}
post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ gtk-update-icon-cache -q -t -f /usr/share/pixmaps
update-desktop-database -q
}