[Lunar-commits] <moonbase-kde> calligra: Version bump to 2.6.2.

[stumbles]

commit 14e9b95c42bb450634770df5a3243aea2cdb1407
Author: stumbles <stumbles at lunar-linux.org>
Date: Wed, 27 Mar 2013 12:55:57 -0700
URL: https://github.com/lunar-linux/moonbase-kde/commit/14e9b95c42bb450634770df5a3243aea2cdb1407

calligra: Version bump to 2.6.2.
---
  office/calligra/BUILD   | +4/-7     
  office/calligra/DEPENDS | +6/-0     
  office/calligra/DETAILS | +4/-4     
  3 files changed, 14 insertions(+), 11 deletions(-)

--- a/office/calligra/BUILD
+++ b/office/calligra/BUILD
@@ -1,15 +1,12 @@
 (
 
-# It has trouble finding openjpeg.h
+# It has trouble finding openjpeg.h because we install the headers in /usr/include/openjpeg-some-version
   if in_depends $MODULE openjpeg ; then
-    OJ_VER="`lvu version openjpeg | cut -c 1-3`" &&
-    CFLAGS+=" -I/usr/include/openjpeg-${OJ_VER}" &&
-    LDFLAGS+=" -lopenjpeg" &&
-    OPTS+=" -DOPENJPEG_INCLUDE_DIR=/usr/include/openjpeg-${OJ_VER}"
+    sedit "s:/usr/include/openjpeg:/usr/include/openjpeg-`lvu version openjpeg | cut -c 1-3`:" cmake/modules/FindOpenJPEG.cmake
+#    OPTS+=" -DOPENJPEG_INCLUDE_DIR=/usr/include/`lvu version openjpeg|cut -c 1-3`"
   fi &&
 
-  OPTS+=" -Wno-dev -DWITH_Iconv=ON"   &&
-
+  OPTS+=" -Wno-dev -DWITH_Iconv=ON" &&
 
   default_cmake_build
 
--- a/office/calligra/DEPENDS
+++ b/office/calligra/DEPENDS
@@ -33,3 +33,9 @@ optional_depends "libwpg"       "-DWITH_WPG=ON"        "-DWITH_WPG=OFF"        "
 optional_depends "zlib"         "-DWITH_ZLIB=ON"       "-DWITH_ZLIB=OFF"       "for lossless data compression support"
 optional_depends "xbase"        "-DWITH_XBase=ON"      "-DWITH_XBase=OFF"      "Required by Kexi XBase Migration driver"
 optional_depends "libvisio"     "-DWITH_LibVisio=ON"   "-DWITH_LibVisio=OFF"   "for importing visio diagrams support"
+optional_depends "Vc"           "-DWITH_Vc=ON"         "-DWITH_Vc=OFF"         "for SIMD support"
+
+optional_depends "imageworks-OpenColorIO" "-DWITH_OCIO=ON" "-DWITH_OCIO=OFF" "for OpenColorIO library support"
+
+optional_depends "OpenGTL"      "" "" "for OpenShiva interpreter for the Shiva Kernel Language support"
+optional_depends "libQtGTL"     "" "" "provides Qt bindings for the OpenShiva interpreter support"
--- a/office/calligra/DETAILS
+++ b/office/calligra/DETAILS
@@ -1,12 +1,12 @@
           MODULE=calligra
-         VERSION=2.5.5
+         VERSION=2.6.2
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$KDE_URL/stable/$MODULE-$VERSION/
-      SOURCE_VFY=sha1:8338c6e120345e23dd6792217609757d933e7d5e
+      SOURCE_VFY=sha1:551c0b2cf1b219d620255d6b34fa5e638f4fab2b
         WEB_SITE=http://www.calligra-suite.org/
          ENTERED=20121208
-         UPDATED=20130123
-           SHORT="graphic art and office suite by KDE "
+         UPDATED=20130327
+           SHORT="graphic art and office suite by KDE"
 
 cat << EOF
 Calligra Suite is a set of applications written to help you to accomplish your work.