[SM-Commit] GIT changes to master grimoire by Robert Figura (9d705377554ded7c209d1adce8a0b532379e8c6e)

Robert Figura scm at sourcemage.org
Sun Aug 28 16:59:29 EDT 2011


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

 utils/recoll/BUILD   |   14 ++------------
 utils/recoll/DEPENDS |   22 ++++++++++++++++++++--
 utils/recoll/DETAILS |    4 ++--
 utils/recoll/HISTORY |    5 +++++
 4 files changed, 29 insertions(+), 16 deletions(-)

New commits:
commit 9d705377554ded7c209d1adce8a0b532379e8c6e
Author: Robert Figura <template at sourcemage.org>
Commit: Robert Figura <template at sourcemage.org>

    recoll -> 1.15.9, add suggested depends

diff --git a/utils/recoll/BUILD b/utils/recoll/BUILD
index 3720052..9addd16 100755
--- a/utils/recoll/BUILD
+++ b/utils/recoll/BUILD
@@ -1,17 +1,7 @@
 
-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
-}
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}"
+ PATH="$QTDIR/bin/qt4:$PATH"
 
-set_qt_environment
 OPTS="$RECOLL_OPTS $OPTS"
 default_build &&
 
diff --git a/utils/recoll/DEPENDS b/utils/recoll/DEPENDS
index 47c90c8..d87ccb4 100755
--- a/utils/recoll/DEPENDS
+++ b/utils/recoll/DEPENDS
@@ -1,9 +1,27 @@
 depends xapian-core &&
 
-optional_depends QT \
+suggest_depends unzip "" "" "openoffice" &&
+suggest_depends xpdf "" "" "pdf" &&                       # pdftotext
+# suggest_depends poppler "" "" "pdf" &&                  # pdftotext
+suggest_depends antiword "" "" "word" &&
+suggest_depends catdoc "" "" "excel and powerpoint" &&
+suggest_depends libwpd "" "" "wordperfect" &&
+suggest_depends unrtf "" "" "rtf" &&
+# suggest_depends untex "" "" "TeX" &&
+suggest_depends texlive "" "" "dvi" &&                    # dvips
+suggest_depends djvulibre "" "" "djvu" &&
+suggest_depends id3lib "" "" "mp3" &&
+# suggest_depends metaflac "" "" "flac" &&
+suggest_depends vorbis-tools "" "" "ogg vorbis" &&        # ogginfo
+suggest_depends image-exiftool "" "" "image metadata" &&
+suggest_depends pychm "" "" "chm help files" &&
+# suggest_depends libical "" "" "ical" &&                 # python icalendar module
+suggest_depends python "" "" "generic zip support" &&
+
+optional_depends qt4 \
                  "" \
                  "--without-gui" \
-                 "build GUI" &&
+                 "build qt4 GUI" &&
 optional_depends FAM \
                  "--with-fam" \
                  "--without-fam" \
diff --git a/utils/recoll/DETAILS b/utils/recoll/DETAILS
index 30911c7..949447a 100755
--- a/utils/recoll/DETAILS
+++ b/utils/recoll/DETAILS
@@ -1,8 +1,8 @@
            SPELL=recoll
-         VERSION=1.14.2
+         VERSION=1.15.9
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://www.lesbonscomptes.com/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:e827f7f5b326d81a176a7073308fc8bc4930e3bb04ce2f4666473b6732af1a3fc4f2ec53bf76b358b5d6bafc4d1405a88dd2b0278442c30c467d0328f2b42e20
+     SOURCE_HASH=sha512:0bc152c133f1c2f8c467f2b4cd98d93bfb0697837e8b0e67e75334b5f95ee91301a87e84a91447a744184372a12e5d0adf0d2131b5d9ed16d57727eacd06ccba
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.recoll.org/"
       LICENSE[0]=GPL
diff --git a/utils/recoll/HISTORY b/utils/recoll/HISTORY
index 4fee86f..1eef774 100644
--- a/utils/recoll/HISTORY
+++ b/utils/recoll/HISTORY
@@ -1,3 +1,8 @@
+2011-08-28 Robert Figura <template at sourcemage.org>
+	* DETAILS: updated spell to 1.15.9
+	* BUILD, DEPENDS: remove qt3 support
+	* DEPENDS: add lots of suggested depends
+
 2010-11-04 Robert Figura <template at sourcemage.org>
 	* DETAILS: updated spell to 1.14.2
 


More information about the SM-Commit mailing list