Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 doc/pstoedit/DETAILS         |    2 +-
 doc/pstoedit/HISTORY         |    3 +++
 http/cherokee/DETAILS        |    4 ++--
 http/cherokee/HISTORY        |    3 +++
 kde4-apps/koffice2/DEPENDS   |    1 +
 kde4-apps/koffice2/DETAILS   |    7 ++++++-
 kde4-apps/koffice2/HISTORY   |    6 ++++++
 kde4-apps/koffice2/PREPARE   |    1 +
 kde4-apps/koffice2/PRE_BUILD |    7 +++++--
 9 files changed, 28 insertions(+), 6 deletions(-)

New commits:
commit b6fd01ac5dfbf7cc9dd9e1106d1b7f8dab8daff4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    koffice2-2.0.81

commit 60e3bf2ed8b20c97fb3571c49296965478d39f22
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    pstoedit - update hash

commit 2d1e7022590ee8bdd71378792d44ca5b761b3457
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    cherokee: => 0.99.23

diff --git a/doc/pstoedit/DETAILS b/doc/pstoedit/DETAILS
index 583d044..2d2a32b 100755
--- a/doc/pstoedit/DETAILS
+++ b/doc/pstoedit/DETAILS
@@ -1,6 +1,6 @@
            SPELL=pstoedit
          VERSION=3.50
-     
SOURCE_HASH=sha512:638443990ca48e0568a62da35513f4a9d0f762ed73cc3251b53034086e02f197cdefc5e36c3d3a6ab44713dc1f565be4017f9c9f6fa5555e601e4c83e95d8d74
+     
SOURCE_HASH=sha512:2da0df61828f6ca46c1e66ca1dd372e9373594375c61c9b30ee848aa952712720dee14da2134ec62398e3e6224123993c0b2406c5c1b39c55a51ddb0b55fb8fb
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/doc/pstoedit/HISTORY b/doc/pstoedit/HISTORY
index 27432ad..eed1f8a 100644
--- a/doc/pstoedit/HISTORY
+++ b/doc/pstoedit/HISTORY
@@ -1,3 +1,6 @@
+2009-08-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: updated hash (config & make files updated)
+
 2009-08-11 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.50
        * DEPENDS: POSTSCRIPT-INTERPRETER => ghostscript
diff --git a/http/cherokee/DETAILS b/http/cherokee/DETAILS
index 94fe161..0119134 100755
--- a/http/cherokee/DETAILS
+++ b/http/cherokee/DETAILS
@@ -3,8 +3,8 @@
 #         VERSION=0.11.6
 #     SOURCE_HASH=sha512:
 #else
-         VERSION=0.99.22
-     
SOURCE_HASH=sha512:a989fa203c04a4c8495535d25711130c35ed48a36e5081340523ecec430699602d9229242d1fbd6351622e41af09d4a501baee2cb1053a13894005225957c3f9
+         VERSION=0.99.23
+     
SOURCE_HASH=sha512:5ebe1b27724cef30681f2e8219819077b76e64510532b69167639d74bf4d02e753d52018375b41fd43446e34765177b71a0e94b8f933c5dd401f719898c3442a
 #fi
           SOURCE=$SPELL-$VERSION.tar.gz 
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/http/cherokee/HISTORY b/http/cherokee/HISTORY
index f2436c9..441284c 100644
--- a/http/cherokee/HISTORY
+++ b/http/cherokee/HISTORY
@@ -1,3 +1,6 @@
+2009-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.99.23
+
 2009-08-05 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 0.99.22
 
diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index d050de7..c69607a 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -12,6 +12,7 @@ optional_depends mysql          '' '' 'import MySql to 
Kexi'         &&
 optional_depends postgresql     '' '' 'import to Postgresql to Kexi' &&
 optional_depends xbase          '' '' 'import dbase to Kexi'         &&
 optional_depends glew           '' '' 'OpenGL shaders in Krita' &&
+optional_depends gmm            '' '' 'Krita panorama plugin' &&
 optional_depends exiv2          '' '' 'decode photo tags'     &&
 optional_depends poppler        '' '' 'PDF support'           &&
 optional_depends pstoedit       '' '' 'Karbon eps import filter' &&
diff --git a/kde4-apps/koffice2/DETAILS b/kde4-apps/koffice2/DETAILS
index bd124b7..cc116c7 100755
--- a/kde4-apps/koffice2/DETAILS
+++ b/kde4-apps/koffice2/DETAILS
@@ -1,10 +1,15 @@
            SPELL=koffice2
+if [[ $KOFF_VER == unstable ]];then
+         VERSION=2.0.81
+     
SOURCE_HASH=sha512:7a662c261374100cc16e1630d6ceb2643766e231ac9ea7fdfaa98d77dfb944163b058db8e51c077a95519849eddee6e46ed94e46daa6301740426219e298f48a
+else
          VERSION=2.0.2
      
SOURCE_HASH=sha512:f8f7a024f2a78ee55d42113a496d293bc09a05ff2112910e983007b28fd2e225c600ce9866b0caf9dc0b7f520d37c839c4b804ec572d37cdfcddf61fdbe4ff0c
+fi
           SPELLX=${SPELL//2}-${VERSION}
           SOURCE=$SPELLX.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX
-   SOURCE_URL[0]=$KDE_URL/stable/$SPELLX/src/$SOURCE
+   SOURCE_URL[0]=$KDE_URL/${KOFF_VER:-stable}/$SPELLX/src/$SOURCE
         WEB_SITE=http://www.koffice.org
          ENTERED=20070707
       LICENSE[0]=GPL
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 647c20f..b3d2d72 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,9 @@
+2009-08-28 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.0.81 (unstable)
+       * PREPARE: added support for unstable version
+       * PRE_BUILD: adjust for unstable
+       * DEPENDS: add gmm
+
 2009-08-12 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.2
 
diff --git a/kde4-apps/koffice2/PREPARE b/kde4-apps/koffice2/PREPARE
new file mode 100755
index 0000000..35cd802
--- /dev/null
+++ b/kde4-apps/koffice2/PREPARE
@@ -0,0 +1 @@
+config_query_list KOFF_VER 'which version to build?' stable unstable
diff --git a/kde4-apps/koffice2/PRE_BUILD b/kde4-apps/koffice2/PRE_BUILD
index 6c55f0a..23b7f12 100755
--- a/kde4-apps/koffice2/PRE_BUILD
+++ b/kde4-apps/koffice2/PRE_BUILD
@@ -1,4 +1,7 @@
-
 default_pre_build    &&
 cd $SOURCE_DIRECTORY &&
-sed -i '/update_xdg_mimetypes/D' filters/krita/ora/CMakeLists.txt
+if [[ $KOFF_VER == unstable ]];then
+  sed -i '/update_xdg_mimetypes/D' krita/plugins/formats/ora/CMakeLists.txt
+else
+  sed -i '/update_xdg_mimetypes/D' filters/krita/ora/CMakeLists.txt
+fi