Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] update libkeyfinder catch2
@ 2023-10-01 16:12 sgn
  2023-10-01 16:39 ` [PR PATCH] [Updated] " sgn
  2023-10-02  3:45 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2023-10-01 16:12 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages libkeyfinder-catch2
https://github.com/void-linux/void-packages/pull/46351

update libkeyfinder catch2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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/46351.patch is attached

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

From b3cc1fcc907ab17d8140f709d7748fdaf65e57dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 21:55:06 +0700
Subject: [PATCH 1/7] catch2: update to 3.4.0.

---
 srcpkgs/catch2/patches/musl-test.patch | 15 ---------------
 srcpkgs/catch2/template                |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/catch2/patches/musl-test.patch

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/musl-test.patch
deleted file mode 100644
index 481a5930dbdf2..0000000000000
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
---- a/scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
-+++ b/scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
-@@ -44,7 +44,7 @@
- 
- # errno macro expands into various names depending on platform, so we need to fix them up as well
- errnoParser = re.compile(r'''
--    \(\*__errno_location\ \(\)\)
-+    \(\*__errno_location\s*\(\)\)
-     |
-     \(\*__error\(\)\)
-     |
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index 71ad84a696bcf..92f07bd8029e8 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,6 +1,6 @@
 # Template file for 'catch2'
 pkgname=catch2
-version=2.13.10
+version=3.4.0
 revision=1
 build_style=cmake
 configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON
@@ -13,7 +13,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="BSL-1.0"
 homepage="https://github.com/catchorg/Catch2"
 distfiles="https://github.com/catchorg/Catch2/archive/v${version}/catch2-v${version}.tar.gz"
-checksum=d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943
+checksum=122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb
 
 post_install() {
 	vlicense LICENSE.txt

From 54197f5dbc808e6e396f723cc8242721a0ae8142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 21:55:19 +0700
Subject: [PATCH 2/7] libkeyfinder: update to 2.2.8.

---
 srcpkgs/libkeyfinder/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libkeyfinder/template b/srcpkgs/libkeyfinder/template
index 18d83051fb33c..6ae29ec472f57 100644
--- a/srcpkgs/libkeyfinder/template
+++ b/srcpkgs/libkeyfinder/template
@@ -1,9 +1,8 @@
 # Template file for 'libkeyfinder'
 pkgname=libkeyfinder
-version=2.2.7
+version=2.2.8
 revision=1
 build_style=cmake
-hostmakedepends=""
 makedepends="fftw-devel catch2"
 short_desc="Small C++11 library for estimating the musical key of digital audio"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -11,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://mixxxdj.github.io/libkeyfinder/"
 changelog="https://raw.githubusercontent.com/mixxxdj/libkeyfinder/main/CHANGELOG.md"
 distfiles="https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/${version}.tar.gz"
-checksum=57dbd89c90b451e449d4652a29f078a90b847fefb29a242ab3c886f39d5d6998
+checksum=a54fc6c5ff435bb4b447f175bc97f9081fb5abf0edd5d125e6f5215c8fff4d11
 
 libkeyfinder-devel_package() {
 	short_desc+=" - development files"

From 6a12862c36339e3994883bf69570becb48d8f3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 22:11:03 +0700
Subject: [PATCH 3/7] cppcodec: fix for new catch2

---
 srcpkgs/cppcodec/patches/new-catch2.patch | 22 ++++++++++++++++++++++
 srcpkgs/cppcodec/template                 |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/cppcodec/patches/new-catch2.patch

diff --git a/srcpkgs/cppcodec/patches/new-catch2.patch b/srcpkgs/cppcodec/patches/new-catch2.patch
new file mode 100644
index 0000000000000..3615ae6191d19
--- /dev/null
+++ b/srcpkgs/cppcodec/patches/new-catch2.patch
@@ -0,0 +1,22 @@
+--- a/test/test_cppcodec.cpp
++++ b/test/test_cppcodec.cpp
+@@ -22,7 +22,7 @@
+  */
+ 
+ #define CATCH_CONFIG_MAIN
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+ 
+ #include <cppcodec/base32_crockford.hpp>
+ #include <cppcodec/base32_hex.hpp>
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -15,6 +15,8 @@ else()
+ endif()
+ 
+ add_executable(test_cppcodec test_cppcodec.cpp)
++find_package(Catch2)
++target_link_libraries(test_cppcodec Catch2::Catch2WithMain)
+ add_test(cppcodec test_cppcodec)
+ 
+ add_executable(benchmark_cppcodec benchmark_cppcodec.cpp)
diff --git a/srcpkgs/cppcodec/template b/srcpkgs/cppcodec/template
index 927fae91cbe87..b7ca3fdd20cc8 100644
--- a/srcpkgs/cppcodec/template
+++ b/srcpkgs/cppcodec/template
@@ -3,6 +3,7 @@ pkgname=cppcodec
 version=0.2
 revision=1
 build_style=cmake
+configure_args="-DCMAKE_CXX_STANDARD=17"
 hostmakedepends="pkg-config"
 makedepends="catch2"
 short_desc="Header-only C++11 library to encode/decode base64*, base32* and hex"

From 27f0cd9752930737702ca44167ad42b7a7e46453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 22:25:18 +0700
Subject: [PATCH 4/7] j4-dmenu-desktop: patch for new catch2

---
 .../j4-dmenu-desktop/patches/new-catch2.patch | 110 ++++++++++++++++++
 srcpkgs/j4-dmenu-desktop/template             |  12 +-
 2 files changed, 114 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch

diff --git a/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch b/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch
new file mode 100644
index 0000000000000..618a82fad977a
--- /dev/null
+++ b/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch
@@ -0,0 +1,110 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,18 +5,14 @@ project(j4-dmenu)
+ option(WITH_TESTS "Build and run tests" ON)
+ option(WITH_GIT_CATCH "Use a Git checkout of Catch to build the tests" ON)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
+-  set(CXX_OPT "-std=c++0x")
+-else()
+-  set(CXX_OPT "-std=c++11")
+-endif()
+-
++set(CMAKE_CXX_STANDARD 11)
+ # _WITH_GETLINE for FreeBSD
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2 -D_WITH_GETLINE")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ 
+ if(WITH_TESTS)
+   enable_testing(true)
++  find_package(Catch2)
+   add_test(
+           NAME j4-dmenu-tests
+           COMMAND j4-dmenu-tests
+@@ -25,6 +21,8 @@ if(WITH_TESTS)
+           j4-dmenu-tests
+           src/Test.cc
+   )
++  set_property(TARGET j4-dmenu-tests PROPERTY CXX_STANDARD 17)
++  target_link_libraries(j4-dmenu-tests Catch2::Catch2WithMain)
+   add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
+ 
+   if(WITH_GIT_CATCH)
+--- a/src/Test.cc
++++ b/src/Test.cc
+@@ -1,8 +1,7 @@
+ 
+ //#include "Application.hh"
+ 
+-#define CATCH_CONFIG_MAIN
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ static const std::string test_files = TEST_FILES;
+ 
+--- a/src/TestApplication.cc
++++ b/src/TestApplication.cc
+@@ -5,7 +5,7 @@
+ 
+ #include "Application.hh"
+ #include "LocaleSuffixes.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("Application/invalid_file", "")
+ {
+--- a/src/TestApplicationRunner.cc
++++ b/src/TestApplicationRunner.cc
+@@ -3,7 +3,7 @@
+ #include "Application.hh"
+ #include "ApplicationRunner.hh"
+ #include "LocaleSuffixes.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("ApplicationRunner/escape", "Regression test for issue #18, %c was not escaped")
+ {
+--- a/src/TestFileFinder.cc
++++ b/src/TestFileFinder.cc
+@@ -3,7 +3,7 @@
+ #include <vector>
+ 
+ #include "FileFinder.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ std::vector<std::string> ff2l(FileFinder &ff)
+ {
+--- a/src/TestFormatters.cc
++++ b/src/TestFormatters.cc
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string>
+ 
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ #include "Application.hh"
+ #include "LocaleSuffixes.hh"
+--- a/src/TestLocaleSuffixes.cc
++++ b/src/TestLocaleSuffixes.cc
+@@ -1,7 +1,7 @@
+ #include <string.h>
+ 
+ #include "LocaleSuffixes.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("LocaleSuffixes/with_encoding", "")
+ {
+--- a/src/TestSearchPath.cc
++++ b/src/TestSearchPath.cc
+@@ -5,7 +5,7 @@
+ #include <vector>
+ 
+ #include "SearchPath.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("SearchPath/XDG_DATA_HOME", "Check SearchPath honors XDG_DATA_HOME")
+ {
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 29db90fca23b3..38f842eb0f5f6 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -3,11 +3,14 @@ pkgname=j4-dmenu-desktop
 version=2.18
 revision=3
 build_style=cmake
+configure_args="-DWITH_GIT_CATCH=OFF
+ -DCATCH_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/catch2"
 # The current version (2.18) needs to have /usr/share/applications dir
 # for tests, xterm creates and populates it with its .desktop files,
 # which fixes tests in case the dir does not exist.
 # https://github.com/enkore/j4-dmenu-desktop/pull/123
-checkdepends="catch2 xterm"
+makedepends="catch2"
+checkdepends="xterm"
 short_desc="Fast desktop menu"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -15,13 +18,6 @@ homepage="https://github.com/enkore/j4-dmenu-desktop"
 distfiles="https://github.com/enkore/j4-dmenu-desktop/archive/r${version}.tar.gz"
 checksum=77c5605d0c1291bcf1e13b186ea3b32ddf4753de0d0e39127b4a7d2098393e25
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-DWITH_GIT_CATCH=OFF
-	 -DCATCH_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/catch2"
-else
-	configure_args="-DWITH_TESTS=OFF"
-fi
-
 post_install() {
 	vman j4-dmenu-desktop.1
 }

From 5377060a6ad6a6b7bb7114a3934af67c3fe5bf44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 23:02:35 +0700
Subject: [PATCH 5/7] libnest2d: fix for new catch2

---
 srcpkgs/libnest2d/patches/new-catch2.patch | 32 ++++++++++++++++++++++
 srcpkgs/libnest2d/template                 |  1 -
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libnest2d/patches/new-catch2.patch

diff --git a/srcpkgs/libnest2d/patches/new-catch2.patch b/srcpkgs/libnest2d/patches/new-catch2.patch
new file mode 100644
index 0000000000000..d2dbd3d8b117b
--- /dev/null
+++ b/srcpkgs/libnest2d/patches/new-catch2.patch
@@ -0,0 +1,32 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-require_package(Catch2 2.9.1 REQUIRED NO_EXPORT)
++require_package(Catch2 "" REQUIRED NO_EXPORT)
+ 
+ add_executable(tests_clipper_nlopt
+     test.cpp
+@@ -14,5 +14,5 @@ if (MSVC)
+ target_compile_options(tests_clipper_nlopt PRIVATE /bigobj)
+ endif ()
+ 
+-target_link_libraries(tests_clipper_nlopt libnest2d Catch2::Catch2)
++target_link_libraries(tests_clipper_nlopt libnest2d Catch2::Catch2WithMain)
+ add_test(libnest2d_tests tests_clipper_nlopt)
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -1,5 +1,4 @@
+-#define CATCH_CONFIG_MAIN
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+ 
+ #include <fstream>
+ 
+@@ -29,6 +28,7 @@ template<> struct _NumTag<LargeInt> { us
+ template<class T> struct _NumTag<boost::rational<T>> { using Type = RationalTag; };
+ 
+ using RectangleItem = libnest2d::Rectangle;
++using Approx = Catch::Approx;
+ 
+ namespace nfp {
+ 
diff --git a/srcpkgs/libnest2d/template b/srcpkgs/libnest2d/template
index 62fc492badbef..7e8f2d7cb124e 100644
--- a/srcpkgs/libnest2d/template
+++ b/srcpkgs/libnest2d/template
@@ -6,7 +6,6 @@ build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DLIBNEST2D_HEADER_ONLY=OFF
  -DLIBNEST2D_BUILD_UNITTESTS=ON"
 makedepends="clipper-devel nlopt-devel boost-devel catch2"
-checkdepends="catch2"
 short_desc="2D irregular bin packing and nesting library"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"

From 1d539a6f4f2533007084b85bf42b1c07a05e8b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 23:07:08 +0700
Subject: [PATCH 6/7] nuspell: fix for new catch2

---
 srcpkgs/nuspell/patches/new-catch2.patch | 40 ++++++++++++++++++++++++
 srcpkgs/nuspell/template                 |  3 +-
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nuspell/patches/new-catch2.patch

diff --git a/srcpkgs/nuspell/patches/new-catch2.patch b/srcpkgs/nuspell/patches/new-catch2.patch
new file mode 100644
index 0000000000000..14246dddfdd82
--- /dev/null
+++ b/srcpkgs/nuspell/patches/new-catch2.patch
@@ -0,0 +1,40 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,7 +58,7 @@ endfunction()
+ 
+ if (BUILD_TESTING)
+ 	enable_testing()
+-	find_package(Catch2 2.3.0 QUIET)
++	find_package(Catch2 QUIET)
+ 	if (NOT Catch2_FOUND)
+ 		find_catch2_from_source()
+ 	endif()
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ add_executable(unit_test unit_test.cxx catch_main.cxx)
+-target_link_libraries(unit_test PRIVATE nuspell Catch2::Catch2)
++target_link_libraries(unit_test PRIVATE nuspell Catch2::Catch2WithMain)
+ if (MSVC)
+ 	target_compile_options(unit_test PRIVATE "/utf-8")
+ 	# Consider doing this for all the other targets by setting this flag
+--- a/tests/catch_main.cxx
++++ b/tests/catch_main.cxx
+@@ -16,5 +16,4 @@
+  * along with Nuspell.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#define CATCH_CONFIG_MAIN
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+--- a/tests/unit_test.cxx
++++ b/tests/unit_test.cxx
+@@ -16,7 +16,7 @@
+  * along with Nuspell.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+ #include <nuspell/dictionary.hxx>
+ #include <nuspell/utils.hxx>
+ 
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 57e5acd58688a..8058419835415 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -4,8 +4,7 @@ version=5.1.2
 revision=3
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="icu-devel"
-checkdepends="catch2"
+makedepends="icu-devel catch2"
 short_desc="C++ spell checking library"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"

From 71ce09ff9c0eb053f06c1c6cd4e5c2c8dc841b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 23:10:15 +0700
Subject: [PATCH 7/7] justbuild: limit makejobs

---
 srcpkgs/justbuild/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 51a41c2b02b84..d28e0d51a3b4f 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -17,10 +17,11 @@ checksum=0fe771914265d3edae0ee17daf2be48ed602e33a0cd1b0d04d822c0b8cb488a4
 conflicts="just>=0"
 nocross="not supported by bootstrapping"
 
-CFLAGS="-Wno-deprecated-declarations"
-CXXFLAGS="-Wno-deprecated-declarations"
+CFLAGS="-Wno-error -Wno-deprecated-declarations"
+CXXFLAGS="-Wno-error -Wno-deprecated-declarations"
 
 do_build() {
+	rm -rf just-work
 	mkdir -p just-work
 	export JUST_BUILD_CONF=$(jo \
 		AR=/usr/bin/ar \
@@ -43,6 +44,8 @@ do_build() {
 		google_apis \
 		protobuf
 	)
+	sed -i "s/TaskSystem[(][0-9]*[)]/TaskSystem($XBPS_MAKEJOBS)/" \
+		justbuild-${version}/bin/parallel-bootstrap-traverser.py
 
 	PACKAGE=YES LOCALBASE=/usr python3 \
 		justbuild-${version}/bin/bootstrap.py \

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

* Re: [PR PATCH] [Updated] update libkeyfinder catch2
  2023-10-01 16:12 [PR PATCH] update libkeyfinder catch2 sgn
@ 2023-10-01 16:39 ` sgn
  2023-10-02  3:45 ` [PR PATCH] [Merged]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2023-10-01 16:39 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages libkeyfinder-catch2
https://github.com/void-linux/void-packages/pull/46351

update libkeyfinder catch2
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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/46351.patch is attached

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

From b3cc1fcc907ab17d8140f709d7748fdaf65e57dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 21:55:06 +0700
Subject: [PATCH 1/7] catch2: update to 3.4.0.

---
 srcpkgs/catch2/patches/musl-test.patch | 15 ---------------
 srcpkgs/catch2/template                |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 srcpkgs/catch2/patches/musl-test.patch

diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/musl-test.patch
deleted file mode 100644
index 481a5930dbdf2..0000000000000
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
---- a/scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
-+++ b/scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
-@@ -44,7 +44,7 @@
- 
- # errno macro expands into various names depending on platform, so we need to fix them up as well
- errnoParser = re.compile(r'''
--    \(\*__errno_location\ \(\)\)
-+    \(\*__errno_location\s*\(\)\)
-     |
-     \(\*__error\(\)\)
-     |
diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index 71ad84a696bcf..92f07bd8029e8 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,6 +1,6 @@
 # Template file for 'catch2'
 pkgname=catch2
-version=2.13.10
+version=3.4.0
 revision=1
 build_style=cmake
 configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON
@@ -13,7 +13,7 @@ maintainer="Louis Dupré Bertoni <contact@louisdb.xyz>"
 license="BSL-1.0"
 homepage="https://github.com/catchorg/Catch2"
 distfiles="https://github.com/catchorg/Catch2/archive/v${version}/catch2-v${version}.tar.gz"
-checksum=d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943
+checksum=122928b814b75717316c71af69bd2b43387643ba076a6ec16e7882bfb2dfacbb
 
 post_install() {
 	vlicense LICENSE.txt

From 749e95f2eba5dae4ae959e66f69385727f25aa8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 21:55:19 +0700
Subject: [PATCH 2/7] libkeyfinder: update to 2.2.8.

---
 srcpkgs/libkeyfinder/patches/test.patch | 10 ++++++++++
 srcpkgs/libkeyfinder/template           |  5 ++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libkeyfinder/patches/test.patch

diff --git a/srcpkgs/libkeyfinder/patches/test.patch b/srcpkgs/libkeyfinder/patches/test.patch
new file mode 100644
index 0000000000000..21f260e769e89
--- /dev/null
+++ b/srcpkgs/libkeyfinder/patches/test.patch
@@ -0,0 +1,10 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -31,5 +31,5 @@ if(NOT TARGET Catch2::Catch2)
+     list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)
+ endif()
+ target_link_libraries(keyfinder-tests PRIVATE Catch2::Catch2WithMain)
+-include(Catch)
+-catch_discover_tests(keyfinder-tests)
++enable_testing()
++add_test(keyfinder-tests keyfinder-tests)
diff --git a/srcpkgs/libkeyfinder/template b/srcpkgs/libkeyfinder/template
index 18d83051fb33c..6ae29ec472f57 100644
--- a/srcpkgs/libkeyfinder/template
+++ b/srcpkgs/libkeyfinder/template
@@ -1,9 +1,8 @@
 # Template file for 'libkeyfinder'
 pkgname=libkeyfinder
-version=2.2.7
+version=2.2.8
 revision=1
 build_style=cmake
-hostmakedepends=""
 makedepends="fftw-devel catch2"
 short_desc="Small C++11 library for estimating the musical key of digital audio"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -11,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://mixxxdj.github.io/libkeyfinder/"
 changelog="https://raw.githubusercontent.com/mixxxdj/libkeyfinder/main/CHANGELOG.md"
 distfiles="https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/${version}.tar.gz"
-checksum=57dbd89c90b451e449d4652a29f078a90b847fefb29a242ab3c886f39d5d6998
+checksum=a54fc6c5ff435bb4b447f175bc97f9081fb5abf0edd5d125e6f5215c8fff4d11
 
 libkeyfinder-devel_package() {
 	short_desc+=" - development files"

From 805a29f27eec6ddf5b9411158b12007f037b574f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 22:11:03 +0700
Subject: [PATCH 3/7] cppcodec: fix for new catch2

---
 srcpkgs/cppcodec/patches/new-catch2.patch | 22 ++++++++++++++++++++++
 srcpkgs/cppcodec/template                 |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 srcpkgs/cppcodec/patches/new-catch2.patch

diff --git a/srcpkgs/cppcodec/patches/new-catch2.patch b/srcpkgs/cppcodec/patches/new-catch2.patch
new file mode 100644
index 0000000000000..3615ae6191d19
--- /dev/null
+++ b/srcpkgs/cppcodec/patches/new-catch2.patch
@@ -0,0 +1,22 @@
+--- a/test/test_cppcodec.cpp
++++ b/test/test_cppcodec.cpp
+@@ -22,7 +22,7 @@
+  */
+ 
+ #define CATCH_CONFIG_MAIN
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+ 
+ #include <cppcodec/base32_crockford.hpp>
+ #include <cppcodec/base32_hex.hpp>
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -15,6 +15,8 @@ else()
+ endif()
+ 
+ add_executable(test_cppcodec test_cppcodec.cpp)
++find_package(Catch2)
++target_link_libraries(test_cppcodec Catch2::Catch2WithMain)
+ add_test(cppcodec test_cppcodec)
+ 
+ add_executable(benchmark_cppcodec benchmark_cppcodec.cpp)
diff --git a/srcpkgs/cppcodec/template b/srcpkgs/cppcodec/template
index 927fae91cbe87..b7ca3fdd20cc8 100644
--- a/srcpkgs/cppcodec/template
+++ b/srcpkgs/cppcodec/template
@@ -3,6 +3,7 @@ pkgname=cppcodec
 version=0.2
 revision=1
 build_style=cmake
+configure_args="-DCMAKE_CXX_STANDARD=17"
 hostmakedepends="pkg-config"
 makedepends="catch2"
 short_desc="Header-only C++11 library to encode/decode base64*, base32* and hex"

From 610cfabd3a55cd8a7bd1afa5aa5676eebab9933c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 22:25:18 +0700
Subject: [PATCH 4/7] j4-dmenu-desktop: patch for new catch2

---
 .../j4-dmenu-desktop/patches/new-catch2.patch | 110 ++++++++++++++++++
 srcpkgs/j4-dmenu-desktop/template             |  12 +-
 2 files changed, 114 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch

diff --git a/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch b/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch
new file mode 100644
index 0000000000000..618a82fad977a
--- /dev/null
+++ b/srcpkgs/j4-dmenu-desktop/patches/new-catch2.patch
@@ -0,0 +1,110 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,18 +5,14 @@ project(j4-dmenu)
+ option(WITH_TESTS "Build and run tests" ON)
+ option(WITH_GIT_CATCH "Use a Git checkout of Catch to build the tests" ON)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
+-  set(CXX_OPT "-std=c++0x")
+-else()
+-  set(CXX_OPT "-std=c++11")
+-endif()
+-
++set(CMAKE_CXX_STANDARD 11)
+ # _WITH_GETLINE for FreeBSD
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2 -D_WITH_GETLINE")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ 
+ if(WITH_TESTS)
+   enable_testing(true)
++  find_package(Catch2)
+   add_test(
+           NAME j4-dmenu-tests
+           COMMAND j4-dmenu-tests
+@@ -25,6 +21,8 @@ if(WITH_TESTS)
+           j4-dmenu-tests
+           src/Test.cc
+   )
++  set_property(TARGET j4-dmenu-tests PROPERTY CXX_STANDARD 17)
++  target_link_libraries(j4-dmenu-tests Catch2::Catch2WithMain)
+   add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
+ 
+   if(WITH_GIT_CATCH)
+--- a/src/Test.cc
++++ b/src/Test.cc
+@@ -1,8 +1,7 @@
+ 
+ //#include "Application.hh"
+ 
+-#define CATCH_CONFIG_MAIN
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ static const std::string test_files = TEST_FILES;
+ 
+--- a/src/TestApplication.cc
++++ b/src/TestApplication.cc
+@@ -5,7 +5,7 @@
+ 
+ #include "Application.hh"
+ #include "LocaleSuffixes.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("Application/invalid_file", "")
+ {
+--- a/src/TestApplicationRunner.cc
++++ b/src/TestApplicationRunner.cc
+@@ -3,7 +3,7 @@
+ #include "Application.hh"
+ #include "ApplicationRunner.hh"
+ #include "LocaleSuffixes.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("ApplicationRunner/escape", "Regression test for issue #18, %c was not escaped")
+ {
+--- a/src/TestFileFinder.cc
++++ b/src/TestFileFinder.cc
+@@ -3,7 +3,7 @@
+ #include <vector>
+ 
+ #include "FileFinder.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ std::vector<std::string> ff2l(FileFinder &ff)
+ {
+--- a/src/TestFormatters.cc
++++ b/src/TestFormatters.cc
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string>
+ 
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ #include "Application.hh"
+ #include "LocaleSuffixes.hh"
+--- a/src/TestLocaleSuffixes.cc
++++ b/src/TestLocaleSuffixes.cc
+@@ -1,7 +1,7 @@
+ #include <string.h>
+ 
+ #include "LocaleSuffixes.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("LocaleSuffixes/with_encoding", "")
+ {
+--- a/src/TestSearchPath.cc
++++ b/src/TestSearchPath.cc
+@@ -5,7 +5,7 @@
+ #include <vector>
+ 
+ #include "SearchPath.hh"
+-#include "catch.hpp"
++#include "catch2/catch_all.hpp"
+ 
+ TEST_CASE("SearchPath/XDG_DATA_HOME", "Check SearchPath honors XDG_DATA_HOME")
+ {
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index 29db90fca23b3..38f842eb0f5f6 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -3,11 +3,14 @@ pkgname=j4-dmenu-desktop
 version=2.18
 revision=3
 build_style=cmake
+configure_args="-DWITH_GIT_CATCH=OFF
+ -DCATCH_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/catch2"
 # The current version (2.18) needs to have /usr/share/applications dir
 # for tests, xterm creates and populates it with its .desktop files,
 # which fixes tests in case the dir does not exist.
 # https://github.com/enkore/j4-dmenu-desktop/pull/123
-checkdepends="catch2 xterm"
+makedepends="catch2"
+checkdepends="xterm"
 short_desc="Fast desktop menu"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -15,13 +18,6 @@ homepage="https://github.com/enkore/j4-dmenu-desktop"
 distfiles="https://github.com/enkore/j4-dmenu-desktop/archive/r${version}.tar.gz"
 checksum=77c5605d0c1291bcf1e13b186ea3b32ddf4753de0d0e39127b4a7d2098393e25
 
-if [ "$XBPS_CHECK_PKGS" ]; then
-	configure_args="-DWITH_GIT_CATCH=OFF
-	 -DCATCH_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/catch2"
-else
-	configure_args="-DWITH_TESTS=OFF"
-fi
-
 post_install() {
 	vman j4-dmenu-desktop.1
 }

From c7241e3410bfe84074ac8691e2f1fce9abce2e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 23:02:35 +0700
Subject: [PATCH 5/7] libnest2d: fix for new catch2

---
 srcpkgs/libnest2d/patches/new-catch2.patch | 32 ++++++++++++++++++++++
 srcpkgs/libnest2d/template                 |  1 -
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libnest2d/patches/new-catch2.patch

diff --git a/srcpkgs/libnest2d/patches/new-catch2.patch b/srcpkgs/libnest2d/patches/new-catch2.patch
new file mode 100644
index 0000000000000..d2dbd3d8b117b
--- /dev/null
+++ b/srcpkgs/libnest2d/patches/new-catch2.patch
@@ -0,0 +1,32 @@
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-require_package(Catch2 2.9.1 REQUIRED NO_EXPORT)
++require_package(Catch2 "" REQUIRED NO_EXPORT)
+ 
+ add_executable(tests_clipper_nlopt
+     test.cpp
+@@ -14,5 +14,5 @@ if (MSVC)
+ target_compile_options(tests_clipper_nlopt PRIVATE /bigobj)
+ endif ()
+ 
+-target_link_libraries(tests_clipper_nlopt libnest2d Catch2::Catch2)
++target_link_libraries(tests_clipper_nlopt libnest2d Catch2::Catch2WithMain)
+ add_test(libnest2d_tests tests_clipper_nlopt)
+--- a/tests/test.cpp
++++ b/tests/test.cpp
+@@ -1,5 +1,4 @@
+-#define CATCH_CONFIG_MAIN
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+ 
+ #include <fstream>
+ 
+@@ -29,6 +28,7 @@ template<> struct _NumTag<LargeInt> { us
+ template<class T> struct _NumTag<boost::rational<T>> { using Type = RationalTag; };
+ 
+ using RectangleItem = libnest2d::Rectangle;
++using Approx = Catch::Approx;
+ 
+ namespace nfp {
+ 
diff --git a/srcpkgs/libnest2d/template b/srcpkgs/libnest2d/template
index 62fc492badbef..7e8f2d7cb124e 100644
--- a/srcpkgs/libnest2d/template
+++ b/srcpkgs/libnest2d/template
@@ -6,7 +6,6 @@ build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON -DLIBNEST2D_HEADER_ONLY=OFF
  -DLIBNEST2D_BUILD_UNITTESTS=ON"
 makedepends="clipper-devel nlopt-devel boost-devel catch2"
-checkdepends="catch2"
 short_desc="2D irregular bin packing and nesting library"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-3.0-or-later"

From 93c67ebf3eadcb8e1a0b54a5f214a220c26acd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 23:07:08 +0700
Subject: [PATCH 6/7] nuspell: fix for new catch2

---
 srcpkgs/nuspell/patches/new-catch2.patch | 40 ++++++++++++++++++++++++
 srcpkgs/nuspell/template                 |  3 +-
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nuspell/patches/new-catch2.patch

diff --git a/srcpkgs/nuspell/patches/new-catch2.patch b/srcpkgs/nuspell/patches/new-catch2.patch
new file mode 100644
index 0000000000000..14246dddfdd82
--- /dev/null
+++ b/srcpkgs/nuspell/patches/new-catch2.patch
@@ -0,0 +1,40 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,7 +58,7 @@ endfunction()
+ 
+ if (BUILD_TESTING)
+ 	enable_testing()
+-	find_package(Catch2 2.3.0 QUIET)
++	find_package(Catch2 QUIET)
+ 	if (NOT Catch2_FOUND)
+ 		find_catch2_from_source()
+ 	endif()
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ add_executable(unit_test unit_test.cxx catch_main.cxx)
+-target_link_libraries(unit_test PRIVATE nuspell Catch2::Catch2)
++target_link_libraries(unit_test PRIVATE nuspell Catch2::Catch2WithMain)
+ if (MSVC)
+ 	target_compile_options(unit_test PRIVATE "/utf-8")
+ 	# Consider doing this for all the other targets by setting this flag
+--- a/tests/catch_main.cxx
++++ b/tests/catch_main.cxx
+@@ -16,5 +16,4 @@
+  * along with Nuspell.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#define CATCH_CONFIG_MAIN
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+--- a/tests/unit_test.cxx
++++ b/tests/unit_test.cxx
+@@ -16,7 +16,7 @@
+  * along with Nuspell.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
+-#include <catch2/catch.hpp>
++#include <catch2/catch_all.hpp>
+ #include <nuspell/dictionary.hxx>
+ #include <nuspell/utils.hxx>
+ 
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 57e5acd58688a..8058419835415 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -4,8 +4,7 @@ version=5.1.2
 revision=3
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="icu-devel"
-checkdepends="catch2"
+makedepends="icu-devel catch2"
 short_desc="C++ spell checking library"
 maintainer="John <me@johnnynator.dev>"
 license="LGPL-3.0-or-later"

From 939e0d342593c4fcfad8df63a58c9ab582677bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sun, 1 Oct 2023 23:10:15 +0700
Subject: [PATCH 7/7] justbuild: limit makejobs

---
 srcpkgs/justbuild/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/justbuild/template b/srcpkgs/justbuild/template
index 51a41c2b02b84..d28e0d51a3b4f 100644
--- a/srcpkgs/justbuild/template
+++ b/srcpkgs/justbuild/template
@@ -17,10 +17,11 @@ checksum=0fe771914265d3edae0ee17daf2be48ed602e33a0cd1b0d04d822c0b8cb488a4
 conflicts="just>=0"
 nocross="not supported by bootstrapping"
 
-CFLAGS="-Wno-deprecated-declarations"
-CXXFLAGS="-Wno-deprecated-declarations"
+CFLAGS="-Wno-error -Wno-deprecated-declarations"
+CXXFLAGS="-Wno-error -Wno-deprecated-declarations"
 
 do_build() {
+	rm -rf just-work
 	mkdir -p just-work
 	export JUST_BUILD_CONF=$(jo \
 		AR=/usr/bin/ar \
@@ -43,6 +44,8 @@ do_build() {
 		google_apis \
 		protobuf
 	)
+	sed -i "s/TaskSystem[(][0-9]*[)]/TaskSystem($XBPS_MAKEJOBS)/" \
+		justbuild-${version}/bin/parallel-bootstrap-traverser.py
 
 	PACKAGE=YES LOCALBASE=/usr python3 \
 		justbuild-${version}/bin/bootstrap.py \

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

* Re: [PR PATCH] [Merged]: update libkeyfinder catch2
  2023-10-01 16:12 [PR PATCH] update libkeyfinder catch2 sgn
  2023-10-01 16:39 ` [PR PATCH] [Updated] " sgn
@ 2023-10-02  3:45 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2023-10-02  3:45 UTC (permalink / raw)
  To: ml

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

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

update libkeyfinder catch2
https://github.com/void-linux/void-packages/pull/46351

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

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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] 3+ messages in thread

end of thread, other threads:[~2023-10-02  3:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-01 16:12 [PR PATCH] update libkeyfinder catch2 sgn
2023-10-01 16:39 ` [PR PATCH] [Updated] " sgn
2023-10-02  3:45 ` [PR PATCH] [Merged]: " sgn

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).