summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlukash2017-12-17 21:07:14 +0100
committerlukash2017-12-17 21:07:14 +0100
commit215b937b0c27a3d7cc1c274ad43aa8a47bfa6bec (patch)
tree0d5131b2a14d89a1459c9519bdac594b8683cde7
parenta26c22d952e66cf9a332b5f0df1e4a1618067795 (diff)
downloadaur-215b937b0c27a3d7cc1c274ad43aa8a47bfa6bec.tar.gz
Temporary use fixed revision because of OpenHantek code refactoring
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD10
-rw-r--r--openhantek-git.install12
3 files changed, 7 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8b58b56dc271..ce56d8e03691 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = openhantek-git
pkgdesc = Qt5 UI for Hantek DSO2xxx/DSO52xx/6022BE/BL oscilloscopes. Including firmware
- pkgver = r145.5913ecb
+ pkgver = r175.85aa946
pkgrel = 1
url = http://www.openhantek.org/
- install = openhantek-git.install
arch = i686
arch = x86_64
license = GPL-3.0
diff --git a/PKGBUILD b/PKGBUILD
index 52c0997d9088..7d9cea8b3a56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Lukas Lamper <lukash.lamper@gmail.com>
_name=openhantek
pkgname=$_name-git
-pkgver=r145.5913ecb
+pkgver=r175.85aa946
pkgrel=1
pkgdesc="Qt5 UI for Hantek DSO2xxx/DSO52xx/6022BE/BL oscilloscopes. Including firmware"
arch=('i686' 'x86_64')
@@ -15,7 +15,6 @@ depends=('bzip2' 'double-conversion' 'fftw' 'freetype2' 'fxload'
'pcre2' 'qt5-base' 'xz' 'zlib')
provides=("$_name")
makedepends=('git' 'cmake' 'binutils' 'fakeroot')
-install=$pkgname.install
source=("git+https://github.com/OpenHantek/openhantek.git")
sha256sums=('SKIP')
@@ -27,6 +26,9 @@ pkgver() {
build() {
cd "$srcdir/$_name"
+ # Temporary used working version, will be removed after
+ # OpenHantek refactoring is done
+ git reset --hard 3bfdb59cbfdb304440066b33de2e9f094d6c26f8
mkdir build
cd build
@@ -43,13 +45,13 @@ package() {
make DESTDIR="$pkgdir" install
sed -i "s;/usr/local/share/hantek;/usr/share/openhantek;g"\
- $srcdir/$_name/firmware/90-hantek.rules
+ $srcdir/$_name/firmware/60-hantek.rules
mkdir -p $pkgdir/usr/share/openhantek
cp -a $srcdir/$_name/firmware/*.hex $pkgdir/usr/share/openhantek/
mkdir -p $pkgdir/etc/udev/rules.d/
- cp $srcdir/$_name/firmware/90-hantek.rules $pkgdir/etc/udev/rules.d/
+ cp $srcdir/$_name/firmware/60-hantek.rules $pkgdir/etc/udev/rules.d/
mv $pkgdir/usr/bin/OpenHantek $pkgdir/usr/bin/openhantek
}
diff --git a/openhantek-git.install b/openhantek-git.install
deleted file mode 100644
index 939abcaf4987..000000000000
--- a/openhantek-git.install
+++ /dev/null
@@ -1,12 +0,0 @@
-pre_install() {
- if ! getent group plugdev >/dev/null; then
- groupadd --system plugdev
- fi
-}
-
-post_install() {
- udevadm control --reload-rules && udevadm trigger
- echo ""
- echo "To be able to use this application, user must be in the plugdev group."
- echo ""
-}