[PR PATCH] tab: update to 9.2

[PR PATCH] tab: update to 9.2

[adigitoleo]

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

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

https://github.com/adigitoleo/void-packages tab
https://github.com/void-linux/void-packages/pull/49358

tab: update to 9.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64 glibc)
- I cross-built this PR for these architectures:
  - aarch64-musl
  - x86_64-musl


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

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

From c79029d9b62245fdd00f3acce673f50eb9082384 Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Tue, 19 Mar 2024 05:08:29 +1100
Subject: [PATCH] tab: update to 9.2

---
 srcpkgs/tab/patches/fix-missing-cstring-include.patch | 10 ----------
 srcpkgs/tab/template                                  |  9 +++------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/tab/patches/fix-missing-cstring-include.patch

diff --git a/srcpkgs/tab/patches/fix-missing-cstring-include.patch b/srcpkgs/tab/patches/fix-missing-cstring-include.patch
deleted file mode 100644
index d3a70a71a7e5b4..00000000000000
--- a/srcpkgs/tab/patches/fix-missing-cstring-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/deps.h
-+++ b/deps.h
-@@ -16,6 +16,7 @@
- #include <utility>
- #include <algorithm>
- #include <random>
-+#include <cstring>
- 
- #include <regex>
- 
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index f1327ee9bbce7e..574bcf3dabaffb 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,18 +1,15 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.1
+version=9.2
 revision=1
+build_style=gnu-makefile
 checkdepends="python3"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a
-
-do_build() {
-	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm
-}
+checksum=e985d7bfd2a724fd7f5cbc68153978ad5ee80be43240a805105275da33d75254
 
 do_check() {
 	( cd test; python go.py; )

Re: tab: update to 9.2

[adigitoleo]

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

New comment by adigitoleo on void-packages repository

https://github.com/void-linux/void-packages/pull/49358#issuecomment-2004649183

Comment:
Failing on 32-bit: https://github.com/ivan-tkatchev/tab/issues/8

Re: [PR PATCH] [Updated] tab: update to 9.2

[adigitoleo]

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

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

https://github.com/adigitoleo/void-packages tab
https://github.com/void-linux/void-packages/pull/49358

tab: update to 9.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64 glibc)
- I cross-built this PR for these architectures:
  - aarch64-musl
  - x86_64-musl


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

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

From c79029d9b62245fdd00f3acce673f50eb9082384 Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Tue, 19 Mar 2024 05:08:29 +1100
Subject: [PATCH 1/2] tab: update to 9.2

---
 srcpkgs/tab/patches/fix-missing-cstring-include.patch | 10 ----------
 srcpkgs/tab/template                                  |  9 +++------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/tab/patches/fix-missing-cstring-include.patch

diff --git a/srcpkgs/tab/patches/fix-missing-cstring-include.patch b/srcpkgs/tab/patches/fix-missing-cstring-include.patch
deleted file mode 100644
index d3a70a71a7e5b4..00000000000000
--- a/srcpkgs/tab/patches/fix-missing-cstring-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/deps.h
-+++ b/deps.h
-@@ -16,6 +16,7 @@
- #include <utility>
- #include <algorithm>
- #include <random>
-+#include <cstring>
- 
- #include <regex>
- 
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index f1327ee9bbce7e..574bcf3dabaffb 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,18 +1,15 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.1
+version=9.2
 revision=1
+build_style=gnu-makefile
 checkdepends="python3"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a
