From: tranzystorek-io <tranzystorek-io@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: boxes-2.2.0
Date: Tue, 04 Oct 2022 22:00:32 +0200 [thread overview]
Message-ID: <20221004200032.4wOOw-NYMPM-J0KxfZtobi3zNfGOOec-9tVcGy9Kcyg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39496@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1259 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages boxes
https://github.com/void-linux/void-packages/pull/39496
New package: boxes-2.2.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
Closes #39490
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39496.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boxes-39496.patch --]
[-- Type: text/x-diff, Size: 3781 bytes --]
From 4b9d6e82c79412b8837b6fd3fe306e01d2d17fb6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 27 Sep 2022 22:41:48 +0200
Subject: [PATCH] New package: boxes-2.2.0
---
.../0001-fix-missing-argument-tests.patch | 24 ++++++++++++++++++
srcpkgs/boxes/patches/0002-fix-segfault.patch | 17 +++++++++++++
srcpkgs/boxes/template | 25 +++++++++++++++++++
3 files changed, 66 insertions(+)
create mode 100644 srcpkgs/boxes/patches/0001-fix-missing-argument-tests.patch
create mode 100644 srcpkgs/boxes/patches/0002-fix-segfault.patch
create mode 100644 srcpkgs/boxes/template
diff --git a/srcpkgs/boxes/patches/0001-fix-missing-argument-tests.patch b/srcpkgs/boxes/patches/0001-fix-missing-argument-tests.patch
new file mode 100644
index 000000000000..18d3e4cc3fdc
--- /dev/null
+++ b/srcpkgs/boxes/patches/0001-fix-missing-argument-tests.patch
@@ -0,0 +1,24 @@
+diff --git a/test/004_missing_option_argument.txt b/test/004_missing_option_argument.txt
+index 8222bbb..bfaba56 100644
+--- a/test/004_missing_option_argument.txt
++++ b/test/004_missing_option_argument.txt
+@@ -2,6 +2,7 @@
+ -s
+ :INPUT
+ :OUTPUT-FILTER
++1s/argument:/argument --/
+ 1s/^.+?: /boxes: /
+ 1s/-- s$/-- 's'/
+ :EXPECTED-ERROR 1
+diff --git a/test/065_size_missing_argument.txt b/test/065_size_missing_argument.txt
+index 6dad5ae..5a00967 100644
+--- a/test/065_size_missing_argument.txt
++++ b/test/065_size_missing_argument.txt
+@@ -3,6 +3,7 @@
+ :INPUT
+ foo
+ :OUTPUT-FILTER
++1s/argument:/argument --/
+ 1s/^.+?: /boxes: /
+ 1s/-- s$/-- 's'/
+ :EXPECTED-ERROR 1
diff --git a/srcpkgs/boxes/patches/0002-fix-segfault.patch b/srcpkgs/boxes/patches/0002-fix-segfault.patch
new file mode 100644
index 000000000000..deb134063d7c
--- /dev/null
+++ b/srcpkgs/boxes/patches/0002-fix-segfault.patch
@@ -0,0 +1,17 @@
+diff --git a/src/remove.c b/src/remove.c
+index c4dae4b..bed7bd0 100644
+--- a/src/remove.c
++++ b/src/remove.c
+@@ -983,10 +983,10 @@ int remove_box()
+ fprintf(stderr, "u32_move(\"%s\", \"%s\", %d); // posmap[c]=%d\n",
+ u32_strconv_to_output(input.lines[j].mbtext),
+ u32_strconv_to_output(input.lines[j].mbtext + input.lines[j].posmap[c]),
+- (int) (input.lines[j].num_chars - c + 1), (int) input.lines[j].posmap[c]);
++ (int) (input.lines[j].num_chars - input.lines[j].posmap[c] + 1), (int) input.lines[j].posmap[c]);
+ #endif
+ u32_move(input.lines[j].mbtext, input.lines[j].mbtext + input.lines[j].posmap[c],
+- input.lines[j].num_chars - c + 1); /* +1 for zero byte */
++ input.lines[j].num_chars - input.lines[j].posmap[c] + 1); /* +1 for zero byte */
+ input.lines[j].num_chars -= c;
+ }
+ }
diff --git a/srcpkgs/boxes/template b/srcpkgs/boxes/template
new file mode 100644
index 000000000000..a5dbd6efe67a
--- /dev/null
+++ b/srcpkgs/boxes/template
@@ -0,0 +1,25 @@
+# Template file for 'boxes'
+pkgname=boxes
+version=2.2.0
+revision=1
+build_style=gnu-makefile
+make_build_args="GLOBALCONF=/etc/boxes"
+make_check_target="test utest"
+hostmakedepends="bison flex"
+makedepends="libunistring-devel pcre2-devel"
+checkdepends="cmocka-devel xxd"
+short_desc="Command line ASCII boxes unlimited"
+maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
+license="GPL-3.0-only"
+homepage="https://boxes.thomasjensen.com/"
+distfiles="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${version}.tar.gz"
+checksum=98b8e3cf5008f46f096d5775d129c34db9f718728bffb0f5d67ae89bb494102e
+conf_files="/etc/boxes"
+
+CFLAGS="-I. -I../src"
+
+do_install() {
+ vbin out/boxes
+ vconf boxes-config boxes
+ vman doc/boxes.1
+}
next prev parent reply other threads:[~2022-10-04 20:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 20:44 [PR PATCH] " tranzystorek-io
2022-09-28 18:28 ` tranzystorek-io
2022-10-04 20:00 ` tranzystorek-io [this message]
2022-10-09 19:04 ` tranzystorek-io
2023-01-08 2:01 ` github-actions
2023-01-08 11:30 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-26 19:39 ` [PR PATCH] [Closed]: " tranzystorek-io
2023-02-26 19:39 ` tranzystorek-io
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221004200032.4wOOw-NYMPM-J0KxfZtobi3zNfGOOec-9tVcGy9Kcyg@z \
--to=tranzystorek-io@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).