Updated dsview 1:1.3.2-2

Fix build issues.
This commit is contained in:
Ladislav Láska 2024-06-09 09:58:23 +08:00
parent c94814c2f2
commit f84af8f362
2 changed files with 53 additions and 2 deletions

45
0001-strings.patch Normal file
View file

@ -0,0 +1,45 @@
commit 2018baf0e1add4f9971dd02271ee8e6773cebfac
Author: Lutz Freitag <lutz@gottliebtfreitag.de>
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 <unistd.h>
#include <fcntl.h>
#include <string.h>
+#include <strings.h>
#include "../log.h"
#include <stdlib.h>
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 <stdlib.h>
#include <string.h>
+#include <strings.h>
#include <stdio.h>
#include "log.h"

View file

@ -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() {