* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/scnlib/files/, dev-cpp/scnlib/
@ 2024-03-26 13:40 Steffen Winter
0 siblings, 0 replies; 3+ messages in thread
From: Steffen Winter @ 2024-03-26 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 082510a288a21536c324bdc538a81d97371727ca
Author: Steffen Winter <steffen.winter <AT> proton <DOT> me>
AuthorDate: Tue Mar 26 13:39:58 2024 +0000
Commit: Steffen Winter <stffn.mobil <AT> freenet <DOT> de>
CommitDate: Tue Mar 26 13:40:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=082510a2
dev-cpp/scnlib: fix compilation with simdutf-5.0.0
Fixes: https://bugs.gentoo.org/927799
Signed-off-by: Steffen Winter <steffen.winter <AT> proton.me>
.../scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch | 16 ++++++++++++++++
...ps.patch => scnlib-2.0.2-no-external-test-deps.patch} | 0
dev-cpp/scnlib/scnlib-2.0.2.ebuild | 6 +++++-
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch
new file mode 100644
index 0000000000..3e42ae495a
--- /dev/null
+++ b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
+index ae2832b..186fbed 100644
+--- a/cmake/dependencies.cmake
++++ b/cmake/dependencies.cmake
+@@ -61,7 +61,10 @@ endif ()
+ # we don't want to include tests of dependencies, so we need to do some manual work
+
+ if (SCN_USE_EXTERNAL_SIMDUTF)
+- find_package(simdutf 4.0.0 CONFIG REQUIRED)
++ find_package(simdutf 5.0.0 CONFIG)
++ if(NOT simdutf_FOUND)
++ find_package(simdutf 4.0.0 CONFIG REQUIRED)
++ endif()
+ else ()
+ FetchContent_Declare(
+ simdutf
diff --git a/dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch
similarity index 100%
rename from dev-cpp/scnlib/files/scnlib-2.0.0-no-external-test-deps.patch
rename to dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch
diff --git a/dev-cpp/scnlib/scnlib-2.0.2.ebuild b/dev-cpp/scnlib/scnlib-2.0.2.ebuild
index 9d0703af8f..dd3f493e65 100644
--- a/dev-cpp/scnlib/scnlib-2.0.2.ebuild
+++ b/dev-cpp/scnlib/scnlib-2.0.2.ebuild
@@ -22,8 +22,12 @@ BDEPEND="
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}/${P}-accept-newer-simdutf.patch"
+)
+
src_prepare() {
- use test && eapply "${FILESDIR}/${PN}-2.0.0-no-external-test-deps.patch"
+ use test && eapply "${FILESDIR}/${P}-no-external-test-deps.patch"
cmake_src_prepare
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/scnlib/files/, dev-cpp/scnlib/
@ 2024-04-03 21:32 Steffen Winter
0 siblings, 0 replies; 3+ messages in thread
From: Steffen Winter @ 2024-04-03 21:32 UTC (permalink / raw
To: gentoo-commits
commit: 37e4ef4c0ecb1fd18d52a78d2995ed666c426929
Author: Steffen Winter <steffen.winter <AT> proton <DOT> me>
AuthorDate: Wed Apr 3 21:31:28 2024 +0000
Commit: Steffen Winter <stffn.mobil <AT> freenet <DOT> de>
CommitDate: Wed Apr 3 21:31:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37e4ef4c
dev-cpp/scnlib: Bump required simdutf version and adjust patch
Signed-off-by: Steffen Winter <steffen.winter <AT> proton.me>
.../files/scnlib-2.0.2-accept-simdutf-5.2.x.patch | 16 ++++++++
dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild | 46 ++++++++++++++++++++++
2 files changed, 62 insertions(+)
diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-simdutf-5.2.x.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-simdutf-5.2.x.patch
new file mode 100644
index 0000000000..af0feb295c
--- /dev/null
+++ b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-simdutf-5.2.x.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
+index ae2832b..186fbed 100644
+--- a/cmake/dependencies.cmake
++++ b/cmake/dependencies.cmake
+@@ -61,7 +61,10 @@ endif ()
+ # we don't want to include tests of dependencies, so we need to do some manual work
+
+ if (SCN_USE_EXTERNAL_SIMDUTF)
+- find_package(simdutf 4.0.0 CONFIG REQUIRED)
++ find_package(simdutf 5.2.0 CONFIG)
++ if(NOT simdutf_FOUND)
++ find_package(simdutf 4.0.0 CONFIG REQUIRED)
++ endif()
+ else ()
+ FetchContent_Declare(
+ simdutf
diff --git a/dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild b/dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild
new file mode 100644
index 0000000000..c4d3153a06
--- /dev/null
+++ b/dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="scanf for modern C++ "
+HOMEPAGE="https://scnlib.dev/"
+SRC_URI="https://github.com/eliaskosunen/scnlib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+BDEPEND="
+ dev-cpp/fast_float
+ >=dev-cpp/simdutf-5.2.0:=
+ test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-accept-simdutf-5.2.x.patch"
+)
+
+src_prepare() {
+ use test && eapply "${FILESDIR}/${P}-no-external-test-deps.patch"
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSCN_BENCHMARKS=OFF
+ -DSCN_BENCHMARKS_BINARYSIZE=OFF
+ -DSCN_BENCHMARKS_BUILDTIME=OFF
+ -DSCN_DOCS=OFF
+ -DSCN_EXAMPLES=$(usex test ON OFF)
+ -DSCN_TESTS=$(usex test ON OFF)
+ -DSCN_USE_EXTERNAL_FAST_FLOAT=ON
+ -DSCN_USE_EXTERNAL_SIMDUTF=ON
+ )
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/scnlib/files/, dev-cpp/scnlib/
@ 2024-05-20 0:54 Steffen Winter
0 siblings, 0 replies; 3+ messages in thread
From: Steffen Winter @ 2024-05-20 0:54 UTC (permalink / raw
To: gentoo-commits
commit: 66fa415e2656420e1bbfa9b54889764be4c1f37c
Author: Steffen Winter <steffen.winter <AT> proton <DOT> me>
AuthorDate: Mon May 20 00:54:16 2024 +0000
Commit: Steffen Winter <stffn.mobil <AT> freenet <DOT> de>
CommitDate: Mon May 20 00:54:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=66fa415e
dev-cpp/scnlib: drop 2.0.2-r1
Signed-off-by: Steffen Winter <steffen.winter <AT> proton.me>
dev-cpp/scnlib/Manifest | 1 -
.../files/scnlib-2.0.2-accept-newer-simdutf.patch | 16 ------
.../files/scnlib-2.0.2-accept-simdutf-5.2.x.patch | 16 ------
.../files/scnlib-2.0.2-no-external-test-deps.patch | 59 ----------------------
dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild | 46 -----------------
5 files changed, 138 deletions(-)
diff --git a/dev-cpp/scnlib/Manifest b/dev-cpp/scnlib/Manifest
index 510b226ecb..970d5182f3 100644
--- a/dev-cpp/scnlib/Manifest
+++ b/dev-cpp/scnlib/Manifest
@@ -1,2 +1 @@
-DIST scnlib-2.0.2.tar.gz 518311 BLAKE2B 21084e8830a10df0777dc100e2e448447f3a777535a821dca96423dfdb467c9073fb3e7c499ffb42598f54b8f44d3fdab9c43d005c313850454a8fd27e152273 SHA512 12b9ae26a5ccc600aacad1e2b2287bfc0b6986a260e182c91541876bc5804fe661093ad10d1befda56803afc7a9aa9f0348820dbb5af4fa6fdf048f85b3bcef1
DIST scnlib-2.0.3.tar.gz 520197 BLAKE2B 6e0a88985e8113d85d5c511fe9ec857af12a5d34224fee7a41d8347e1e1e9fe7bb78b15bbdafd9c06006112de747c9c3cd6b101d1076b619e33ac7e745668cc4 SHA512 888f60d5a60b2e348001a56a59e123f496f89b09668f0b05791e878528c1c46930963f22e3b64130c875896ace56dffc0d9310edabb4804abf79cc125dfd5ff4
diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch
deleted file mode 100644
index 3e42ae495a..0000000000
--- a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-newer-simdutf.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index ae2832b..186fbed 100644
---- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -61,7 +61,10 @@ endif ()
- # we don't want to include tests of dependencies, so we need to do some manual work
-
- if (SCN_USE_EXTERNAL_SIMDUTF)
-- find_package(simdutf 4.0.0 CONFIG REQUIRED)
-+ find_package(simdutf 5.0.0 CONFIG)
-+ if(NOT simdutf_FOUND)
-+ find_package(simdutf 4.0.0 CONFIG REQUIRED)
-+ endif()
- else ()
- FetchContent_Declare(
- simdutf
diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-simdutf-5.2.x.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-accept-simdutf-5.2.x.patch
deleted file mode 100644
index af0feb295c..0000000000
--- a/dev-cpp/scnlib/files/scnlib-2.0.2-accept-simdutf-5.2.x.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index ae2832b..186fbed 100644
---- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -61,7 +61,10 @@ endif ()
- # we don't want to include tests of dependencies, so we need to do some manual work
-
- if (SCN_USE_EXTERNAL_SIMDUTF)
-- find_package(simdutf 4.0.0 CONFIG REQUIRED)
-+ find_package(simdutf 5.2.0 CONFIG)
-+ if(NOT simdutf_FOUND)
-+ find_package(simdutf 4.0.0 CONFIG REQUIRED)
-+ endif()
- else ()
- FetchContent_Declare(
- simdutf
diff --git a/dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch b/dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch
deleted file mode 100644
index e78ba0a2a1..0000000000
--- a/dev-cpp/scnlib/files/scnlib-2.0.2-no-external-test-deps.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index ae2832b..c250eff 100644
---- a/cmake/dependencies.cmake
-+++ b/cmake/dependencies.cmake
-@@ -4,41 +4,10 @@ set(SCN_OPTIONAL_DEPENDENCIES "")
-
- if (SCN_TESTS)
- # GTest
--
-- FetchContent_Declare(
-- googletest
-- GIT_REPOSITORY https://github.com/google/googletest.git
-- GIT_TAG main
-- GIT_SHALLOW TRUE
-- )
--
-- # gtest CMake does some flag overriding we don't want, and it's also quite heavy
-- # Do it manually
--
-- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
--
-- FetchContent_GetProperties(googletest)
-- if (NOT googletest)
-- FetchContent_Populate(googletest)
-- endif ()
--
-- find_package(Threads)
--
-- add_library(scn_gtest
-- "${googletest_SOURCE_DIR}/googletest/src/gtest-all.cc"
-- "${googletest_SOURCE_DIR}/googlemock/src/gmock-all.cc"
-- )
-- target_include_directories(scn_gtest SYSTEM
-- PUBLIC
-- "${googletest_SOURCE_DIR}/googletest/include"
-- "${googletest_SOURCE_DIR}/googlemock/include"
-- PRIVATE
-- "${googletest_SOURCE_DIR}/googletest"
-- "${googletest_SOURCE_DIR}/googlemock"
-- )
-- target_link_libraries(scn_gtest PRIVATE Threads::Threads)
-- target_compile_features(scn_gtest PUBLIC cxx_std_17)
-- target_compile_options(scn_gtest PRIVATE $<$<CXX_COMPILER_ID:GNU>: -Wno-psabi>)
-+ find_package(GTest REQUIRED)
-+ add_library(scn_gtest INTERFACE)
-+ target_link_libraries(scn_gtest INTERFACE GTest::GTest)
-+ target_compile_features(scn_gtest INTERFACE cxx_std_17)
- endif ()
-
- if (SCN_BENCHMARKS)
-@@ -158,8 +127,3 @@ if (SCN_REGEX_BACKEND STREQUAL "re2")
- set(SCN_REGEX_BACKEND_TARGET re2::re2)
- endif ()
-
--# make available
--
--FetchContent_MakeAvailable(
-- ${SCN_OPTIONAL_DEPENDENCIES}
--)
diff --git a/dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild b/dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild
deleted file mode 100644
index c4d3153a06..0000000000
--- a/dev-cpp/scnlib/scnlib-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="scanf for modern C++ "
-HOMEPAGE="https://scnlib.dev/"
-SRC_URI="https://github.com/eliaskosunen/scnlib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-BDEPEND="
- dev-cpp/fast_float
- >=dev-cpp/simdutf-5.2.0:=
- test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/${P}-accept-simdutf-5.2.x.patch"
-)
-
-src_prepare() {
- use test && eapply "${FILESDIR}/${P}-no-external-test-deps.patch"
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DSCN_BENCHMARKS=OFF
- -DSCN_BENCHMARKS_BINARYSIZE=OFF
- -DSCN_BENCHMARKS_BUILDTIME=OFF
- -DSCN_DOCS=OFF
- -DSCN_EXAMPLES=$(usex test ON OFF)
- -DSCN_TESTS=$(usex test ON OFF)
- -DSCN_USE_EXTERNAL_FAST_FLOAT=ON
- -DSCN_USE_EXTERNAL_SIMDUTF=ON
- )
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-20 0:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-20 0:54 [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/scnlib/files/, dev-cpp/scnlib/ Steffen Winter
-- strict thread matches above, loose matches on Subject: below --
2024-04-03 21:32 Steffen Winter
2024-03-26 13:40 Steffen Winter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox