Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: fatsort-1.6.2.605
@ 2020-07-09  0:59 tibequadorian
  2020-07-11 18:40 ` [PR REVIEW] " ahesford
                   ` (22 more replies)
  0 siblings, 23 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-09  0:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 327 bytes --]

There is a new pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages fatsort
https://github.com/void-linux/void-packages/pull/23485

New package: fatsort-1.6.2.605


A patch file from https://github.com/void-linux/void-packages/pull/23485.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fatsort-23485.patch --]
[-- Type: text/x-diff, Size: 1171 bytes --]

From 1185bbcbad278e7cf017e0d8e9415604e5ec1cd6 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 9 Jul 2020 02:57:24 +0200
Subject: [PATCH] New package: fatsort-1.6.2.605

---
 srcpkgs/fatsort/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/fatsort/template

diff --git a/srcpkgs/fatsort/template b/srcpkgs/fatsort/template
new file mode 100644
index 00000000000..9b0720a147c
--- /dev/null
+++ b/srcpkgs/fatsort/template
@@ -0,0 +1,18 @@
+# Template file for 'fatsort'
+pkgname=fatsort
+version=1.6.2.605
+revision=1
+build_style=gnu-makefile
+hostmakedepends="help2man"
+short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://fatsort.sourceforge.io/"
+distfiles="https://iweb.dl.sourceforge.net/project/fatsort/fatsort-${version}.tar.xz"
+checksum=08cafa36f86ab89e7a3241d437df9af8a008549d7d13416256b7aaa006d5ffb7
+nocross=yes
+
+pre_install() {
+	sed -i 's|/usr/local/share|/usr/share|g' ${wrksrc}/Makefile
+	sed -i 's|/usr/local/sbin|/usr/bin|g' ${wrksrc}/src/Makefile
+}

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
@ 2020-07-11 18:40 ` ahesford
  2020-07-11 18:40 ` ahesford
                   ` (21 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ahesford @ 2020-07-11 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#discussion_r453219396

Comment:
Replace with
```
post_patch() {
	vsed -e 's|/usr/local|/usr|g' -i Makefile
	vsed -e 's|/usr/local/sbin|/usr/bin|' -i src/Makefile
}
```
Doing this in `post_patch` is logically consistent since it's a patch and will automatically place you in `$wrksrc` so the paths are simpler. Using `vsed` will verify that changes were actually made rather than silently proceeding if no matches are replaced.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
  2020-07-11 18:40 ` [PR REVIEW] " ahesford
@ 2020-07-11 18:40 ` ahesford
  2020-07-11 18:40 ` ahesford
                   ` (20 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ahesford @ 2020-07-11 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1211 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#discussion_r453222458

Comment:
This is only `nocross` because upstream requires you to generate a man page on the fly using `help2man` and the target executable can't be run on the host. You have two easy fixes to make this cross-compilable:
1. Place a pregenerated `fatsort.1` in the `files` subdirectory alongside the template, then add
```
cp ${FILESDIR}/fatsort.1 man 
```
in either `post_patch` (see comment below) or `pre_build`.

2. Add `build_helper="qemu"` to the template and add the following snippet to `post_patch`:
```
if [ "$CROSS_BUILD}" ]; then
	cat > src/fatsort.qemu <<-EOF
	#!/bin/sh
	qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/src/fatsort "\$@"
	EOF
	chmod 755 src/fatsort.qemu
	vsed -i man/Makefile -e 's|../src/fatsort|../src/fatsort.qemu|'
