summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD16
2 files changed, 11 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 70d3c7f9ba66..8716f29d7289 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = dsview-git
pkgdesc = GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc.
- pkgver = 1.01.r31.gb018742
+ pkgver = 1.2.0.r15.g9264bce
pkgrel = 1
url = http://www.dreamsourcelab.com/
arch = i686
@@ -11,10 +11,7 @@ pkgbase = dsview-git
depends = boost-libs
depends = qt5-base
depends = fftw
- depends = libsigrok4dsl-git
- depends = libsigrokdecode4dsl-git
- source = git://github.com/DreamSourceLab/DSView
+ source = git+https://github.com/DreamSourceLab/DSView
sha1sums = SKIP
pkgname = dsview-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 92f91d79d71b..b5f4c90fedf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
# Maintainer: Anatol Pomozov
+# Co-Maintainer: Abdelhak Bougouffa <abougouffa@fedoraproject.org>
# Contributor: Thomas Krug <t.krug@elektronenpumpe.de>
pkgname=dsview-git
-pkgver=1.01.r31.gb018742
+pkgver=1.2.0.r15.g9264bce
pkgrel=1
pkgdesc='GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc.'
arch=(i686 x86_64)
url='http://www.dreamsourcelab.com/'
license=(GPL3)
# Upstream added VCS dependency to libsigrokdecode :/
-depends=(boost-libs qt5-base fftw libsigrok4dsl-git libsigrokdecode4dsl-git)
+depends=(boost-libs qt5-base fftw)
makedepends=(boost cmake)
-source=(git://github.com/DreamSourceLab/DSView) #branch=develop
+source=(git+https://github.com/DreamSourceLab/DSView) #branch=develop
sha1sums=('SKIP')
pkgver() {
@@ -20,19 +21,20 @@ pkgver() {
}
prepare() {
- cd DSView/DSView
- sed 's|/usr/local/|/usr/|' -i DSView.desktop
+ cd DSView
+ sed 's|/usr/local/|/usr/|' -i DSView/DSView.desktop
+ sed 's| /lib/udev/rules.d| /usr/lib/udev/rules.d|' -i CMakeLists.txt
}
build() {
- cd DSView/DSView
+ cd DSView
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
make
}
package() {
- cd DSView/DSView
+ cd DSView
make DESTDIR="$pkgdir" install
#install -Dm644 icons/logo_color.png "$pkgdir/usr/share/pixmaps/dsview.png"