summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--.gitignore6
-rw-r--r--PKGBUILD22
-rw-r--r--xyscan.install11
4 files changed, 11 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a6c0615226ea..9e9e0c5790af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
pkgbase = xyscan
pkgdesc = Tool to extract data points from graphical plots
- pkgver = 4.2.1
+ pkgver = 4.6.4
pkgrel = 1
url = http://rhig.physics.yale.edu/~ullrich/software/xyscan/
- install = xyscan.install
arch = i686
arch = x86_64
license = GPL
+ depends = qt5-charts
depends = qt5-multimedia>=5.2.0
depends = poppler-qt5
- source = http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/4.21/xyscan-4.21-src.tgz
+ source = http://rhig.physics.yale.edu/~ullrich/software/xyscan/Distributions/4.64/xyscan-4.64-src.tgz
source = xyscan.desktop
- md5sums = f38c2c6676db6d92519d850ab6f358d9
+ md5sums = 20226ddcba9f8054ac63dd19aa055669
md5sums = 2df01c952f8425d05e0d138778ca5be9
pkgname = xyscan
-
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e6b6b4b8077d..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.tar.gz
-*.tar.bz2
-*.tar.xz
-*.tar.lz
-src/
-pkg/ \ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 40fb56b6ded1..8f16b016011b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,34 @@
# Contributor: Anton Leontiev <scileont /at/ gmail.com>
pkgname=xyscan
-pkgver=4.2.1
+pkgver=4.6.4
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='Tool to extract data points from graphical plots'
url='http://rhig.physics.yale.edu/~ullrich/software/xyscan/'
license=('GPL')
-depends=('qt5-multimedia>=5.2.0' 'poppler-qt5')
+depends=('qt5-charts' 'qt5-multimedia>=5.2.0' 'poppler-qt5')
# Version in filename lacks last dot
pkgverf=${pkgver%.*}${pkgver##*.}
source=(http://rhig.physics.yale.edu/~ullrich/software/$pkgname/Distributions/$pkgverf/$pkgname-$pkgverf-src.tgz
xyscan.desktop)
-md5sums=('f38c2c6676db6d92519d850ab6f358d9'
+md5sums=('20226ddcba9f8054ac63dd19aa055669'
'2df01c952f8425d05e0d138778ca5be9')
-install=xyscan.install
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
- if test -x /usr/bin/desktop-file-install; then
- /usr/bin/desktop-file-install --dir $pkgdir/usr/share/applications $srcdir/xyscan.desktop
- else
- install --mode=644 -D $srcdir/xyscan.desktop $pkgdir/usr/share/applications/xyscan.desktop
- fi
+ install --mode=644 -D $srcdir/xyscan.desktop $pkgdir/usr/share/applications/xyscan.desktop
}
diff --git a/xyscan.install b/xyscan.install
deleted file mode 100644
index a957b6034e90..000000000000
--- a/xyscan.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- [ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}