Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (c67dd542d49c915a39189bca5a8cc53a3bc0554f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (c67dd542d49c915a39189bca5a8cc53a3bc0554f)
  • Date: Sat, 23 Jul 2011 04:30:25 -0500

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

utils/strigi/BUILD | 2 +-
utils/strigi/CONFIGURE | 1 -
utils/strigi/DEPENDS | 6 ++----
utils/strigi/HISTORY | 5 +++++
utils/strigi/strigi.sh | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)

New commits:
commit c67dd542d49c915a39189bca5a8cc53a3bc0554f
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

strigi: strigi.sh -> don't override XDG_DATA_DIRS that might be set
allready

commit ec66e540968b6f793266ece9a2496ca1f32ca7ac
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

strigi: depend on qt4 if dbus support is enabled

diff --git a/utils/strigi/BUILD b/utils/strigi/BUILD
index aeb1798..1eda951 100755
--- a/utils/strigi/BUILD
+++ b/utils/strigi/BUILD
@@ -1,4 +1,4 @@
-if [ $STRIGI_GUI = y ]; then
+if is_depends_enabled $SPELL dbus ; then
qt4_cmake_build
else
cmake_build
diff --git a/utils/strigi/CONFIGURE b/utils/strigi/CONFIGURE
deleted file mode 100755
index 7cb9ce3..0000000
--- a/utils/strigi/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query STRIGI_GUI 'do you want to use a GUI (qt4)?' n
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index f62c7f6..afd7eb6 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -8,11 +8,9 @@ depends pkgconfig &&
depends openssl &&
depends clucene &&
depends libxml2 &&
-if [[ $STRIGI_GUI = y ]]; then
- depends dbus &&
+optional_depends dbus '' '' 'message based indexing'
+if is_depends_enabled $SPELL dbus ; then
depends -sub DBUS qt4
-else
- optional_depends dbus '' '' 'message based indexing'
fi &&
optional_depends FAM '-DENABLE_FAM=on' '' 'file change monitoring' &&
optional_depends sqlite '-DENABLE_SQLITE=off' '' 'sqlite3 backend (broken)'
&&
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 07b0c22..9e93671 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,8 @@
+2011-07-23 Bor Kraljič <pyrobor AT ver.si>
+ * BUILD, DEPENDS: depend on qt4 if dbus support is enabled
+ * CONFIGURE: removed, no longer needed
+ * strigi.sh: don't override XDG_DATA_DIRS that might be set allready
+
2011-06-03 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 0.7.5
fixed WEB_SITE
diff --git a/utils/strigi/strigi.sh b/utils/strigi/strigi.sh
index 8cad416..dd291a5 100755
--- a/utils/strigi/strigi.sh
+++ b/utils/strigi/strigi.sh
@@ -1,3 +1,3 @@
#!/bin/sh
#set environment for using strigi
-export XDG_DATA_DIRS=/opt/kde4/share:/usr/share
+export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde4/share:/usr/share



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (c67dd542d49c915a39189bca5a8cc53a3bc0554f), Bor Kraljič, 07/23/2011

Archive powered by MHonArc 2.6.24.

Top of Page