From 9b273268992da14b9d230d2d98ffa2bdd8ad685d 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 8d32c3af15c..5005b449423 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3916,3 +3916,4 @@ libwinbind-client-samba4.so samba-libs-4.13.2_1 libsixel.so.1 libsixel-1.8.6_1 libpamtest.so.0 pam_wrapper-1.1.3_1 libopenaptx.so.0 libopenaptx-0.2.0_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 3a9f39fe1c1..995018f5439 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -3,18 +3,28 @@ pkgname=dialog _distver=1.3 _date=20210117 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=3c1ed08f44bcf6f159f2aa6fde765db94e8997b3eefb49d8b4c86691693c43e1 -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 349b2dca7641068c3f3ab49a8033ff6db5f501e8 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 +++++++++++++++++ srcpkgs/whdd/update | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 srcpkgs/whdd/patches/gnu-source.patch create mode 100644 srcpkgs/whdd/template create mode 100644 srcpkgs/whdd/update 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..970395527a4 --- /dev/null +++ b/srcpkgs/whdd/template @@ -0,0 +1,17 @@ +# Template file for 'whdd' +pkgname=whdd +version=3.0.1 +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=58c975695fca5ae8ed67589d7db945d99a027019ecab39aee4e3a608d29a1801 + +post_install() { + mv "${DESTDIR}/usr/sbin" "${DESTDIR}/usr/bin" +} diff --git a/srcpkgs/whdd/update b/srcpkgs/whdd/update new file mode 100644 index 00000000000..149f9520c4e --- /dev/null +++ b/srcpkgs/whdd/update @@ -0,0 +1,2 @@ +site="https://github.com/whdd/whdd/tags" +pattern="archive/\K[\d.]+(?=\.tar\.gz)"