Package Details: openhantek6022-git 3.0.2.rc1-2

Git Clone URL: https://aur.archlinux.org/openhantek6022-git.git (read-only, click to copy)
Package Base: openhantek6022-git
Description: A DSO software for Hantek USB digital signal oscilloscopes 6022BE/BL.
Upstream URL: https://github.com/OpenHantek/OpenHantek6022
Licenses: GPL3
Conflicts: openhantek, openhantek-git, openhantek6022
Provides: openhantek6022
Submitter: thomasandres
Maintainer: thomasandres
Last Packager: thomasandres
Votes: 4
Popularity: 0.62
First Submitted: 2019-10-06 10:56
Last Updated: 2020-02-03 21:38

Latest Comments

thomasandres commented on 2020-02-03 21:42

Thank you, I wasn't aware if this. I just removed the parallel make instruction.

dviktor commented on 2020-02-02 22:12

We shouldn't use make parallelism explicitly - /etc/makepkg.conf will take care of it if you don't specify !makeflags in options directive

thomasandres commented on 2020-02-02 19:03

dvictor thank you for your proposal, but i want to keep the pkgver similar to the stable software version. I decided to replace the hyphen with a dot.

dviktor commented on 2020-02-02 14:39

Seems like PKGBUILD requires some modifications: most importantly - fixing up pkgver () (because git tags contain hyphens which are prohibited by Arch-specific requirements); fixing parallel make; updating dependencies; cleaning up a bit etc. Here is my proposal:

diff --git a/PKGBUILD b/PKGBUILD
index 3ebbd3e..790ce81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Thomas Andres <thomas at andres dot in>
+
 pkgname=openhantek6022-git
 _gitname=OpenHantek6022
-pkgver=v2.15
-pkgrel=2
-pkgdesc="A DSO software for Hantek USB digital signal oscilloscopes 6022BE / BL."
+pkgver=r609.10e1c69
+pkgrel=1
+pkgdesc="A DSO software for Hantek USB digital signal oscilloscopes 6022BE/BL"
 arch=('i686' 'x86_64')
-url=https://github.com/OpenHantek/OpenHantek6022
+url="https://github.com/OpenHantek/OpenHantek6022"
 license=('GPL3')
-depends=('fftw' 'qt5-base')
-makedepends=('git' 'cmake' 'make' 'sed' 'binutils' 'gcc' 'gendesk' 'qt5-tools')
+depends=('fftw>=3' 'qt5-base>=5.4' 'qt5-svg>=5.4' 'libusb>=1.0.16')
+makedepends=('git' 'cmake>=3.5' 'make' 'sed' 'gcc>=4.3' 'gendesk' 'qt5-tools>=5.4')
 conflicts=(openhantek6022 openhantek openhantek-git)
 provides=(openhantek6022)
-source=('git+https://github.com/OpenHantek/OpenHantek6022.git')
+source=("$_gitname::git+https://github.com/OpenHantek/OpenHantek6022.git")
 md5sums=('SKIP')

 prepare() {
@@ -30,18 +31,20 @@ prepare() {

 pkgver() {
     cd $_gitname
-    git describe --tags $(git rev-list --tags --max-count=1)
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }

 build() {
     cd $_gitname
-    git checkout $pkgver -q
-    [[ ! -d build ]] && mkdir -p build
+
+    mkdir -p build
     cd build
+
     cmake \
         -DCMAKE_INSTALL_PREFIX=/usr \
         ../
-    make -j$(nproc)
+
+    make
 }

 package() {
@@ -52,5 +55,5 @@ package() {
     install -Dm644 "$_gitname.desktop" "$pkgdir/usr/share/applications/$_gitname.desktop"

     cd $_gitname/openhantek/res/images
-    install -Dm644 OpenHantek6022.svg "$pkgdir/usr/share/pixmaps/$_gitname.svg"
-}
\ No newline at end of file
+    install -Dm644 OpenHantek.svg "$pkgdir/usr/share/pixmaps/$_gitname.svg"
+}