Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 ChangeLog                                      |    3 +
 audio-libs/openal-soft/DETAILS                 |    6 +-
 audio-libs/openal-soft/HISTORY                 |    4 +
 database/firebird/CONFIGURE                    |    6 ++
 database/firebird/DETAILS                      |    4 -
 database/firebird/HISTORY                      |   10 ++++
 database/firebird/fb2.5.patch.bz2              |binary
 database/firebird/init.d/firebird2             |    4 +
 kde4-apps/koffice2/BUILD                       |    2 
 kde4-apps/koffice2/CONFIGURE                   |    8 ---
 kde4-apps/koffice2/DEPENDS                     |   53 
++++++++++++++++---------
 kde4-apps/koffice2/HISTORY                     |    7 +++
 kde4-support/shared-desktop-ontologies/BUILD   |    2 
 kde4-support/shared-desktop-ontologies/DEPENDS |    1 
 kde4-support/shared-desktop-ontologies/DETAILS |   18 ++++++++
 kde4-support/shared-desktop-ontologies/HISTORY |    4 +
 kde4/FUNCTIONS                                 |    7 ++-
 kde4/HISTORY                                   |    6 ++
 18 files changed, 113 insertions(+), 32 deletions(-)

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

    koffice2 - tiny buld
    (cherry picked from commit c25641a8496a76994d61384cb5274e26175d4fb7)

commit 9bbd495546e48fa97ffe0fc8b7e6305aabd8b058
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    koffice2 - extra depends
    (cherry picked from commit 9ace38e39517f070cee395bafb7daf5a3c4b8bda)

commit 6e2634691b4fc210a759b1e12178d81309404613
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    kde4/FUNCTIONS - fix for kdelibs4
    (cherry picked from commit 7a827899ab8b33786da576e505730513c810ff9c)

commit 5df744349dc888b243a5ee673cc5aff7ec0ec0b2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    shared-desktop-ontologies - new spell

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

    FUNCTIONS - add $OPTS to build

commit 671ba3e32a502951680be83642524d506efb2655
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    openal-soft: => 1.10.622
    (cherry picked from commit 12c8da2609bb847f6221bba30e592049e797f9df)
    (cherry picked from commit 35f775bd9d8f6310a0ba3d652254cca767b2de2c)

commit 5e51d8cf0c0c158a34f3739b485d26987fb109a5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    firebird2 - fix init script typo

commit 2219556349f09bbdfa8df9c31f893b1789ceaf17
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    firebird-2.5.0.25784-ReleaseCandidate1
    (cherry picked from commit 8ec5a65a12592f9f5a6d178fd6eca2c924a78d8d)

diff --git a/ChangeLog b/ChangeLog
index 76c4488..a2740c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
        * wm-addons/visibility: new spell, desktop pager/windowlist
        * ftp/lince: new spell, bittorrent client
 
+2009-11-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * kde4-support/shared-desktop-ontologies: new spell for semantic 
desktop
+
 2009-11-26 Vlad Glagolev <stealth AT sourcemage.org>
        * gnu.gpg: added key B97154D3 (Andreas Gruenbacher <agruen AT suse.de>) 
for
          patch spell
diff --git a/audio-libs/openal-soft/DETAILS b/audio-libs/openal-soft/DETAILS
index 87af372..6930a49 100755
--- a/audio-libs/openal-soft/DETAILS
+++ b/audio-libs/openal-soft/DETAILS
@@ -1,11 +1,11 @@
            SPELL=openal-soft
-         VERSION=1.8.466
+         VERSION=1.10.622
+     
SOURCE_HASH=sha512:156db97ac24b92f8365f51dab259e3db82e7c44aefff9a3efebbd17ab41cf923c156ee7ee65d2a7699f022ae3140e7f2187530a864b520cbacd7820e5b343f2a
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    SOURCE_URL[0]=http://kcat.strangesoft.net/openal-releases/${SOURCE}
-     
SOURCE_HASH=sha512:352b3cd934d052c2741a1a85e4e6921847dcde15ac8c185d1bf9e67a508b17c49a0d5370bd928af262a56978ef70f0e140d8937e4ac181bd1c93a825f98b9793
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://kcat.strangesoft.net/openal.html";
-      LICENSE[0]=foomatic
+      LICENSE[0]=LGPL
          ENTERED=20090421
            SHORT="software implementation of the OpenAL 3D audio API."
 cat << EOF
