* Re: [PR REVIEW] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
@ 2020-11-13 1:08 ` ndowens
2020-11-13 1:08 ` ndowens
` (53 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ndowens @ 2020-11-13 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r522541359
Comment:
```suggestion
vmove "usr/lib/*.so"
```
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
2020-11-13 1:08 ` [PR REVIEW] " ndowens
@ 2020-11-13 1:08 ` ndowens
2020-11-13 2:07 ` [PR PATCH] [Updated] " Logarithmus
` (52 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ndowens @ 2020-11-13 1:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r522541393
Comment:
```suggestion
vmove "usr/lib/*.a"
```
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
2020-11-13 1:08 ` [PR REVIEW] " ndowens
2020-11-13 1:08 ` ndowens
@ 2020-11-13 2:07 ` Logarithmus
2020-11-18 22:26 ` Logarithmus
` (51 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-13 2:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux\nThis PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 3477 bytes --]
From 1e6551b8be45e6e9dd7a9241eb501fb33a150698 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 5dea7af6b68..8762dfcb169 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3995,3 +3995,4 @@ libSeExpr2.so.3 seexpr-krita-3.4.4.0_1
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
+libdialog.so.15 dialog-devel-1.3.20200327_2
From 3efdd6bbf84d80f88afec7e1a752a5831d41fe07 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 12 Nov 2020 06:38:58 +0300
Subject: [PATCH 2/3] dialog: add *-devel package
---
srcpkgs/dialog-devel | 1 +
srcpkgs/dialog/template | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 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..ff10fc45d3d 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"
-makedepends="ncurses-devel"
+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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 e5f53167d287afc0bc85c81202b707a3cef476cb Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 12 Nov 2020 05:39:30 +0300
Subject: [PATCH 3/3] New package: whdd-3.0
---
srcpkgs/whdd/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/whdd/template
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (2 preceding siblings ...)
2020-11-13 2:07 ` [PR PATCH] [Updated] " Logarithmus
@ 2020-11-18 22:26 ` Logarithmus
2020-11-20 0:04 ` Logarithmus
` (50 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-18 22:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux\nThis PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 3471 bytes --]
From e2d6b2268010d4971a6f293f9f66b5a51856193f Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 f9b5aa60e5c903285875bc9d750431e93fc37c3c Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 12 Nov 2020 06:38:58 +0300
Subject: [PATCH 2/3] dialog: add *-devel package
---
srcpkgs/dialog-devel | 1 +
srcpkgs/dialog/template | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 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..ff10fc45d3d 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"
-makedepends="ncurses-devel"
+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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 c0f9bc5a2ce49a5e41b012eaa5c35337ba31af43 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 12 Nov 2020 05:39:30 +0300
Subject: [PATCH 3/3] New package: whdd-3.0
---
srcpkgs/whdd/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/whdd/template
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (3 preceding siblings ...)
2020-11-18 22:26 ` Logarithmus
@ 2020-11-20 0:04 ` Logarithmus
2020-11-20 0:06 ` [PR REVIEW] " ndowens
` (49 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 0:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux\nThis PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4250 bytes --]
From e2d6b2268010d4971a6f293f9f66b5a51856193f Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 028a3834742becca5565549b667d1eea1f21feeb Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (4 preceding siblings ...)
2020-11-20 0:04 ` Logarithmus
@ 2020-11-20 0:06 ` ndowens
2020-11-20 0:06 ` ndowens
` (48 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ndowens @ 2020-11-20 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r527285370
Comment:
No need to bump, as it isn't in the repo; Only time it is needed to change is when it is in repo and needs a rebuild.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (5 preceding siblings ...)
2020-11-20 0:06 ` [PR REVIEW] " ndowens
@ 2020-11-20 0:06 ` ndowens
2020-11-20 0:23 ` Logarithmus
` (47 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ndowens @ 2020-11-20 0:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New review comment by ndowens on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r527285370
Comment:
No need to bump, as it isn't in the repo; Only time it is needed to change is when it is in repo and needs a rebuild.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (6 preceding siblings ...)
2020-11-20 0:06 ` ndowens
@ 2020-11-20 0:23 ` Logarithmus
2020-11-20 0:40 ` [PR PATCH] [Updated] " Logarithmus
` (46 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 0:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 712 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-730720567
Comment:
```
/usr/bin/ld: .libs/trace.o: Relocations in generic ELF (EM: 183)
/usr/bin/ld: .libs/trace.o: Relocations in generic ELF (EM: 183)
/usr/bin/ld: .libs/trace.o: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status
make: *** [makefile:378: libdialog.la] Error 1
make: *** Waiting for unfinished jobs....
=> ERROR: dialog-1.3.20200327_2: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 2
=> ERROR: in do_build() at common/build-style/gnu-configure.sh:13
```
Any idea how to fix that?
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (7 preceding siblings ...)
2020-11-20 0:23 ` Logarithmus
@ 2020-11-20 0:40 ` Logarithmus
2020-11-20 0:44 ` Logarithmus
` (45 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 0:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux\nThis PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4250 bytes --]
From e2d6b2268010d4971a6f293f9f66b5a51856193f Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (8 preceding siblings ...)
2020-11-20 0:40 ` [PR PATCH] [Updated] " Logarithmus
@ 2020-11-20 0:44 ` Logarithmus
2020-11-20 0:45 ` [PR PATCH] [Updated] " Logarithmus
` (44 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 0:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 855 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-730720567
Comment:
```
/usr/bin/ld: .libs/trace.o: Relocations in generic ELF (EM: 183)
/usr/bin/ld: .libs/trace.o: Relocations in generic ELF (EM: 183)
/usr/bin/ld: .libs/trace.o: error adding symbols: file in wrong format
collect2: error: ld returned 1 exit status
make: *** [makefile:378: libdialog.la] Error 1
make: *** Waiting for unfinished jobs....
=> ERROR: dialog-1.3.20200327_2: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 2
=> ERROR: in do_build() at common/build-style/gnu-configure.sh:13
```
Any idea how to fix that?
**UPD**: Adding `LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool ` to `configure_args`, `make_build_args` & `make_install_args` seems to fix it.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (9 preceding siblings ...)
2020-11-20 0:44 ` Logarithmus
@ 2020-11-20 0:45 ` Logarithmus
2020-11-20 0:51 ` Logarithmus
` (43 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 0:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 5176 bytes --]
From e2d6b2268010d4971a6f293f9f66b5a51856193f Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 9a8d64b67da45952511674e799ea31f43d8e793c Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 12 Nov 2020 05:39:30 +0300
Subject: [PATCH 3/3] New package: whdd-3.0
---
srcpkgs/dialog/template | 7 ++++---
srcpkgs/whdd/patches/gnu-source.patch | 11 +++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
3 files changed, 32 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/whdd/patches/gnu-source.patch
create mode 100644 srcpkgs/whdd/template
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 14ea1d440f4..2db4e5581b2 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -6,10 +6,11 @@ version="${_distver}.${_date}"
revision=2
wrksrc="${pkgname}-${_distver}-${_date}"
build_style=gnu-configure
-configure_args="--with-ncursesw --with-libtool --disable-nls"
+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="ncurses-devel"
+makedepends="libtool ncurses-devel"
short_desc="Tool to display dialog boxes from shell scripts"
maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="LGPL-2.1-only"
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (10 preceding siblings ...)
2020-11-20 0:45 ` [PR PATCH] [Updated] " Logarithmus
@ 2020-11-20 0:51 ` Logarithmus
2020-11-20 0:55 ` Logarithmus
` (42 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 0:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4990 bytes --]
From e2d6b2268010d4971a6f293f9f66b5a51856193f Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 3449a5431c2f9c5ce20a9837f10fc931b4f79497 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 12 Nov 2020 05:39:30 +0300
Subject: [PATCH 3/3] New package: whdd-3.0
---
srcpkgs/dialog/template | 4 +++-
srcpkgs/whdd/patches/gnu-source.patch | 11 +++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
3 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/whdd/patches/gnu-source.patch
create mode 100644 srcpkgs/whdd/template
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 14ea1d440f4..e613be6ca19 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -6,7 +6,9 @@ version="${_distver}.${_date}"
revision=2
wrksrc="${pkgname}-${_distver}-${_date}"
build_style=gnu-configure
-configure_args="--with-ncursesw --with-libtool --disable-nls"
+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="ncurses-devel"
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (11 preceding siblings ...)
2020-11-20 0:51 ` Logarithmus
@ 2020-11-20 0:55 ` Logarithmus
2020-11-20 17:32 ` Logarithmus
` (41 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 0:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 5175 bytes --]
From e2d6b2268010d4971a6f293f9f66b5a51856193f Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 43f42b3da384d7d4c67e744518a472b85beabe13 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Thu, 12 Nov 2020 05:39:30 +0300
Subject: [PATCH 3/3] New package: whdd-3.0
---
srcpkgs/dialog/template | 6 ++++--
srcpkgs/whdd/patches/gnu-source.patch | 11 +++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
3 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/whdd/patches/gnu-source.patch
create mode 100644 srcpkgs/whdd/template
diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template
index 14ea1d440f4..b9fd7c7ef87 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -6,10 +6,12 @@ version="${_distver}.${_date}"
revision=2
wrksrc="${pkgname}-${_distver}-${_date}"
build_style=gnu-configure
-configure_args="--with-ncursesw --with-libtool --disable-nls"
+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="ncurses-devel"
+makedepends="libtool ncurses-devel"
short_desc="Tool to display dialog boxes from shell scripts"
maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="LGPL-2.1-only"
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (12 preceding siblings ...)
2020-11-20 0:55 ` Logarithmus
@ 2020-11-20 17:32 ` Logarithmus
2020-12-26 19:28 ` [PR PATCH] [Updated] " Logarithmus
` (40 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-11-20 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-731303316
Comment:
@ndowens it works, GitHub Actions built successfully, but Travis hangs for no reason.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (13 preceding siblings ...)
2020-11-20 17:32 ` Logarithmus
@ 2020-12-26 19:28 ` Logarithmus
2021-02-19 2:24 ` Logarithmus
` (39 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2020-12-26 19:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4273 bytes --]
From 39bd5c29c699bcab3d1b1f89ddc0e7489e0dd9bd Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (14 preceding siblings ...)
2020-12-26 19:28 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-02-19 2:24 ` Logarithmus
2021-02-19 3:09 ` Logarithmus
` (38 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-19 2:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4247 bytes --]
From 9b273268992da14b9d230d2d98ffa2bdd8ad685d Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 67a1d595bbdc2ec58e4a12368510052ac850bea5 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>"
+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"
+}
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (15 preceding siblings ...)
2021-02-19 2:24 ` Logarithmus
@ 2021-02-19 3:09 ` Logarithmus
2021-02-19 3:16 ` Logarithmus
` (37 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-19 3:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4582 bytes --]
From 9b273268992da14b9d230d2d98ffa2bdd8ad685d Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 63ce50d13dfa07d53aa7364287ee161fe1b553dd Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>"
+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..701a4994c50
--- /dev/null
+++ b/srcpkgs/whdd/update
@@ -0,0 +1,2 @@
+site="https://github.com/whdd/whdd/tags"
+pattern='archive/\K[\d.]+(?=\.tar\.gz)'
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (16 preceding siblings ...)
2021-02-19 3:09 ` Logarithmus
@ 2021-02-19 3:16 ` Logarithmus
2021-02-19 3:16 ` Logarithmus
` (36 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-19 3:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-781785842
Comment:
Something nasty happens with CI: https://github.com/void-linux/void-packages/pull/26339/checks?check_run_id=1932367887
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (17 preceding siblings ...)
2021-02-19 3:16 ` Logarithmus
@ 2021-02-19 3:16 ` Logarithmus
2021-02-19 3:18 ` Logarithmus
` (35 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-19 3:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-781785842
Comment:
Something nasty happens with CI: https://github.com/void-linux/void-packages/pull/26339/checks?check_run_id=1932367887
Any ideas how to solve this?
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (18 preceding siblings ...)
2021-02-19 3:16 ` Logarithmus
@ 2021-02-19 3:18 ` Logarithmus
2021-02-19 3:57 ` [PR PATCH] [Updated] " Logarithmus
` (34 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-19 3:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-781785842
Comment:
Something nasty happens to the CI: https://github.com/void-linux/void-packages/pull/26339/checks?check_run_id=1932367887
Any ideas how to solve this?
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (19 preceding siblings ...)
2021-02-19 3:18 ` Logarithmus
@ 2021-02-19 3:57 ` Logarithmus
2021-02-19 4:23 ` [PR PATCH] [Updated] New package: whdd-3.0.1 Logarithmus
` (33 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-19 3:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 478 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4582 bytes --]
From 9b273268992da14b9d230d2d98ffa2bdd8ad685d Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 <opensource@logarithmus.dev>
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 <opensource@logarithmus.dev>"
+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)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (20 preceding siblings ...)
2021-02-19 3:57 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-02-19 4:23 ` Logarithmus
2021-02-21 2:56 ` Logarithmus
` (32 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-19 4:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4584 bytes --]
From 9b273268992da14b9d230d2d98ffa2bdd8ad685d Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 54ca1ed155e3a34a5e38c18adb3d40de2cba4a62 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
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 <opensource@logarithmus.dev>"
+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)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (21 preceding siblings ...)
2021-02-19 4:23 ` [PR PATCH] [Updated] New package: whdd-3.0.1 Logarithmus
@ 2021-02-21 2:56 ` Logarithmus
2021-02-21 3:14 ` Logarithmus
` (31 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 2:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 5048 bytes --]
From 187b00e351a2d2ef27066554a5b785100176fcbf Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 eae36d09d1e..b5f256dde2d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3917,3 +3917,4 @@ 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
libsword-1.8.1.so libsword-1.8.1_6
+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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 0bf074c6d58e81591238a85dc9856c4044c036b9 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
common/shlibs | 2 +-
srcpkgs/whdd/patches/gnu-source.patch | 11 +++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
4 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/whdd/patches/gnu-source.patch
create mode 100644 srcpkgs/whdd/template
create mode 100644 srcpkgs/whdd/update
diff --git a/common/shlibs b/common/shlibs
index b5f256dde2d..150002bd67e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3916,5 +3916,5 @@ 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
-libsword-1.8.1.so libsword-1.8.1_6
libdialog.so.15 dialog-devel-1.3.20200327_2
+libsword-1.8.1.so libsword-1.8.1_6
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 <opensource@logarithmus.dev>"
+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)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (22 preceding siblings ...)
2021-02-21 2:56 ` Logarithmus
@ 2021-02-21 3:14 ` Logarithmus
2021-02-21 4:49 ` [PR REVIEW] " ericonr
` (30 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 3:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-782788219
Comment:
CI fails:
```
=> dialog-1.3.20210117_2: fetching distfile 'dialog-1.3-20210117.tgz'...
https://invisible-mirror.net/archives/dialog/dialog-1.3-20210117.tgz: Connection timed out
=> ERROR: dialog-1.3.20210117_2: failed to fetch dialog-1.3-20210117.tgz.
Error: Process completed with exit code 1.
```
@ndowens @ericonr, I need help with it.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (23 preceding siblings ...)
2021-02-21 3:14 ` Logarithmus
@ 2021-02-21 4:49 ` ericonr
2021-02-21 4:49 ` ericonr
` (29 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ericonr @ 2021-02-21 4:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579749935
Comment:
Isn't setting `CFLAGS="-D_GNU_SOURCE"` in the template enough?
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (24 preceding siblings ...)
2021-02-21 4:49 ` [PR REVIEW] " ericonr
@ 2021-02-21 4:49 ` ericonr
2021-02-21 4:49 ` ericonr
` (28 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ericonr @ 2021-02-21 4:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579750019
Comment:
```suggestion
depends="${sourcepkg}>=${version}_${revision}"
```
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (25 preceding siblings ...)
2021-02-21 4:49 ` ericonr
@ 2021-02-21 4:49 ` ericonr
2021-02-21 4:49 ` ericonr
` (27 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ericonr @ 2021-02-21 4:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579750054
Comment:
```suggestion
libdialog.so.15 dialog-1.3.20200327_2
```
Right?
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (26 preceding siblings ...)
2021-02-21 4:49 ` ericonr
@ 2021-02-21 4:49 ` ericonr
2021-02-21 5:14 ` Logarithmus
` (26 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ericonr @ 2021-02-21 4:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579749956
Comment:
Ugh, do we really need to involve libtool so much? :/
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (27 preceding siblings ...)
2021-02-21 4:49 ` ericonr
@ 2021-02-21 5:14 ` Logarithmus
2021-02-21 5:24 ` [PR PATCH] [Updated] " Logarithmus
` (25 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579752398
Comment:
AFAIK it fails to cross-build without that
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (28 preceding siblings ...)
2021-02-21 5:14 ` Logarithmus
@ 2021-02-21 5:24 ` Logarithmus
2021-02-21 5:25 ` [PR REVIEW] " Logarithmus
` (24 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 3771 bytes --]
From c5fdd388920746c349518e2a41c8bdd37eabe8f6 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 23 +++++++++++++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index eae36d09d1e..d848e638619 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3917,3 +3917,4 @@ 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
libsword-1.8.1.so libsword-1.8.1_6
+libdialog.so.15 dialog-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..4b7bf04aa4b 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -3,18 +3,29 @@ 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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 c2233f50793b0592e78daec191540d91e6d2f45a Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/template | 19 +++++++++++++++++++
srcpkgs/whdd/update | 2 ++
2 files changed, 21 insertions(+)
create mode 100644 srcpkgs/whdd/template
create mode 100644 srcpkgs/whdd/update
diff --git a/srcpkgs/whdd/template b/srcpkgs/whdd/template
new file mode 100644
index 00000000000..aed3f810d5e
--- /dev/null
+++ b/srcpkgs/whdd/template
@@ -0,0 +1,19 @@
+# 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 <opensource@logarithmus.dev>"
+license="GPL-3.0-only"
+homepage="https://github.com/whdd/whdd"
+distfiles="https://github.com/whdd/whdd/archive/${version}.tar.gz"
+checksum=58c975695fca5ae8ed67589d7db945d99a027019ecab39aee4e3a608d29a1801
+
+CFLAGS="-D_GNU_SOURCE"
+
+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)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (29 preceding siblings ...)
2021-02-21 5:24 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-02-21 5:25 ` Logarithmus
2021-02-21 5:26 ` Logarithmus
` (23 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579753336
Comment:
yes
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (30 preceding siblings ...)
2021-02-21 5:25 ` [PR REVIEW] " Logarithmus
@ 2021-02-21 5:26 ` Logarithmus
2021-02-21 5:28 ` Logarithmus
` (22 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579753373
Comment:
yes, it's enough
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (31 preceding siblings ...)
2021-02-21 5:26 ` Logarithmus
@ 2021-02-21 5:28 ` Logarithmus
2021-02-21 5:36 ` [PR PATCH] [Updated] " Logarithmus
` (21 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579753373
Comment:
yes, it's enough
**UPD**: no, now it fails to cross-build
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (32 preceding siblings ...)
2021-02-21 5:28 ` Logarithmus
@ 2021-02-21 5:36 ` Logarithmus
2021-02-21 5:40 ` [PR REVIEW] " Logarithmus
` (20 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4564 bytes --]
From c5fdd388920746c349518e2a41c8bdd37eabe8f6 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 23 +++++++++++++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index eae36d09d1e..d848e638619 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3917,3 +3917,4 @@ 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
libsword-1.8.1.so libsword-1.8.1_6
+libdialog.so.15 dialog-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..4b7bf04aa4b 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -3,18 +3,29 @@ 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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 75f2307ece2ba14062d7d8b6fbd052fdaa8bd3b0 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/patches/gnu-source.patch | 10 ++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
3 files changed, 29 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..a46e7cc9cb8
--- /dev/null
+++ b/srcpkgs/whdd/patches/gnu-source.patch
@@ -0,0 +1,10 @@
+--- 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 <opensource@logarithmus.dev>"
+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)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (33 preceding siblings ...)
2021-02-21 5:36 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-02-21 5:40 ` Logarithmus
2021-02-21 5:40 ` Logarithmus
` (19 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579754601
Comment:
**UPD 2**: putting the patch back fixed it
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (34 preceding siblings ...)
2021-02-21 5:40 ` [PR REVIEW] " Logarithmus
@ 2021-02-21 5:40 ` Logarithmus
2021-02-21 5:40 ` Logarithmus
` (18 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579753373
Comment:
yes, it's enough
**UPD**: no, now it fails to cross-build
**UPD 2**: putting the patch back fixed it
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (35 preceding siblings ...)
2021-02-21 5:40 ` Logarithmus
@ 2021-02-21 5:40 ` Logarithmus
2021-02-21 5:41 ` Logarithmus
` (17 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579754601
Comment:
**UPD 2**: putting the patch back fixed it
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (36 preceding siblings ...)
2021-02-21 5:40 ` Logarithmus
@ 2021-02-21 5:41 ` Logarithmus
2021-02-21 5:48 ` [PR REVIEW] " ericonr
` (16 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-782804047
Comment:
> I restarted CI, so it completed fine.
@ericonr it happened again
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (37 preceding siblings ...)
2021-02-21 5:41 ` Logarithmus
@ 2021-02-21 5:48 ` ericonr
2021-02-21 5:58 ` Logarithmus
` (15 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ericonr @ 2021-02-21 5:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 249 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579755350
Comment:
Did you take the patch from https://github.com/whdd/whdd/pull/12 ? This really should be upstreamed :/
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (38 preceding siblings ...)
2021-02-21 5:48 ` [PR REVIEW] " ericonr
@ 2021-02-21 5:58 ` Logarithmus
2021-02-21 5:58 ` Logarithmus
` (14 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 435 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579756161
Comment:
I think that patching 1 file is better than patching 3. The author isn't interested in upstreaming the patch.
Despite not being actively developed, I find `whdd` very useful, because it's the only one program with Victoria-like (https://hdd.by/victoria/) disk scanning visualization.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (39 preceding siblings ...)
2021-02-21 5:58 ` Logarithmus
@ 2021-02-21 5:58 ` Logarithmus
2021-02-21 5:59 ` Logarithmus
` (13 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 444 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579756161
Comment:
I think that patching 1 file is better than patching 3. It's unlikely that the patch will be upstreamed any time soon.
Despite not being actively developed, I find `whdd` very useful, because it's the only one program with Victoria-like (https://hdd.by/victoria/) disk scanning visualization.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (40 preceding siblings ...)
2021-02-21 5:58 ` Logarithmus
@ 2021-02-21 5:59 ` Logarithmus
2021-02-21 5:59 ` ericonr
` (12 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-02-21 5:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 509 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r579756161
Comment:
I think that patching 1 file is better than patching 3. It's unlikely that the patch will be upstreamed any time soon.
Despite not being actively developed, I find `whdd` very useful, because it's the only one Linux program with Victoria-like (https://hdd.by/victoria/) disk scanning visualization. Victoria is a disk scanning/repairing utility for Windows.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (41 preceding siblings ...)
2021-02-21 5:59 ` Logarithmus
@ 2021-02-21 5:59 ` ericonr
2021-03-26 18:27 ` [PR PATCH] [Updated] " Logarithmus
` (11 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ericonr @ 2021-02-21 5:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-782805748
Comment:
The CI failures are probably just the server limiting us :p
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (42 preceding siblings ...)
2021-02-21 5:59 ` ericonr
@ 2021-03-26 18:27 ` Logarithmus
2021-03-26 18:27 ` Logarithmus
` (10 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-03-26 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4658 bytes --]
From d123f9005c38698c62f2881e526f293978750187 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 23 +++++++++++++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index 7319cc8d20cb..3b9379330b5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3969,4 +3969,5 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libdialog.so.15 dialog-1.3.20200327_2
libspdlog.so.1 libspdlog-1.8.2_2
diff --git a/srcpkgs/dialog-devel b/srcpkgs/dialog-devel
new file mode 120000
index 000000000000..3c8c6c894561
--- /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 3a9f39fe1c1b..4b7bf04aa4ba 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -3,18 +3,29 @@ 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 <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 247a46385cb6c64809a7c1541a4dacb5b8c56443 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/patches/gnu-source.patch | 10 ++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
3 files changed, 29 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 000000000000..a46e7cc9cb87
--- /dev/null
+++ b/srcpkgs/whdd/patches/gnu-source.patch
@@ -0,0 +1,10 @@
+--- 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 000000000000..970395527a44
--- /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 <opensource@logarithmus.dev>"
+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 000000000000..149f9520c4ec
--- /dev/null
+++ b/srcpkgs/whdd/update
@@ -0,0 +1,2 @@
+site="https://github.com/whdd/whdd/tags"
+pattern="archive/\K[\d.]+(?=\.tar\.gz)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (43 preceding siblings ...)
2021-03-26 18:27 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-03-26 18:27 ` Logarithmus
2021-03-26 18:34 ` Logarithmus
` (9 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-03-26 18:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-808430435
Comment:
@ericonr what should I do in order to get this PR accepted?
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (44 preceding siblings ...)
2021-03-26 18:27 ` Logarithmus
@ 2021-03-26 18:34 ` Logarithmus
2021-03-26 18:48 ` [PR REVIEW] " ericonr
` (8 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-03-26 18:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-808430435
Comment:
@ericonr what should I do in order to get this PR accepted? The rate-limiting thing still stands in our way.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (45 preceding siblings ...)
2021-03-26 18:34 ` Logarithmus
@ 2021-03-26 18:48 ` ericonr
2021-03-26 18:59 ` [PR PATCH] [Updated] " Logarithmus
` (7 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: ericonr @ 2021-03-26 18:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r602519808
Comment:
I'm not in love with the `LIBTOOL` part, was it fully necessary? What errors did you get?
Also, please create a `_libtool=` variable to avoid repeating the path multiple times.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (46 preceding siblings ...)
2021-03-26 18:48 ` [PR REVIEW] " ericonr
@ 2021-03-26 18:59 ` Logarithmus
2021-03-26 19:01 ` [PR REVIEW] " Logarithmus
` (6 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-03-26 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4610 bytes --]
From 209f3ef032604bea32bd9f0fb869b496deee6809 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 23 +++++++++++++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index 7319cc8d20cb..3b9379330b5a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3969,4 +3969,5 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libdialog.so.15 dialog-1.3.20200327_2
libspdlog.so.1 libspdlog-1.8.2_2
diff --git a/srcpkgs/dialog-devel b/srcpkgs/dialog-devel
new file mode 120000
index 000000000000..3c8c6c894561
--- /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 3a9f39fe1c1b..b2295db2f11f 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -3,18 +3,29 @@ 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"
+_libtool="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
+configure_args="${_libtool} --with-ncursesw --with-libtool --disable-nls"
+make_build_args=$_libtool
+make_install_args=$_libtool
+make_install_target="install-full"
+hostmakedepends="libtool"
+makedepends="libtool ncurses-devel"
short_desc="Tool to display dialog boxes from shell scripts"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
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 937d622ced5c5a28d7df87bce4b87d5c7fe82521 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/patches/gnu-source.patch | 10 ++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
3 files changed, 29 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 000000000000..a46e7cc9cb87
--- /dev/null
+++ b/srcpkgs/whdd/patches/gnu-source.patch
@@ -0,0 +1,10 @@
+--- 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 000000000000..970395527a44
--- /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 <opensource@logarithmus.dev>"
+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 000000000000..149f9520c4ec
--- /dev/null
+++ b/srcpkgs/whdd/update
@@ -0,0 +1,2 @@
+site="https://github.com/whdd/whdd/tags"
+pattern="archive/\K[\d.]+(?=\.tar\.gz)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR REVIEW] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (47 preceding siblings ...)
2021-03-26 18:59 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-03-26 19:01 ` Logarithmus
2021-07-27 2:13 ` [PR PATCH] [Updated] " Logarithmus
` (5 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-03-26 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
New review comment by Logarithmus on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#discussion_r602527290
Comment:
@ericonr me too, but I've tried different options without much luck.
See https://github.com/void-linux/void-packages/pull/26339#issuecomment-730720567 and other comments in this PR for more context.
I've created `_libtool` variable to avoid duplication.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (48 preceding siblings ...)
2021-03-26 19:01 ` [PR REVIEW] " Logarithmus
@ 2021-07-27 2:13 ` Logarithmus
2021-08-14 11:54 ` Logarithmus
` (4 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-07-27 2:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4672 bytes --]
From 0a83bfc4ef1b4f924dc1b0803b9e900b8d0fa377 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 21 ++++++++++++++++-----
3 files changed, 18 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index 14c9e6a84e2c..3dbae0aff2a2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4011,6 +4011,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libdialog.so.15 dialog-1.3.20200327_2
libspdlog.so.1 libspdlog-1.8.2_2
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/dialog-devel b/srcpkgs/dialog-devel
new file mode 120000
index 000000000000..3c8c6c894561
--- /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 8e00e4c5579f..1308e146a8f9 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -6,16 +6,27 @@ _distver=${version%.*}
_date=${version##*.}
wrksrc="${pkgname}-${_distver}-${_date}"
build_style=gnu-configure
-configure_args="--with-ncursesw --disable-nls"
-makedepends="ncurses-devel"
+_libtool="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
+configure_args="${_libtool} --with-ncursesw --with-libtool --disable-nls"
+make_build_args=$_libtool
+make_install_args=$_libtool
+make_install_target="install-full"
+hostmakedepends="libtool"
+makedepends="libtool ncurses-devel"
short_desc="Tool to display dialog boxes from shell scripts"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
checksum=1f62df6a48dac087b98452119e4cdfcaa3447b3eb5746b241e5632e1d57bfc4b
-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 a5916b48184e8f92e2123e5f6fab741cd10aeb5c Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/patches/gnu-source.patch | 10 ++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
3 files changed, 29 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 000000000000..a46e7cc9cb87
--- /dev/null
+++ b/srcpkgs/whdd/patches/gnu-source.patch
@@ -0,0 +1,10 @@
+--- 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 000000000000..970395527a44
--- /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 <opensource@logarithmus.dev>"
+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 000000000000..149f9520c4ec
--- /dev/null
+++ b/srcpkgs/whdd/update
@@ -0,0 +1,2 @@
+site="https://github.com/whdd/whdd/tags"
+pattern="archive/\K[\d.]+(?=\.tar\.gz)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (49 preceding siblings ...)
2021-07-27 2:13 ` [PR PATCH] [Updated] " Logarithmus
@ 2021-08-14 11:54 ` Logarithmus
2021-08-14 12:06 ` Logarithmus
` (3 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-08-14 11:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4672 bytes --]
From 5cee41d9e36edf5ee20bc66732956502e3dddf44 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 21 ++++++++++++++++-----
3 files changed, 18 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..2ea75a899d5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3987,6 +3987,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libdialog.so.15 dialog-1.3.20200327_2
libspdlog.so.1 libspdlog-1.8.2_2
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/dialog-devel b/srcpkgs/dialog-devel
new file mode 120000
index 000000000000..3c8c6c894561
--- /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 187eaa0437cf..f746955cfddb 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -6,16 +6,27 @@ _distver=${version%.*}
_date=${version##*.}
wrksrc="${pkgname}-${_distver}-${_date}"
build_style=gnu-configure
-configure_args="--with-ncursesw --disable-nls"
-makedepends="ncurses-devel"
+_libtool="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
+configure_args="${_libtool} --with-ncursesw --with-libtool --disable-nls"
+make_build_args=$_libtool
+make_install_args=$_libtool
+make_install_target="install-full"
+hostmakedepends="libtool"
+makedepends="libtool ncurses-devel"
short_desc="Tool to display dialog boxes from shell scripts"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
-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 6aed9937553e286508c6a1557cada882f1f4d3ff Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 26 Dec 2020 22:25:28 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/patches/gnu-source.patch | 10 ++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
3 files changed, 29 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 000000000000..a46e7cc9cb87
--- /dev/null
+++ b/srcpkgs/whdd/patches/gnu-source.patch
@@ -0,0 +1,10 @@
+--- 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 000000000000..970395527a44
--- /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 <opensource@logarithmus.dev>"
+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 000000000000..149f9520c4ec
--- /dev/null
+++ b/srcpkgs/whdd/update
@@ -0,0 +1,2 @@
+site="https://github.com/whdd/whdd/tags"
+pattern="archive/\K[\d.]+(?=\.tar\.gz)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (50 preceding siblings ...)
2021-08-14 11:54 ` Logarithmus
@ 2021-08-14 12:06 ` Logarithmus
2021-08-14 12:18 ` Logarithmus
` (2 subsequent siblings)
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-08-14 12:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4700 bytes --]
From 5cee41d9e36edf5ee20bc66732956502e3dddf44 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 21 ++++++++++++++++-----
3 files changed, 18 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..2ea75a899d5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3987,6 +3987,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libdialog.so.15 dialog-1.3.20200327_2
libspdlog.so.1 libspdlog-1.8.2_2
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/dialog-devel b/srcpkgs/dialog-devel
new file mode 120000
index 000000000000..3c8c6c894561
--- /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 187eaa0437cf..f746955cfddb 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -6,16 +6,27 @@ _distver=${version%.*}
_date=${version##*.}
wrksrc="${pkgname}-${_distver}-${_date}"
build_style=gnu-configure
-configure_args="--with-ncursesw --disable-nls"
-makedepends="ncurses-devel"
+_libtool="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
+configure_args="${_libtool} --with-ncursesw --with-libtool --disable-nls"
+make_build_args=$_libtool
+make_install_args=$_libtool
+make_install_target="install-full"
+hostmakedepends="libtool"
+makedepends="libtool ncurses-devel"
short_desc="Tool to display dialog boxes from shell scripts"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Artur Sinila <opensource@logarithmus.dev>"
license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
-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 78f3f511a5fe22a27c12bca058425a5e30831293 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 14 Aug 2021 15:05:15 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/patches/00-gnu-source.patch | 11 +++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
3 files changed, 30 insertions(+)
create mode 100644 srcpkgs/whdd/patches/00-gnu-source.patch
create mode 100644 srcpkgs/whdd/template
create mode 100644 srcpkgs/whdd/update
diff --git a/srcpkgs/whdd/patches/00-gnu-source.patch b/srcpkgs/whdd/patches/00-gnu-source.patch
new file mode 100644
index 000000000000..2b7f205f41ac
--- /dev/null
+++ b/srcpkgs/whdd/patches/00-gnu-source.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/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 000000000000..970395527a44
--- /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 <opensource@logarithmus.dev>"
+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 000000000000..149f9520c4ec
--- /dev/null
+++ b/srcpkgs/whdd/update
@@ -0,0 +1,2 @@
+site="https://github.com/whdd/whdd/tags"
+pattern="archive/\K[\d.]+(?=\.tar\.gz)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Updated] New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (51 preceding siblings ...)
2021-08-14 12:06 ` Logarithmus
@ 2021-08-14 12:18 ` Logarithmus
2022-04-28 2:16 ` github-actions
2022-05-13 2:15 ` [PR PATCH] [Closed]: " github-actions
54 siblings, 0 replies; 56+ messages in thread
From: Logarithmus @ 2021-08-14 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 480 bytes --]
There is an updated pull request by Logarithmus against master on the void-packages repository
https://github.com/Logarithmus/void-packages whdd
https://github.com/void-linux/void-packages/pull/26339
New package: whdd-3.0.1
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
A patch file from https://github.com/void-linux/void-packages/pull/26339.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whdd-26339.patch --]
[-- Type: text/x-diff, Size: 4769 bytes --]
From fc3643cffc930e70f69c3ed06db041dbe58462c4 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
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 | 23 ++++++++++++++++++-----
3 files changed, 20 insertions(+), 5 deletions(-)
create mode 120000 srcpkgs/dialog-devel
diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..2ea75a899d5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3987,6 +3987,7 @@ libwayland-client++.so.0 libwaylandpp-0.2.8_1
libwayland-cursor++.so.0 libwaylandpp-0.2.8_1
libwayland-egl++.so.0 libwaylandpp-0.2.8_1
libwayland-client-extra++.so.0 libwaylandpp-0.2.8_1
+libdialog.so.15 dialog-1.3.20200327_2
libspdlog.so.1 libspdlog-1.8.2_2
libmd.so.0 libmd-1.0.3_1
libldacBT_abr.so.2 ldacBT-2.0.2.3_1
diff --git a/srcpkgs/dialog-devel b/srcpkgs/dialog-devel
new file mode 120000
index 000000000000..3c8c6c894561
--- /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 187eaa0437cf..b4b9463d1ceb 100644
--- a/srcpkgs/dialog/template
+++ b/srcpkgs/dialog/template
@@ -6,16 +6,29 @@ _distver=${version%.*}
_date=${version##*.}
wrksrc="${pkgname}-${_distver}-${_date}"
build_style=gnu-configure
-configure_args="--with-ncursesw --disable-nls"
-makedepends="ncurses-devel"
+_libtool="LIBTOOL=${XBPS_CROSS_BASE}/usr/bin/libtool"
+configure_args="${_libtool} --with-ncursesw --with-libtool --disable-nls"
+make_build_args=$_libtool
+make_install_args=$_libtool
+make_install_target="install-full"
+hostmakedepends="libtool"
+makedepends="libtool ncurses-devel"
short_desc="Tool to display dialog boxes from shell scripts"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Artur Sinila <freesoftware@logarithmus.dev>"
license="LGPL-2.1-only"
homepage="https://invisible-island.net/dialog/"
changelog="https://invisible-island.net/dialog/CHANGES"
distfiles="https://invisible-mirror.net/archives/${pkgname}/${pkgname}-${_distver}-${_date}.tgz"
checksum=c3af22ccfcd9baca384062108dd9354e86990929ee270c239eef69518c5da7c8
-post_install() {
- rm -r ${DESTDIR}/usr/lib
+dialog-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove "usr/bin/dialog-config"
+ vmove "usr/include"
+ vmove "usr/share/man/man3"
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
}
From ab83f7d6f3ba637c3ca94de72e8b1142636bf509 Mon Sep 17 00:00:00 2001
From: Artur Sinila <opensource@logarithmus.dev>
Date: Sat, 14 Aug 2021 15:05:15 +0300
Subject: [PATCH 2/2] New package: whdd-3.0.1
---
srcpkgs/whdd/patches/00-gnu-source.patch | 11 +++++++++++
srcpkgs/whdd/template | 17 +++++++++++++++++
srcpkgs/whdd/update | 2 ++
3 files changed, 30 insertions(+)
create mode 100644 srcpkgs/whdd/patches/00-gnu-source.patch
create mode 100644 srcpkgs/whdd/template
create mode 100644 srcpkgs/whdd/update
diff --git a/srcpkgs/whdd/patches/00-gnu-source.patch b/srcpkgs/whdd/patches/00-gnu-source.patch
new file mode 100644
index 000000000000..2b7f205f41ac
--- /dev/null
+++ b/srcpkgs/whdd/patches/00-gnu-source.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/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 000000000000..970395527a44
--- /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 <opensource@logarithmus.dev>"
+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 000000000000..149f9520c4ec
--- /dev/null
+++ b/srcpkgs/whdd/update
@@ -0,0 +1,2 @@
+site="https://github.com/whdd/whdd/tags"
+pattern="archive/\K[\d.]+(?=\.tar\.gz)"
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (52 preceding siblings ...)
2021-08-14 12:18 ` Logarithmus
@ 2022-04-28 2:16 ` github-actions
2022-05-13 2:15 ` [PR PATCH] [Closed]: " github-actions
54 siblings, 0 replies; 56+ messages in thread
From: github-actions @ 2022-04-28 2:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/26339#issuecomment-1111666135
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 56+ messages in thread* Re: [PR PATCH] [Closed]: New package: whdd-3.0.1
2020-11-13 0:45 [PR PATCH] New package: whdd-3.0 Logarithmus
` (53 preceding siblings ...)
2022-04-28 2:16 ` github-actions
@ 2022-05-13 2:15 ` github-actions
54 siblings, 0 replies; 56+ messages in thread
From: github-actions @ 2022-05-13 2:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
There's a closed pull request on the void-packages repository
New package: whdd-3.0.1
https://github.com/void-linux/void-packages/pull/26339
Description:
HDD diagnostics and data recovery tool for Linux.
This PR also fixes `dialog` package, which is needed for `whdd`. Also it adds `libdialog` into `common/shlibs`.
^ permalink raw reply [flat|nested] 56+ messages in thread