summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leontiev2014-02-08 12:52:06 +0400
committerAnton Leontiev2015-02-15 07:48:20 +0300
commit52d2a5e4ffac51e95717e6bd06772a3450bd2122 (patch)
tree279483240f8f1bbda72b3201ed39a488eb16e627
parent9b0db61f58c1eab840e81dee577f1afdabce24b2 (diff)
downloadaur-52d2a5e4ffac51e95717e6bd06772a3450bd2122.tar.gz
Fix error when building on a system with qt5 installed
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD48
2 files changed, 25 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 141038960c2..dda11430ad1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = xyscan
pkgdesc = Tool to extract data points from graphical plots
pkgver = 3.3.1
- pkgrel = 2
+ pkgrel = 3
url = http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/
install = xyscan.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index a6142ffc6b9..21ea10e55e1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,37 @@
# Contributor: Anton Leontiev <bunder /at/ t-25.ru>
pkgname=xyscan
pkgver=3.3.1
-pkgrel=2
-arch=("i686" "x86_64")
-pkgdesc="Tool to extract data points from graphical plots"
-url="http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/"
-license=("GPL")
-depends=("qt4>=4.6.0")
+pkgrel=3
+arch=('i686' 'x86_64')
+pkgdesc='Tool to extract data points from graphical plots'
+url='http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/'
+license=('GPL')
+depends=('qt4>=4.6.0')
source=(http://star.physics.yale.edu/~ullrich/xyscanDistributionPage/3.31/$pkgname-3.31-src.tar.gz
xyscan-$pkgver-docs.patch
xyscan.desktop)
-md5sums=("af25ded942dbfdc4e73c5f9986db6e2e"
- "22093f1c22b73f95de1cbfee14d74dc4"
- "2df01c952f8425d05e0d138778ca5be9")
+md5sums=('af25ded942dbfdc4e73c5f9986db6e2e'
+ '22093f1c22b73f95de1cbfee14d74dc4'
+ '2df01c952f8425d05e0d138778ca5be9')
install=xyscan.install
build() {
- cd "$srcdir/$pkgname"
- patch -i "$srcdir/$pkgname-$pkgver-docs.patch"
- qmake -o Makefile xyscan.pro
- make
+ cd $pkgname
+ patch -i ../$pkgname-$pkgver-docs.patch
+ qmake-qt4 -o Makefile xyscan.pro
+ make
}
package() {
- cd "$srcdir/$pkgname"
- install --mode=755 -D xyscan $pkgdir/usr/bin/xyscan
- install --mode=755 --directory $pkgdir/usr/share/doc/xyscan/{en,fr}
- install --mode=644 --target-directory=$pkgdir/usr/share/doc/xyscan/en docs/en/*
- install --mode=644 --target-directory=$pkgdir/usr/share/doc/xyscan/fr docs/fr/*
- install --mode=644 -D images/xyscanIcon.png $pkgdir/usr/share/icons/hicolor/32x32/apps/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
+ cd $pkgname
+ install --mode=755 -D xyscan $pkgdir/usr/bin/xyscan
+ install --mode=755 --directory $pkgdir/usr/share/doc/xyscan/{en,fr}
+ install --mode=644 --target-directory=$pkgdir/usr/share/doc/xyscan/en docs/en/*
+ install --mode=644 --target-directory=$pkgdir/usr/share/doc/xyscan/fr docs/fr/*
+ install --mode=644 -D images/xyscanIcon.png $pkgdir/usr/share/icons/hicolor/32x32/apps/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
}