* [PR PATCH] New package: contour-0.4.0.6245
@ 2023-12-20 7:48 0x5c
2023-12-20 8:04 ` 0x5c
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 7:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1569 bytes --]
There is a new pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.
I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 5823 bytes --]
From a37cfb23ad798a789aebf49dea3302fbb50e40d0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/4] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From f89fb03afc782277e1673164d736dc8e540912d9 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/4] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..c466ff88e0d43
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,12 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From 35f207576612d05c27d14769d8c57a1743a883e1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/4] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 32 ++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index a45654c4fa3cf..b5fcc05469326 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,6 @@ libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..44ab0f0607f03
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,32 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3 wget unzip"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
+checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+
+post_extract() {
+ mkdir -p _ucd
+ wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/bin
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From c7b50030a1eaf5bb3f9c4d1932e75c2c3206cf5f Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/4] New package: contour-0.4.0.6245
---
srcpkgs/contour/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..638d0f51645e5
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,18 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.0.6245
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=a46ee637d793d72ffdc8b0570b9cc1ba90729d2fa5b571b74b815c7562ec8894
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
@ 2023-12-20 8:04 ` 0x5c
2023-12-20 8:09 ` [PR PATCH] [Updated] " 0x5c
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 8:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 330 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode]
- i686 (glibc): c++ intrinsics sadness [libunicode]
- x86_64-musl (all-musl?): pthread sadness [contour]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
2023-12-20 8:04 ` 0x5c
@ 2023-12-20 8:09 ` 0x5c
2023-12-20 8:13 ` 0x5c
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 8:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1574 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.
I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 6511 bytes --]
From a37cfb23ad798a789aebf49dea3302fbb50e40d0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/5] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From f89fb03afc782277e1673164d736dc8e540912d9 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/5] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..c466ff88e0d43
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,12 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From 35f207576612d05c27d14769d8c57a1743a883e1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/5] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 32 ++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index a45654c4fa3cf..b5fcc05469326 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,6 @@ libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..44ab0f0607f03
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,32 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3 wget unzip"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
+checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+
+post_extract() {
+ mkdir -p _ucd
+ wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/bin
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From c7b50030a1eaf5bb3f9c4d1932e75c2c3206cf5f Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/5] New package: contour-0.4.0.6245
---
srcpkgs/contour/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..638d0f51645e5
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,18 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.0.6245
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=a46ee637d793d72ffdc8b0570b9cc1ba90729d2fa5b571b74b815c7562ec8894
From a32be44acfd05956846faa089e5f610a6df7ffc1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:08:20 -0500
Subject: [PATCH 5/5] fix libunicode cross failures?
it better do
---
srcpkgs/libunicode/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
index 44ab0f0607f03..2f9b25c583f7b 100644
--- a/srcpkgs/libunicode/template
+++ b/srcpkgs/libunicode/template
@@ -4,6 +4,7 @@ version=0.4.0
revision=1
_ucd_version=15.0.0
build_style=cmake
+build_helper=qemu
configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
hostmakedepends="python3 wget unzip"
makedepends="fmt-devel"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
2023-12-20 8:04 ` 0x5c
2023-12-20 8:09 ` [PR PATCH] [Updated] " 0x5c
@ 2023-12-20 8:13 ` 0x5c
2023-12-20 8:16 ` 0x5c
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 8:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode]
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
- x86_64-musl (all-musl?): pthread sadness [contour]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (2 preceding siblings ...)
2023-12-20 8:13 ` 0x5c
@ 2023-12-20 8:16 ` 0x5c
2023-12-20 8:19 ` 0x5c
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 8:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 415 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode]
- `build_helper=qemu` is made of :magic_wand: *Magic* :sparkles:
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
- x86_64-musl (all-musl?): pthread sadness [contour]
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (3 preceding siblings ...)
2023-12-20 8:16 ` 0x5c
@ 2023-12-20 8:19 ` 0x5c
2023-12-20 8:20 ` 0x5c
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 8:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 603 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode]
- `build_helper=qemu` is made of :magic_wand: *Magic* :sparkles:
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
- x86_64-musl (all-musl?): pthread sadness [contour]
- aarch64-musl: ???
```
To use a cross-compiled Qt, please set the QT_HOST_PATH_CMAKE_DIR cache
variable to the location of your host Qt installation lib/cmake directory.
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (4 preceding siblings ...)
2023-12-20 8:19 ` 0x5c
@ 2023-12-20 8:20 ` 0x5c
2023-12-20 9:01 ` [PR PATCH] [Updated] " 0x5c
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 8:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode]
- `build_helper=qemu` is made of :magic_wand: *Magic* :sparkles:
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
- x86_64-musl (all-musl?): pthread sadness [contour]
- aarch64: ??? [contour]
```
To use a cross-compiled Qt, please set the QT_HOST_PATH_CMAKE_DIR cache
variable to the location of your host Qt installation lib/cmake directory.
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (5 preceding siblings ...)
2023-12-20 8:20 ` 0x5c
@ 2023-12-20 9:01 ` 0x5c
2023-12-20 9:03 ` 0x5c
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 9:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1574 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.
I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 9890 bytes --]
From a37cfb23ad798a789aebf49dea3302fbb50e40d0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/8] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From f89fb03afc782277e1673164d736dc8e540912d9 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/8] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..c466ff88e0d43
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,12 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From 35f207576612d05c27d14769d8c57a1743a883e1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/8] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 32 ++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index a45654c4fa3cf..b5fcc05469326 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,6 @@ libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..44ab0f0607f03
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,32 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3 wget unzip"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
+checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+
+post_extract() {
+ mkdir -p _ucd
+ wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/bin
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From c7b50030a1eaf5bb3f9c4d1932e75c2c3206cf5f Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/8] New package: contour-0.4.0.6245
---
srcpkgs/contour/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..638d0f51645e5
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,18 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.0.6245
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=a46ee637d793d72ffdc8b0570b9cc1ba90729d2fa5b571b74b815c7562ec8894
From a32be44acfd05956846faa089e5f610a6df7ffc1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:08:20 -0500
Subject: [PATCH 5/8] fix libunicode cross failures?
it better do
---
srcpkgs/libunicode/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
index 44ab0f0607f03..2f9b25c583f7b 100644
--- a/srcpkgs/libunicode/template
+++ b/srcpkgs/libunicode/template
@@ -4,6 +4,7 @@ version=0.4.0
revision=1
_ucd_version=15.0.0
build_style=cmake
+build_helper=qemu
configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
hostmakedepends="python3 wget unzip"
makedepends="fmt-devel"
From ffb9e1c99ae88f4f4eb2797ccd33281f8c216045 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:56:16 -0500
Subject: [PATCH 6/8] fixup: boxed-cpp
---
srcpkgs/boxed-cpp/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
index c466ff88e0d43..267e125a78b9c 100644
--- a/srcpkgs/boxed-cpp/template
+++ b/srcpkgs/boxed-cpp/template
@@ -3,7 +3,6 @@ pkgname=boxed-cpp
version=1.1.0
revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
short_desc="Boxing primitive types in C++"
maintainer="0x5c <dev@0x5c.io>"
license="Apache-2.0"
From 423dbf34bab2899ace2ae344724cb9d00e3d7f14 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:58:49 -0500
Subject: [PATCH 7/8] fixup: libunicode
---
srcpkgs/libunicode/template | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
index 2f9b25c583f7b..6ad6a3fa7e4a1 100644
--- a/srcpkgs/libunicode/template
+++ b/srcpkgs/libunicode/template
@@ -5,20 +5,27 @@ revision=1
_ucd_version=15.0.0
build_style=cmake
build_helper=qemu
-configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
-hostmakedepends="python3 wget unzip"
+configure_args="-DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3"
makedepends="fmt-devel"
short_desc="Modern C++17 Unicode library"
maintainer="0x5c <dev@0x5c.io>"
license="Apache-2.0"
homepage="https://github.com/contour-terminal/libunicode"
changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
-distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
-checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz
+ https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip"
+checksum="a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+ 5fbde400f3e687d25cc9b0a8d30d7619e76cb2f4c3e85ba9df8ec1312cb6718c"
+skip_extraction="UCD.zip"
+
+if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+ broken="32bit architectures not currently supported, problems with SIMD"
+fi
post_extract() {
- mkdir -p _ucd
- wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+ mkdir _ucd
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/UCD.zip" "_ucd/ucd-${_ucd_version}.zip"
}
libunicode-devel_package() {
From 520267c100c8cdd9cc825b93f71d26a18b2f9e68 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 04:01:05 -0500
Subject: [PATCH 8/8] fixup: contour
---
srcpkgs/contour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
index 638d0f51645e5..1c25b96839460 100644
--- a/srcpkgs/contour/template
+++ b/srcpkgs/contour/template
@@ -3,7 +3,7 @@ pkgname=contour
version=0.4.0.6245
revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
-DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
hostmakedepends="pkg-config"
makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (6 preceding siblings ...)
2023-12-20 9:01 ` [PR PATCH] [Updated] " 0x5c
@ 2023-12-20 9:03 ` 0x5c
2023-12-20 9:24 ` [PR PATCH] [Updated] " 0x5c
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 9:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode]
- `build_helper=qemu` is made of :magic_wand: *Magic* :sparkles:
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
- Upstream says it's not supported (yet), marking broken
- x86_64-musl (all-musl?): pthread sadness [contour]
- aarch64: ??? [contour]
```
To use a cross-compiled Qt, please set the QT_HOST_PATH_CMAKE_DIR cache
variable to the location of your host Qt installation lib/cmake directory.
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (7 preceding siblings ...)
2023-12-20 9:03 ` 0x5c
@ 2023-12-20 9:24 ` 0x5c
2023-12-20 10:14 ` 0x5c
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 9:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1574 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.
I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 10807 bytes --]
From a37cfb23ad798a789aebf49dea3302fbb50e40d0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/9] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From f89fb03afc782277e1673164d736dc8e540912d9 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/9] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..c466ff88e0d43
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,12 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From 35f207576612d05c27d14769d8c57a1743a883e1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/9] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 32 ++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index a45654c4fa3cf..b5fcc05469326 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,6 @@ libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..44ab0f0607f03
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,32 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3 wget unzip"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
+checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+
+post_extract() {
+ mkdir -p _ucd
+ wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/bin
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From c7b50030a1eaf5bb3f9c4d1932e75c2c3206cf5f Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/9] New package: contour-0.4.0.6245
---
srcpkgs/contour/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..638d0f51645e5
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,18 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.0.6245
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=a46ee637d793d72ffdc8b0570b9cc1ba90729d2fa5b571b74b815c7562ec8894
From a32be44acfd05956846faa089e5f610a6df7ffc1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:08:20 -0500
Subject: [PATCH 5/9] fix libunicode cross failures?
it better do
---
srcpkgs/libunicode/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
index 44ab0f0607f03..2f9b25c583f7b 100644
--- a/srcpkgs/libunicode/template
+++ b/srcpkgs/libunicode/template
@@ -4,6 +4,7 @@ version=0.4.0
revision=1
_ucd_version=15.0.0
build_style=cmake
+build_helper=qemu
configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
hostmakedepends="python3 wget unzip"
makedepends="fmt-devel"
From ffb9e1c99ae88f4f4eb2797ccd33281f8c216045 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:56:16 -0500
Subject: [PATCH 6/9] fixup: boxed-cpp
---
srcpkgs/boxed-cpp/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
index c466ff88e0d43..267e125a78b9c 100644
--- a/srcpkgs/boxed-cpp/template
+++ b/srcpkgs/boxed-cpp/template
@@ -3,7 +3,6 @@ pkgname=boxed-cpp
version=1.1.0
revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
short_desc="Boxing primitive types in C++"
maintainer="0x5c <dev@0x5c.io>"
license="Apache-2.0"
From 423dbf34bab2899ace2ae344724cb9d00e3d7f14 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:58:49 -0500
Subject: [PATCH 7/9] fixup: libunicode
---
srcpkgs/libunicode/template | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
index 2f9b25c583f7b..6ad6a3fa7e4a1 100644
--- a/srcpkgs/libunicode/template
+++ b/srcpkgs/libunicode/template
@@ -5,20 +5,27 @@ revision=1
_ucd_version=15.0.0
build_style=cmake
build_helper=qemu
-configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
-hostmakedepends="python3 wget unzip"
+configure_args="-DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3"
makedepends="fmt-devel"
short_desc="Modern C++17 Unicode library"
maintainer="0x5c <dev@0x5c.io>"
license="Apache-2.0"
homepage="https://github.com/contour-terminal/libunicode"
changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
-distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
-checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz
+ https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip"
+checksum="a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+ 5fbde400f3e687d25cc9b0a8d30d7619e76cb2f4c3e85ba9df8ec1312cb6718c"
+skip_extraction="UCD.zip"
+
+if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+ broken="32bit architectures not currently supported, problems with SIMD"
+fi
post_extract() {
- mkdir -p _ucd
- wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+ mkdir _ucd
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/UCD.zip" "_ucd/ucd-${_ucd_version}.zip"
}
libunicode-devel_package() {
From 520267c100c8cdd9cc825b93f71d26a18b2f9e68 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 04:01:05 -0500
Subject: [PATCH 8/9] fixup: contour
---
srcpkgs/contour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
index 638d0f51645e5..1c25b96839460 100644
--- a/srcpkgs/contour/template
+++ b/srcpkgs/contour/template
@@ -3,7 +3,7 @@ pkgname=contour
version=0.4.0.6245
revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
-DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
hostmakedepends="pkg-config"
makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
From f5f0331db2f8f84fe32895c5869661afb0b66e12 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 04:24:25 -0500
Subject: [PATCH 9/9] fixup: contour 2
---
srcpkgs/contour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
index 1c25b96839460..1351baed0670c 100644
--- a/srcpkgs/contour/template
+++ b/srcpkgs/contour/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
-DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt6-base qt6-tools"
makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (8 preceding siblings ...)
2023-12-20 9:24 ` [PR PATCH] [Updated] " 0x5c
@ 2023-12-20 10:14 ` 0x5c
2023-12-20 10:58 ` 0x5c
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 10:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1574 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.
I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 12242 bytes --]
From a37cfb23ad798a789aebf49dea3302fbb50e40d0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 01/10] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From f89fb03afc782277e1673164d736dc8e540912d9 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 02/10] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..c466ff88e0d43
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,12 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From 35f207576612d05c27d14769d8c57a1743a883e1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 03/10] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 32 ++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index a45654c4fa3cf..b5fcc05469326 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,6 @@ libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..44ab0f0607f03
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,32 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3 wget unzip"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
+checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+
+post_extract() {
+ mkdir -p _ucd
+ wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/bin
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From c7b50030a1eaf5bb3f9c4d1932e75c2c3206cf5f Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 04/10] New package: contour-0.4.0.6245
---
srcpkgs/contour/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..638d0f51645e5
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,18 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.0.6245
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=a46ee637d793d72ffdc8b0570b9cc1ba90729d2fa5b571b74b815c7562ec8894
From a32be44acfd05956846faa089e5f610a6df7ffc1 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:08:20 -0500
Subject: [PATCH 05/10] fix libunicode cross failures?
it better do
---
srcpkgs/libunicode/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
index 44ab0f0607f03..2f9b25c583f7b 100644
--- a/srcpkgs/libunicode/template
+++ b/srcpkgs/libunicode/template
@@ -4,6 +4,7 @@ version=0.4.0
revision=1
_ucd_version=15.0.0
build_style=cmake
+build_helper=qemu
configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
hostmakedepends="python3 wget unzip"
makedepends="fmt-devel"
From ffb9e1c99ae88f4f4eb2797ccd33281f8c216045 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:56:16 -0500
Subject: [PATCH 06/10] fixup: boxed-cpp
---
srcpkgs/boxed-cpp/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
index c466ff88e0d43..267e125a78b9c 100644
--- a/srcpkgs/boxed-cpp/template
+++ b/srcpkgs/boxed-cpp/template
@@ -3,7 +3,6 @@ pkgname=boxed-cpp
version=1.1.0
revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release"
short_desc="Boxing primitive types in C++"
maintainer="0x5c <dev@0x5c.io>"
license="Apache-2.0"
From 423dbf34bab2899ace2ae344724cb9d00e3d7f14 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 03:58:49 -0500
Subject: [PATCH 07/10] fixup: libunicode
---
srcpkgs/libunicode/template | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
index 2f9b25c583f7b..6ad6a3fa7e4a1 100644
--- a/srcpkgs/libunicode/template
+++ b/srcpkgs/libunicode/template
@@ -5,20 +5,27 @@ revision=1
_ucd_version=15.0.0
build_style=cmake
build_helper=qemu
-configure_args="-DCMAKE_BUILD_TYPE=Release -DLIBUNICODE_TESTING=OFF"
-hostmakedepends="python3 wget unzip"
+configure_args="-DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3"
makedepends="fmt-devel"
short_desc="Modern C++17 Unicode library"
maintainer="0x5c <dev@0x5c.io>"
license="Apache-2.0"
homepage="https://github.com/contour-terminal/libunicode"
changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
-distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz"
-checksum=a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz
+ https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip"
+checksum="a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+ 5fbde400f3e687d25cc9b0a8d30d7619e76cb2f4c3e85ba9df8ec1312cb6718c"
+skip_extraction="UCD.zip"
+
+if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+ broken="32bit architectures not currently supported, problems with SIMD"
+fi
post_extract() {
- mkdir -p _ucd
- wget -O "_ucd/ucd-${_ucd_version}.zip" https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip
+ mkdir _ucd
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/UCD.zip" "_ucd/ucd-${_ucd_version}.zip"
}
libunicode-devel_package() {
From 520267c100c8cdd9cc825b93f71d26a18b2f9e68 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 04:01:05 -0500
Subject: [PATCH 08/10] fixup: contour
---
srcpkgs/contour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
index 638d0f51645e5..1c25b96839460 100644
--- a/srcpkgs/contour/template
+++ b/srcpkgs/contour/template
@@ -3,7 +3,7 @@ pkgname=contour
version=0.4.0.6245
revision=1
build_style=cmake
-configure_args="-DCMAKE_BUILD_TYPE=Release -DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
-DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
hostmakedepends="pkg-config"
makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
From f5f0331db2f8f84fe32895c5869661afb0b66e12 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 04:24:25 -0500
Subject: [PATCH 09/10] fixup: contour 2
---
srcpkgs/contour/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
index 1c25b96839460..1351baed0670c 100644
--- a/srcpkgs/contour/template
+++ b/srcpkgs/contour/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
-DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config qt6-base qt6-tools"
makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
From 4bcb078a13aeb50b3116fbd0121f8abc6d3624ee Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 05:14:18 -0500
Subject: [PATCH 10/10] contour: fixup 3
---
srcpkgs/contour/patches/0000-phtread_musl.patch | 15 +++++++++++++++
srcpkgs/contour/template | 1 +
2 files changed, 16 insertions(+)
create mode 100644 srcpkgs/contour/patches/0000-phtread_musl.patch
diff --git a/srcpkgs/contour/patches/0000-phtread_musl.patch b/srcpkgs/contour/patches/0000-phtread_musl.patch
new file mode 100644
index 0000000000000..557112d8b81d0
--- /dev/null
+++ b/srcpkgs/contour/patches/0000-phtread_musl.patch
@@ -0,0 +1,15 @@
+--- a/src/crispy/utils.cpp
++++ b/src/crispy/utils.cpp
+@@ -31,8 +31,12 @@
+ }
+ return ""s;
+ #else
++ #ifdef __GLIBC__
+ char text[32] = {};
+ pthread_getname_np(pthread_self(), text, sizeof(text));
+ return text;
++ #else
++ return ""s;
++ #endif
+ #endif
+ }
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
index 1351baed0670c..eeea40c73b734 100644
--- a/srcpkgs/contour/template
+++ b/srcpkgs/contour/template
@@ -3,6 +3,7 @@ pkgname=contour
version=0.4.0.6245
revision=1
build_style=cmake
+build_helper=qemu
configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
-DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
hostmakedepends="pkg-config qt6-base qt6-tools"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (9 preceding siblings ...)
2023-12-20 10:14 ` 0x5c
@ 2023-12-20 10:58 ` 0x5c
2023-12-20 10:58 ` 0x5c
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 10:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1574 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.
I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 7774 bytes --]
From a37cfb23ad798a789aebf49dea3302fbb50e40d0 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/4] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From 80fd2e5d8ce215799a8cab36e2e2497e136bf31c Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/4] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..267e125a78b9c
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,11 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From 19638139787c63ae48a2bfd464c15d06ebae2ae4 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/4] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 39 +++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index a45654c4fa3cf..b5fcc05469326 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,6 @@ libdraco.so.8 draco-1.5.6_1
libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..37a8b80fd19cd
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,39 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+build_helper="qemu"
+configure_args="-DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz
+ https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip"
+checksum="a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+ 5fbde400f3e687d25cc9b0a8d30d7619e76cb2f4c3e85ba9df8ec1312cb6718c"
+skip_extraction="UCD.zip"
+
+if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+ broken="32bit architectures not currently supported, problems with SIMD"
+fi
+
+post_extract() {
+ mkdir _ucd
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/UCD.zip" "_ucd/ucd-${_ucd_version}.zip"
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From f046b4a7d22c80e0c5dd341634ac4a5c86234591 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/4] New package: contour-0.4.0.6245
---
srcpkgs/contour-shell-integration | 1 +
srcpkgs/contour-terminfo | 1 +
.../contour/patches/0000-phtread_musl.patch | 15 ++++++++
srcpkgs/contour/template | 34 +++++++++++++++++++
4 files changed, 51 insertions(+)
create mode 120000 srcpkgs/contour-shell-integration
create mode 120000 srcpkgs/contour-terminfo
create mode 100644 srcpkgs/contour/patches/0000-phtread_musl.patch
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour-shell-integration b/srcpkgs/contour-shell-integration
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-shell-integration
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour-terminfo b/srcpkgs/contour-terminfo
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-terminfo
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour/patches/0000-phtread_musl.patch b/srcpkgs/contour/patches/0000-phtread_musl.patch
new file mode 100644
index 0000000000000..557112d8b81d0
--- /dev/null
+++ b/srcpkgs/contour/patches/0000-phtread_musl.patch
@@ -0,0 +1,15 @@
+--- a/src/crispy/utils.cpp
++++ b/src/crispy/utils.cpp
+@@ -31,8 +31,12 @@
+ }
+ return ""s;
+ #else
++ #ifdef __GLIBC__
+ char text[32] = {};
+ pthread_getname_np(pthread_self(), text, sizeof(text));
+ return text;
++ #else
++ return ""s;
++ #endif
+ #endif
+ }
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..aac23691efae1
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,34 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.0.6245
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config qt6-base qt6-tools"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+depends="contour-terminfo-${version}_${revision} contour-shell-integration-${version}_${revision}"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=a46ee637d793d72ffdc8b0570b9cc1ba90729d2fa5b571b74b815c7562ec8894
+
+contour-terminfo_package() {
+ short_desc+=" - terminfo data"
+ pkg_install() {
+ vmove usr/share/terminfo
+ }
+}
+
+contour-shell-integration_package() {
+ short_desc+=" - shell integration scripts"
+ pkg_install() {
+ vmove usr/share/contour/shell-integration
+ }
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (10 preceding siblings ...)
2023-12-20 10:58 ` 0x5c
@ 2023-12-20 10:58 ` 0x5c
2023-12-20 10:58 ` 0x5c
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 10:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode]
- `build_helper=qemu` is made of :magic_wand: *Magic* :sparkles:
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
- Upstream says it's not supported (yet), marking broken
- x86_64-musl (all-musl?): pthread sadness [contour]
- in musl land, you don't get a thread name
- aarch64: ??? [contour]
- `qt6-base qt6-tools` in hostmakedepends, duh
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (11 preceding siblings ...)
2023-12-20 10:58 ` 0x5c
@ 2023-12-20 10:58 ` 0x5c
2023-12-31 7:04 ` [PR PATCH] [Updated] " 0x5c
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-20 10:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode & contour]
- `build_helper=qemu` is made of :magic_wand: *Magic* :sparkles:
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
- Upstream says it's not supported (yet), marking broken
- x86_64-musl (all-musl?): pthread sadness [contour]
- in musl land, you don't get a thread name
- aarch64: ??? [contour]
- `qt6-base qt6-tools` in hostmakedepends, duh
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (12 preceding siblings ...)
2023-12-20 10:58 ` 0x5c
@ 2023-12-31 7:04 ` 0x5c
2023-12-31 7:07 ` 0x5c
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-31 7:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
~~`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.~~ With feedback, the tool is now left in the main package.
~~I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.~~ While having it as a distfile is still a but annoying, it's way less clunky.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 7775 bytes --]
From 7454be4a01eb18ce5c3e959c20c8a4c1c6428d2c Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/4] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From 20f42184eca724784c9d998407b0d92d71f96c15 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/4] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..267e125a78b9c
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,11 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From f804db435fc619f6a027104d2cfa461fb4950654 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/4] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 39 +++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index c1792cffc77e4..00b4f5827e1cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4278,3 +4278,6 @@ libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
libsqsh.so.1 libsqsh-1.3.0_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..37a8b80fd19cd
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,39 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+build_helper="qemu"
+configure_args="-DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz
+ https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip"
+checksum="a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+ 5fbde400f3e687d25cc9b0a8d30d7619e76cb2f4c3e85ba9df8ec1312cb6718c"
+skip_extraction="UCD.zip"
+
+if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+ broken="32bit architectures not currently supported, problems with SIMD"
+fi
+
+post_extract() {
+ mkdir _ucd
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/UCD.zip" "_ucd/ucd-${_ucd_version}.zip"
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From 10de4dc84098020b59764d848fda16eff7c271fd Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/4] New package: contour-0.4.0.6245
---
srcpkgs/contour-shell-integration | 1 +
srcpkgs/contour-terminfo | 1 +
.../contour/patches/0000-phtread_musl.patch | 15 ++++++++
srcpkgs/contour/template | 34 +++++++++++++++++++
4 files changed, 51 insertions(+)
create mode 120000 srcpkgs/contour-shell-integration
create mode 120000 srcpkgs/contour-terminfo
create mode 100644 srcpkgs/contour/patches/0000-phtread_musl.patch
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour-shell-integration b/srcpkgs/contour-shell-integration
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-shell-integration
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour-terminfo b/srcpkgs/contour-terminfo
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-terminfo
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour/patches/0000-phtread_musl.patch b/srcpkgs/contour/patches/0000-phtread_musl.patch
new file mode 100644
index 0000000000000..557112d8b81d0
--- /dev/null
+++ b/srcpkgs/contour/patches/0000-phtread_musl.patch
@@ -0,0 +1,15 @@
+--- a/src/crispy/utils.cpp
++++ b/src/crispy/utils.cpp
+@@ -31,8 +31,12 @@
+ }
+ return ""s;
+ #else
++ #ifdef __GLIBC__
+ char text[32] = {};
+ pthread_getname_np(pthread_self(), text, sizeof(text));
+ return text;
++ #else
++ return ""s;
++ #endif
+ #endif
+ }
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..aac23691efae1
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,34 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.0.6245
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config qt6-base qt6-tools"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+depends="contour-terminfo-${version}_${revision} contour-shell-integration-${version}_${revision}"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=a46ee637d793d72ffdc8b0570b9cc1ba90729d2fa5b571b74b815c7562ec8894
+
+contour-terminfo_package() {
+ short_desc+=" - terminfo data"
+ pkg_install() {
+ vmove usr/share/terminfo
+ }
+}
+
+contour-shell-integration_package() {
+ short_desc+=" - shell integration scripts"
+ pkg_install() {
+ vmove usr/share/contour/shell-integration
+ }
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (13 preceding siblings ...)
2023-12-31 7:04 ` [PR PATCH] [Updated] " 0x5c
@ 2023-12-31 7:07 ` 0x5c
2024-01-01 5:16 ` [PR PATCH] [Updated] " 0x5c
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2023-12-31 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 616 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#issuecomment-1864030201
Comment:
Inventory of failure:
- cross archs: build tool is compiled for target [libunicode & contour]
→ `build_helper=qemu` is made of :magic_wand: *Magic* :sparkles:
- ~~i686 (glibc)~~ 32bit archs: c++ intrinsics sadness [libunicode]
→ Upstream says it's not supported (yet), marking broken
- x86_64-musl (all-musl?): pthread sadness [contour]
→ in musl land, you don't get a thread name
- aarch64: ??? [contour]
→ `qt6-base qt6-tools` in hostmakedepends, duh
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (14 preceding siblings ...)
2023-12-31 7:07 ` 0x5c
@ 2024-01-01 5:16 ` 0x5c
2024-01-05 5:22 ` [PR REVIEW] " classabbyamp
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2024-01-01 5:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
~~`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.~~ With feedback, the tool is now left in the main package.
~~I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.~~ While having it as a distfile is still a but annoying, it's way less clunky.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 7775 bytes --]
From 7454be4a01eb18ce5c3e959c20c8a4c1c6428d2c Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/4] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From 20f42184eca724784c9d998407b0d92d71f96c15 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/4] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..267e125a78b9c
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,11 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From f804db435fc619f6a027104d2cfa461fb4950654 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/4] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 39 +++++++++++++++++++++++++++++++++++++
3 files changed, 43 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index c1792cffc77e4..00b4f5827e1cd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4278,3 +4278,6 @@ libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
libsqsh.so.1 libsqsh-1.3.0_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..37a8b80fd19cd
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,39 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+build_helper="qemu"
+configure_args="-DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz
+ https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip"
+checksum="a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+ 5fbde400f3e687d25cc9b0a8d30d7619e76cb2f4c3e85ba9df8ec1312cb6718c"
+skip_extraction="UCD.zip"
+
+if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+ broken="32bit architectures not currently supported, problems with SIMD"
+fi
+
+post_extract() {
+ mkdir _ucd
+ cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/UCD.zip" "_ucd/ucd-${_ucd_version}.zip"
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From 1d30b46c48a485344c21fb4669b9c371b996eca9 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/4] New package: contour-0.4.1.6292
---
srcpkgs/contour-shell-integration | 1 +
srcpkgs/contour-terminfo | 1 +
.../contour/patches/0000-phtread_musl.patch | 15 ++++++++
srcpkgs/contour/template | 34 +++++++++++++++++++
4 files changed, 51 insertions(+)
create mode 120000 srcpkgs/contour-shell-integration
create mode 120000 srcpkgs/contour-terminfo
create mode 100644 srcpkgs/contour/patches/0000-phtread_musl.patch
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour-shell-integration b/srcpkgs/contour-shell-integration
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-shell-integration
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour-terminfo b/srcpkgs/contour-terminfo
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-terminfo
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour/patches/0000-phtread_musl.patch b/srcpkgs/contour/patches/0000-phtread_musl.patch
new file mode 100644
index 0000000000000..557112d8b81d0
--- /dev/null
+++ b/srcpkgs/contour/patches/0000-phtread_musl.patch
@@ -0,0 +1,15 @@
+--- a/src/crispy/utils.cpp
++++ b/src/crispy/utils.cpp
+@@ -31,8 +31,12 @@
+ }
+ return ""s;
+ #else
++ #ifdef __GLIBC__
+ char text[32] = {};
+ pthread_getname_np(pthread_self(), text, sizeof(text));
+ return text;
++ #else
++ return ""s;
++ #endif
+ #endif
+ }
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..6dda7c2ed8e89
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,34 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.1.6292
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config qt6-base qt6-tools"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+depends="contour-terminfo-${version}_${revision} contour-shell-integration-${version}_${revision}"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=3755dd93065b7cfab7eafedf6c2e8c00b9ca1b028f9fa2742905efe06f6084d1
+
+contour-terminfo_package() {
+ short_desc+=" - terminfo data"
+ pkg_install() {
+ vmove usr/share/terminfo
+ }
+}
+
+contour-shell-integration_package() {
+ short_desc+=" - shell integration scripts"
+ pkg_install() {
+ vmove usr/share/contour/shell-integration
+ }
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (17 preceding siblings ...)
2024-01-05 5:22 ` classabbyamp
@ 2024-01-05 5:22 ` classabbyamp
2024-01-05 23:05 ` [PR PATCH] [Updated] " 0x5c
2024-01-06 1:32 ` [PR PATCH] [Merged]: " classabbyamp
20 siblings, 0 replies; 22+ messages in thread
From: classabbyamp @ 2024-01-05 5:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 213 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#discussion_r1442504355
Comment:
```suggestion
vsrccopy "ucd-${_ucd_version}.zip" _ucd
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (15 preceding siblings ...)
2024-01-01 5:16 ` [PR PATCH] [Updated] " 0x5c
@ 2024-01-05 5:22 ` classabbyamp
2024-01-05 5:22 ` classabbyamp
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: classabbyamp @ 2024-01-05 5:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#discussion_r1442504631
Comment:
```suggestion
skip_extraction="ucd-${_ucd_version}.zip"
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (16 preceding siblings ...)
2024-01-05 5:22 ` [PR REVIEW] " classabbyamp
@ 2024-01-05 5:22 ` classabbyamp
2024-01-05 5:22 ` classabbyamp
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: classabbyamp @ 2024-01-05 5:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/47845#discussion_r1442504071
Comment:
```suggestion
https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip>ucd-${_ucd_version}.zip"
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (18 preceding siblings ...)
2024-01-05 5:22 ` classabbyamp
@ 2024-01-05 23:05 ` 0x5c
2024-01-06 1:32 ` [PR PATCH] [Merged]: " classabbyamp
20 siblings, 0 replies; 22+ messages in thread
From: 0x5c @ 2024-01-05 23:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1716 bytes --]
There is an updated pull request by 0x5c against master on the void-packages repository
https://github.com/0x5c/void-packages new/contour
https://github.com/void-linux/void-packages/pull/47845
New package: contour-0.4.0.6245
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
~~`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.~~ With feedback, the tool is now left in the main package.
~~I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.~~ While having it as a distfile is still a but annoying, it's way less clunky.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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/47845.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/contour-47845.patch --]
[-- Type: text/x-diff, Size: 7757 bytes --]
From 2f579183aa62ef816f09ae27e24db9c886893420 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:23 -0500
Subject: [PATCH 1/4] New package: guidelines-support-library-4.0.0
---
srcpkgs/guidelines-support-library/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/guidelines-support-library/template
diff --git a/srcpkgs/guidelines-support-library/template b/srcpkgs/guidelines-support-library/template
new file mode 100644
index 0000000000000..af77bd4941733
--- /dev/null
+++ b/srcpkgs/guidelines-support-library/template
@@ -0,0 +1,16 @@
+# Template file for 'guidelines-support-library'
+pkgname=guidelines-support-library
+version=4.0.0
+revision=1
+build_style=cmake
+configure_args="-DGSL_TEST:BOOL=OFF"
+short_desc="C++ Guidelines Support Library"
+maintainer="0x5c <dev@0x5c.io>"
+license="MIT"
+homepage="https://github.com/microsoft/GSL"
+distfiles="https://github.com/microsoft/GSL/archive/refs/tags/v${version}.tar.gz"
+checksum=f0e32cb10654fea91ad56bde89170d78cfbf4363ee0b01d8f097de2ba49f6ce9
+
+post_install() {
+ vlicense LICENSE
+}
From 628fcca5d9daeec3736a4022745178e9677e1cf8 Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Wed, 20 Dec 2023 02:29:08 -0500
Subject: [PATCH 2/4] New package: boxed-cpp-1.1.0
---
srcpkgs/boxed-cpp/template | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/boxed-cpp/template
diff --git a/srcpkgs/boxed-cpp/template b/srcpkgs/boxed-cpp/template
new file mode 100644
index 0000000000000..267e125a78b9c
--- /dev/null
+++ b/srcpkgs/boxed-cpp/template
@@ -0,0 +1,11 @@
+# Template file for 'boxed-cpp'
+pkgname=boxed-cpp
+version=1.1.0
+revision=1
+build_style=cmake
+short_desc="Boxing primitive types in C++"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/boxed-cpp"
+distfiles="https://github.com/contour-terminal/boxed-cpp/archive/refs/tags/v${version}.tar.gz"
+checksum=dd1c78c3bad24e777bc33aa19e8e8efb8c579f8faa3220592c3aae4d7b103bf0
From c5d184f540065493e33b6163bd11d3291ebfe6dd Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:42 -0500
Subject: [PATCH 3/4] New package: libunicode-0.4.0
---
common/shlibs | 3 +++
srcpkgs/libunicode-devel | 1 +
srcpkgs/libunicode/template | 38 +++++++++++++++++++++++++++++++++++++
3 files changed, 42 insertions(+)
create mode 120000 srcpkgs/libunicode-devel
create mode 100644 srcpkgs/libunicode/template
diff --git a/common/shlibs b/common/shlibs
index dcdcacac70bc4..1d38ebfb5efbb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4277,3 +4277,6 @@ libpdal_base.so.15 libpdal-2.5.6_1
libpdal_util.so.15 libpdal-2.5.6_1
libdisplay-info.so.1 libdisplay-info-0.1.1_1
libsqsh.so.1 libsqsh-1.3.0_1
+libunicode.so.0.4 libunicode-0.4.0_1
+libunicode_ucd.so.0.4 libunicode-0.4.0_1
+libunicode_loader.so.0.4 libunicode-0.4.0_1
diff --git a/srcpkgs/libunicode-devel b/srcpkgs/libunicode-devel
new file mode 120000
index 0000000000000..3ee4071cb0f23
--- /dev/null
+++ b/srcpkgs/libunicode-devel
@@ -0,0 +1 @@
+libunicode
\ No newline at end of file
diff --git a/srcpkgs/libunicode/template b/srcpkgs/libunicode/template
new file mode 100644
index 0000000000000..d79dd26d22937
--- /dev/null
+++ b/srcpkgs/libunicode/template
@@ -0,0 +1,38 @@
+# Template file for 'libunicode'
+pkgname=libunicode
+version=0.4.0
+revision=1
+_ucd_version=15.0.0
+build_style=cmake
+build_helper="qemu"
+configure_args="-DLIBUNICODE_TESTING=OFF"
+hostmakedepends="python3"
+makedepends="fmt-devel"
+short_desc="Modern C++17 Unicode library"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="https://github.com/contour-terminal/libunicode"
+changelog="https://github.com/contour-terminal/libunicode/raw/master/Changelog.md"
+distfiles="https://github.com/contour-terminal/libunicode/archive/refs/tags/v${version}.tar.gz
+ https://www.unicode.org/Public/${_ucd_version}/ucd/UCD.zip>ucd-${_ucd_version}.zip"
+checksum="a5c8ba2cd3df539985bfafe43f812de143a56f01e4074e95831a37a13606beda
+ 5fbde400f3e687d25cc9b0a8d30d7619e76cb2f4c3e85ba9df8ec1312cb6718c"
+skip_extraction="ucd-${_ucd_version}.zip"
+
+if [ "$XBPS_TARGET_WORDSIZE" -eq 32 ]; then
+ broken="32bit architectures not currently supported, problems with SIMD"
+fi
+
+post_extract() {
+ vsrccopy "ucd-${_ucd_version}.zip" _ucd
+}
+
+libunicode-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/cmake
+ }
+}
From bd3a794d446c4a37466e0a88436e61d3ac880f8b Mon Sep 17 00:00:00 2001
From: 0x5c <dev@0x5c.io>
Date: Mon, 11 Dec 2023 07:22:56 -0500
Subject: [PATCH 4/4] New package: contour-0.4.1.6292
---
srcpkgs/contour-shell-integration | 1 +
srcpkgs/contour-terminfo | 1 +
.../contour/patches/0000-phtread_musl.patch | 15 ++++++++
srcpkgs/contour/template | 34 +++++++++++++++++++
4 files changed, 51 insertions(+)
create mode 120000 srcpkgs/contour-shell-integration
create mode 120000 srcpkgs/contour-terminfo
create mode 100644 srcpkgs/contour/patches/0000-phtread_musl.patch
create mode 100644 srcpkgs/contour/template
diff --git a/srcpkgs/contour-shell-integration b/srcpkgs/contour-shell-integration
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-shell-integration
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour-terminfo b/srcpkgs/contour-terminfo
new file mode 120000
index 0000000000000..3a8fa0e2050f0
--- /dev/null
+++ b/srcpkgs/contour-terminfo
@@ -0,0 +1 @@
+contour
\ No newline at end of file
diff --git a/srcpkgs/contour/patches/0000-phtread_musl.patch b/srcpkgs/contour/patches/0000-phtread_musl.patch
new file mode 100644
index 0000000000000..557112d8b81d0
--- /dev/null
+++ b/srcpkgs/contour/patches/0000-phtread_musl.patch
@@ -0,0 +1,15 @@
+--- a/src/crispy/utils.cpp
++++ b/src/crispy/utils.cpp
+@@ -31,8 +31,12 @@
+ }
+ return ""s;
+ #else
++ #ifdef __GLIBC__
+ char text[32] = {};
+ pthread_getname_np(pthread_self(), text, sizeof(text));
+ return text;
++ #else
++ return ""s;
++ #endif
+ #endif
+ }
diff --git a/srcpkgs/contour/template b/srcpkgs/contour/template
new file mode 100644
index 0000000000000..6dda7c2ed8e89
--- /dev/null
+++ b/srcpkgs/contour/template
@@ -0,0 +1,34 @@
+# Template file for 'contour'
+pkgname=contour
+version=0.4.1.6292
+revision=1
+build_style=cmake
+build_helper="qemu"
+configure_args="-DCONTOUR_QT_VERSION=6 -DCONTOUR_TESTING=OFF
+ -DCRISPY_TESTING=OFF -DVTPARSER_TESTING=OFF -DLIBTERMINAL_TESTING=OFF"
+hostmakedepends="pkg-config qt6-base qt6-tools"
+makedepends="boxed-cpp fmt-devel guidelines-support-library freetype-devel
+ harfbuzz-devel libunicode-devel libutempter-devel range-v3 yaml-cpp-devel
+ qt6-base-devel qt6-core qt6-declarative-devel qt6-gui qt6-multimedia-devel
+ qt6-network qt6-opengl-widgets qt6-qt5compat-devel qt6-widgets"
+depends="contour-terminfo-${version}_${revision} contour-shell-integration-${version}_${revision}"
+short_desc="Modern C++ Terminal Emulator"
+maintainer="0x5c <dev@0x5c.io>"
+license="Apache-2.0"
+homepage="http://contour-terminal.org/"
+distfiles="https://github.com/contour-terminal/contour/archive/refs/tags/v${version}.tar.gz"
+checksum=3755dd93065b7cfab7eafedf6c2e8c00b9ca1b028f9fa2742905efe06f6084d1
+
+contour-terminfo_package() {
+ short_desc+=" - terminfo data"
+ pkg_install() {
+ vmove usr/share/terminfo
+ }
+}
+
+contour-shell-integration_package() {
+ short_desc+=" - shell integration scripts"
+ pkg_install() {
+ vmove usr/share/contour/shell-integration
+ }
+}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Merged]: New package: contour-0.4.0.6245
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
` (19 preceding siblings ...)
2024-01-05 23:05 ` [PR PATCH] [Updated] " 0x5c
@ 2024-01-06 1:32 ` classabbyamp
20 siblings, 0 replies; 22+ messages in thread
From: classabbyamp @ 2024-01-06 1:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1562 bytes --]
There's a merged pull request on the void-packages repository
New package: contour-0.4.0.6245
https://github.com/void-linux/void-packages/pull/47845
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
Fixes #34513
~~`libunicode` provides a tool, currently packaged in `-devel`, should it be somewhere else? It's a simple tool that provides info on characters passed as argument.~~ With feedback, the tool is now left in the main package.
~~I'm also not a fan of the way I have to download the Unicode UCD archive manually. The `linunicode` build system tries to do it, but it fails locally in xbps-src.~~ While having it as a distfile is still a but annoying, it's way less clunky.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### 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
-->
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2024-01-06 1:32 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-20 7:48 [PR PATCH] New package: contour-0.4.0.6245 0x5c
2023-12-20 8:04 ` 0x5c
2023-12-20 8:09 ` [PR PATCH] [Updated] " 0x5c
2023-12-20 8:13 ` 0x5c
2023-12-20 8:16 ` 0x5c
2023-12-20 8:19 ` 0x5c
2023-12-20 8:20 ` 0x5c
2023-12-20 9:01 ` [PR PATCH] [Updated] " 0x5c
2023-12-20 9:03 ` 0x5c
2023-12-20 9:24 ` [PR PATCH] [Updated] " 0x5c
2023-12-20 10:14 ` 0x5c
2023-12-20 10:58 ` 0x5c
2023-12-20 10:58 ` 0x5c
2023-12-20 10:58 ` 0x5c
2023-12-31 7:04 ` [PR PATCH] [Updated] " 0x5c
2023-12-31 7:07 ` 0x5c
2024-01-01 5:16 ` [PR PATCH] [Updated] " 0x5c
2024-01-05 5:22 ` [PR REVIEW] " classabbyamp
2024-01-05 5:22 ` classabbyamp
2024-01-05 5:22 ` classabbyamp
2024-01-05 23:05 ` [PR PATCH] [Updated] " 0x5c
2024-01-06 1:32 ` [PR PATCH] [Merged]: " classabbyamp
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).