diff --git a/audio-libs/openal-soft/HISTORY b/audio-libs/openal-soft/HISTORY
index 2aba9b5..3e5f5cb 100644
--- a/audio-libs/openal-soft/HISTORY
+++ b/audio-libs/openal-soft/HISTORY
@@ -1,3 +1,7 @@
+2009-11-21 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.10.622
+         LICENSE = LGPL
+
 2009-07-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
        * DEPENDS: fixed syntax error
 
diff --git a/database/firebird/CONFIGURE b/database/firebird/CONFIGURE
index e53b3a7..707f24a 100755
--- a/database/firebird/CONFIGURE
+++ b/database/firebird/CONFIGURE
@@ -4,5 +4,9 @@ if [ $FB_CLIENT == n ]; then
   config_query_multi  FB_GPRE "which additional GPRE languages to support?" \
       none ada cobol pascal fortran  &&
   config_query_option FB_STAT "build static libraries?" n "--enable-static"  
"--disable-static" &&
-  config_query_option FB_SS "Build Superserver?" y "--enable-superserver" ""
+  if [[ $FB_VER != 2.5 ]];then
+    config_query_option FB_SS "Build Superserver?" y "--enable-superserver" 
""
+  else
+    FB_SS=""
+  fi
 fi
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index 5939dc8..b73c17e 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,8 +1,8 @@
            SPELL=firebird
 case $FB_VER in 
    2.5)
-         VERSION=2.5.0.24643-Beta2
-     
SOURCE_HASH=sha512:816144a2baac37d077864f7d809c3b0b2351703e4ab0a034b33fe51e8e1593fb3ddc12454ab249cab9f227360443c526f5d6c92eba2d69aa75d743354dc46c7d
+         VERSION=2.5.0.25784-ReleaseCandidate1
+     
SOURCE_HASH=sha512:7227b39cd73477dc50123999f819b52cdaaf19a37bc583bae77b4ae68743a7fff51b67eebab28e4faa8ba15af47e9560b94d5284fac639ac74e882879f652fd0
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
   SECURITY_PATCH=1
 ;;
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index 9191fcd..a0fe66c 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,3 +1,13 @@
+2009-11-28 Treeve Jelbert <treeve AT sourcemage.org>
+       * init.d/firebird2: fic typo
+
+2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.5.0.25784-ReleaseCandidate1
+       * fb2.5.patch.bz2: updated
+       * CONFIGURE: disable superserver query
+         there is now one super-classic build
+       * init.d/firebird2: name of server has changed
+
 2009-09-20 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.1.3.18185-0
 
diff --git a/database/firebird/fb2.5.patch.bz2 
b/database/firebird/fb2.5.patch.bz2
index 05f2d07..db885b4 100644
Binary files a/database/firebird/fb2.5.patch.bz2 and 
b/database/firebird/fb2.5.patch.bz2 differ
diff --git a/database/firebird/init.d/firebird2 
b/database/firebird/init.d/firebird2
index 0dbcb40..e68436e 100755
--- a/database/firebird/init.d/firebird2
+++ b/database/firebird/init.d/firebird2
@@ -8,6 +8,10 @@
 
 FB_DIR=/opt/firebird/bin
 FB=fbserver
+if [[ ! -f $FB_DIR/$FB ]];then
+# 2.5 has a combined classic-super server using libfbembed.so
+  FB=fb_smp_server
+fi
 # as of rc2, preferred method of stopping is to kill the process
 
 source /etc/init.d/smgl_functions
diff --git a/kde4-apps/koffice2/BUILD b/kde4-apps/koffice2/BUILD
new file mode 100755
index 0000000..305886e
--- /dev/null
+++ b/kde4-apps/koffice2/BUILD
@@ -0,0 +1,2 @@
+OPTS+=" $KTINY" &&
+default_build
diff --git a/kde4-apps/koffice2/CONFIGURE b/kde4-apps/koffice2/CONFIGURE
index 6fab675..6b7722f 100755
--- a/kde4-apps/koffice2/CONFIGURE
+++ b/kde4-apps/koffice2/CONFIGURE
@@ -1,7 +1,3 @@
-source  $SECTION_DIRECTORY/KDE_CONFIGURE
+source  $SECTION_DIRECTORY/KDE_CONFIGURE  &&
+config_query_option KTINY 'build tiny koffice - kword/kspread/kpresenter' y  
'-DTINY=1' ''
 