-
-do_build() {
-	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm
-}
+checksum=e985d7bfd2a724fd7f5cbc68153978ad5ee80be43240a805105275da33d75254
 
 do_check() {
 	( cd test; python go.py; )

From 8b940e93f00a6c3c2417b44f705744c7545db041 Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Tue, 19 Mar 2024 07:51:43 +1100
Subject: [PATCH 2/2] Temporarily try building master to check if 32-bit tests
 pass natively

---
 srcpkgs/tab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 574bcf3dabaffb..a38ed491b0e18e 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,6 +1,6 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.2
+version=9.3
 revision=1
 build_style=gnu-makefile
 checkdepends="python3"
@@ -8,8 +8,8 @@ short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
-distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=e985d7bfd2a724fd7f5cbc68153978ad5ee80be43240a805105275da33d75254
+distfiles="https://github.com/ivan-tkatchev/tab/archive/refs/heads/master.tar.gz"
+checksum=a5d8850f1a6040acb2f531d270cc295a83441dc9da6cd2bae278c5c28dab6d6c
 
 do_check() {
 	( cd test; python go.py; )

Re: tab: update to 9.2

[adigitoleo]

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

New comment by adigitoleo on void-packages repository

https://github.com/void-linux/void-packages/pull/49358#issuecomment-2004975174

Comment:
Can either revert 8b940e9 and fail on 32-bit or wait for upstream to cut 9.3 release.

Re: tab: update to 9.2

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49358#issuecomment-2005561132

Comment:
instead of that, import the fix as a patch: https://github.com/ivan-tkatchev/tab/commit/ecb7eca54b0c66ecfd6b80312fc60676002adf36.patch

Re: [PR PATCH] [Updated] tab: update to 9.2

[adigitoleo]

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

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

https://github.com/adigitoleo/void-packages tab
https://github.com/void-linux/void-packages/pull/49358

tab: update to 9.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64 glibc)
- I cross-built this PR for these architectures:
  - aarch64-musl
  - x86_64-musl


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

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

From c79029d9b62245fdd00f3acce673f50eb9082384 Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Tue, 19 Mar 2024 05:08:29 +1100
Subject: [PATCH 1/3] tab: update to 9.2

---
 srcpkgs/tab/patches/fix-missing-cstring-include.patch | 10 ----------
 srcpkgs/tab/template                                  |  9 +++------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 srcpkgs/tab/patches/fix-missing-cstring-include.patch

diff --git a/srcpkgs/tab/patches/fix-missing-cstring-include.patch b/srcpkgs/tab/patches/fix-missing-cstring-include.patch
deleted file mode 100644
index d3a70a71a7e5b4..00000000000000
--- a/srcpkgs/tab/patches/fix-missing-cstring-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/deps.h
-+++ b/deps.h
-@@ -16,6 +16,7 @@
- #include <utility>
- #include <algorithm>
- #include <random>
-+#include <cstring>
- 
- #include <regex>
- 
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index f1327ee9bbce7e..574bcf3dabaffb 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,18 +1,15 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.1
+version=9.2
 revision=1
+build_style=gnu-makefile
 checkdepends="python3"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a
-
-do_build() {
-	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm
-}
+checksum=e985d7bfd2a724fd7f5cbc68153978ad5ee80be43240a805105275da33d75254
 
 do_check() {
 	( cd test; python go.py; )

From 8b940e93f00a6c3c2417b44f705744c7545db041 Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Tue, 19 Mar 2024 07:51:43 +1100
Subject: [PATCH 2/3] Temporarily try building master to check if 32-bit tests
 pass natively

---
 srcpkgs/tab/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index 574bcf3dabaffb..a38ed491b0e18e 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,6 +1,6 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.2
+version=9.3
 revision=1
 build_style=gnu-makefile
 checkdepends="python3"
@@ -8,8 +8,8 @@ short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
-distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=e985d7bfd2a724fd7f5cbc68153978ad5ee80be43240a805105275da33d75254
+distfiles="https://github.com/ivan-tkatchev/tab/archive/refs/heads/master.tar.gz"
+checksum=a5d8850f1a6040acb2f531d270cc295a83441dc9da6cd2bae278c5c28dab6d6c
 
 do_check() {
 	( cd test; python go.py; )

From 3727fd3db5ac4df3459437b285de1293043e8506 Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Sun, 24 Mar 2024 01:52:51 +1100
Subject: [PATCH 3/3] Import patch to fix 32bit builds

---
 srcpkgs/tab/patches/fix-hash-32bit.diff | 30 +++++++++++++++++++++++++
 srcpkgs/tab/template                    |  6 ++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/tab/patches/fix-hash-32bit.diff

diff --git a/srcpkgs/tab/patches/fix-hash-32bit.diff b/srcpkgs/tab/patches/fix-hash-32bit.diff
new file mode 100644
index 00000000000000..74e824c7110eac
--- /dev/null
+++ b/srcpkgs/tab/patches/fix-hash-32bit.diff
@@ -0,0 +1,30 @@
+From ecb7eca54b0c66ecfd6b80312fc60676002adf36 Mon Sep 17 00:00:00 2001
+From: Ivan Tkatchev <tkatchev@gmail.com>
+Date: Mon, 18 Mar 2024 22:57:19 +0300
+Subject: [PATCH] Fix test for #8
+
+---
+ test/uniques.test32.in                      | 8 ++++++++
+ test/{uniques.test.in => uniques.test64.in} | 0
+ 2 files changed, 8 insertions(+)
+ create mode 100644 test/uniques.test32.in
+ rename test/{uniques.test.in => uniques.test64.in} (100%)
+
+diff --git a/test/uniques.test32.in b/test/uniques.test32.in
+new file mode 100644
+index 0000000..f64e748
+--- /dev/null
++++ b/test/uniques.test32.in
+@@ -0,0 +1,8 @@
++temps.tsv
++===>
++z = { x=cut(@,"\t"), uint(x~0)/50 -> uniques.x~3, uniques_estimate.x~3 }, lines(sort.z, merge.first.second.z)
++===>
++38	221	330
++39	589	834
++40	528	783
++608
+diff --git a/test/uniques.test.in b/test/uniques.test64.in
+similarity index 100%
+rename from test/uniques.test.in
+rename to test/uniques.test64.in
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index a38ed491b0e18e..574bcf3dabaffb 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,6 +1,6 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.3
+version=9.2
 revision=1
 build_style=gnu-makefile
 checkdepends="python3"
@@ -8,8 +8,8 @@ short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
-distfiles="https://github.com/ivan-tkatchev/tab/archive/refs/heads/master.tar.gz"
-checksum=a5d8850f1a6040acb2f531d270cc295a83441dc9da6cd2bae278c5c28dab6d6c
+distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
+checksum=e985d7bfd2a724fd7f5cbc68153978ad5ee80be43240a805105275da33d75254
 
 do_check() {
 	( cd test; python go.py; )

Re: [PR PATCH] [Updated] tab: update to 9.2

[adigitoleo]

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

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

https://github.com/adigitoleo/void-packages tab
https://github.com/void-linux/void-packages/pull/49358

tab: update to 9.2
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64 glibc)
- I cross-built this PR for these architectures:
  - aarch64-musl
  - x86_64-musl


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

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

From 4ba3d5810cf44810406606a2e8b9fa49721827de Mon Sep 17 00:00:00 2001
From: adigitoleo <adigitoleo@posteo.net>
Date: Tue, 19 Mar 2024 05:08:29 +1100
Subject: [PATCH] tab: update to 9.2

---
 srcpkgs/tab/patches/fix-hash-32bit.diff       | 30 +++++++++++++++++++
 .../patches/fix-missing-cstring-include.patch | 10 -------
 srcpkgs/tab/template                          |  9 ++----
 3 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 srcpkgs/tab/patches/fix-hash-32bit.diff
 delete mode 100644 srcpkgs/tab/patches/fix-missing-cstring-include.patch

diff --git a/srcpkgs/tab/patches/fix-hash-32bit.diff b/srcpkgs/tab/patches/fix-hash-32bit.diff
new file mode 100644
index 00000000000000..74e824c7110eac
--- /dev/null
+++ b/srcpkgs/tab/patches/fix-hash-32bit.diff
@@ -0,0 +1,30 @@
+From ecb7eca54b0c66ecfd6b80312fc60676002adf36 Mon Sep 17 00:00:00 2001
+From: Ivan Tkatchev <tkatchev@gmail.com>
+Date: Mon, 18 Mar 2024 22:57:19 +0300
+Subject: [PATCH] Fix test for #8
+
+---
+ test/uniques.test32.in                      | 8 ++++++++
+ test/{uniques.test.in => uniques.test64.in} | 0
+ 2 files changed, 8 insertions(+)
+ create mode 100644 test/uniques.test32.in
+ rename test/{uniques.test.in => uniques.test64.in} (100%)
+
+diff --git a/test/uniques.test32.in b/test/uniques.test32.in
+new file mode 100644
+index 0000000..f64e748
+--- /dev/null
++++ b/test/uniques.test32.in
+@@ -0,0 +1,8 @@
++temps.tsv
++===>
++z = { x=cut(@,"\t"), uint(x~0)/50 -> uniques.x~3, uniques_estimate.x~3 }, lines(sort.z, merge.first.second.z)
++===>
++38	221	330
++39	589	834
++40	528	783
++608
+diff --git a/test/uniques.test.in b/test/uniques.test64.in
+similarity index 100%
+rename from test/uniques.test.in
+rename to test/uniques.test64.in
diff --git a/srcpkgs/tab/patches/fix-missing-cstring-include.patch b/srcpkgs/tab/patches/fix-missing-cstring-include.patch
deleted file mode 100644
index d3a70a71a7e5b4..00000000000000
--- a/srcpkgs/tab/patches/fix-missing-cstring-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/deps.h
-+++ b/deps.h
-@@ -16,6 +16,7 @@
- #include <utility>
- #include <algorithm>
- #include <random>
-+#include <cstring>
- 
- #include <regex>
- 
diff --git a/srcpkgs/tab/template b/srcpkgs/tab/template
index f1327ee9bbce7e..574bcf3dabaffb 100644
--- a/srcpkgs/tab/template
+++ b/srcpkgs/tab/template
@@ -1,18 +1,15 @@
 # Template file for 'tab'
 pkgname=tab
-version=9.1
+version=9.2
 revision=1
+build_style=gnu-makefile
 checkdepends="python3"
 short_desc="Shell language for text/number manipulation"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSL-1.0"
 homepage="http://tkatchev.bitbucket.io/tab/"
 distfiles="https://bitbucket.org/tkatchev/${pkgname}/get/${version}.tar.bz2"
-checksum=ccc72e4c8a5f0d7786a8c4a4c8b8dd5599ad867c876605b2cacad7f32c30651a
-
-do_build() {
-	${CXX} ${CXXFLAGS} -std=c++11 -Wall -Iaxe *.cc -o tab ${LDFLAGS} -pthread -lm
-}
+checksum=e985d7bfd2a724fd7f5cbc68153978ad5ee80be43240a805105275da33d75254
 
 do_check() {
 	( cd test; python go.py; )

Re: [PR PATCH] [Merged]: tab: update to 9.2

[classabbyamp]

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

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

tab: update to 9.2
https://github.com/void-linux/void-packages/pull/49358

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64 glibc)
- I cross-built this PR for these architectures:
  - aarch64-musl
  - x86_64-musl