[SM-Commit] GIT changes to master grimoire by Robert Figura (0e1dfd6b86bcf7235c80a50806e8d6987a7e0d74)

Robert Figura scm at sourcemage.org
Thu Jun 17 11:31:55 EDT 2010


GIT changes to master grimoire by Robert Figura <template at sourcemage.org>:

 utils/recoll/BUILD     |   16 ++++++++++++++++
 utils/recoll/CONFIGURE |   10 ++++++++++
 utils/recoll/DEPENDS   |   16 ++++------------
 utils/recoll/HISTORY   |    4 +++-
 4 files changed, 33 insertions(+), 13 deletions(-)

New commits:
commit 0e1dfd6b86bcf7235c80a50806e8d6987a7e0d74
Author: Robert Figura <template at sourcemage.org>
Commit: Robert Figura <template at sourcemage.org>

    recoll: use providers (QT and FAM), add 2 options

diff --git a/utils/recoll/BUILD b/utils/recoll/BUILD
new file mode 100755
index 0000000..cc13fed
--- /dev/null
+++ b/utils/recoll/BUILD
@@ -0,0 +1,16 @@
+
+function set_qt_environment()
+{
+  if check_if_qt4_provider
+  then
+    QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+    PATH="$QTDIR/bin/qt4:$PATH"
+  else
+    [[ -z $QTDIR ]] && source /etc/profile.d/qt.sh
+    QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+  fi
+}
+
+set_qt_environment
+OPTS="$RECOLL_OPTS $OPTS"
+default_build
diff --git a/utils/recoll/CONFIGURE b/utils/recoll/CONFIGURE
new file mode 100755
index 0000000..e4d459f
--- /dev/null
+++ b/utils/recoll/CONFIGURE
@@ -0,0 +1,10 @@
+config_query_option RECOLL_OPTS \
+                    "Enable splitting camelCase words" \
+                    n \
+                    "--enable-camelcase" \
+                    "" &&
+config_query_option RECOLL_OPTS \
+                    "Enable fetching metadata from file extended attributes" \
+                    n \
+                    "--enable-xattr" \
+                    ""
diff --git a/utils/recoll/DEPENDS b/utils/recoll/DEPENDS
index 5b92600..47c90c8 100755
--- a/utils/recoll/DEPENDS
+++ b/utils/recoll/DEPENDS
@@ -1,21 +1,13 @@
 depends xapian-core &&
 
-optional_depends qt4 \
+optional_depends QT \
                  "" \
                  "--without-gui" \
-                 "qt4 gui" &&
-#optional_depends qt-x11 \
-#                 "" \
-#                 "--without-gui" \
-#                 "qt3 gui?" &&
-optional_depends fam \
+                 "build GUI" &&
+optional_depends FAM \
                  "--with-fam" \
                  "--without-fam" \
-                 "use fam" &&
-#optional_depends gamin \
-#                 "--with-fam" \
-#                 "--without-fam" \
-#                 "use gamin" &&
+                 "for filesystem monitoring" &&
 optional_depends aspell \
                  "--with-aspell" \
                  "--without-aspell" \
diff --git a/utils/recoll/HISTORY b/utils/recoll/HISTORY
index 4beff84..a83d218 100644
--- a/utils/recoll/HISTORY
+++ b/utils/recoll/HISTORY
@@ -1,3 +1,5 @@
+2010-06-17 Robert Figura <template at sourcemage.org>
+	* CONFIGURE, DEPENDS, BUILD: use providers (QT and FAM), add 2 options
+
 2010-06-11 Robert Figura <template at sourcemage.org>
 	* DEPENDS, DETAILS: spell created
-



More information about the SM-Commit mailing list