From 9918411b3b39ac58b43ffada83e1ae59bfd26000 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Wed, 20 Jul 2022 11:12:57 -0400 Subject: [PATCH 01/10] update to 1.2.0 (epoch=1) dsview now includes a CMakeLists.txt that builds dsview, libsigrok4dsl, and libsigrokdecode4dsl in one shot, so this also drops the dependencies on those other libraries. --- .SRCINFO | 23 +++++++------------ .gitignore | 4 ++-- PKGBUILD | 60 ++++++++++++++++++-------------------------------- dsview.desktop | 7 ------ udev.rules | 16 -------------- 5 files changed, 32 insertions(+), 78 deletions(-) delete mode 100644 dsview.desktop delete mode 100644 udev.rules diff --git a/.SRCINFO b/.SRCINFO index b70077f..fe7c5d3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,27 +1,20 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer - pkgver = 1.12 - pkgrel = 3 + pkgver = 1.2.0 + pkgrel = 1 + epoch = 1 url = http://www.dreamsourcelab.com/ arch = i686 arch = x86_64 license = GPL3 makedepends = cmake + makedepends = ninja makedepends = boost - depends = boost-libs + depends = hicolor-icon-theme depends = qt5-base - depends = libsigrokdecode4dsl>=1.12 - depends = libsigrok4dsl>=1.12 depends = fftw - source = DSView-1.12.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.12.tar.gz - source = qt5.15.patch::https://github.com/DreamSourceLab/DSView/commit/33e3d896a47e559de95b26b13121bef10827e88d.patch - source = extern-c.patch::https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch - source = udev.rules - source = dsview.desktop - sha384sums = 52b9fc2dbd9853f33140c2c528d1b31187a185f5869dd4e7700da1da872fec0d2d03732e4f194f487a287107c3e9b0e0 - sha384sums = e20413c49f636fccdd1d9e107e1aeb52e0c8e8d2d3eecc4cff6e5f239391d512909512a52af768dc44ec3837b7da363c - sha384sums = d7ab026223bf7633a1c7cc1e03a6a15db942f956751547675423abea34223ae6e84973b8c1229e1e6a0b619fa665d568 - sha384sums = c8811523d8712b4cfd2ee10661a36e6ec4ade8fe62384f2cfec9f419a9a50d55cc14c64f944fc82623fdbd955bd63a28 - sha384sums = 6c47f8b81858cfccc96a0e18dd56dbb23c72baa165650d145898eea8d8f3493a9179f7c8c9afd651ed99e713c9106238 + depends = python + source = DSView-1.2.0.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.2.0.tar.gz + sha384sums = 076ba3d9cdf5d598ca8a4ad75194f2b9a30c62ac3591df0cbeb9c33c32d380cdf5e9deb3cf644b129d66f3b46b26a530 pkgname = dsview diff --git a/.gitignore b/.gitignore index 071613b..39759df 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ pkg/ src/ *.swp -*.pkg.tar.xz -*.tar.gz +*.pkg.tar.* +*.tar.* *.tar DSView/ diff --git a/PKGBUILD b/PKGBUILD index 3d1b729..00c6e81 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,62 +2,46 @@ # Maintainer: Jake # Contributor: Thomas Krug +# epoch 0: up to 1.11 +# epoch 1: 1.2.0 +epoch=1 pkgname=dsview -pkgver=1.12 -pkgrel=3 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') url="http://www.dreamsourcelab.com/" license=('GPL3') -depends=('boost-libs' 'qt5-base' "libsigrokdecode4dsl>=${pkgver}" "libsigrok4dsl>=${pkgver}" 'fftw') -makedepends=('cmake' 'boost') +depends=('hicolor-icon-theme' 'qt5-base' 'fftw' 'python') +makedepends=('cmake' 'ninja' 'boost') source=( "DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz" - 'qt5.15.patch::https://github.com/DreamSourceLab/DSView/commit/33e3d896a47e559de95b26b13121bef10827e88d.patch' - 'extern-c.patch::https://github.com/DreamSourceLab/DSView/commit/33cc733abe19872bf5ed08540a94b798d0d4ecf4.patch' - 'udev.rules' - 'dsview.desktop' ) -sha384sums=('52b9fc2dbd9853f33140c2c528d1b31187a185f5869dd4e7700da1da872fec0d2d03732e4f194f487a287107c3e9b0e0' - 'e20413c49f636fccdd1d9e107e1aeb52e0c8e8d2d3eecc4cff6e5f239391d512909512a52af768dc44ec3837b7da363c' - 'd7ab026223bf7633a1c7cc1e03a6a15db942f956751547675423abea34223ae6e84973b8c1229e1e6a0b619fa665d568' - 'c8811523d8712b4cfd2ee10661a36e6ec4ade8fe62384f2cfec9f419a9a50d55cc14c64f944fc82623fdbd955bd63a28' - '6c47f8b81858cfccc96a0e18dd56dbb23c72baa165650d145898eea8d8f3493a9179f7c8c9afd651ed99e713c9106238') - -_wdir() { - cd "$srcdir/DSView-$pkgver/DSView" -} +sha384sums=('076ba3d9cdf5d598ca8a4ad75194f2b9a30c62ac3591df0cbeb9c33c32d380cdf5e9deb3cf644b129d66f3b46b26a530') prepare() { - cd "$srcdir/DSView-$pkgver" - patch -Np1 < "$srcdir/qt5.15.patch" - patch -Np1 < "$srcdir/extern-c.patch" - - cd DSView - sed -i 's#install(FILES icons/logo.png DESTINATION share/${PROJECT_NAME} RENAME logo.png)##; - s#install(FILES DreamSourceLab.rules DESTINATION /etc/udev/rules.d/)##; - s#install(FILES DSView.desktop DESTINATION /usr/share/applications/)##' CMakeLists.txt - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_SKIP_RPATH=1 . + sed -i 's#MODE="0666"#TAG+="uaccess"#' \ + "DSView-${pkgver}/DSView/DreamSourceLab.rules" } build() { - _wdir - cmake . - make + cmake -B build -S "DSView-${pkgver}" \ + -GNinja \ + -DCMAKE_BUILD_TYPE='None' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -Wno-dev + cmake --build build +} + +check() { + ctest --test-dir build --output-on-failure } package() { - _wdir + DESTDIR="$pkgdir" cmake --install build - make DESTDIR="$pkgdir" PREFIX=/usr install - - ln -s "/usr/bin/DSView" "${pkgdir}/usr/bin/${pkgname}" - - install -Dm644 "$srcdir/dsview.desktop" "$pkgdir/usr/share/applications/dsview.desktop" - install -Dm644 "$srcdir/udev.rules" "$pkgdir/usr/lib/udev/rules.d/20-dsview.rules" - - install -Dm644 icons/logo.svg "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${pkgname}.svg" + ln -s "DSView" "${pkgdir}/usr/bin/${pkgname}" } # vim:set ts=2 sw=2 et: diff --git a/dsview.desktop b/dsview.desktop deleted file mode 100644 index 10cd630..0000000 --- a/dsview.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Exec=DSView -Name=DSView -Icon=dsview -Comment=GUI Program for DreamSourceLab USB-based Instruments -Type=Application -Categories=Development diff --git a/udev.rules b/udev.rules deleted file mode 100644 index 91fa0b1..0000000 --- a/udev.rules +++ /dev/null @@ -1,16 +0,0 @@ -# DreamSourceLab DSLogic -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0001", TAG+="uaccess" -# DreamSourceLab DSLogic Pro -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0003", TAG+="uaccess" -# DreamSourceLab DScope -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0002", TAG+="uaccess" -# DreamSourceLab DScope20 -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0022", TAG+="uaccess" -# DreamSourceLab DSLogic Plus -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0020", TAG+="uaccess" -# DreamSourceLab DSLogic Basic -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="0021", TAG+="uaccess" -# DreamSourceLab DSLogic U3Pro16 -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="002a", TAG+="uaccess" -# DreamSourceLab DSLogic U3Pro32 -ATTRS{idVendor}=="2a0e", ATTRS{idProduct}=="002c", TAG+="uaccess" From 83ebff9d8c3f4fbf07b93e2c0c04ae692c2f899d Mon Sep 17 00:00:00 2001 From: Jake Date: Sat, 10 Sep 2022 23:00:37 +0200 Subject: [PATCH 02/10] Update: dsview 1:1.2.1-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fe7c5d3..84194c3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer - pkgver = 1.2.0 + pkgver = 1.2.1 pkgrel = 1 epoch = 1 url = http://www.dreamsourcelab.com/ @@ -14,7 +14,7 @@ pkgbase = dsview depends = qt5-base depends = fftw depends = python - source = DSView-1.2.0.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.2.0.tar.gz - sha384sums = 076ba3d9cdf5d598ca8a4ad75194f2b9a30c62ac3591df0cbeb9c33c32d380cdf5e9deb3cf644b129d66f3b46b26a530 + source = DSView-1.2.1.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.2.1.tar.gz + sha384sums = a0cdd4d9e28641ab42bb94354398b470be28ef2ec296544e8eea55186aacc1f2709fdb7f142bf345d6680c15e36cbd65 pkgname = dsview diff --git a/PKGBUILD b/PKGBUILD index 00c6e81..9c23ca5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # epoch 1: 1.2.0 epoch=1 pkgname=dsview -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('cmake' 'ninja' 'boost') source=( "DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz" ) -sha384sums=('076ba3d9cdf5d598ca8a4ad75194f2b9a30c62ac3591df0cbeb9c33c32d380cdf5e9deb3cf644b129d66f3b46b26a530') +sha384sums=('a0cdd4d9e28641ab42bb94354398b470be28ef2ec296544e8eea55186aacc1f2709fdb7f142bf345d6680c15e36cbd65') prepare() { sed -i 's#MODE="0666"#TAG+="uaccess"#' \ From 2e79a41827f1de749ff68a953d24c2091436850a Mon Sep 17 00:00:00 2001 From: Jake Date: Sat, 14 Jan 2023 14:48:41 +0100 Subject: [PATCH 03/10] Update: dsview 1:1.2.2-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 84194c3..9c5fbb7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer - pkgver = 1.2.1 + pkgver = 1.2.2 pkgrel = 1 epoch = 1 url = http://www.dreamsourcelab.com/ @@ -14,7 +14,7 @@ pkgbase = dsview depends = qt5-base depends = fftw depends = python - source = DSView-1.2.1.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.2.1.tar.gz - sha384sums = a0cdd4d9e28641ab42bb94354398b470be28ef2ec296544e8eea55186aacc1f2709fdb7f142bf345d6680c15e36cbd65 + source = DSView-1.2.2.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.2.2.tar.gz + sha384sums = 7fb5c8970fe88a58b94571cc36ed0916d758bd4a1e3d0d80713b3b7124fdb164607ee806c34b84bc5248e2937ec4b915 pkgname = dsview diff --git a/PKGBUILD b/PKGBUILD index 9c23ca5..575e81b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # epoch 1: 1.2.0 epoch=1 pkgname=dsview -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('cmake' 'ninja' 'boost') source=( "DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz" ) -sha384sums=('a0cdd4d9e28641ab42bb94354398b470be28ef2ec296544e8eea55186aacc1f2709fdb7f142bf345d6680c15e36cbd65') +sha384sums=('7fb5c8970fe88a58b94571cc36ed0916d758bd4a1e3d0d80713b3b7124fdb164607ee806c34b84bc5248e2937ec4b915') prepare() { sed -i 's#MODE="0666"#TAG+="uaccess"#' \ From 53f7e8dc79440d7c44872a8fb88fd3aef3253d81 Mon Sep 17 00:00:00 2001 From: Jake Date: Sun, 23 Jul 2023 11:51:34 +0200 Subject: [PATCH 04/10] Update: dsview 1:1.3.0-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9c5fbb7..211a240 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer - pkgver = 1.2.2 + pkgver = 1.3.0 pkgrel = 1 epoch = 1 url = http://www.dreamsourcelab.com/ @@ -14,7 +14,7 @@ pkgbase = dsview depends = qt5-base depends = fftw depends = python - source = DSView-1.2.2.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.2.2.tar.gz - sha384sums = 7fb5c8970fe88a58b94571cc36ed0916d758bd4a1e3d0d80713b3b7124fdb164607ee806c34b84bc5248e2937ec4b915 + source = DSView-1.3.0.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.0.tar.gz + sha384sums = 2fb32b0c48275ee4c7278fda59174aa7f7873a203952eded105cb7de1f2e60387a1db7a955455ceba5c269b911fe9a66 pkgname = dsview diff --git a/PKGBUILD b/PKGBUILD index 575e81b..52d97be 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # epoch 1: 1.2.0 epoch=1 pkgname=dsview -pkgver=1.2.2 +pkgver=1.3.0 pkgrel=1 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('cmake' 'ninja' 'boost') source=( "DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz" ) -sha384sums=('7fb5c8970fe88a58b94571cc36ed0916d758bd4a1e3d0d80713b3b7124fdb164607ee806c34b84bc5248e2937ec4b915') +sha384sums=('2fb32b0c48275ee4c7278fda59174aa7f7873a203952eded105cb7de1f2e60387a1db7a955455ceba5c269b911fe9a66') prepare() { sed -i 's#MODE="0666"#TAG+="uaccess"#' \ From 5ead71c239a46d9ea725193d290e6e367f94b80a Mon Sep 17 00:00:00 2001 From: Jake Date: Tue, 25 Jul 2023 19:10:31 +0200 Subject: [PATCH 05/10] Fix: dsview 1:1.3.0-2 add libusb --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 211a240..3aeb454 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer pkgver = 1.3.0 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = http://www.dreamsourcelab.com/ arch = i686 @@ -14,6 +14,7 @@ pkgbase = dsview depends = qt5-base depends = fftw depends = python + depends = libusb source = DSView-1.3.0.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.0.tar.gz sha384sums = 2fb32b0c48275ee4c7278fda59174aa7f7873a203952eded105cb7de1f2e60387a1db7a955455ceba5c269b911fe9a66 diff --git a/PKGBUILD b/PKGBUILD index 52d97be..be888a0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,12 +7,12 @@ epoch=1 pkgname=dsview pkgver=1.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') url="http://www.dreamsourcelab.com/" license=('GPL3') -depends=('hicolor-icon-theme' 'qt5-base' 'fftw' 'python') +depends=('hicolor-icon-theme' 'qt5-base' 'fftw' 'python' 'libusb') makedepends=('cmake' 'ninja' 'boost') source=( From f30a2442b1ac55f5798d14285dabe68a63721980 Mon Sep 17 00:00:00 2001 From: Jake Date: Mon, 6 Nov 2023 18:52:11 +0100 Subject: [PATCH 06/10] Update: dsview 1:1.3.1-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3aeb454..82d88e7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer - pkgver = 1.3.0 - pkgrel = 2 + pkgver = 1.3.1 + pkgrel = 1 epoch = 1 url = http://www.dreamsourcelab.com/ arch = i686 @@ -15,7 +15,7 @@ pkgbase = dsview depends = fftw depends = python depends = libusb - source = DSView-1.3.0.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.0.tar.gz - sha384sums = 2fb32b0c48275ee4c7278fda59174aa7f7873a203952eded105cb7de1f2e60387a1db7a955455ceba5c269b911fe9a66 + source = DSView-1.3.1.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.1.tar.gz + sha384sums = 32d23c8a81e56ee7fae4cda171365b3a54cab9d68f6b73954776aec0c0ee3abeb91259ea16ee1fad90c1fc0f5a895fa6 pkgname = dsview diff --git a/PKGBUILD b/PKGBUILD index be888a0..12393cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # epoch 1: 1.2.0 epoch=1 pkgname=dsview -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') url="http://www.dreamsourcelab.com/" @@ -18,7 +18,7 @@ makedepends=('cmake' 'ninja' 'boost') source=( "DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz" ) -sha384sums=('2fb32b0c48275ee4c7278fda59174aa7f7873a203952eded105cb7de1f2e60387a1db7a955455ceba5c269b911fe9a66') +sha384sums=('32d23c8a81e56ee7fae4cda171365b3a54cab9d68f6b73954776aec0c0ee3abeb91259ea16ee1fad90c1fc0f5a895fa6') prepare() { sed -i 's#MODE="0666"#TAG+="uaccess"#' \ From c94814c2f2f71b008621ef290758bbca978945af Mon Sep 17 00:00:00 2001 From: Jake Date: Fri, 17 May 2024 02:22:38 +0200 Subject: [PATCH 07/10] Update: dsview 1:1.3.2-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 82d88e7..30f6ace 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer - pkgver = 1.3.1 + pkgver = 1.3.2 pkgrel = 1 epoch = 1 url = http://www.dreamsourcelab.com/ @@ -15,7 +15,7 @@ pkgbase = dsview depends = fftw depends = python depends = libusb - source = DSView-1.3.1.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.1.tar.gz - sha384sums = 32d23c8a81e56ee7fae4cda171365b3a54cab9d68f6b73954776aec0c0ee3abeb91259ea16ee1fad90c1fc0f5a895fa6 + source = DSView-1.3.2.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.2.tar.gz + sha384sums = afd4790c3bef0c0772971f679c6d542edf8c2d8384ae7738f5039f9015e80773bd7e12857252cf88ef4053b97be502ed pkgname = dsview diff --git a/PKGBUILD b/PKGBUILD index 12393cd..c0e85e7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # epoch 1: 1.2.0 epoch=1 pkgname=dsview -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('cmake' 'ninja' 'boost') source=( "DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz" ) -sha384sums=('32d23c8a81e56ee7fae4cda171365b3a54cab9d68f6b73954776aec0c0ee3abeb91259ea16ee1fad90c1fc0f5a895fa6') +sha384sums=('afd4790c3bef0c0772971f679c6d542edf8c2d8384ae7738f5039f9015e80773bd7e12857252cf88ef4053b97be502ed') prepare() { sed -i 's#MODE="0666"#TAG+="uaccess"#' \ From f84af8f362e3fad7a8af0b3a0e8c464a6d80b67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= Date: Sun, 9 Jun 2024 09:58:23 +0800 Subject: [PATCH 08/10] Updated dsview 1:1.3.2-2 Fix build issues. --- 0001-strings.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 10 ++++++++-- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 0001-strings.patch diff --git a/0001-strings.patch b/0001-strings.patch new file mode 100644 index 0000000..eb311ac --- /dev/null +++ b/0001-strings.patch @@ -0,0 +1,45 @@ +commit 2018baf0e1add4f9971dd02271ee8e6773cebfac +Author: Lutz Freitag +Date: Wed May 22 21:29:54 2024 +0200 + + added missing includes and a define to compile it for recent machines + + I use arch btw + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d12bd0db..7b8cf57d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -668,6 +668,8 @@ install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg) + if(CMAKE_SYSTEM_NAME MATCHES "Linux") + install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop) + ++ add_compile_definitions(_DEFAULT_SOURCE) ++ + if(IS_DIRECTORY /usr/lib/udev/rules.d) + install(FILES DSView/DreamSourceLab.rules DESTINATION /usr/lib/udev/rules.d RENAME 60-dreamsourcelab.rules) + elseif(IS_DIRECTORY /lib/udev/rules.d) +diff --git a/libsigrok4DSL/input/in_wav.c b/libsigrok4DSL/input/in_wav.c +index de16e513..7a130496 100644 +--- a/libsigrok4DSL/input/in_wav.c ++++ b/libsigrok4DSL/input/in_wav.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include "../log.h" + #include + +diff --git a/libsigrok4DSL/strutil.c b/libsigrok4DSL/strutil.c +index 52cb01d8..6c02c6df 100644 +--- a/libsigrok4DSL/strutil.c ++++ b/libsigrok4DSL/strutil.c +@@ -21,6 +21,7 @@ + #include "libsigrok-internal.h" + #include + #include ++#include + #include + #include "log.h" + diff --git a/PKGBUILD b/PKGBUILD index c0e85e7..d5e1c72 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ epoch=1 pkgname=dsview pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') url="http://www.dreamsourcelab.com/" @@ -17,12 +17,18 @@ makedepends=('cmake' 'ninja' 'boost') source=( "DSView-$pkgver.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v${pkgver}.tar.gz" + "0001-strings.patch" ) -sha384sums=('afd4790c3bef0c0772971f679c6d542edf8c2d8384ae7738f5039f9015e80773bd7e12857252cf88ef4053b97be502ed') +sha384sums=('afd4790c3bef0c0772971f679c6d542edf8c2d8384ae7738f5039f9015e80773bd7e12857252cf88ef4053b97be502ed' + '5a115bdebf0a0fd2db0ef79168d2f34f9a1e564bdfd4661db90afcaf380a05efc3073b9cbff89cfaee56c6c0ea98f3db') prepare() { sed -i 's#MODE="0666"#TAG+="uaccess"#' \ "DSView-${pkgver}/DSView/DreamSourceLab.rules" + + cd "DSView-${pkgver}" + # This patch is upstream 2018baf0e1add4f9971dd02271ee8e6773cebfac, should be removed with next release + patch --forward --strip=1 --input=../0001-strings.patch } build() { From 11ee99f946c062a51fbfc9c52472cd29c94a7ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= Date: Sun, 9 Jun 2024 10:09:02 +0800 Subject: [PATCH 09/10] Updated srcinfo. --- .SRCINFO | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 30f6ace..213e0f5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = dsview pkgdesc = Client software that supports the DreamSourceLab logic analyzer pkgver = 1.3.2 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = http://www.dreamsourcelab.com/ arch = i686 @@ -16,6 +16,8 @@ pkgbase = dsview depends = python depends = libusb source = DSView-1.3.2.tar.gz::https://github.com/DreamSourceLab/DSView/archive/v1.3.2.tar.gz + source = 0001-strings.patch sha384sums = afd4790c3bef0c0772971f679c6d542edf8c2d8384ae7738f5039f9015e80773bd7e12857252cf88ef4053b97be502ed + sha384sums = 5a115bdebf0a0fd2db0ef79168d2f34f9a1e564bdfd4661db90afcaf380a05efc3073b9cbff89cfaee56c6c0ea98f3db pkgname = dsview From 9730fc37ac7d6fe5023179b78db7f409eb6957de Mon Sep 17 00:00:00 2001 From: Attila Body Date: Tue, 1 Jul 2025 08:28:14 +0200 Subject: [PATCH 10/10] Fix cmake policy --- PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index d5e1c72..d8185da 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ epoch=1 pkgname=dsview pkgver=1.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Client software that supports the DreamSourceLab logic analyzer" arch=('i686' 'x86_64') url="http://www.dreamsourcelab.com/" @@ -36,6 +36,7 @@ build() { -GNinja \ -DCMAKE_BUILD_TYPE='None' \ -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -Wno-dev cmake --build build }