-#
-# Fails to build
-#
-#config_query_option  KOFFICE_KROSS 'build Kross scripting support'  n  \
-#                     '--enable-scripting'  '--disable-scripting'
diff --git a/kde4-apps/koffice2/DEPENDS b/kde4-apps/koffice2/DEPENDS
index 94e3062..43d04cc 100755
--- a/kde4-apps/koffice2/DEPENDS
+++ b/kde4-apps/koffice2/DEPENDS
@@ -1,28 +1,45 @@
 source  $SECTION_DIRECTORY/KDE_DEPENDS     &&
-depends OPENGL                             &&
-optional_depends kdegraphics4 '' '' 'process RAW photos'      &&
-optional_depends eigen2         '-DEIGEN2_INCLUDE_DIR=/usr/include/eigen2' 
'' \
-                                      'for KSpread'           &&
-optional_depends freetype2      '' '' ''                      &&
-optional_depends fontconfig     '' '' ''                      &&
-optional_depends gsl            '' '' 'improved maths'        &&
-optional_depends lcms           '' '' 'colour management'     &&
+depends perl    &&
+depends libpng  &&
+depends zlib    &&
+
+depends OPENGL  &&
+optional_depends freetype2      '' '' 'font support'   &&
+optional_depends fontconfig     '' '' ''   &&
+
+if [[ -z "$KTINY" ]];then
+#Karbon
+optional_depends pstoedit       '' '' 'Karbon eps import filter' &&
+# Kexi
+depends bzip2  && 
 optional_depends sqlite         '' '' 'kexi database'         &&
-optional_depends mysql          '' '' 'import MySql to Kexi'         &&
-optional_depends postgresql     '' '' 'import to Postgresql to Kexi' &&
-optional_depends xbase          '' '' 'import dbase to Kexi'         &&
+optional_depends mysql          '' '' 'import MySql to Kexi'      &&
+optional_depends postgresql     '' '' 'import Postgresql to Kexi' &&
+optional_depends xbase          '' '' 'import dbase to Kexi'      &&
+#Krita
+optional_depends kdegraphics4   '' '' 'process RAW photos'      &&
 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' &&
-optional_depends wv2            '' '' 'MS Word import'        &&
-optional_depends tiff           '' '' 'graphics support'      &&
-optional_depends graphicsmagick '' '' 'various Krita filters' &&
+optional_depends lcms           '' '' 'colour management'     &&
 optional_depends openexr        '' '' 'Krita EXR filter'      &&
-optional_depends qca2           '' '' 'crypto support'        &&
+optional_depends openjpeg       '' '' 'Krita graphics filters' &&
 optional_depends qimageblitz    '' '' 'graphics manipulation' &&
-optional_depends glpk           '' '' 'painterly mixer plugin'&&
+optional_depends glpk           '' '' 'painterly mixer plugin' &&
+optional_depends tiff           '' '' 'graphics support'      &&
+#KPlato
 optional_depends kdepimlibs4    '' '' 'PIM support'           &&
+#KPresenter
+optional_depends boost        '' '' 'for KPresenter'
+fi &&
+#KSpread
+optional_depends eigen2         '-DEIGEN2_INCLUDE_DIR=/usr/include/eigen2' 
'' \
+                                      'for KSpread'           &&
+optional_depends gsl            '' '' 'improved maths'        &&
+#KWord
+optional_depends poppler        '' '' 'PDF support'           &&
+optional_depends wv2            '' '' 'MS Word import'        &&
+optional_depends qca2           '' '' 'crypto support'        &&
 optional_depends libwpg         '' '' 'WordPerfect graphics'  &&
 optional_depends libwpd         '' '' 'WordPerfect import'
