updpkg

5 files changed, 27 insertions, 101 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03fa3b404771..f9566c108ef4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Dec 14 17:26:51 UTC 2015
 pkgbase = dsview-git
 	pkgdesc = GUI programe for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc.
-	pkgver = 0.94.r2.g1cd6420
+	pkgver = 0.94.r32.g3100bc8
 	pkgrel = 1
 	url = http://www.dreamsourcelab.com/
 	install = dsview.install
@@ -12,19 +14,15 @@ pkgbase = dsview-git
 	depends = boost-libs
 	depends = qt5-base
 	depends = libsigrok4dsl-git
-	depends = libsigrokdecode
+	depends = libsigrokdecode-git
 	source = git://github.com/DreamSourceLab/DSView
-	source = 0001-Fix-compilation-error-found-at-Linux-Arch.patch
-	source = 0002-Use-usr-share-for-resource-files-bin-folder-is-for-b.patch
-	source = 0003-Fix-compile-error.patch
+	source = Use-usr-share-for-resource-files-bin-folder-is-for-b.patch
 	source = udev.rules
 	source = dsview.desktop
 	sha1sums = SKIP
-	sha1sums = e5ae41c0157e8e318866be7785ff9bee3198d387
-	sha1sums = 0fe0fb09ce13383c26c39f016d23a37a9af82bef
-	sha1sums = 64fb34f100c4a94ab497581a871f006012727b5c
+	sha1sums = 80beaa22bab87925a38a9be56abdb7cb77d4ac5e
 	sha1sums = 50f23061fcd03e0aafdefb3b676f1846c036c856
-	sha1sums = 2354eb8d1140e8e3ce523122a52a5d07fa80f739
+	sha1sums = 96d3a0168f392af655e2b309711d7810ad3c022f
 
 pkgname = dsview-git
 