fi
```
This will dynamically generate the man page as upstream intends but will use qemu to make it cross-compilable.

Whatever you do, you should also file an issue upstream to get them to ship a pregenerated `fatsort.1` since there is no reason we should be dynamically generating it with every build.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
  2020-07-11 18:40 ` [PR REVIEW] " ahesford
  2020-07-11 18:40 ` ahesford
@ 2020-07-11 18:40 ` ahesford
  2020-07-11 19:56 ` [PR PATCH] [Updated] " tibequadorian
                   ` (19 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ahesford @ 2020-07-11 18:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#discussion_r453219275

Comment:
`distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.xz"`

You can leave `fatsort` instead of `${pkgname}` if you want, but this is the most general approach. Definitely prefer `$SOURCEFORGE_SITE` regardless of the `$pkgname` decision.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (2 preceding siblings ...)
  2020-07-11 18:40 ` ahesford
@ 2020-07-11 19:56 ` tibequadorian
  2020-07-11 20:22 ` [PR REVIEW] " tibequadorian
                   ` (18 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-11 19:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages fatsort
https://github.com/void-linux/void-packages/pull/23485

New package: fatsort-1.6.2.605


A patch file from https://github.com/void-linux/void-packages/pull/23485.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fatsort-23485.patch --]
[-- Type: text/x-diff, Size: 1458 bytes --]

From 2638c723dc92d082fda03496f0c06fd182484223 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 9 Jul 2020 02:57:24 +0200
Subject: [PATCH] New package: fatsort-1.6.2.605

---
 srcpkgs/fatsort/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/fatsort/template

diff --git a/srcpkgs/fatsort/template b/srcpkgs/fatsort/template
new file mode 100644
index 00000000000..cb344b28c30
--- /dev/null
+++ b/srcpkgs/fatsort/template
@@ -0,0 +1,28 @@
+# Template file for 'fatsort'
+pkgname=fatsort
+version=1.6.2.605
+revision=1
+build_style=gnu-makefile
+build_helper="qemu"
+hostmakedepends="help2man"
+short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://fatsort.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/project/fatsort/fatsort-${version}.tar.xz"
+checksum=08cafa36f86ab89e7a3241d437df9af8a008549d7d13416256b7aaa006d5ffb7
+
+post_patch() {
+	vsed -e 's|/usr/local|/usr|g' -i Makefile
+	vsed -e 's|/usr/local/sbin|/usr/bin|g' -i src/Makefile
+
+	# help2man needs to run the target executable
+	if [ "$CROSS_BUILD" ]; then
+		cat > src/fatsort.qemu <<-EOF
+		#!/bin/sh
+		qemu-${XBPS_TARGET_QEMU_MACHINE}-static ${wrksrc}/src/fatsort "\$@"
+		EOF
+		chmod 755 src/fatsort.qemu
+		vsed -i man/Makefile -e 's|../src/fatsort|../src/fatsort.qemu|'
+	fi
+}

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (3 preceding siblings ...)
  2020-07-11 19:56 ` [PR PATCH] [Updated] " tibequadorian
@ 2020-07-11 20:22 ` tibequadorian
  2020-07-11 20:22 ` tibequadorian
                   ` (17 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-11 20:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#discussion_r453231293

Comment:
done, decided to keep `fatsort` though

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (4 preceding siblings ...)
  2020-07-11 20:22 ` [PR REVIEW] " tibequadorian
@ 2020-07-11 20:22 ` tibequadorian
  2020-07-11 20:22 ` tibequadorian
                   ` (16 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-11 20:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 157 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#discussion_r453231324

Comment:
done

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR REVIEW] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (5 preceding siblings ...)
  2020-07-11 20:22 ` tibequadorian
@ 2020-07-11 20:22 ` tibequadorian
  2020-07-11 20:47 ` Chocimier
                   ` (15 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-11 20:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#discussion_r453231329

Comment:
done, thanks for help!

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (6 preceding siblings ...)
  2020-07-11 20:22 ` tibequadorian
@ 2020-07-11 20:47 ` Chocimier
  2020-07-22 17:45 ` tibequadorian
                   ` (14 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: Chocimier @ 2020-07-11 20:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-657127281

Comment:
As @sgn noticed, fighting for help2man is not worth it, all one get is already there with `--help`.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (7 preceding siblings ...)
  2020-07-11 20:47 ` Chocimier
@ 2020-07-22 17:45 ` tibequadorian
  2020-07-24  0:45 ` sgn
                   ` (13 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-22 17:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 151 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-662593250

Comment:
bump

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (8 preceding siblings ...)
  2020-07-22 17:45 ` tibequadorian
@ 2020-07-24  0:45 ` sgn
  2020-07-24  2:15 ` ahesford
                   ` (12 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: sgn @ 2020-07-24  0:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663300349

Comment:
I may go with this, `help2man` is useless.

```sh
# Template file for 'fatsort'
pkgname=fatsort
version=1.6.2.605
revision=1
build_style=gnu-makefile
hostmakedepends="help2man"
checkdepends="xz dosfstools diffutils valgrind"
make_check_target=tests
make_install_args="MANDIR=/usr/share/man/man1 SBINDIR=/usr/bin"
short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions"
maintainer="tibequadorian <tibequadorian@posteo.de>"
license="GPL-2.0-or-later"
homepage="https://fatsort.sourceforge.io/"
distfiles="${SOURCEFORGE_SITE}/project/fatsort/fatsort-${version}.tar.xz"
checksum=08cafa36f86ab89e7a3241d437df9af8a008549d7d13416256b7aaa006d5ffb7

if [ "$XBPS_TARGET_LIBC" = musl ]; then
	broken="most tests are failed"
fi

if [ "$CROSS_BUILD" ]; then
	make_build_args="HELP2MAN=:"
	post_build() {
		: >man/fatsort.1
	}
	post_install() {
		rm -rf $DESTDIR/usr/share/man
	}
fi
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (9 preceding siblings ...)
  2020-07-24  0:45 ` sgn
@ 2020-07-24  2:15 ` ahesford
  2020-07-25  4:44 ` sgn
                   ` (11 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ahesford @ 2020-07-24  2:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663318160

Comment:
I like supporting the `check` mechanism in @sgn's template and, given that tests failing, marking broken on musl seems appropriate. If we're going to remove the (not very helpful) man page on cross-built packages, we should remove it everywhere. Native-built and cross-built packages for the same architecture should have the same contents.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (10 preceding siblings ...)
  2020-07-24  2:15 ` ahesford
@ 2020-07-25  4:44 ` sgn
  2020-07-25 13:07 ` tibequadorian
                   ` (10 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: sgn @ 2020-07-25  4:44 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 859 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663808555

Comment:
On 2020-07-23 19:15:17-0700, "Andrew J. Hesford" <notifications@github.com> wrote:
> I like supporting the `check` mechanism in @sgn's template and,
> given that tests failing, marking broken on musl seems appropriate.

Yes, considering this package touch filesystem level, I don't think
it's acceptable to ship a broken package.

> If we're going to remove the (not very helpful) man page on
> cross-built packages, we should remove it everywhere. Native-built
> and cross-built packages for the same architecture should have the
> same contents.

Don't know, there're packages that have different contents in
native-build and cross build. Removing manpages for this one looks
fine. help2man is useless anyway.

-- 
Danh


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (11 preceding siblings ...)
  2020-07-25  4:44 ` sgn
@ 2020-07-25 13:07 ` tibequadorian
  2020-07-25 13:30 ` ahesford
                   ` (9 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-25 13:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 223 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663853716

Comment:
What's the problem with simply using the qemu build helper for the man page?

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (12 preceding siblings ...)
  2020-07-25 13:07 ` tibequadorian
@ 2020-07-25 13:30 ` ahesford
  2020-07-25 16:45 ` tibequadorian
                   ` (8 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ahesford @ 2020-07-25 13:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663855855

Comment:
The qemu helper is a bit heavy handed just to dump the help output to a man page, but I don't have a real problem with it because it's "correct" in that it honors the upstream intentions. I *do* think you should complain upsream that they should ship a proper man page rather than relying on dynamic generation at build time.

The real issue is that @sgn improved the template by supporting `xbps-src check` and by using `make_install_args` to get the right installation behavior without resorting to patch the makefile. You should adapt those changes and make sure to mark the package broken for musl since it fails tests.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (13 preceding siblings ...)
  2020-07-25 13:30 ` ahesford
@ 2020-07-25 16:45 ` tibequadorian
  2020-07-25 16:51 ` [PR PATCH] [Updated] " tibequadorian
                   ` (7 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-25 16:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 851 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663875848

Comment:
what about tcc instead of qemu? 😄

```sh
if [ "$CROSS_BUILD" ]; then
        hostmakedepends+=" tcc"
        post_patch() {
                cpp -dM src/fatsort.c | grep '#define INFO' > man/info.h
                cat > man/fatsort.sh <<-EOF
                #!/bin/sh
                case \$1 in
                        "--help")       arg="INFO_OPTION_HELP" ;;
                        "--version")    arg="INFO_OPTION_VERSION" ;;
                esac
                echo "#include\"info.h\"int main(){printf(\$arg);}" | tcc -run -
                EOF
                chmod 755 man/fatsort.sh
                vsed -i man/Makefile -e 's|../src/fatsort|./fatsort.sh|'
        }
fi
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (14 preceding siblings ...)
  2020-07-25 16:45 ` tibequadorian
@ 2020-07-25 16:51 ` tibequadorian
  2020-07-25 17:32 ` tibequadorian
                   ` (6 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-25 16:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages fatsort
https://github.com/void-linux/void-packages/pull/23485

New package: fatsort-1.6.2.605


A patch file from https://github.com/void-linux/void-packages/pull/23485.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fatsort-23485.patch --]
[-- Type: text/x-diff, Size: 1392 bytes --]

From 7436a03eb34468cc13a58cf94f883ae0085f26a8 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 9 Jul 2020 02:57:24 +0200
Subject: [PATCH] New package: fatsort-1.6.2.605

---
 srcpkgs/fatsort/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/fatsort/template

diff --git a/srcpkgs/fatsort/template b/srcpkgs/fatsort/template
new file mode 100644
index 00000000000..7377b72a14a
--- /dev/null
+++ b/srcpkgs/fatsort/template
@@ -0,0 +1,29 @@
+# Template file for 'fatsort'
+pkgname=fatsort
+version=1.6.2.605
+revision=1
+build_style=gnu-makefile
+hostmakedepends="help2man"
+checkdepends="xz dosfstools diffutils valgrind"
+make_check_target=tests
+make_install_args="MANDIR=/usr/share/man/man1 SBINDIR=/usr/bin"
+short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://fatsort.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/project/fatsort/fatsort-${version}.tar.xz"
+checksum=08cafa36f86ab89e7a3241d437df9af8a008549d7d13416256b7aaa006d5ffb7
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	broken="most tests are failed"
+fi
+
+if [ "$CROSS_BUILD" ]; then
+	make_build_args="HELP2MAN=:"
+	post_build() {
+		: >man/fatsort.1
+	}
+	post_install() {
+		rm -rf $DESTDIR/usr/share/man
+	}
+fi

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Updated] New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (15 preceding siblings ...)
  2020-07-25 16:51 ` [PR PATCH] [Updated] " tibequadorian
@ 2020-07-25 17:32 ` tibequadorian
  2020-07-25 17:58 ` ahesford
                   ` (5 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-25 17:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages fatsort
https://github.com/void-linux/void-packages/pull/23485

New package: fatsort-1.6.2.605


A patch file from https://github.com/void-linux/void-packages/pull/23485.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fatsort-23485.patch --]
[-- Type: text/x-diff, Size: 1392 bytes --]

From 78c376d8faf15ce37807130adf49e3b4fa289204 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 9 Jul 2020 02:57:24 +0200
Subject: [PATCH] New package: fatsort-1.6.2.605

---
 srcpkgs/fatsort/template | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 srcpkgs/fatsort/template

diff --git a/srcpkgs/fatsort/template b/srcpkgs/fatsort/template
new file mode 100644
index 00000000000..fc961ca5bf6
--- /dev/null
+++ b/srcpkgs/fatsort/template
@@ -0,0 +1,29 @@
+# Template file for 'fatsort'
+pkgname=fatsort
+version=1.6.2.605
+revision=1
+build_style=gnu-makefile
+make_check_target=tests
+make_install_args="MANDIR=/usr/share/man/man1 SBINDIR=/usr/bin"
+hostmakedepends="help2man"
+checkdepends="xz dosfstools diffutils valgrind"
+short_desc="Utility that sorts FAT12, FAT16, FAT32 and exFAT partitions"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="GPL-2.0-or-later"
+homepage="https://fatsort.sourceforge.io/"
+distfiles="${SOURCEFORGE_SITE}/project/fatsort/fatsort-${version}.tar.xz"
+checksum=08cafa36f86ab89e7a3241d437df9af8a008549d7d13416256b7aaa006d5ffb7
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	broken="most tests are failed"
+fi
+
+if [ "$CROSS_BUILD" ]; then
+	make_build_args="HELP2MAN=:"
+	post_build() {
+		: >man/fatsort.1
+	}
+	post_install() {
+		rm -rf $DESTDIR/usr/share/man
+	}
+fi

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (16 preceding siblings ...)
  2020-07-25 17:32 ` tibequadorian
@ 2020-07-25 17:58 ` ahesford
  2020-07-26  0:57 ` sgn
                   ` (4 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ahesford @ 2020-07-25 17:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663883367

Comment:
Looks fine to me. @sgn Any objections? This looks like exactly what you suggested. 

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (17 preceding siblings ...)
  2020-07-25 17:58 ` ahesford
@ 2020-07-26  0:57 ` sgn
  2020-07-26  3:52 ` ahesford
                   ` (3 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: sgn @ 2020-07-26  0:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 882 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663922330

Comment:
- `printf(3)` is incorrect if help/version contains `%`,
either use `puts(3)` instead or
```cpp
printf("%s", $arg);
```
- Add a newline between include and main
- In case you don't know, we can quote EOF to save extra quoting in here doc.
```sh
if [ "$CROSS_BUILD" ]; then
	hostmakedepends+=" tcc"
	post_patch() {
		cpp -dM src/fatsort.c | grep '#define INFO' > man/info.h
		cat > man/fatsort.sh <<-'EOF'
		#!/bin/sh
		case $1 in
			"--help")       arg="INFO_OPTION_HELP" ;;
			"--version")    arg="INFO_OPTION_VERSION" ;;
		esac
		echo '#include "info.h"' "int main(){return printf(\"%s\", $arg) > 0;}" |
		tcc -run -
		EOF
		chmod 755 man/fatsort.sh
		vsed -i man/Makefile -e 's|../src/fatsort|./fatsort.sh|'
	}
fi
```

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (18 preceding siblings ...)
  2020-07-26  0:57 ` sgn
@ 2020-07-26  3:52 ` ahesford
  2020-07-26  3:57 ` sgn
                   ` (2 subsequent siblings)
  22 siblings, 0 replies; 24+ messages in thread
From: ahesford @ 2020-07-26  3:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663932311

Comment:
Is this seriously being considered? If you're going to go to this much trouble to wrap the help text in a man page, just use the `qemu` helper. A custom executable is too fragile.

^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (19 preceding siblings ...)
  2020-07-26  3:52 ` ahesford
@ 2020-07-26  3:57 ` sgn
  2020-07-26  4:02 ` [PR PATCH] [Merged]: " sgn
  2020-07-26  9:59 ` tibequadorian
  22 siblings, 0 replies; 24+ messages in thread
From: sgn @ 2020-07-26  3:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663932568

Comment:
On 2020-07-25 20:52:42-0700, "Andrew J. Hesford" <notifications@github.com> wrote:
> Is this seriously being considered? If you're going to go to this
> much trouble to wrap the help text in a man page, just use the
> `qemu` helper. A custom executable is too fragile.

Yes, I think qemu is fine.
Just want to give more options :)

-- 
Danh


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: [PR PATCH] [Merged]: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (20 preceding siblings ...)
  2020-07-26  3:57 ` sgn
@ 2020-07-26  4:02 ` sgn
  2020-07-26  9:59 ` tibequadorian
  22 siblings, 0 replies; 24+ messages in thread
From: sgn @ 2020-07-26  4:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 164 bytes --]

There's a merged pull request on the void-packages repository

New package: fatsort-1.6.2.605
https://github.com/void-linux/void-packages/pull/23485

Description:


^ permalink raw reply	[flat|nested] 24+ messages in thread

* Re: New package: fatsort-1.6.2.605
  2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
                   ` (21 preceding siblings ...)
  2020-07-26  4:02 ` [PR PATCH] [Merged]: " sgn
@ 2020-07-26  9:59 ` tibequadorian
  22 siblings, 0 replies; 24+ messages in thread
From: tibequadorian @ 2020-07-26  9:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/23485#issuecomment-663967932

Comment:
thank you for correction @sgn :)

^ permalink raw reply	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2020-07-26  9:59 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-09  0:59 [PR PATCH] New package: fatsort-1.6.2.605 tibequadorian
2020-07-11 18:40 ` [PR REVIEW] " ahesford
2020-07-11 18:40 ` ahesford
2020-07-11 18:40 ` ahesford
2020-07-11 19:56 ` [PR PATCH] [Updated] " tibequadorian
2020-07-11 20:22 ` [PR REVIEW] " tibequadorian
2020-07-11 20:22 ` tibequadorian
2020-07-11 20:22 ` tibequadorian
2020-07-11 20:47 ` Chocimier
2020-07-22 17:45 ` tibequadorian
2020-07-24  0:45 ` sgn
2020-07-24  2:15 ` ahesford
2020-07-25  4:44 ` sgn
2020-07-25 13:07 ` tibequadorian
2020-07-25 13:30 ` ahesford
2020-07-25 16:45 ` tibequadorian
2020-07-25 16:51 ` [PR PATCH] [Updated] " tibequadorian
2020-07-25 17:32 ` tibequadorian
2020-07-25 17:58 ` ahesford
2020-07-26  0:57 ` sgn
2020-07-26  3:52 ` ahesford
2020-07-26  3:57 ` sgn
2020-07-26  4:02 ` [PR PATCH] [Merged]: " sgn
2020-07-26  9:59 ` tibequadorian

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).