capnproto, bump version (#11672)

dev-libs/capnproto/capnproto-1.1.0.recipe

@@ -6,7 +6,7 @@ COPYRIGHT="2017 Cloudflare, Inc. and contributors"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/capnproto/capnproto/archive/refs/tags/v${portVersion}.tar.gz"
-CHECKSUM_SHA256="5bdb16f6b389a9e29b04214b9bae1759e8b7fe2b45049d7e3f1f286ba050a200"
+CHECKSUM_SHA256="c0a0d78a07e821f7bae26c7fcac20a9202eb3d639a673b2606b76092a1f35b6b"
 SOURCE_DIR="capnproto-$portVersion"
 PATCHES="capnproto-$portVersion.patchset"
 
@@ -61,7 +61,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libssl$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix >= 3
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -73,14 +73,12 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cmake \
-		-B build -S . \
+	cmake -B build -S . -DCMAKE_BUILD_TYPE=Release \
 		$cmakeDirArgs \
 		-DCMAKE_CXX_FLAGS="-std=c++11" \
 		-DBUILD_SHARED_LIBS=ON \
-		-DBUILD_TESTING=OFF \
 		-DWITH_OPENSSL=ON \
-		-DCMAKE_BUILD_TYPE=Release
+		-DBUILD_TESTING=OFF
 
 	make -C build $jobArgs
 }
@@ -112,5 +110,6 @@ INSTALL()
 
 TEST()
 {
-	make -C build test
+	# 40% tests passed, 3 tests failed out of 5 (1 nuked -> iddles)
+	ctest --test-dir build --output-on-failure
 }

dev-libs/capnproto/patches/capnproto-1.1.0.patchset

@@ -1,11 +1,11 @@
-From 738813fcc720bbd4c9053a58954411a33fe6d71d Mon Sep 17 00:00:00 2001
+From 14cacfcf108741f8cb04194a660b241ba875c518 Mon Sep 17 00:00:00 2001
 From: Han Pengfei <pengphei@qq.com>
 Date: Thu, 20 Oct 2022 02:46:51 +0000
 Subject: Fix missing pwritev
 
 
 diff --git a/c++/src/kj/filesystem-disk-unix.c++ b/c++/src/kj/filesystem-disk-unix.c++
-index 67d7bf2..355ad12 100644
+index 74d59fd..d290b38 100644
 --- a/c++/src/kj/filesystem-disk-unix.c++
 +++ b/c++/src/kj/filesystem-disk-unix.c++
 @@ -416,7 +416,7 @@ public:
@@ -18,40 +18,40 @@ index 67d7bf2..355ad12 100644
      while (size > sizeof(ZEROS)) {
        write(offset, ZEROS);
 -- 
-2.37.3
+2.45.2
 
 
-From 5713157be79b8a5d092294a9d75038cd6d16f834 Mon Sep 17 00:00:00 2001
+From b492071b0fe3162058ecb0f1e33c2c4d1a2124ff Mon Sep 17 00:00:00 2001
 From: Han Pengfei <pengphei@qq.com>
 Date: Fri, 28 Oct 2022 02:12:30 +0000
 Subject: message: fix sizeof assert for areaspace
 
 
 diff --git a/c++/src/capnp/message.h b/c++/src/capnp/message.h
-index af87aec..c38cb77 100644
+index 983761d..2567f1e 100644
 --- a/c++/src/capnp/message.h
 +++ b/c++/src/capnp/message.h
 @@ -127,7 +127,7 @@ public:
  private:
    ReaderOptions options;
  
--#if defined(__EMSCRIPTEN__) || (defined(__APPLE__) && defined(__ppc__))
-+#if defined(__EMSCRIPTEN__) || defined(__HAIKU__) || (defined(__APPLE__) && defined(__ppc__))
+-#if defined(__EMSCRIPTEN__) || (defined(__APPLE__) && (defined(__ppc__) || defined(__i386__)))
++#if defined(__EMSCRIPTEN__) || defined(__HAIKU__) || (defined(__APPLE__) && (defined(__ppc__) || defined(__i386__)))
    static constexpr size_t arenaSpacePadding = 19;
  #else
    static constexpr size_t arenaSpacePadding = 18;
 -- 
-2.37.3
+2.45.2
 
 
-From bdc99a0b576ff8abc415154128158b31d262c1f1 Mon Sep 17 00:00:00 2001
+From 66a0d4180908ee6028d4142c3ba5c79f1fd5fa4e Mon Sep 17 00:00:00 2001
 From: Begasus <begasus@gmail.com>
 Date: Sat, 23 Sep 2023 13:29:21 +0200
 Subject: Fixes for building and running the tests
 
 
 diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt
-index f60cb95..0f6dd81 100644
+index e2b72fe..2501907 100644
 --- a/c++/CMakeLists.txt
 +++ b/c++/CMakeLists.txt
 @@ -24,6 +24,10 @@ set(INSTALL_TARGETS_DEFAULT_ARGS
@@ -80,6 +80,19 @@ index 64190c4..7873ddc 100644
  namespace kj {
  namespace {
  
+diff --git a/c++/src/kj/filesystem-disk-unix.c++ b/c++/src/kj/filesystem-disk-unix.c++
+index d290b38..185809f 100644
+--- a/c++/src/kj/filesystem-disk-unix.c++
++++ b/c++/src/kj/filesystem-disk-unix.c++
+@@ -333,7 +333,7 @@ public:
+   void datasync() const {
+     // The presence of the _POSIX_SYNCHRONIZED_IO define is supposed to tell us that fdatasync()
+     // exists. But Apple defines this yet doesn't offer fdatasync(). Thanks, Apple.
+-#if _POSIX_SYNCHRONIZED_IO && !__APPLE__
++#if _POSIX_SYNCHRONIZED_IO && !__APPLE__ && !__HAIKU__
+     KJ_SYSCALL(fdatasync(fd));
+ #else
+     this->sync();
 diff --git a/c++/src/kj/test-helpers.c++ b/c++/src/kj/test-helpers.c++
 index 6ae8cd3..ef00d7e 100644
 --- a/c++/src/kj/test-helpers.c++
@@ -94,5 +107,5 @@ index 6ae8cd3..ef00d7e 100644
  #else
      // TODO(perf): This is not the best algorithm for substring matching. strstr can't be used
 -- 
-2.37.3
+2.45.2