From 39bd5c29c699bcab3d1b1f89ddc0e7489e0dd9bd Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Thu, 12 Nov 2020 07:08:36 +0300 Subject: [PATCH 1/2] dialog: add *-devel package --- common/shlibs | 1 + srcpkgs/dialog-devel | 1 + srcpkgs/dialog/template | 22 ++++++++++++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/dialog-devel diff --git a/common/shlibs b/common/shlibs index a05844bbebb..5377ad1d420 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4040,3 +4040,4 @@ libndr-samba4.so samba-libs-4.13.2_1 libsmb-transport-samba4.so samba-libs-4.13.2_1 libutil-cmdline-samba4.so samba-libs-4.13.2_1 libwinbind-client-samba4.so samba-libs-4.13.2_1 +libdialog.so.15 dialog-devel-1.3.20200327_2 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 bafc9132ef3..e9e17ca9eda 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -3,18 +3,28 @@ pkgname=dialog _distver=1.3 _date=20201126 version="${_distver}.${_date}" -revision=1 +revision=2 wrksrc="${pkgname}-${_distver}-${_date}" build_style=gnu-configure -configure_args="--with-ncursesw --disable-nls" -makedepends="ncurses-devel" +configure_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool --with-ncursesw --with-libtool --disable-nls" +make_build_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool" +make_install_args="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool" +make_install_target="install-full" +hostmakedepends="libtool" +makedepends="libtool 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=c9233a6c8ea33a59e2378e5146ae2bd13b519744cfdb647af7420adac5ad3866 -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 a3c63d090d63e29a1f28a9f40d163d71f2d1c881 Mon Sep 17 00:00:00 2001 From: Artur Sinila Date: Sat, 26 Dec 2020 22:25:28 +0300 Subject: [PATCH 2/2] 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" +}