+#
diff --git a/kde4-apps/koffice2/HISTORY b/kde4-apps/koffice2/HISTORY
index 0e96a9b..124015e 100644
--- a/kde4-apps/koffice2/HISTORY
+++ b/kde4-apps/koffice2/HISTORY
@@ -1,3 +1,10 @@
+2009-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+       * CONFIGURE: added, prompt for tiny koffice
+       * BUILD: added
+       * DEPENDS: restructure for tiny build
+       * DEPENDS: remove graphicsmagick, no longer used
+         add openjpeg, boost
+
 2009-10-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.0.91 (unstable)
 
diff --git a/kde4-support/shared-desktop-ontologies/BUILD 
b/kde4-support/shared-desktop-ontologies/BUILD
new file mode 100755
index 0000000..760e1eb
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/BUILD
@@ -0,0 +1,2 @@
+cmake_build
+
diff --git a/kde4-support/shared-desktop-ontologies/DEPENDS 
b/kde4-support/shared-desktop-ontologies/DEPENDS
new file mode 100755
index 0000000..60dd614
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/DEPENDS
@@ -0,0 +1 @@
+depends cmake
diff --git a/kde4-support/shared-desktop-ontologies/DETAILS 
b/kde4-support/shared-desktop-ontologies/DETAILS
new file mode 100755
index 0000000..b4e78b5
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=shared-desktop-ontologies
+         VERSION=0.1
+     
SOURCE_HASH=sha512:b1b883585d19a2f77ce861d9c34f985be3088f92b9f02d82cfc81c555efc9984442592d71004689df22883e17d78d36f9f380ae0bae831e13c7ef90f6c0841ed
+          SOURCE=$SPELL-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+   SOURCE_URL[0]=$SOURCEFORGE_URL/oscaf/files/$SPELL/$VERSION/$SOURCE
+        WEB_SITE=http://sourceforge.net/projects/oscaf
+      LICENSE[0]=BSD
+      LICENSE[1]=BY-CC
+         ENTERED=20091126
+        KEYWORDS=""
+           SHORT="OSCAF ontologies and reference code"
+cat << EOF
+The shared-desktop-ontologies package brings the semantic web to the desktop
+in terms of vocabulary. It contains the well known core ontologies such as 
RDF
+and RDFS as well as the Nepomuk ontologies which are used by projects like 
KDE
+or Strigi.
+EOF
diff --git a/kde4-support/shared-desktop-ontologies/HISTORY 
b/kde4-support/shared-desktop-ontologies/HISTORY
new file mode 100644
index 0000000..e5dc591
--- /dev/null
+++ b/kde4-support/shared-desktop-ontologies/HISTORY
@@ -0,0 +1,4 @@
+2009-11-26 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.1
+         spell created
+
diff --git a/kde4/FUNCTIONS b/kde4/FUNCTIONS
index 6f37961..7fe261e 100755
--- a/kde4/FUNCTIONS
+++ b/kde4/FUNCTIONS
@@ -5,11 +5,14 @@ default_build() {
   cd $SOURCE_DIRECTORY                            &&
   mkdir -p build                                  &&
   cd build                                        &&
-  PATH=$KDE4DIR:$QTDIR:$PATH                      &&
+  PATH+=:$QTDIR   &&
+  if [[ $SPELL != kdelibs4 ]];then
+   PATH+=:$KDE4DIR
+  fi &&
   CMAKE_PREFIX_PATH=$KDE4DIR                      &&
   cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR           \
         -DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION      \
-        ../                                       &&
+        $OPTS ../                                 &&
   make
 }
 
diff --git a/kde4/HISTORY b/kde4/HISTORY
index a89b491..1ba12ca 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,9 @@
+2009-11-27 Treeve Jelbert <treeve AT sourcemage.org>
+       * FUNCTIONS: fix special case of kdelibs4
+
+2009-11-18 Treeve Jelbert <treeve AT sourcemage.org>
+       * FUNCTIONS: add $OPTS to build
+
 2009-10-15 Treeve Jelbert <treeve AT sourcemage.org>
        * KDE_DEPENDS: kdelibs4 requires qt4 built with TOOLS
          (QT_DBUSXML2CPP, QT_QTDESIGNER, QT_QTUITOOLS)