Re: [PR PATCH] [Updated] New package: contour-0.4.0.6245

[0x5c <0x5c@users.noreply.github.com>]

[-- 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
+	}
+}