From b7e90a4457c2fa6eba11cc8df1d2201cf54811fa Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 30 Oct 2023 00:04:32 +0300 Subject: [PATCH] clucene rebuild --- .../0001-Fix-missing-include-time.h.patch | 49 +++++++++++++++++++ programming/misc/clucene/pspec.xml | 1 + 2 files changed, 50 insertions(+) create mode 100644 programming/misc/clucene/files/0001-Fix-missing-include-time.h.patch diff --git a/programming/misc/clucene/files/0001-Fix-missing-include-time.h.patch b/programming/misc/clucene/files/0001-Fix-missing-include-time.h.patch new file mode 100644 index 0000000000..0ac26f7692 --- /dev/null +++ b/programming/misc/clucene/files/0001-Fix-missing-include-time.h.patch @@ -0,0 +1,49 @@ +From c1c2000c35ff39b09cb70fbdf66a107d3b17a674 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Wed, 12 Oct 2022 08:40:49 +0200 +Subject: [PATCH] Fix missing #include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +At least on recent Fedora 37 beta, building now failed with + +> CLucene/document/DateTools.cpp:26:19: error: ‘gmtime’ was not declared in this scope +> 26 | tm *ptm = gmtime(&secs); +> | ^~~~~~ + +etc. + +As it turns out, after 22f9d40320e3deeaa8d6aaa7a770077c20a21dae "git-svn-id: +https://clucene.svn.sourceforge.net/svnroot/clucene/branches/lucene2_3_2@2672 +20ef185c-fe11-0410-a618-ba9304b01011" on 2008-06-26 had commented out +_CL_TIME_WITH_SYS_TIME in clucene-config.h.cmake as "not actually used for +anything", then cceccfb52917b5f4da447f1cf20c135952d41442 "Presenting DateTools +and deprecating DateField. DateTools still requires some testing and its own +unit testing" on 2008-06-29 had introduced this use of it (into then +src/CLucene/document/DateTools.H). And apparently most build environments have +silently been happy ever since when the dead leading check for +_CL_TIME_WITH_SYS_TIME didn't include both and , but the +following check for _CL_HAVE_SYS_TIME_H only included but not +. +--- + src/shared/CLucene/clucene-config.h.cmake | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/shared/CLucene/clucene-config.h.cmake b/src/shared/CLucene/clucene-config.h.cmake +index bd8683a5..6fe0f92b 100644 +--- a/src/shared/CLucene/clucene-config.h.cmake ++++ b/src/shared/CLucene/clucene-config.h.cmake +@@ -100,8 +100,7 @@ ${SYMBOL__T} + //#cmakedefine _CL_STAT_MACROS_BROKEN + + /* Define to 1 if you can safely include both and . */ +-//not actually used for anything... +-//#cmakedefine _CL_TIME_WITH_SYS_TIME 1 ++#cmakedefine _CL_TIME_WITH_SYS_TIME 1 + + /* Define that we will be using -fvisibility=hidden, and + * make public classes visible using __attribute__ ((visibility("default"))) +-- +2.37.3 + diff --git a/programming/misc/clucene/pspec.xml b/programming/misc/clucene/pspec.xml index c54e619a06..16b9232992 100644 --- a/programming/misc/clucene/pspec.xml +++ b/programming/misc/clucene/pspec.xml @@ -27,6 +27,7 @@ clucene-2.3.3.4-contribs_lib-1.patch fix_zlib_detections.diff clucene-core-2.3.3.4-usleep.patch + 0001-Fix-missing-include-time.h.patch clucene-warnings.patch clucene-gcc-atomics.patch