diff --git a/0001-Fix-compilation-error-found-at-Linux-Arch.patch b/0001-Fix-compilation-error-found-at-Linux-Arch.patch
deleted file mode 100644
index b9947d81661b..000000000000
--- a/0001-Fix-compilation-error-found-at-Linux-Arch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5270c97b76674d6f19fd14758d443cfda44c0036 Mon Sep 17 00:00:00 2001
-From: Anatol Pomozov <anatol.pomozov@gmail.com>
-Date: Fri, 15 May 2015 16:04:00 -0700
-Subject: [PATCH 1/4] Fix compilation error found at Linux Arch
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-/home/anatol/sources/archpackages/dsview-git/src/DSView/DSView/pv/data/decode/annotation.cpp: In constructor ‘pv::data::decode::Annotation::Annotation(const srd_proto_data*)’:
-/home/anatol/sources/archpackages/dsview-git/src/DSView/DSView/pv/data/decode/annotation.cpp:43:17: error: ‘const struct srd_proto_data_annotation’ has no member named ‘ann_class’
-  _format = pda->ann_class;
----
- DSView/pv/data/decode/annotation.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/DSView/pv/data/decode/annotation.cpp b/DSView/pv/data/decode/annotation.cpp
-index 32d3897..c3c7440 100644
---- a/DSView/pv/data/decode/annotation.cpp
-+++ b/DSView/pv/data/decode/annotation.cpp
-@@ -40,7 +40,7 @@ Annotation::Annotation(const srd_proto_data *const pdata) :
- 		(const srd_proto_data_annotation*)pdata->data;
- 	assert(pda);
- 
--	_format = pda->ann_class;
-+	_format = pda->ann_format;
- 
- 	const char *const *annotations = (char**)pda->ann_text;
- 	while(*annotations) {
--- 
-2.4.4
-
diff --git a/0003-Fix-compile-error.patch b/0003-Fix-compile-error.patch
deleted file mode 100644
index 097ce430c859..000000000000
--- a/0003-Fix-compile-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 35fc34271fbbd6f504aa428e7da45bfb3c8b7a44 Mon Sep 17 00:00:00 2001
-From: Anatol Pomozov <anatol.pomozov@gmail.com>
-Date: Mon, 29 Jun 2015 19:11:19 -0700
-Subject: [PATCH 3/4] Fix compile error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-/home/anatol/sources/dreamstudio/DSView/DSView/pv/mainwindow.cpp: In member function ‘bool pv::MainWindow
-/home/anatol/sources/dreamstudio/DSView/DSView/pv/mainwindow.cpp:742:77: error: conversion from ‘uint64_t
-             s_obj["vdiv"] = QJsonValue::fromVariant(dsoSig->get_vDialValue());
-                                                                             ^
----
- DSView/pv/mainwindow.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp
-index a00cc67..00ef817 100644
---- a/DSView/pv/mainwindow.cpp
-+++ b/DSView/pv/mainwindow.cpp
-@@ -739,8 +739,8 @@ bool MainWindow::store_session(QString name)
-         s_obj["strigger"] = s->get_trig();
-         boost::shared_ptr<view::DsoSignal> dsoSig;
-         if (dsoSig = dynamic_pointer_cast<view::DsoSignal>(s)) {
--            s_obj["vdiv"] = QJsonValue::fromVariant(dsoSig->get_vDialValue());
--            s_obj["vfactor"] = QJsonValue::fromVariant(dsoSig->get_factor());
-+            s_obj["vdiv"] = QJsonValue::fromVariant(static_cast<qulonglong>(dsoSig->get_vDialValue()));
-+            s_obj["vfactor"] = QJsonValue::fromVariant(static_cast<qulonglong>(dsoSig->get_factor()));
-             s_obj["coupling"] = dsoSig->get_acCoupling();
-             s_obj["trigValue"] = dsoSig->get_trigRate();
-             s_obj["zeroPos"] = dsoSig->get_zeroRate();
--- 
-2.4.4
-
diff --git a/PKGBUILD b/PKGBUILD
index 6e91513b0d81..6f0c76156f46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,24 +2,21 @@
 # Contributor: Thomas Krug <t.krug@elektronenpumpe.de>
 
 pkgname=dsview-git
-pkgver=0.94.r2.g1cd6420
+pkgver=0.94.r32.g3100bc8
 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)
-depends=(boost-libs qt5-base libsigrok4dsl-git libsigrokdecode)
+# Upstream added VCS dependency to libsigrokdecode :/
+depends=(boost-libs qt5-base libsigrok4dsl-git libsigrokdecode-git)
 makedepends=(boost cmake)
 source=(git://github.com/DreamSourceLab/DSView
-        0001-Fix-compilation-error-found-at-Linux-Arch.patch
-        0002-Use-usr-share-for-resource-files-bin-folder-is-for-b.patch
-        0003-Fix-compile-error.patch
+        Use-usr-share-for-resource-files-bin-folder-is-for-b.patch
         udev.rules
         dsview.desktop)
 sha1sums=('SKIP'
-          'e5ae41c0157e8e318866be7785ff9bee3198d387'
-          '0fe0fb09ce13383c26c39f016d23a37a9af82bef'
-          '64fb34f100c4a94ab497581a871f006012727b5c'
+          '80beaa22bab87925a38a9be56abdb7cb77d4ac5e'
           '50f23061fcd03e0aafdefb3b676f1846c036c856'
           '96d3a0168f392af655e2b309711d7810ad3c022f')
 install=dsview.install
@@ -31,17 +28,13 @@ pkgver() {
 
 prepare() {
   cd DSView
-  patch -p1 < "$srcdir/0001-Fix-compilation-error-found-at-Linux-Arch.patch"
-  patch -p1 < "$srcdir/0002-Use-usr-share-for-resource-files-bin-folder-is-for-b.patch"
-  patch -p1 < "$srcdir/0003-Fix-compile-error.patch"
+  patch -p1 < "$srcdir/Use-usr-share-for-resource-files-bin-folder-is-for-b.patch"
 }
 
 build() {
   cd DSView/DSView
 
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_SKIP_RPATH=1 .
-
-  # for f in $(find . -type f -name "*.png"); do echo "Processing $f ..."; convert $f -strip $f; done
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release # -DCMAKE_SKIP_RPATH=1
   make
 }
 
diff --git a/0002-Use-usr-share-for-resource-files-bin-folder-is-for-b.patch b/Use-usr-share-for-resource-files-bin-folder-is-for-b.patch
index 4e9894e7d54b..001f9ca87aae 100644
--- a/0002-Use-usr-share-for-resource-files-bin-folder-is-for-b.patch
+++ b/Use-usr-share-for-resource-files-bin-folder-is-for-b.patch
@@ -1,7 +1,7 @@
-From 691a7be3dbf7b0685d410a88efd57bfc6ca41ec1 Mon Sep 17 00:00:00 2001
+From 3ccc5276eefd927c6e999b22fb6cc997b79fc8a4 Mon Sep 17 00:00:00 2001
 From: Anatol Pomozov <anatol.pomozov@gmail.com>
-Date: Fri, 15 May 2015 16:28:42 -0700
-Subject: [PATCH 2/4] Use /usr/share for resource files bin folder is for
+Date: Mon, 14 Dec 2015 09:05:10 -0800
+Subject: [PATCH] Use /usr/share for resource files bin folder is for 
  binaries.
 
 ---
@@ -10,10 +10,10 @@ Subject: [PATCH 2/4] Use /usr/share for resource files bin folder is for
  2 files changed, 20 insertions(+), 15 deletions(-)
 
 diff --git a/DSView/CMakeLists.txt b/DSView/CMakeLists.txt
-index 652cb58..9c146b8 100644
+index c5703c6..eb8bbc0 100644
 --- a/DSView/CMakeLists.txt
 +++ b/DSView/CMakeLists.txt
-@@ -350,21 +350,21 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "/usr/local/lib")
+@@ -352,21 +352,21 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL_RPATH "/usr/local/lib")
  
  # Install the executable.
  install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
@@ -51,27 +51,27 @@ index 652cb58..9c146b8 100644
  #===============================================================================
  #= Packaging (handled by CPack)
 diff --git a/DSView/pv/devicemanager.cpp b/DSView/pv/devicemanager.cpp
-index a3d6d21..99b49ec 100644
+index 066af64..d6406d9 100644
 --- a/DSView/pv/devicemanager.cpp
 +++ b/DSView/pv/devicemanager.cpp
 @@ -103,12 +103,17 @@ std::list<boost::shared_ptr<device::DevInst> > DeviceManager::driver_scan(
  
      // Check If DSL hardware driver
-     if (strcmp(driver->name, "demo") != 0) {
-+        /*
+     if (strncmp(driver->name, "virtual", 7)) {
++	/*
          QDir dir(QCoreApplication::applicationDirPath());
          if (!dir.cd("res"))
              return driver_devices;
          QString str = dir.absolutePath() + "/";
          QString str_utf8 = QString::fromLocal8Bit(str.toLocal8Bit());
          strcpy(config_path, str_utf8.toUtf8().data());
-+        */
-+        // dirty
-+        // maybe use  QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
-+        strcpy(config_path, "/usr/share/dsview/");
++	*/
++	// dirty
++	// maybe use  QStandardPaths::standardLocations(QStandardPaths::AppDataLocation);
++	strcpy(config_path, "/usr/share/dsview/");
      }
  
  	// Do the scan
 -- 
-2.4.4
+2.6.4