Updated to version 3.2

3 files changed, 29 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c07848d63830..0302fab09cbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = veusz
 	pkgdesc = A 2D and 3D scientific plotting package, designed to create publication-ready PDF or SVG output
-	pkgver = 3.1
+	pkgver = 3.2
 	pkgrel = 1
 	url = https://veusz.github.io/
 	arch = x86_64
@@ -15,8 +15,10 @@ pkgbase = veusz
 	optdepends = python-iminuit: improved fitting
 	optdepends = python-astropy: VO table import and FITS import
 	optdepends = ghostscript: for EPS/PS output
-	source = https://github.com/veusz/veusz/releases/download/veusz-3.1/veusz-3.1.tar.gz
-	sha256sums = c2e2c1bd6891c21fc05484f3b87db52274378e9bf8d4cfa44ea689e56b22f77e
+	source = https://github.com/veusz/veusz/releases/download/veusz-3.2/veusz-3.2.tar.gz
+	source = veusz-3.2-sip_dir.patch
+	sha256sums = 67d4adcc83b33098f4740ac036e54b3078c596b67363b674ef167ac3a812b018
+	sha256sums = 526cf71bfa70e4a400e46054cb0e73254b45d1b930c36c5c2afd2cf8e0c59938
 
 pkgname = veusz
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ed267952e6b..890812daa969 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: moostik <mooostik_at_gmail.com>
 
 pkgname=veusz
-pkgver=3.1
+pkgver=3.2
 pkgrel=1
 pkgdesc="A 2D and 3D scientific plotting package, designed to create publication-ready PDF or SVG output"
 arch=('x86_64')
@@ -19,11 +19,19 @@ optdepends=('python-h5py:  HDF5 support'
             'python-iminuit: improved fitting'
             'python-astropy: VO table import and FITS import'
             'ghostscript: for EPS/PS output')
-source=("https://github.com/veusz/veusz/releases/download/veusz-${pkgver}/veusz-${pkgver}.tar.gz")
-sha256sums=('c2e2c1bd6891c21fc05484f3b87db52274378e9bf8d4cfa44ea689e56b22f77e')
+       # patch from https://github.com/veusz/veusz/issues/307
+source=("https://github.com/veusz/veusz/releases/download/veusz-${pkgver}/veusz-${pkgver}.tar.gz"
+        "veusz-${pkgver}-sip_dir.patch")
+sha256sums=('67d4adcc83b33098f4740ac036e54b3078c596b67363b674ef167ac3a812b018'
+            '526cf71bfa70e4a400e46054cb0e73254b45d1b930c36c5c2afd2cf8e0c59938')
+
+prepare() {
+  patch -Np1 -i "veusz-${pkgver}-sip_dir.patch"
+}
 
 build() {
   cd "${pkgname}-${pkgver}"
+  python setup.py build_ext --sip-dir=/usr/lib/python3.8/site-packages/PyQt5/bindings/
   python setup.py build
 }
 
@@ -38,3 +46,4 @@ package() {
   install -D -m644 "support/veusz.desktop" \
       "${pkgdir}/usr/share/applications/veusz.desktop"
 }
+
diff --git a/veusz-3.2-sip_dir.patch b/veusz-3.2-sip_dir.patch
new file mode 100644
index 000000000000..390fa12c77b2
--- /dev/null
+++ b/veusz-3.2-sip_dir.patch
@@ -0,0 +1,12 @@
+diff -Nuar src/veusz-3.2/pyqtdistutils.py src/veusz-3.2.patched/pyqtdistutils.py
+--- src/veusz-3.2/pyqtdistutils.py	2020-01-26 18:25:09.000000000 +0700
++++ src/veusz-3.2.patched/pyqtdistutils.py	2020-03-10 12:14:02.317395029 +0700
+@@ -272,7 +272,7 @@
+                 sip_exe,
+                 '-c', self.build_temp
+             ] + SIP_FLAGS.split() + [
+-                '-I', os.path.join(sip_dir, 'PyQt5'),
++                '-I', sip_dir,
+                 '-b', sbf,
+                 source
+             ]