moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

lshw: update to B.02.19.2.

Browse source
This commit is contained in:
Piraty 2020-04-17 00:37:46 +02:00
parent 21d7212257
commit f5e86977ee
3 changed files with 17 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

13
srcpkgs/lshw/patches/fix-array-bounds.patch
View file

@ -1,13 +0,0 @@
Fix GCC warning "array subscript is above array bounds [-Warray-bounds]"
--- src/core/dmi.cc 2016-05-06 22:17:33.416045355 +0200
+++ src/core/dmi.cc 2016-05-06 22:21:31.694032471 +0200
@@ -511,7 +511,7 @@
if (num <= 0x0A)
return _(memory_array_location[num]);
if (num >= 0xA0 && num < 0xA4)
- return _(jp_memory_array_location[num]);
+ return _(jp_memory_array_location[num - 0xA0]);
return "";
}

13
srcpkgs/lshw/patches/musl-basename.patch
View file

@ -1,18 +1,5 @@
For musl libc declare a macro version of basename(3). For musl libc declare a macro version of basename(3).
--- src/core/dasd.cc 2016-05-07 05:33:49.580629923 +0200
+++ src/core/dasd.cc 2016-05-07 05:35:10.000625574 +0200
@@ -10,6 +10,10 @@
#include <linux/fs.h>
#include <map>
+#if !defined(__GLIBC__)
+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
+#endif
+
using namespace std;
/*Read only block devices, not partitions*/
--- src/core/sysfs.cc 2016-05-07 05:36:45.771620396 +0200 --- src/core/sysfs.cc 2016-05-07 05:36:45.771620396 +0200
+++ src/core/sysfs.cc 2016-05-07 05:37:33.265617827 +0200 +++ src/core/sysfs.cc 2016-05-07 05:37:33.265617827 +0200
@@ -19,6 +19,10 @@ @@ -19,6 +19,10 @@

32
srcpkgs/lshw/template
View file

@ -1,28 +1,30 @@
# Template file for 'lshw' # Template file for 'lshw'
pkgname=lshw pkgname=lshw
version=B.02.18 version=B.02.19.2
revision=7 revision=1
build_style=gnu-makefile
make_build_args="VERSION=${version}"
make_build_target="all gui"
make_install_args="SBINDIR=/usr/bin"
make_install_target="install install-gui"
make_use_env=yes
hostmakedepends="docbook2x pkg-config" hostmakedepends="docbook2x pkg-config"
makedepends="gtk+-devel libglade-devel sqlite-devel" makedepends="gtk+-devel"
short_desc="Hardware lister application" short_desc="Hardware lister application"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only" license="GPL-2.0-only"
homepage="http://ezix.org/project/wiki/HardwareLiSter" homepage="https://ezix.org/project/wiki/HardwareLiSter"
distfiles="http://ezix.org/software/files/lshw-${version}.tar.gz" distfiles="https://ezix.org/software/files/lshw-${version}.tar.gz"
checksum=ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f checksum=9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80
do_build() { post_patch() {
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
*-musl) cp -p ${FILESDIR}/confname.h ${wrksrc}/src/core *-musl)
find . -type f -exec sed -i "{}" -e "s;__uint;uint;g" \; cp -p ${FILESDIR}/confname.h ${wrksrc}/src/core
;; ;;
esac esac
sed -i 's,CXXFLAGS=,CXXFLAGS += ,g; s,LDFLAGS=,LDFLAGS += ,g' \ vsed -i src/Makefile src/gui/Makefile \
src/Makefile src/gui/Makefile -e 's,CXXFLAGS=,CXXFLAGS += ,g'
make CC=$CC CXX=$CXX PREFIX=/usr SBINDIR=/usr/bin all gui
}
do_install() {
make PREFIX=/usr SBINDIR=/usr/bin DESTDIR=${DESTDIR} install install-gui
} }
gtk-lshw_package() { gtk-lshw_package() {