[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (c6ab7ef9fac7cc99e99918767f629842b86ed9b6)

Vlad Glagolev scm at sourcemage.org
Sat Jul 23 10:04:05 EDT 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 dev/null                                                  |binary
 education/klavaro/DEPENDS                                 |    4 +-
 education/klavaro/DETAILS                                 |    4 +-
 education/klavaro/HISTORY                                 |    4 ++
 graphics-libs/sane-backends/DETAILS                       |    2 -
 graphics-libs/sane-backends/HISTORY                       |    3 +
 python-pypi/bpython/DEPENDS                               |    3 +
 python-pypi/bpython/DETAILS                               |    4 +-
 python-pypi/bpython/HISTORY                               |    4 ++
 python-pypi/python-ldap/DETAILS                           |    4 +-
 python-pypi/python-ldap/HISTORY                           |    3 +
 python-pypi/urwid/DEPENDS                                 |    2 +
 python-pypi/urwid/DETAILS                                 |    4 +-
 python-pypi/urwid/HISTORY                                 |    5 ++
 python-pypi/urwid/urwid-0.9.9.1.tar.gz.sig                |    0 
 python-pypi/urwid/urwid-0.9.9.2.tar.gz.sig                |binary
 utils/strigi/0001-fix-build-for-disabled-qt4-option.patch |   26 ++++++++++++++
 utils/strigi/BUILD                                        |    2 -
 utils/strigi/CONFIGURE                                    |    1 
 utils/strigi/DEPENDS                                      |   11 +----
 utils/strigi/DETAILS                                      |   13 -------
 utils/strigi/HISTORY                                      |    9 ++++
 utils/strigi/PREPARE                                      |    4 --
 utils/strigi/PRE_BUILD                                    |    3 +
 utils/strigi/strigi.sh                                    |    2 -
 25 files changed, 76 insertions(+), 41 deletions(-)

New commits:
commit c5878a9bcf7ba648c198d9e0bf1ea12668b0288d
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    bpython: => 0.10

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

    urwid: => 0.9.9.2

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

    python-ldap: => 2.4.3

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)

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

    sane-backends: fixed SOURCE_URL[1] (http://bugs.sourcemage.org/show_bug.cgi?id=15998)

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

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

    klavaro: => 1.9.3

diff --git a/education/klavaro/DEPENDS b/education/klavaro/DEPENDS
index f53620c..afd25c4 100755
--- a/education/klavaro/DEPENDS
+++ b/education/klavaro/DEPENDS
@@ -1,3 +1,5 @@
 depends gtk+2 &&
 depends gtkdatabox &&
-depends curl
+depends curl &&
+
+suggest_depends espeak "" "" "for speech synthesizer support"
diff --git a/education/klavaro/DETAILS b/education/klavaro/DETAILS
index 67e81a6..70ec686 100755
--- a/education/klavaro/DETAILS
+++ b/education/klavaro/DETAILS
@@ -1,9 +1,9 @@
            SPELL=klavaro
-         VERSION=1.8.1
+         VERSION=1.9.3
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:676ef2bd96c2e6e4c2fa7a97d68542386587b9c06c4d64dc318c944fb83e6f02a84189e8c93fe57fe540561402621dfd1193a1d1caea5679054910a67387f9e2
+     SOURCE_HASH=sha512:2534885b9fb741e613d38d9e4887b0e641be4e9aecea89630d30f93078eb574a7a4cd5c0e9cda44a88caa4fb5ad86bb1897ce1f0c8810bb7a13ccf88afbb252f
       LICENSE[0]=GPL
         WEB_SITE=http://klavaro.sourceforge.net/
          ENTERED=20110123
diff --git a/education/klavaro/HISTORY b/education/klavaro/HISTORY
index 18a02ee..5c3d275 100644
--- a/education/klavaro/HISTORY
+++ b/education/klavaro/HISTORY
@@ -1,3 +1,7 @@
+2011-07-23 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.9.3
+	* DEPENDS: added espeak suggest depends
+
 2011-02-27 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.8.1
 
diff --git a/graphics-libs/sane-backends/DETAILS b/graphics-libs/sane-backends/DETAILS
index 1bf0a2e..b92ded3 100755
--- a/graphics-libs/sane-backends/DETAILS
+++ b/graphics-libs/sane-backends/DETAILS
@@ -5,7 +5,7 @@
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.sane-project.org/pub/sane/$SPELL-$VERSION/$SOURCE
-   SOURCE_URL[1]=http://alioth.debian.org/download.php/1669/$SOURCE
+   SOURCE_URL[1]=http://alioth.debian.org/download.php/3503/$SOURCE
 #      SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=GPL
         WEB_SITE=http://www.sane-project.org/
diff --git a/graphics-libs/sane-backends/HISTORY b/graphics-libs/sane-backends/HISTORY
index 946676f..e631dc2 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,6 @@
+2011-07-23 Bor Kraljič <pyrobor at ver.si>
+	* DETAILS: fixed SOURCE_URL[1] (http://bugs.sourcemage.org/show_bug.cgi?id=15998)
+
 2011-02-14 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.0.22
 
diff --git a/python-pypi/bpython/DEPENDS b/python-pypi/bpython/DEPENDS
index 058648f..8a7aa57 100755
--- a/python-pypi/bpython/DEPENDS
+++ b/python-pypi/bpython/DEPENDS
@@ -1,4 +1,5 @@
 depends python &&
 depends pygments &&
 
-suggest_depends pygtk2 "" "" "for GTK interface support"
+suggest_depends pygtk2 "" "" "for GTK interface support" &&
+suggest_depends urwid "" "" "for console interface support"
diff --git a/python-pypi/bpython/DETAILS b/python-pypi/bpython/DETAILS
index b1bf321..d0d7d67 100755
--- a/python-pypi/bpython/DETAILS
+++ b/python-pypi/bpython/DETAILS
@@ -1,8 +1,8 @@
            SPELL=bpython
-         VERSION=0.9.7.1
+         VERSION=0.10
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://www.bpython-interpreter.org/releases/$SOURCE
-     SOURCE_HASH=sha512:a64ee832257d9589a43e198ecd4689efde9bce868edff133555628ef2ba01b4fc5beabe946bdd979c6f4c236ddecdc60735d019e5a6754a82026598f4c5dad63
+     SOURCE_HASH=sha512:7396970f59f6b7c68c1f092b19179ad69b542aa46077134373a6f38bdc6421938864ce9f2749be076b8472c7712a72c38a025a2f7ce0e7887d28584ad9c5f301
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.bpython-interpreter.org/
       LICENSE[0]=MIT
diff --git a/python-pypi/bpython/HISTORY b/python-pypi/bpython/HISTORY
index 93bd7cb..967f947 100644
--- a/python-pypi/bpython/HISTORY
+++ b/python-pypi/bpython/HISTORY
@@ -1,3 +1,7 @@
+2011-07-23 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.10
+	* DEPENDS: added urwid suggest dep
+
 2010-08-02 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.9.7.1
 
diff --git a/python-pypi/python-ldap/DETAILS b/python-pypi/python-ldap/DETAILS
index 28765a7..2652997 100755
--- a/python-pypi/python-ldap/DETAILS
+++ b/python-pypi/python-ldap/DETAILS
@@ -1,6 +1,6 @@
            SPELL=python-ldap
-         VERSION=2.4.0
-     SOURCE_HASH=sha512:58a0b62f80af584f38fdfe64299ffb7f482fe9e3d97cd7ab13cc38ff4dfadfae9183f707a7afa1e2ec346c287ec76a00792c8767a92ebd7785851215557aa9bd
+         VERSION=2.4.3
+     SOURCE_HASH=sha512:30addd6e0985a0962cb254643411c666430f0fb6353a33bf7cdfaabd0e86076871da1ac3269c4dd7373cbe5dd3a658652307895ec61ab9891593004b4d6edadd
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://pypi.python.org/packages/source/p/$SPELL/$SOURCE
diff --git a/python-pypi/python-ldap/HISTORY b/python-pypi/python-ldap/HISTORY
index 29263cd..0a27af4 100644
--- a/python-pypi/python-ldap/HISTORY
+++ b/python-pypi/python-ldap/HISTORY
@@ -1,3 +1,6 @@
+2011-07-23 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.4.3
+
 2011-06-05 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.4.0
 
diff --git a/python-pypi/urwid/DEPENDS b/python-pypi/urwid/DEPENDS
new file mode 100755
index 0000000..d637527
--- /dev/null
+++ b/python-pypi/urwid/DEPENDS
@@ -0,0 +1,2 @@
+depends python &&
+depends ncurses
diff --git a/python-pypi/urwid/DETAILS b/python-pypi/urwid/DETAILS
index 636b977..d449981 100755
--- a/python-pypi/urwid/DETAILS
+++ b/python-pypi/urwid/DETAILS
@@ -1,5 +1,5 @@
            SPELL=urwid
-         VERSION=0.9.9.1
+         VERSION=0.9.9.2
           SOURCE=$SPELL-$VERSION.tar.gz
    SOURCE_URL[0]=http://excess.org/$SPELL/$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://excess.org/urwid
       LICENSE[0]=LGPL
         KEYWORDS="curses python"
-           SHORT="A curses user interfaces library in Python."
+           SHORT="curses user interfaces library in Python"
 cat << EOF
 Urwid is a console user interface library for Python. Urwid is released under
 the GNU Lesser General Public License and it includes many features useful for
diff --git a/python-pypi/urwid/HISTORY b/python-pypi/urwid/HISTORY
index 2514842..c4b13d7 100644
--- a/python-pypi/urwid/HISTORY
+++ b/python-pypi/urwid/HISTORY
@@ -1,3 +1,6 @@
+2011-07-23 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.9.9.2; corrected desc
+	* DEPENDS: added, for missing dependencies
+
 2010-05-20 Donald Johnson <minozake at codemages.net>
 	* ALL: Created spell.
-
diff --git a/python-pypi/urwid/urwid-0.9.9.1.tar.gz.sig b/python-pypi/urwid/urwid-0.9.9.1.tar.gz.sig
deleted file mode 100644
index 787dc24..0000000
Binary files a/python-pypi/urwid/urwid-0.9.9.1.tar.gz.sig and /dev/null differ
diff --git a/python-pypi/urwid/urwid-0.9.9.2.tar.gz.sig b/python-pypi/urwid/urwid-0.9.9.2.tar.gz.sig
new file mode 100644
index 0000000..1b72e7c
Binary files /dev/null and b/python-pypi/urwid/urwid-0.9.9.2.tar.gz.sig differ
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 aeb1798..afb5930 100755
--- a/utils/strigi/BUILD
+++ b/utils/strigi/BUILD
@@ -1,4 +1,4 @@
-if [ $STRIGI_GUI = y ]; then
+if is_depends_enabled $SPELL qt4 ; 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..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,12 +5,8 @@ depends pkgconfig     &&
 depends openssl       &&
 depends clucene       &&
 depends libxml2       &&
-if [[ $STRIGI_GUI = y ]]; then
-  depends dbus &&
-  depends -sub DBUS qt4
-else
-  optional_depends dbus    '' '' 'message based indexing'
-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 07b0c22..160275f 100644
--- a/utils/strigi/HISTORY
+++ b/utils/strigi/HISTORY
@@ -1,3 +1,12 @@
+2011-07-23 Bor Kraljič <pyrobor at ver.si>
+	* 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
+
 2011-06-03 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 0.7.5
 	  fixed WEB_SITE
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
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


More information about the SM-Commit mailing list