From e2d6b2268010d4971a6f293f9f66b5a51856193f Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Thu, 12 Nov 2020 07:08:36 +0300 Subject: [PATCH 1/3] common/shlibs: add dialog-devel --- common/shlibs | 1 + 1 file changed, 1 insertion(+) diff --git a/common/shlibs b/common/shlibs index 9a576f18d0f..0392d7d98aa 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3993,3 +3993,4 @@ liburing.so.1 liburing-0.7_1 libbson-1.0.so.0 libbson-1.17.0_1 libsonic.so.0 libsonic-0.2.0_1 libtickit.so.3 libtickit-0.4.1_1 +libdialog.so.15 dialog-devel-1.3.20200327_2 From 832b4fdce109b367660ee6ba7e111dfe76ee0c7e Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Thu, 12 Nov 2020 06:38:58 +0300 Subject: [PATCH 2/3] dialog: add *-devel package --- srcpkgs/dialog-devel | 1 + srcpkgs/dialog/template | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/dialog-devel diff --git a/srcpkgs/dialog-devel b/srcpkgs/dialog-devel new file mode 120000 index 00000000000..3c8c6c89456 --- /dev/null +++ b/srcpkgs/dialog-devel @@ -0,0 +1 @@ +dialog \ No newline at end of file diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template index 30a5ec2c02e..14ea1d440f4 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -3,18 +3,26 @@ pkgname=dialog _distver=1.3 _date=20200327 version="${_distver}.${_date}" -revision=1 +revision=2 wrksrc="${pkgname}-${_distver}-${_date}" build_style=gnu-configure -configure_args="--with-ncursesw --disable-nls" +configure_args="--with-ncursesw --with-libtool --disable-nls" +make_install_target="install-full" +hostmakedepends="libtool" makedepends="ncurses-devel" short_desc="Tool to display dialog boxes from shell scripts" -maintainer="Orphaned " +maintainer="Artur Sinila " license="LGPL-2.1-only" homepage="https://invisible-island.net/dialog/" distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz" checksum=466163e8b97c2b7709d00389199add3156bd813f60ccb0335d0a30f2d4a17f99 -post_install() { - rm -r ${DESTDIR}/usr/lib +dialog-devel_package() { + depends="${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } } From 9dce307ae0bf060967092d99af0d0cbc2c4a26a0 Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Thu, 12 Nov 2020 05:39:30 +0300 Subject: [PATCH 3/3] New package: whdd-3.0 --- srcpkgs/whdd/patches/gnu-source.patch | 11 +++++++++++ srcpkgs/whdd/template | 17 +++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 srcpkgs/whdd/patches/gnu-source.patch create mode 100644 srcpkgs/whdd/template diff --git a/srcpkgs/whdd/patches/gnu-source.patch b/srcpkgs/whdd/patches/gnu-source.patch new file mode 100644 index 00000000000..08ad39750c1 --- /dev/null +++ b/srcpkgs/whdd/patches/gnu-source.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -5,7 +5,7 @@ + option(STATIC "Build static binaries" OFF) + option(CLI "Build whdd-cli" OFF) + +-set(CMAKE_C_FLAGS "-std=gnu99 -pthread -Wall -Wextra -Wno-missing-field-initializers ${CFLAGS}") ++set(CMAKE_C_FLAGS "-D_GNU_SOURCE -std=gnu99 -pthread -Wall -Wextra -Wno-missing-field-initializers ${CFLAGS}") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb ${CMAKE_C_FLAGS}") + diff --git a/srcpkgs/whdd/template b/srcpkgs/whdd/template new file mode 100644 index 00000000000..afcaafb86e2 --- /dev/null +++ b/srcpkgs/whdd/template @@ -0,0 +1,17 @@ +# Template file for 'whdd' +pkgname=whdd +version=3.0 +revision=1 +build_style=cmake +configure_args="-DCLI=ON" +makedepends="dialog-devel ncurses-devel" +short_desc="HDD diagnostics and data recovery tool for Linux" +maintainer="Artur Sinila " +license="GPL-3.0-only" +homepage="https://github.com/whdd/whdd" +distfiles="https://github.com/whdd/whdd/archive/${version}.tar.gz" +checksum=b0877375a54e0c915dfe418f5330b0e1d409629d1f298539f6a0556df2c8335a + +post_install() { + mv "${DESTDIR}/usr/sbin" "${DESTDIR}/usr/bin" +}