Skip to Content.
Sympa Menu

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

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č (ae373964d95ce9c11683326f0dbcea1326f1daef)
  • Date: Sat, 23 Jul 2011 06:20:41 -0500

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

utils/strigi/0001-fix-build-for-disabled-qt4-option.patch | 26
++++++++++++++
utils/strigi/BUILD | 2 -
utils/strigi/DEPENDS | 9 +---
utils/strigi/DETAILS | 13 -------
utils/strigi/HISTORY | 6 ++-
utils/strigi/PREPARE | 4 --
utils/strigi/PRE_BUILD | 3 +
7 files changed, 37 insertions(+), 26 deletions(-)

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

strigi: minor correcting of HISTORY

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

strigi: removed svn version since source is no longer available

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

strigi: qt4 and dbus are optional (added patch that that fixes that
problem)

diff --git a/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
b/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
new file mode 100644
index 0000000..f94e0bc
--- /dev/null
+++ b/utils/strigi/0001-fix-build-for-disabled-qt4-option.patch
@@ -0,0 +1,26 @@
+From e92b260635e4fe542c0c606f2a2484334e8240ca Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu AT gmx.de>
+Date: Wed, 13 Jul 2011 18:32:16 +0200
+Subject: [PATCH] fix build for disabled qt4 option
+
+---
+ lib/CMakeLists.txt | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index ba07497..5c6ae79 100644
+--- a/strigiclient/lib/CMakeLists.txt
++++ b/strigiclient/lib/CMakeLists.txt
+@@ -1,4 +1,7 @@
+ if(NOT WIN32)
+ add_subdirectory(htmlgui)
+ endif(NOT WIN32)
+-add_subdirectory(searchclient)
++
++if(QT4_FOUND)
++ add_subdirectory(searchclient)
++endif(QT4_FOUND)
+--
+1.7.3.4
+
+
diff --git a/utils/strigi/BUILD b/utils/strigi/BUILD
index 1eda951..afb5930 100755
--- a/utils/strigi/BUILD
+++ b/utils/strigi/BUILD
@@ -1,4 +1,4 @@
-if is_depends_enabled $SPELL dbus ; then
+if is_depends_enabled $SPELL qt4 ; then
qt4_cmake_build
else
cmake_build
diff --git a/utils/strigi/DEPENDS b/utils/strigi/DEPENDS
index afd7eb6..0b52881 100755
--- a/utils/strigi/DEPENDS
+++ b/utils/strigi/DEPENDS
@@ -1,6 +1,3 @@
-if [ $STRIGI_SVN = y ]; then
- depends subversion
-fi &&
depends g++ &&
depends cmake &&
depends bzip2 &&
@@ -8,10 +5,8 @@ depends pkgconfig &&
depends openssl &&
depends clucene &&
depends libxml2 &&
-optional_depends dbus '' '' 'message based indexing'
-if is_depends_enabled $SPELL dbus ; then
- depends -sub DBUS qt4
-fi &&
+optional_depends dbus '-DENABLE_DBUS=on' '-DENABLE_DBUS=off' '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 sqlite '-DENABLE_SQLITE=off' '' 'sqlite3 backend (broken)'
&&
optional_depends exiv2 '-DENABLE_EXIV2=on' '' 'picure indexing'
diff --git a/utils/strigi/DETAILS b/utils/strigi/DETAILS
index 65d2d55..d3f2177 100755
--- a/utils/strigi/DETAILS
+++ b/utils/strigi/DETAILS
@@ -1,23 +1,10 @@
SPELL=strigi
-if [[ "$STRIGI_SVN" == "y" ]]; then
-if [[ "$STRIGI_SVN_AUTOUPDATE" == "y" ]]; then
- VERSION=$(date +%Y%m%d)
-else
- VERSION=svn
-fi
- FORCE_DOWNLOAD=on
- SOURCE=$SPELL.tar.bz2
- SOURCE_IGNORE=volatile
-
SOURCE_URL[0]=svn://anonsvn.kde.org/home/kde/trunk//kdesupport/$SPELL:$SPELL
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
-else
VERSION=0.7.5

SOURCE_HASH=sha512:9c6f46475095996927153b9e8ee07d92c4cba0793772792c3a9b40229bdbd2b503fe07bcd3c8d73f235474326b8a601dea20bc77bc64c090248ea414d393c240
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[0]=http://www.vandenoever.info/software/strigi/$SOURCE
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-fi
WEB_SITE=http://www.vandenoever.info/software/strigi/
LICENSE[0]=LGPL
ENTERED=20070309
diff --git a/utils/strigi/HISTORY b/utils/strigi/HISTORY
index 9e93671..160275f 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,5 +1,9 @@
2011-07-23 Bor Kraljič <pyrobor AT ver.si>
- * BUILD, DEPENDS: depend on qt4 if dbus support is enabled
+ * DEPENDS, PREPARE, DETAILS: removed svn version since source is no
longer available
+ * PRE_BUILD, 0001-fix-build-for-disabled-qt4-option.patch: added
patch from
+
(http://sourceforge.net/tracker/?func=detail&aid=3366249&group_id=171000&atid=856302)
+ (now qt4 qui could be disabled and compile will not fail)
+ * BUILD, DEPENDS: qt4 and dbus are optional
* CONFIGURE: removed, no longer needed
* strigi.sh: don't override XDG_DATA_DIRS that might be set allready

diff --git a/utils/strigi/PREPARE b/utils/strigi/PREPARE
deleted file mode 100755
index bd03eb9..0000000
--- a/utils/strigi/PREPARE
+++ /dev/null
@@ -1,4 +0,0 @@
-config_query STRIGI_SVN 'Do you want the SVN version?' n &&
-if [[ $STRIGI_SVN == y ]]; then
- config_query STRIGI_SVN_AUTOUPDATE "Update to the latest SVN on every
cast?" ${DEFAULT:-n}
-fi
diff --git a/utils/strigi/PRE_BUILD b/utils/strigi/PRE_BUILD
new file mode 100755
index 0000000..4f1c189
--- /dev/null
+++ b/utils/strigi/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 -d $SOURCE_DIRECTORY <
$SPELL_DIRECTORY/0001-fix-build-for-disabled-qt4-option.patch



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

Archive powered by MHonArc 2.6.24.

Top of Page