Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (03ac7de855e8d16e0efaf22e3e93b98c067bb21d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Sukneet Basuta (03ac7de855e8d16e0efaf22e3e93b98c067bb21d)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (03ac7de855e8d16e0efaf22e3e93b98c067bb21d)
  • Date: Mon, 23 Jul 2012 16:29:17 -0500
GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

kde4-support/soprano/DEPENDS | 10 +++++-----
kde4-support/soprano/HISTORY | 6 ++++++
libs/clucene/BUILD | 7 ++++++-
libs/clucene/DEPENDS | 5 ++++-
libs/clucene/DETAILS | 7 +++++++
libs/clucene/HISTORY | 8 ++++++++
libs/clucene/PREPARE | 2 ++
libs/clucene/PRE_SUB_DEPENDS | 4 ++++
libs/clucene/REPAIR^all^PRE_SUB_DEPENDS | 4 ++++
libs/clucene/SUB_DEPENDS | 5 +++++
utils/strigi/DEPENDS | 16 ++++++++++------
utils/strigi/HISTORY | 4 ++++
12 files changed, 65 insertions(+), 13 deletions(-)

New commits:
commit 03ac7de855e8d16e0efaf22e3e93b98c067bb21d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

soprano: added sub_depends stable to clucene to ensure proper
functionality, as 2.x of clucene is not supported
suggested_depends virtuosso -> optional_depends since it is the default
backend.

commit 2ce48d2434e815f7cfc7691894d96c0bd9b1254d
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

strigi: changed depends clucene to optional_depends, with sub_depends
stable

commit 02a237b365819e933912195c62aafd93eb1894cd
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

clucene: re-add stable branch (0.9.21b)
* PREPARE: added, to select branch
* DEPENDS: if branch is 2.x depend on boost and cmake
* BUILD: use default_build if stable branch, cmake_build otherwise
* SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^ALL^PRE_SUB_DEPENDS: added,
to force stable branch

diff --git a/kde4-support/soprano/DEPENDS b/kde4-support/soprano/DEPENDS
index 3b9c186..9b5451d 100755
--- a/kde4-support/soprano/DEPENDS
+++ b/kde4-support/soprano/DEPENDS
@@ -1,10 +1,10 @@
depends qt4 &&
depends cmake &&

-optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'Redland
backend' &&
-optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'raptor
parser and serializer plugins' &&
-suggest_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1'
'full-text search database' &&
-optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'dbus integration'
+optional_depends redland '' '-DSOPRANO_DISABLE_REDLAND_BACKEND=1' 'for
Redland backend' &&
+optional_depends raptor '' '-DSOPRANO_DISABLE_RAPTOR_PARSER=1' 'for raptor
parser and serializer plugins' &&
+optional_depends virtuoso '' '-DSOPRANO_DISABLE_VIRTUOSO_BACKEND=1' 'for
full-text search database (default soprano backend)' &&
+optional_depends dbus '' '-DSOPRANO_DISABLE_DBUS=1' 'for dbus integration'

if is_depends_enabled $SPELL dbus;then
sub_depends qt4 DBUS
@@ -13,4 +13,4 @@ fi &&
if is_depends_enabled $SPELL virtuoso;then
depends libiodbc
fi &&
-optional_depends clucene '' '-DSOPRANO_DISABLE_CLUCENE_INDEX=1' 'full-text
search index'
+optional_depends -sub stable clucene '' '-DSOPRANO_DISABLE_CLUCENE_INDEX=1'
'to use standalone version (not required if only used with KDE)'
diff --git a/kde4-support/soprano/HISTORY b/kde4-support/soprano/HISTORY
index 542b24b..2ead6ae 100644
--- a/kde4-support/soprano/HISTORY
+++ b/kde4-support/soprano/HISTORY
@@ -1,3 +1,9 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: suggested_depends virtuosso -> optional_depends since it
is the
+ default backend.
+ added sub_depends stable to clucene to ensure proper functionality,
as
+ 2.x of clucene is not supported
+
2012-05-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.7.6

diff --git a/libs/clucene/BUILD b/libs/clucene/BUILD
index e013b8d..f52df82 100755
--- a/libs/clucene/BUILD
+++ b/libs/clucene/BUILD
@@ -1 +1,6 @@
-cmake_build
+if [[ $CLUCENE_BRANCH == "stable" ]]; then
+ OPTS="--disable-static $OPTS" &&
+ default_build
+else
+ cmake_build
+fi
diff --git a/libs/clucene/DEPENDS b/libs/clucene/DEPENDS
index ea22aff..fad9e2f 100755
--- a/libs/clucene/DEPENDS
+++ b/libs/clucene/DEPENDS
@@ -1,2 +1,5 @@
depends -sub CXX gcc &&
-depends cmake
+if [[ $CLUCENE_BRANCH == "2.x" ]]; then
+ depends boost &&
+ depends cmake
+fi
diff --git a/libs/clucene/DETAILS b/libs/clucene/DETAILS
index 49fa991..9f98fb7 100755
--- a/libs/clucene/DETAILS
+++ b/libs/clucene/DETAILS
@@ -1,8 +1,15 @@
SPELL=clucene
+if [[ $CLUCENE_BRANCH == "2.x" ]];then
VERSION=2.3.3.4

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_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
WEB_SITE=http://sourceforge.net/projects/clucene/
diff --git a/libs/clucene/HISTORY b/libs/clucene/HISTORY
index 58e0cb6..f32643e 100644
--- a/libs/clucene/HISTORY
+++ b/libs/clucene/HISTORY
@@ -1,3 +1,11 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: re-add stable branch (0.9.21b)
+ * PREPARE: added, to select branch
+ * DEPENDS: if branch is 2.x depend on boost and cmake
+ * BUILD: use default_build if stable branch, cmake_build otherwise
+ * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^ALL^PRE_SUB_DEPENDS: added,
+ to force stable branch
+
2012-07-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.3.3.4
* DEPENDS: always depends cmake
diff --git a/libs/clucene/PREPARE b/libs/clucene/PREPARE
new file mode 100755
index 0000000..d6a0f92
--- /dev/null
+++ b/libs/clucene/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable 2.x
diff --git a/libs/clucene/PRE_SUB_DEPENDS b/libs/clucene/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..efc181b
--- /dev/null
+++ b/libs/clucene/PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ stable) [[ $CLUCENE_BRANCH == "stable" ]] && 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
new file mode 100755
index 0000000..efc181b
--- /dev/null
+++ b/libs/clucene/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,4 @@
+case $THIS_SUB_DEPENDS in
+ stable) [[ $CLUCENE_BRANCH == "stable" ]] && 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
new file mode 100755
index 0000000..cd14da7
--- /dev/null
+++ b/libs/clucene/SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ stable) message "clucene stable branch (0.9.21b) needed, forcing it." &&
+ CLUCENE_BRANCH="stable";;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"; return 1;;
+esac
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index 4e6d40b..2ee1f71 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -1,13 +1,17 @@
-depends -sub CXX gcc &&
+depends -sub CXX gcc &&
depends cmake &&
depends bzip2 &&
depends pkgconfig &&
depends openssl &&
-depends clucene &&
depends libxml2 &&
depends boost &&
-optional_depends dbus '-DENABLE_DBUS=on' '-DENABLE_DBUS=off' 'message
based indexing' &&
+
+optional_depends -sub stable clucene \
+ '-DENABLE_CLUCENE=on' \
+ '-DENABLE_CLUCENE=OFF -DENABLE_CLUCENE_NG=OFF' \
+ 'to use standalone version (not required if only used with
KDE)' &&
+optional_depends dbus '-DENABLE_DBUS=on' '-DENABLE_DBUS=off' 'for message
based indexing' &&
optional_depends -sub DBUS qt4 '-DENABLE_QT4=on' '-DENABLE_QT4=off' 'for qt4
gui' &&
-optional_depends FAM '-DENABLE_FAM=on' '' 'file change monitoring' &&
-optional_depends exiv2 '-DENABLE_EXIV2=on' '' 'picture indexing' &&
-optional_depends LIBAVCODEC '-DENABLE_FFMPEG=on' '-DENABLE_FFMPEG=off'
'video indexing'
+optional_depends FAM '-DENABLE_FAM=on' '' 'for file change
monitoring' &&
+optional_depends exiv2 '-DENABLE_EXIV2=on' '' 'for picture indexing' &&
+optional_depends LIBAVCODEC '-DENABLE_FFMPEG=on' '-DENABLE_FFMPEG=off' 'for
video indexing'
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index ee7c14b..e0daa0e 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,7 @@
+2012-07-23 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DEPENDS: changed depends clucene to optional_depends, with
sub_depends
+ stable
+
2012-07-22 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 0.7.7
changed SOURCE_URL to debian since 0.7.7 is no longer available from


  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (03ac7de855e8d16e0efaf22e3e93b98c067bb21d), Sukneet Basuta, 07/23/2012

Archive powered by MHonArc 2.6.24.

Top of Page