xyscan: Update to v4.6.4

2 files changed, 8 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bb9c5d9ad36..9e9e0c5790af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xyscan
 	pkgdesc = Tool to extract data points from graphical plots
-	pkgver = 4.5.0
+	pkgver = 4.6.4
 	pkgrel = 1
 	url = http://rhig.physics.yale.edu/~ullrich/software/xyscan/
 	arch = i686
@@ -9,10 +9,9 @@ pkgbase = xyscan
 	depends = qt5-charts
 	depends = qt5-multimedia>=5.2.0
 	depends = poppler-qt5
-	source = http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/4.50/xyscan-4.50-src.tgz
+	source = http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/4.64/xyscan-4.64-src.tgz
 	source = xyscan.desktop
-	md5sums = 6129579aa1b8c70c8a66d8e844c398ae
+	md5sums = 20226ddcba9f8054ac63dd19aa055669
 	md5sums = 2df01c952f8425d05e0d138778ca5be9
 
 pkgname = xyscan
-
diff --git a/PKGBUILD b/PKGBUILD
index 803a197e7567..8f16b016011b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Anton Leontiev <scileont /at/ gmail.com>
 pkgname=xyscan
-pkgver=4.5.0
+pkgver=4.6.4
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Tool to extract data points from graphical plots'
@@ -12,26 +12,23 @@ depends=('qt5-charts' 'qt5-multimedia>=5.2.0' 'poppler-qt5')
 pkgverf=${pkgver%.*}${pkgver##*.}
 source=(http://rhig.physics.yale.edu/~ullrich/software/$pkgname/Distributions/$pkgverf/$pkgname-$pkgverf-src.tgz
 	xyscan.desktop)
-md5sums=('6129579aa1b8c70c8a66d8e844c398ae'
+md5sums=('20226ddcba9f8054ac63dd19aa055669'
          '2df01c952f8425d05e0d138778ca5be9')
 
 prepare() {
 	cd $pkgname
-	sed -i 's:/usr/local/share/xyscan/docs:/usr/share/doc/xyscan:' src/xyscanWindow.cpp
-	sed -i 's:/usr/local:/usr:' xyscan.pro
+	sed -i 's:/usr/local/share/xyscan/docs:/usr/share/xyscan/docs:' src/xyscanBaseWindow.cpp
 }
 
 build() {
 	cd $pkgname
-	qmake-qt5
+	qmake-qt5 PREFIX=/usr
 	make
 }
 
 package() {
 	cd $pkgname
-	install --mode=755 -D xyscan $pkgdir/usr/bin/xyscan
-	install --mode=755 --directory $pkgdir/usr/share/doc/xyscan
-	install --mode=644 --target-directory=$pkgdir/usr/share/doc/xyscan docs/*
+	make install INSTALL_ROOT="$pkgdir"
 	install --mode=644 -D images/xyscanIcon.png $pkgdir/usr/share/pixmaps/xyscan.png
 	install --mode=644 -D $srcdir/xyscan.desktop $pkgdir/usr/share/applications/xyscan.desktop
 }