[SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (eeb3186dd3649081a8f1ef2b9bf9eb80ad3927e0)

Bor Kraljič scm at sourcemage.org
Mon Aug 29 01:44:47 EDT 2011


GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor at ver.si>:

 ChangeLog                                     |   11 +++++++++++
 dev/null                                      |binary
 devel/binutils/DETAILS                        |   10 +++++-----
 devel/binutils/HISTORY                        |    4 ++++
 devel/cflow/DETAILS                           |   26 ++++++++++++++++++++++++++
 devel/cflow/HISTORY                           |    3 +++
 gnu.gpg                                       |binary
 http/xxxterm/DETAILS                          |    2 +-
 http/xxxterm/HISTORY                          |    3 +++
 http/xxxterm/xxxterm-1.489.tgz.sig            |    0 
 http/xxxterm/xxxterm-1.518.tgz.sig            |binary
 net/tor/DETAILS                               |    8 ++++----
 net/tor/HISTORY                               |    3 +++
 python-pypi/mercurial/DETAILS                 |    4 ++--
 python-pypi/mercurial/HISTORY                 |    3 +++
 python-pypi/python-cliapp/DEPENDS             |    1 +
 python-pypi/python-cliapp/DETAILS             |   15 +++++++++++++++
 python-pypi/python-cliapp/HISTORY             |    2 ++
 science/gnofract4d/DETAILS                    |    4 ++--
 science/gnofract4d/HISTORY                    |    3 +++
 security/samhain/DETAILS                      |    2 +-
 security/samhain/HISTORY                      |    3 +++
 utils/extrautils/DEPENDS                      |    1 +
 utils/extrautils/DETAILS                      |    4 ++--
 utils/extrautils/HISTORY                      |    4 ++++
 utils/installwatch/DETAILS                    |    2 +-
 utils/installwatch/HISTORY                    |    4 ++++
 utils/installwatch/PRE_BUILD                  |    1 +
 utils/installwatch/installwatch-relpath.patch |   15 +++++++++++++++
 utils/recoll/BUILD                            |   14 ++------------
 utils/recoll/DEPENDS                          |   22 ++++++++++++++++++++--
 utils/recoll/DETAILS                          |    4 ++--
 utils/recoll/HISTORY                          |    5 +++++
 33 files changed, 149 insertions(+), 34 deletions(-)

New commits:
commit cc81672162e9e775e083f6cb723a4a261830b402
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    xxxterm 1.518

commit ed367dbafd2d8d4984d1f1f7eb9f4dff1c5f21e5
Author: Robert Figura <template at sourcemage.org>
Commit: Robert Figura <template at sourcemage.org>

    gnofract4d: => 3.14

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

    recoll -> 1.15.9, add suggested depends

commit cfd7c300d74c1f8a55b595766453f1f0e77cd9e5
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    samhain: updated spell to 2.8.5a (fixes #106 until next version update)

commit 2f8dc141adb19a4e27e4c6dd9227ac4a2e89b6c2
Author: Remko van der Vossen <wich at sourcemage.org>
Commit: Remko van der Vossen <wich at sourcemage.org>

    installwatch: patch a memory handling bug
    
    Relative path handling in installwatch contained a bug in which the
    directory size was used in a malloc for the expanded path string,
    instead of a saner PATH_MAX value. (fixes #94)

commit 6a06911ebf95602f06c263223e84bd76b7e960aa
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mercurial: => 1.9.2

commit 309111b6e0882c3813f4feac518b66fcca2e273c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    binutils: => 2.21.1a

commit 7c2f26a2a06367a87005e481fbf15146085b0d01
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gnu.gpg: added public key 4AE55E93 (Tristan Gingold <gingold at adacore.com>), required for binutils

commit cd141523a2eb3631130fa35ee7a78135f1dae199
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    tor: => 0.2.2.32

commit bbe069d9731d9735b565caa153608317bb2f7be4
Author: Ismael Luceno <ismael at sourcemage.org>
Commit: Ismael Luceno <ismael at sourcemage.org>

    cflow: new spell, Control flow charting software

commit b89fb185a7cb9d3ea79c792d1a219f8171fb909a
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    extrautils 1.16.1, #99

commit 563a2575d7266d2a3ca42a84711430cd8385ab99
Author: Ladislav Hagara <hgr at vabo.cz>
Commit: Ladislav Hagara <hgr at vabo.cz>

    python-pypi/python-cliapp: new spell, Python framework for Unix-like
    command line programs

diff --git a/ChangeLog b/ChangeLog
index a572c05..562f217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-08-28 Vlad Glagolev <stealth at sourcemage.org>
+	* gnu.gpg: added public key 4AE55E93 (Tristan Gingold
+	  <gingold at adacore.com>), required for binutils
+
+2011-08-27 Ismael Luceno <ismael at sourcemage.org>
+	* devel/cflow: new spell, Control flow charting software
+
+2011-08-27 Ladislav Hagara <hgr at vabo.cz>
+	* python-pypi/python-cliapp: new spell
+	  Python framework for Unix-like command line programs
+
 2011-08-26 Pol Vinogradov <vin.public at gmail.com>
 	* xfce-plugins/thunar-dropbox: new spell, Dropbox plugin for Thunar
 	* gnome2-libs/nautilus-dropbox: new spell, Dropbox extension for Nautilus
diff --git a/devel/binutils/DETAILS b/devel/binutils/DETAILS
index 1279615..ae80873 100755
--- a/devel/binutils/DETAILS
+++ b/devel/binutils/DETAILS
@@ -1,18 +1,18 @@
            SPELL=binutils
-         VERSION=2.21.1
+         VERSION=2.21.1a
+        VERSIONX=2.21.1
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSIONX"
    SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=$GNU_URL/$SPELL/$SOURCE2
-     SOURCE_HASH=sha512:31f34457b525f2cbde85f7cc169a41b37a6552e05011e3fc6180d015bc1043c842e0ed0ef261061ec7d5db8807b0e86f3ca9ba9d6cb449ff3314e8254cac3d21
-#      SOURCE_GPG=gnu-verified.gpg:$SOURCE2
+      SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
         WEB_SITE=http://sourceware.org/binutils/
          ENTERED=20010922
         KEYWORDS="devel"
-           SHORT="binutils is an essential collection of binary utilities."
+           SHORT="essential collection of binary utilities"
 cat << EOF
 binutils - Collection of binary utilities
 ld 	-the GNU linker
diff --git a/devel/binutils/HISTORY b/devel/binutils/HISTORY
index d41e9fb..a14ba83 100644
--- a/devel/binutils/HISTORY
+++ b/devel/binutils/HISTORY
@@ -1,3 +1,7 @@
+2011-08-28 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.21.1a; quoting paths; switched to upstream
+	  gpg checking
+
 2011-06-27 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 2.21.1
 
diff --git a/devel/cflow/DETAILS b/devel/cflow/DETAILS
new file mode 100755
index 0000000..b67f2dd
--- /dev/null
+++ b/devel/cflow/DETAILS
@@ -0,0 +1,26 @@
+           SPELL=cflow
+         VERSION=1.3
+          SOURCE="${SPELL}-${VERSION}.tar.bz2"
+         SOURCE2=$SOURCE.sig
+   SOURCE_URL[0]=http://ftp.gnu.org/gnu/${SPELL}/${SOURCE}
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://www.gnu.org/software/cflow/"
+      LICENSE[0]=GPLv3
+         ENTERED=20110827
+           SHORT="Control flow charting software"
+cat << EOF
+GNU cflow analyzes a collection of C source files and prints a graph,
+charting control flow within the program.
+
+GNU cflow is able to produce both direct and inverted flowgraphs for C
+sources. Optionally a cross-reference listing can be generated. Two output
+formats are implemented: POSIX and GNU (extended).
+
+Input files can optionally be preprocessed before analyzing.
+
+The package also provides Emacs major mode for examining the produced
+flowcharts in Emacs.
+EOF
diff --git a/devel/cflow/HISTORY b/devel/cflow/HISTORY
new file mode 100644
index 0000000..3a53c08
--- /dev/null
+++ b/devel/cflow/HISTORY
@@ -0,0 +1,3 @@
+2011-08-27 Ismael Luceno <ismael at sourcemage.org>
+	* DETAILS: spell created
+
diff --git a/gnu.gpg b/gnu.gpg
index efd878a..53bcb92 100644
Binary files a/gnu.gpg and b/gnu.gpg differ
diff --git a/http/xxxterm/DETAILS b/http/xxxterm/DETAILS
index b39ffff..0a29e37 100755
--- a/http/xxxterm/DETAILS
+++ b/http/xxxterm/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xxxterm
-         VERSION=1.489
+         VERSION=1.518
           SOURCE=$SPELL-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=https://opensource.conformal.com/snapshots/$SPELL/$SOURCE
diff --git a/http/xxxterm/HISTORY b/http/xxxterm/HISTORY
index 3c70f9f..c231950 100644
--- a/http/xxxterm/HISTORY
+++ b/http/xxxterm/HISTORY
@@ -1,3 +1,6 @@
+2011-08-29 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.518
+
 2011-08-15 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.489, http -> https, SOURCE_HINTS added
 
diff --git a/http/xxxterm/xxxterm-1.489.tgz.sig b/http/xxxterm/xxxterm-1.489.tgz.sig
deleted file mode 100644
index b78d2f7..0000000
Binary files a/http/xxxterm/xxxterm-1.489.tgz.sig and /dev/null differ
diff --git a/http/xxxterm/xxxterm-1.518.tgz.sig b/http/xxxterm/xxxterm-1.518.tgz.sig
new file mode 100644
index 0000000..58c8600
Binary files /dev/null and b/http/xxxterm/xxxterm-1.518.tgz.sig differ
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index 1991646..6ad54a4 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,9 +4,10 @@ if [ "$TOR_DEVEL" == "y" ]; then
          VERSION=0.2.2.23-alpha
   SECURITY_PATCH=4
 else
-         VERSION=0.2.1.30
+         VERSION=0.2.2.32
   SECURITY_PATCH=4
 fi
+
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
          SOURCE2=$SOURCE.asc
@@ -14,13 +15,12 @@ fi
       SOURCE_GPG=tor.gpg:$SOURCE2:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
       LICENSE[0]=BSD
         WEB_SITE=http://www.torproject.org/
          ENTERED=20050415
         KEYWORDS="net"
-           SHORT="An anonymous Internet communication system"
-
+           SHORT="anonymous Internet communication system"
 cat << EOF
 Tor is a toolset for a wide range of organizations and people that want to
 improve their safety and security on the Internet. Using Tor can help you
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 3fc1a58..0b95b4c 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,6 @@
+2011-08-28 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.2.2.32; quoting paths
+
 2011-03-27 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: moved system account creation and TOR_USERGROUP here; create
 	  built-in system account only if the default one had been selected
diff --git a/python-pypi/mercurial/DETAILS b/python-pypi/mercurial/DETAILS
index dce5c99..8a88292 100755
--- a/python-pypi/mercurial/DETAILS
+++ b/python-pypi/mercurial/DETAILS
@@ -1,6 +1,6 @@
            SPELL=mercurial
-         VERSION=1.9.1
-     SOURCE_HASH=sha512:64c46f1d53acae98cdd9285440a1c7cd3e8ed2fd5df3acd7f4cdd33edab8010979cbc19a379cf7a59a3db63c0f7eb6cae883248f05075919552a0624ca5cb067
+         VERSION=1.9.2
+     SOURCE_HASH=sha512:17dc4f5bcd60b52b15998b13e6818d530cb1c707cb7cb9603d463c0bd0c48d4d1409035f2ccce5cf9be71755bc7fb88e5b361c17f0054f139b543f947702f01b
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.selenic.com/mercurial/release/$SOURCE
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/mercurial/HISTORY b/python-pypi/mercurial/HISTORY
index a19334f..ed1dad2 100644
--- a/python-pypi/mercurial/HISTORY
+++ b/python-pypi/mercurial/HISTORY
@@ -1,3 +1,6 @@
+2011-08-28 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.9.2
+
 2011-08-03 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.9.1
 
diff --git a/python-pypi/python-cliapp/DEPENDS b/python-pypi/python-cliapp/DEPENDS
new file mode 100755
index 0000000..a86d429
--- /dev/null
+++ b/python-pypi/python-cliapp/DEPENDS
@@ -0,0 +1 @@
+depends python
diff --git a/python-pypi/python-cliapp/DETAILS b/python-pypi/python-cliapp/DETAILS
new file mode 100755
index 0000000..28d814a
--- /dev/null
+++ b/python-pypi/python-cliapp/DETAILS
@@ -0,0 +1,15 @@
+           SPELL=python-cliapp
+         VERSION=0.18
+          SOURCE="${SPELL}_${VERSION}.orig.tar.gz"
+   SOURCE_URL[0]=http://code.liw.fi/debian/pool/main/p/$SPELL/$SOURCE
+     SOURCE_HASH=sha512:886a3b9ff9aeb9765eae1ae115eff2cdc3d4fe4fd911a87f040d71f2bd7f5b8c8f3842aa4c5d2f8344e7379f1b8302d1d4bfd3ec5c671998563f9ad3361c094e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}_${VERSION}.orig"
+        WEB_SITE="http://liw.fi/cliapp/"
+      LICENSE[0]=GPL
+         ENTERED=20110827
+           SHORT="Python framework for Unix-like command line programs"
+cat << EOF
+cliapp is a Python framework for Unix-like command line programs. It contains
+the typical stuff such programs need to do, such as parsing the command line for
+options, and iterating over input files.
+EOF
diff --git a/python-pypi/python-cliapp/HISTORY b/python-pypi/python-cliapp/HISTORY
new file mode 100644
index 0000000..910f1e9
--- /dev/null
+++ b/python-pypi/python-cliapp/HISTORY
@@ -0,0 +1,2 @@
+2011-08-27 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS, DEPENDS: spell created, version 0.18
diff --git a/science/gnofract4d/DETAILS b/science/gnofract4d/DETAILS
index 48918c1..c7dc241 100755
--- a/science/gnofract4d/DETAILS
+++ b/science/gnofract4d/DETAILS
@@ -1,8 +1,8 @@
            SPELL=gnofract4d
-         VERSION=3.13
+         VERSION=3.14
           SOURCE=gnofract4d-${VERSION}.tar.gz
    SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:866c01be0ca04603d3ea9632d6172893a6b4d843b8720955f1ba1bf843e8034278dc9c4f00ef9bde9c9ae611a5815aafa6c999c84252b9c7b6afa9c4ff17940b
+     SOURCE_HASH=sha512:cf3614f60a43f7ab20208fb1a62d3823495c84060d177d2926bad20a475e661d7ec45a7bc14e826229656027fe7c0f68aac093b6b0dc7912e84d8d8ec8ff81e5
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://gnofract4d.sourceforge.net/
          ENTERED=20050307
diff --git a/science/gnofract4d/HISTORY b/science/gnofract4d/HISTORY
index d922de2..298204a 100644
--- a/science/gnofract4d/HISTORY
+++ b/science/gnofract4d/HISTORY
@@ -1,3 +1,6 @@
+2011-08-28 Robert Figura <template at sourcemage.org>
+	* DETAILS: 3.14
+
 2010-04-18 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 3.13
 
diff --git a/security/samhain/DETAILS b/security/samhain/DETAILS
index 3b2e9c6..4501194 100755
--- a/security/samhain/DETAILS
+++ b/security/samhain/DETAILS
@@ -1,5 +1,5 @@
            SPELL=samhain
-         VERSION=2.7.2c
+         VERSION=2.8.5a
           SOURCE="$SPELL-$VERSION.tar.gz"
          SOURCE2="$SOURCE.asc"
       SOURCE_GPG="$SPELL.gpg":"$SOURCE2":UPSTREAM_KEY
diff --git a/security/samhain/HISTORY b/security/samhain/HISTORY
index 3cde0c5..65de746 100644
--- a/security/samhain/HISTORY
+++ b/security/samhain/HISTORY
@@ -1,3 +1,6 @@
+2011-08-28 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: updated spell to 2.8.5a (fixes #106 until next version update)
+
 2010-10-11 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2.7.2c
 	  Fixed SOURCE2_URL[0], fixed long description wrap
diff --git a/utils/extrautils/DEPENDS b/utils/extrautils/DEPENDS
new file mode 100755
index 0000000..5058221
--- /dev/null
+++ b/utils/extrautils/DEPENDS
@@ -0,0 +1 @@
+depends python-cliapp
diff --git a/utils/extrautils/DETAILS b/utils/extrautils/DETAILS
index bd1c4de..fcfdd50 100755
--- a/utils/extrautils/DETAILS
+++ b/utils/extrautils/DETAILS
@@ -1,8 +1,8 @@
            SPELL=extrautils
-         VERSION=1.13
+         VERSION=1.16.1
           SOURCE="${SPELL}_${VERSION}.tar.gz"
    SOURCE_URL[0]=http://code.liw.fi/debian/pool/main/e/${SPELL}/${SOURCE}
-     SOURCE_HASH=sha512:712569de8621d189e0e8d465b90ffb1356c3952f6dbeb94b1cb001bd535d24cf7aa0b823ca1ac16c22796fcdb593d1a07c9fb4e85cb89a2bda402d4572e8ef29
+     SOURCE_HASH=sha512:c69bd3fc432f8d65477fc6220f22b184c77bb24671ad0b289718d8d060eb6a9d594d4b9c17876c466bf052d00251b6d30879b083fbd7de33e9f05aafab5dd2c6
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://liw.fi/extrautils"
       LICENSE[0]=GPL
diff --git a/utils/extrautils/HISTORY b/utils/extrautils/HISTORY
index 50bebf1..d82db80 100644
--- a/utils/extrautils/HISTORY
+++ b/utils/extrautils/HISTORY
@@ -1,3 +1,7 @@
+2011-08-27 Ladislav Hagara <hgr at vabo.cz>
+	* DETAILS: 1.16.1, #99
+	* DEPENDS: python-cliapp added
+
 2011-05-28 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DETAILS: version 1.13
 
diff --git a/utils/installwatch/DETAILS b/utils/installwatch/DETAILS
index 09a3776..d5aec02 100755
--- a/utils/installwatch/DETAILS
+++ b/utils/installwatch/DETAILS
@@ -1,6 +1,6 @@
            SPELL=installwatch
          VERSION=2010-12-12
-      PATCHLEVEL=1
+      PATCHLEVEL=2
           SOURCE=$SPELL-$VERSION.tar.bz2
      SOURCE_HASH=sha512:eda74e4a8b1707b7b5992e222baa8873b6248c0c9ef4475c521bef4dc3ba5374713ba09fc0acdaa369c67930865924994f4c15deb7b6b0e39cce5eeb6d24e50f
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
diff --git a/utils/installwatch/HISTORY b/utils/installwatch/HISTORY
index 31aa875..3923f54 100644
--- a/utils/installwatch/HISTORY
+++ b/utils/installwatch/HISTORY
@@ -1,3 +1,7 @@
+2011-08-28 Remko van der Vossen <wich at sourcemage.org>
+	* DETAILS, PRE_BUILD, installwatch-relpath.patch: added patch to fix
+	  incorrect memory handling in relative path handling.
+
 2011-02-05 Ladislav Hagara <hgr at vabo.cz>
 	* PRE_BUILD, installwatch-glibc-2.13.patch: added patch
 
diff --git a/utils/installwatch/PRE_BUILD b/utils/installwatch/PRE_BUILD
index c6a146c..742685b 100755
--- a/utils/installwatch/PRE_BUILD
+++ b/utils/installwatch/PRE_BUILD
@@ -3,6 +3,7 @@ cd $SOURCE_DIRECTORY &&
 
 patch Makefile < $SPELL_DIRECTORY/ld_preload.patch &&
 patch -p 1 < $SPELL_DIRECTORY/installwatch-glibc-2.13.patch &&
+patch -p 1 < $SPELL_DIRECTORY/installwatch-relpath.patch &&
 sed -i "s:PREFIX=/usr/local:PREFIX=/usr:" Makefile &&
 
 # due to the compatibility with stable sorcery
diff --git a/utils/installwatch/installwatch-relpath.patch b/utils/installwatch/installwatch-relpath.patch
new file mode 100644
index 0000000..b0f4d11
--- /dev/null
+++ b/utils/installwatch/installwatch-relpath.patch
@@ -0,0 +1,15 @@
+diff -Naur installwatch.orig/installwatch.c installwatch/installwatch.c
+--- installwatch.orig/installwatch.c	2010-02-14 04:19:42.000000000 +0100
++++ installwatch/installwatch.c	2011-08-28 20:44:02.000000000 +0200
+@@ -1711,9 +1711,9 @@
+ 	snprintf(proc_path, PROC_PATH_LEN, "/proc/self/fd/%d", dirfd);
+ 	if(true_stat(proc_path, &s) == -1)
+ 		goto out;
+-	if(!(newpath = malloc(s.st_size+strlen(relpath)+2)))
++	if(!(newpath = malloc(PATH_MAX+strlen(relpath)+2)))
+ 		goto out;
+-	if((l = true_readlink(proc_path, newpath, s.st_size)) == -1)
++	if((l = true_readlink(proc_path, newpath, PATH_MAX)) == -1)
+ 		goto free_out;
+ 	newpath[l] = '/';
+ 	strcpy(newpath + l + 1, relpath);
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