sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (88eaa246776d8dea35807b165b8ff08f6851e9b8)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (88eaa246776d8dea35807b165b8ff08f6851e9b8)
- Date: Wed, 22 Jan 2025 21:13:30 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
libs/clucene/BUILD | 13 +-----
libs/clucene/CONFIGURE | 7 +--
libs/clucene/DEPENDS | 6 --
libs/clucene/DETAILS | 14 +-----
libs/clucene/HISTORY | 6 ++
libs/clucene/PREPARE | 2
libs/clucene/PRE_SUB_DEPENDS | 1
libs/clucene/REPAIR^all^PRE_SUB_DEPENDS | 1
libs/clucene/SUB_DEPENDS | 2
libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch | 30
++++++++------
libs/clucene/patches/clucene-pthread.patch | 25 +++++++++++
libs/clucene/patches/ctime.patch | 16 ++++++-
12 files changed, 76 insertions(+), 47 deletions(-)
New commits:
commit 88eaa246776d8dea35807b165b8ff08f6851e9b8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
clucene: Fix build; PATCHLEVEL++
commit 3918b052a866e53c045e9d3b2fac895640e5b472
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
clucene: Normalise the patches
commit 6d7487be5aafa3cdbba3bd03d33209a7a801bb32
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
clucene: Remove "stable" branch
This branch is completely abandoned and slower, and probably not used by
anyone; time is better spent in porting any user to branch 2.x.
diff --git a/libs/clucene/BUILD b/libs/clucene/BUILD
index 22e4416..e0b164f 100755
--- a/libs/clucene/BUILD
+++ b/libs/clucene/BUILD
@@ -1,9 +1,4 @@
-if [[ $CLUCENE_BRANCH == "stable" ]]; then
- OPTS="--disable-static $OPTS" &&
- default_build
-else
- if [[ $CLUCENE_CONTRIBS == "y" ]]; then
- OPTS="-DBUILD_CONTRIBS=ON -DBUILD_CONTRIBS_LIB=ON $OPTS"
- fi &&
- cmake_build
-fi
+if [[ $CLUCENE_CONTRIBS == "y" ]]; then
+ OPTS="-DBUILD_CONTRIBS=ON -DBUILD_CONTRIBS_LIB=ON $OPTS"
+fi &&
+cmake_build
diff --git a/libs/clucene/CONFIGURE b/libs/clucene/CONFIGURE
index 7ba092d..4dfb45a 100755
--- a/libs/clucene/CONFIGURE
+++ b/libs/clucene/CONFIGURE
@@ -1,3 +1,4 @@
-if [[ $CLUCENE_BRANCH != "stable" ]]; then
- config_query CLUCENE_CONTRIBS "Do you want third-party contributions?" n
-fi
+persistent_remove CLUCENE_BRANCH &&
+. "$GRIMOIRE"/CMAKE_CONFIGURE &&
+
+config_query CLUCENE_CONTRIBS "Do you want third-party contributions?" n
diff --git a/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index fad9e2f..4404da1 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,5 +1,3 @@
+. "$GRIMOIRE"/CMAKE_DEPENDS &&
depends -sub CXX gcc &&
-if [[ $CLUCENE_BRANCH == "2.x" ]]; then
- depends boost &&
- depends cmake
-fi
+depends boost
diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index d8939b8..c68095d 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -1,17 +1,11 @@
+. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=clucene
-if [[ $CLUCENE_BRANCH == "2.x" ]];then
VERSION=2.3.3.4
+ PATCHLEVEL=1
SOURCE_HASH=sha512:1c9da9077edcebd46563bd9e47d330518e0b30061016650a759cfe051e9748fdad8932a472b1cca53a6adafed5f41656527271fc5f55ddfcefb558f0d83286b4
- SPELLX=$SPELL-core-$VERSION
- SOURCE=$SPELLX.tar.gz
-else
- VERSION=0.9.21b
-
SOURCE_HASH=sha512:706e8ad1fc944ffe12f0b0057169bca63131ae2263a3e46dd9750bfe2e7401870dac8dc494e0159f9302afb285473d89b5bd62f9c2339a1a1954e4cb98391ee3
- SPELLX=$SPELL-core-$VERSION
- SOURCE=$SPELLX.tar.bz2
-fi
+ SOURCE=$SPELL-core-$VERSION.tar.gz
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SOURCE%.tar.gz}
WEB_SITE=http://sourceforge.net/projects/clucene/
ENTERED=20050531
LICENSE[0]=LGPL
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 52003bd..5166a91 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,9 @@
+2025-01-22 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, PREPARE, PRE_SUB_DEPENDS,
+ REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: removed "stable" branch
+ * patches/clucene-pthread.patch: fixed build
+ * DETAILS: PATCHLEVEL++
+
2022-12-13 Treeve Jelbert <treeve AT sourcemage.org>
* patches/ctime.patch: added
* PRE_BUILD: adjusted
diff --git a/libs/clucene/PREPARE b/libs/clucene/PREPARE
deleted file mode 100755
index d6a0f92..0000000
--- a/libs/clucene/PREPARE
+++ /dev/null
@@ -1,2 +0,0 @@
-. ${GRIMOIRE}/FUNCTIONS &&
-prepare_select_branch stable 2.x
diff --git a/libs/clucene/PRE_SUB_DEPENDS b/libs/clucene/PRE_SUB_DEPENDS
index 07f5559..77ff85e 100755
--- a/libs/clucene/PRE_SUB_DEPENDS
+++ b/libs/clucene/PRE_SUB_DEPENDS
@@ -1,5 +1,4 @@
case $THIS_SUB_DEPENDS in
- stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
CONTRIBS) [[ $CLUCENE_BRANCH == "2.x" && $CLUCENE_CONTRIBS == "y" ]] &&
return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
index 07f5559..77ff85e 100755
--- a/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,5 +1,4 @@
case $THIS_SUB_DEPENDS in
- stable) [[ $CLUCENE_BRANCH == "stable" ]] && return 0;;
CONTRIBS) [[ $CLUCENE_BRANCH == "2.x" && $CLUCENE_CONTRIBS == "y" ]] &&
return 0;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
esac
diff --git a/libs/clucene/SUB_DEPENDS b/libs/clucene/SUB_DEPENDS
index f158859..f1f5a75 100755
--- a/libs/clucene/SUB_DEPENDS
+++ b/libs/clucene/SUB_DEPENDS
@@ -1,6 +1,4 @@
case $THIS_SUB_DEPENDS in
- stable) message "clucene stable branch (0.9.21b) needed, forcing it." &&
- CLUCENE_BRANCH="stable";;
CONTRIBS) message "clucene third-party contributions in 2.x branch needed,
forcing it." &&
CLUCENE_BRANCH="2.x" && CLUCENE_CONTRIBS="y";;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
diff --git a/libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch
b/libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch
index 7866eae..612c7f8 100644
--- a/libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch
+++ b/libs/clucene/patches/clucene-2.3.3.4-contribs_lib-1.patch
@@ -1,13 +1,19 @@
-Submitted By: Igor Živković <contact AT igor-zivkovic.from.hr>
-Date: 2013-10-17
-Initial Package Version: 2.3.3.4
-Upstream Status: Reported
-Origin: Debian
-Description: Fixed building and installing of contribs-lib if
specified by config.
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Igor Živković <contact AT igor-zivkovic.from.hr>
+Date: Thu, 17 Oct 2013 00:00:00 +0000
+Subject: [PATCH] Fix build and install of contribs-lib if specified by
config.
-diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt clucene-2.3.3.4/CMakeLists.txt
---- clucene-2.3.3.4.orig/CMakeLists.txt 2013-10-17 11:32:30.064546492
+0200
-+++ clucene-2.3.3.4/CMakeLists.txt 2013-10-17 11:33:58.559550441 +0200
+Origin: Debian
+Upstream Status: Reported
+[ismael AT sourcemage.org: Normalised the patch]
+---
+ CMakeLists.txt | 2 +-
+ src/contribs-lib/CMakeLists.txt | 17 +++++++++++++++++
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -163,7 +163,7 @@
SET(BUILD_CONTRIBS_LIB 1)
ENDIF ( BUILD_CONTRIBS )
@@ -17,9 +23,9 @@ diff -Naur clucene-2.3.3.4.orig/CMakeLists.txt
clucene-2.3.3.4/CMakeLists.txt
ENDIF ( BUILD_CONTRIBS_LIB )
-diff -Naur clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt
clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt
---- clucene-2.3.3.4.orig/src/contribs-lib/CMakeLists.txt 2013-10-17
11:32:30.076546493 +0200
-+++ clucene-2.3.3.4/src/contribs-lib/CMakeLists.txt 2013-10-17
11:33:58.560550441 +0200
+diff -Naur a/src/contribs-lib/CMakeLists.txt
b/src/contribs-lib/CMakeLists.txt
+--- a/src/contribs-lib/CMakeLists.txt 2013-10-17 11:32:30.076546493 +0200
++++ b/src/contribs-lib/CMakeLists.txt 2013-10-17 11:33:58.560550441 +0200
@@ -106,9 +106,26 @@
)
TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
diff --git a/libs/clucene/patches/clucene-pthread.patch
b/libs/clucene/patches/clucene-pthread.patch
new file mode 100644
index 0000000..e273167
--- /dev/null
+++ b/libs/clucene/patches/clucene-pthread.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: psykose <alice AT ayaya.dev>
+Date: Fri, 19 Aug 2022 14:43:41 +0000
+Subject: [PATCH] Fix missing pthread header
+
+Origin: Alpine Linux
+Upstream-Status: Unknown
+[ismael AT sourcemage.org: Patch Normalised]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ src/shared/CLucene/LuceneThreads.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/shared/CLucene/LuceneThreads.h
b/src/shared/CLucene/LuceneThreads.h
+index 97072ee..4ee241e 100644
+--- a/src/shared/CLucene/LuceneThreads.h
++++ b/src/shared/CLucene/LuceneThreads.h
+@@ -7,6 +7,7 @@
+ #ifndef _LuceneThreads_h
+ #define _LuceneThreads_h
+
++#include <pthread.h>
+
+ CL_NS_DEF(util)
+ class CLuceneThreadIdCompare;
diff --git a/libs/clucene/patches/ctime.patch
b/libs/clucene/patches/ctime.patch
index 0f1fc09..3827e5b 100644
--- a/libs/clucene/patches/ctime.patch
+++ b/libs/clucene/patches/ctime.patch
@@ -1,6 +1,16 @@
-diff -uNr clucene-core-2.3.3.4.orig/src/core/CLucene/document/DateTools.cpp
clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp
---- clucene-core-2.3.3.4.orig/src/core/CLucene/document/DateTools.cpp
2011-03-17 01:21:07.000000000 +0100
-+++ clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp
2022-12-13 20:07:53.493774189 +0100
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 13 Dec 2022 20:15:50 +0100
+Subject: [PATCH] Add missing include of <ctime>
+
+[ismael AT sourcemage.org: Normalised the patch]
+---
+ src/core/CLucene/document/DateTools.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff -uNr a/src/core/CLucene/document/DateTools.cpp
b/src/core/CLucene/document/DateTools.cpp
+--- a/src/core/CLucene/document/DateTools.cpp
++++ b/src/core/CLucene/document/DateTools.cpp
@@ -8,6 +8,7 @@
#include "DateTools.h"
- [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (88eaa246776d8dea35807b165b8ff08f6851e9b8), Ismael Luceno, 01/22/2025
Archive powered by MHonArc 2.6.24.