* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/clucene/files/
@ 2017-06-18 18:50 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2017-06-18 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 6cdb97e62d8b13c849b4ca0ab873071deca63688
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 18:49:04 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 18:50:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdb97e6
dev-cpp/clucene: Allow any gcc version, #617870
dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch b/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch
index 54be5265d3e..b0b9ac1a327 100644
--- a/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-gcc6.patch
@@ -3,6 +3,9 @@ From: Hodorgasm <nsane457@gmail.com>
Date: Thu, 12 May 2016 20:38:12 -0400
Subject: [PATCH] Support GCC-6
+Updated 2017-06-18 by mgorny to allow *any* gcc version so that
+we do not have to update the patch every second month.
+
---
src/shared/cmake/MacroCheckGccVisibility.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -16,7 +19,7 @@ index 2022aa3..020f913 100644
exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
-+ string (REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++ string (REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" _gcc_version "${_gcc_version_info}")
if (NOT _gcc_version)
# clang reports: clang version 1.1 (trunk 95754)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/clucene/files/
@ 2021-06-14 15:08 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-06-14 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 6ad363bb19b264c0e3405a38c1969c5bc9b259d0
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 14 15:08:20 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 14 15:08:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad363bb
dev-cpp/clucene: add the .patch file to fix clang build issue
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../clucene/files/clucene-2.3.3.4-fix-clang.patch | 35 ++++++++++++++++++++++
1 file changed, 35 insertions(+)
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
new file mode 100644
index 00000000000..f743fa8c448
--- /dev/null
+++ b/dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch
@@ -0,0 +1,35 @@
+--- /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
+@@ -79,7 +79,7 @@
+ _T("<RANGEEX_GOOP>")
+ };
+
+-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
++const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,(int32_t)0x80000000,0x20000000,(int32_t)0x80000000,0x10000,0x80000,0x10000,0x1f68000};
+ 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
+@@ -15,9 +15,9 @@
+
+ CL_NS_DEF(queryParser)
+
+-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
++const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff)};
+ const int64_t QueryParserTokenManager::jjbitVec0[] = {
+- _ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)
++ (int64_t)_ILONGLONG(0xfffffffffffffffe), (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff), (int64_t)_ILONGLONG(0xffffffffffffffff)
+ };
+ 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
+@@ -8,6 +8,7 @@
+
+ #include "DateTools.h"
+ #include "CLucene/util/Misc.h"
++#include <time.h>
+
+ CL_NS_USE(util)
+ CL_NS_DEF(document)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/clucene/files/
@ 2022-10-30 11:13 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-10-30 11:13 UTC (permalink / raw
To: gentoo-commits
commit: a8e9d5d45b58bc4f4f7eb2f73878e5b2f9ee46af
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 11:12:40 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 11:12:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e9d5d4
dev-cpp/clucene: [QA] use git-format-patch style patches
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-cpp/clucene/files/clucene-2.3.3.4-fix-clang.patch | 12 ++++++------
1 file changed, 6 insertions(+), 6 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"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-30 11:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-30 11:13 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/clucene/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-06-14 15:08 Joonas Niilola
2017-06-18 18:50 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox