diff options
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch | 12 | ||||
| -rw-r--r-- | dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch | 20 | ||||
| -rw-r--r-- | dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch | 12 | ||||
| -rw-r--r-- | dev-cpp/rapidfuzz-cpp/Manifest | 3 | ||||
| -rw-r--r-- | dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.0.ebuild (renamed from dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild) | 2 | ||||
| -rw-r--r-- | dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild | 42 |
6 files changed, 24 insertions, 67 deletions
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch index f743fa8c4480..f81f812c4978 100644 --- a/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch +++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch @@ -1,5 +1,5 @@ ---- /src/core/CLucene/queryParser/QueryParser.cpp.original 2018-08-02 15:11:33.157174224 +0200 -+++ /src/core/CLucene/queryParser/QueryParser.cpp 2018-08-02 15:12:33.189175705 +0200 +--- a/src/core/CLucene/queryParser/QueryParser.cpp ++++ b/src/core/CLucene/queryParser/QueryParser.cpp @@ -79,7 +79,7 @@ _T("<RANGEEX_GOOP>") }; @@ -9,8 +9,8 @@ const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0}; struct QueryParser::JJCalls { ---- /src/core/CLucene/queryParser/QueryParserTokenManager.cpp.original 2018-08-02 15:14:27.104178515 +0200 -+++ /src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2018-08-02 15:15:10.399179583 +0200 +--- a/src/core/CLucene/queryParser/QueryParserTokenManager.cpp ++++ b/src/core/CLucene/queryParser/QueryParserTokenManager.cpp @@ -15,9 +15,9 @@ CL_NS_DEF(queryParser) @@ -23,8 +23,8 @@ }; const int32_t QueryParserTokenManager::jjnextStates[]={ 15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27, ---- /src/core/CLucene/document/DateTools.cpp.original 2018-08-02 15:20:28.903187441 +0200 -+++ /src/core/CLucene/document/DateTools.cpp 2018-08-02 15:20:35.441187602 +0200 +--- a/src/core/CLucene/document/DateTools.cpp ++++ b/src/core/CLucene/document/DateTools.cpp @@ -8,6 +8,7 @@ #include "DateTools.h" diff --git a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch index a19ebdcf0fac..d08e4b17882f 100644 --- a/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch +++ b/dev-cpp/glog/files/glog-0.5.0-IsGoogleLoggingInitialized_public.patch @@ -2,8 +2,8 @@ https://github.com/google/glog/issues/125 https://github.com/google/glog/pull/651 https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 ---- /src/glog/logging.h.in -+++ /src/glog/logging.h.in +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in @@ -594,6 +594,9 @@ void* prefix_callback_data = NULL); #endif @@ -14,8 +14,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 // Shutdown google's logging library. GOOGLE_GLOG_DLL_DECL void ShutdownGoogleLogging(); ---- /src/logging_custom_prefix_unittest.cc -+++ /src/logging_custom_prefix_unittest.cc +--- a/src/logging_custom_prefix_unittest.cc ++++ b/src/logging_custom_prefix_unittest.cc @@ -221,11 +221,15 @@ LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors" const string early_stderr = GetCapturedTestStderr(); @@ -43,8 +43,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 } _START_GOOGLE_NAMESPACE_ ---- /src/logging_unittest.cc -+++ /src/logging_unittest.cc +--- a/src/logging_unittest.cc ++++ b/src/logging_unittest.cc @@ -197,8 +197,12 @@ LogWithLevels(0, 0, 0, 0); // simulate "before global c-tors" const string early_stderr = GetCapturedTestStderr(); @@ -69,8 +69,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 } _START_GOOGLE_NAMESPACE_ ---- /src/utilities.cc -+++ /src/utilities.cc +--- a/src/utilities.cc ++++ b/src/utilities.cc @@ -62,6 +62,10 @@ static const char* g_program_invocation_short_name = NULL; @@ -93,8 +93,8 @@ https://github.com/google/glog/commit/81e0d616edeb73cbd06d6c40bc4f90593ac0c5d1 #ifdef OS_WINDOWS struct timeval { long tv_sec, tv_usec; ---- /src/utilities.h -+++ /src/utilities.h +--- a/src/utilities.h ++++ b/src/utilities.h @@ -163,8 +163,6 @@ const char* ProgramInvocationShortName(); diff --git a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch index f9b90c1521aa..ed1f6a17d8df 100644 --- a/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch +++ b/dev-cpp/glog/files/glog-0.5.0-vmodule_levels_changeability.patch @@ -2,8 +2,8 @@ https://github.com/google/glog/issues/649 https://github.com/google/glog/pull/650 https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c ---- /src/glog/vlog_is_on.h.in -+++ /src/glog/vlog_is_on.h.in +--- a/src/glog/vlog_is_on.h.in ++++ b/src/glog/vlog_is_on.h.in @@ -81,10 +81,10 @@ // parsing of --vmodule flag and/or SetVLOGLevel calls. #define VLOG_IS_ON(verboselevel) \ @@ -41,8 +41,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c @ac_google_namespace@::int32* site_default, const char* fname, @ac_google_namespace@::int32 verbose_level); ---- /src/logging_unittest.cc -+++ /src/logging_unittest.cc +--- a/src/logging_unittest.cc ++++ b/src/logging_unittest.cc @@ -98,6 +98,7 @@ static void TestRawLogging(); static void LogWithLevels(int v, int severity, bool err, bool alsoerr); @@ -84,8 +84,8 @@ https://github.com/google/glog/commit/86fea1ab254c463cbb72e5ce8bcc6855bc4e1e9c TEST(DeathRawCHECK, logging) { ASSERT_DEATH(RAW_CHECK(false, "failure 1"), "RAW: Check false failed: failure 1"); ---- /src/vlog_is_on.cc -+++ /src/vlog_is_on.cc +--- a/src/vlog_is_on.cc ++++ b/src/vlog_is_on.cc @@ -125,6 +125,8 @@ // Pointer to head of the VModuleInfo list. // It's a map from module pattern to logging level for those module(s). diff --git a/dev-cpp/rapidfuzz-cpp/Manifest b/dev-cpp/rapidfuzz-cpp/Manifest index 4e7aaa9035db..f8eaf0948ac1 100644 --- a/dev-cpp/rapidfuzz-cpp/Manifest +++ b/dev-cpp/rapidfuzz-cpp/Manifest @@ -1,3 +1,2 @@ -DIST rapidfuzz-cpp-1.7.0.gh.tar.gz 252646 BLAKE2B 5d79c07e26b6bb8e84d3280c3401bad60a3ca9846977a5bf9b13787ed7951c3805c71b7e6e2e03b14e2b988381484d969e1cc885c316bcb805b403e53332b31b SHA512 ed8af678a40161aa738bd3606b41fd54c1dba603c47fbdb1182527abd5667736e50f458af252e7bde954f263040cdbd662ad1c6be0a5caa5289f0a351dfd6d9e -DIST rapidfuzz-cpp-1.8.0.gh.tar.gz 280419 BLAKE2B ae6b7694df3f8ba97b369608bb02783bdd48572e80a9d4f0ee51585975aaee1c0ee058862b94a7a8e46f835b03c04d134143ed07fb5c6d412b4b5cff8686c6d3 SHA512 35729c90494b419fefd9c6bbd03e42cc485d421defcd65bf5dee776d4d0756318a90456980914ccebc100b1bb388474db54638a8628efd496764c604d6221688 +DIST rapidfuzz-cpp-1.10.0.gh.tar.gz 283171 BLAKE2B d126134f3250b5c5320d5776bb913b6458f5bcc61629c1ffd5957b3ddf79e5ff1ccc1c67a9c33271942e7f59846c73d2fdc672a99141964dae716c4ac8057193 SHA512 5d9b184e2b7975b0ba3f29e2698b80906afffa7c561f8b7c49988f99c92ff480bf0a471cb48f7e8024f3e048fb2b01ebbbf1bc28afacee78890f6a595cf10517 DIST rapidfuzz-cpp-1.9.0.gh.tar.gz 281385 BLAKE2B 4afc48edd9c8270200645eb77065bf212b9579b90b3916e261bbe69fd60f67c1e510c3ae4ef9877a26c3313063717b362e01c6cf799a0f9fc3429799d9b2dca6 SHA512 d95c90f9118811d650d859a20f847c71427acbc8c4f907f49d23b069cd6d1a848749d32f8fbff7326828b7a030c3f488acacba5845a72a0057ccf4c3088badf4 diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.0.ebuild index 99e66055cc0f..32f8979b752f 100644 --- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.7.0.ebuild +++ b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.10.0.ebuild @@ -14,7 +14,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm ~riscv" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild b/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild deleted file mode 100644 index 6fb280d52d37..000000000000 --- a/dev-cpp/rapidfuzz-cpp/rapidfuzz-cpp-1.8.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Rapid fuzzy string matching in C++" -HOMEPAGE="https://github.com/maxbachmann/rapidfuzz-cpp/" -SRC_URI=" - https://github.com/maxbachmann/rapidfuzz-cpp/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~riscv" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND=" - test? ( - >=dev-cpp/catch-3 - ) -" - -src_prepare() { - # apparently "C++ best practices" don't mind fetching random stuff - # at build time - sed -i -e '/aminya/,/^)/d' test/CMakeLists.txt || die - find -name 'CMakeLists.txt' -exec \ - sed -i -e 's:project_warnings::' {} + || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DRAPIDFUZZ_BUILD_TESTING=$(usex test) - ) - cmake_src_configure -} |
