[Lunar-commits] <moonbase> tulip: Version bump to 3.6.1. Adding a patch so it will compile with our current

[Dennis `stumbles` Veatch]

commit 77c1f06556a5d14be13c53928f9c8ac16c8d0a68
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Jan 8 09:24:34 2012 -0500

    tulip: Version bump to 3.6.1. Adding a patch so it will compile with our current
    
    version of qscintilla2. Adding some depends and adjusting the BUILD to use
    default_cmake_build. Unfortunately, even though -DBUILD_DOCS defaults to OFF, Sphinx
    and Jinja2 is still required.
---
 qt4-apps/tulip/BUILD     |   13 +++----------
 qt4-apps/tulip/CONFIGURE |    1 +
 qt4-apps/tulip/DEPENDS   |    7 +++++++
 qt4-apps/tulip/DETAILS   |   14 ++++++++------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/qt4-apps/tulip/BUILD b/qt4-apps/tulip/BUILD
index 9c16021..69c47f1 100644
--- a/qt4-apps/tulip/BUILD
+++ b/qt4-apps/tulip/BUILD
@@ -1,17 +1,10 @@
 (
 
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build"  &&
+  patch_it $SOURCE2 0 &&
 
-  source /etc/profile.d/qt4.rc   &&
+  source /etc/profile.d/qt4.rc &&
 
-  mkdir $OOSB_DIR  &&
-  cd $OOSB_DIR     &&
-
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE             \
-                           $OPTS                                 &&
-
-  default_make &&
+  default_cmake_build &&
 
   # Desktop menu entry
   cat > ${MODULE}.desktop << EOF  &&
diff --git a/qt4-apps/tulip/CONFIGURE b/qt4-apps/tulip/CONFIGURE
new file mode 100644
index 0000000..438958c
--- /dev/null
+++ b/qt4-apps/tulip/CONFIGURE
@@ -0,0 +1 @@
+mquery ENABLE_RENDER "Enable the rendering time display?" n "-DENABLE_RENDERING_TIME_DISPLAY=ON" "-DENABLE_RENDERING_TIME_DISPLAY=OFF"
diff --git a/qt4-apps/tulip/DEPENDS b/qt4-apps/tulip/DEPENDS
index 94e7b06..c24c8d0 100644
--- a/qt4-apps/tulip/DEPENDS
+++ b/qt4-apps/tulip/DEPENDS
@@ -1,3 +1,10 @@
+depends zlib
+depends %JPEG
+depends libpng
+depends libxml2
+depends Python
 depends cmake
+depends Sphinx
+depends Jinja2
 
 optional_depends ftgl "" "" "for ftgl support"
diff --git a/qt4-apps/tulip/DETAILS b/qt4-apps/tulip/DETAILS
index 7758a78..381d761 100644
--- a/qt4-apps/tulip/DETAILS
+++ b/qt4-apps/tulip/DETAILS
@@ -1,13 +1,15 @@
           MODULE=tulip
-         VERSION=3.6.0
-          SOURCE=$MODULE-$VERSION-src.tar.gz
-      SOURCE_URL=$SFORGE_URL/auber/tulip/tulip-3.5.0/
+         VERSION=3.6.1-src
+          SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=tulip-3.6.1-qscintilla.patch
+      SOURCE_URL=$SFORGE_URL/auber/tulip/tulip-3.6.1/
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:5beaf2fe6d873bea54adc245967cefdc6ea2890c
+     SOURCE2_VFY=sha1:78ae38d2bd548a595ca39c2b1e5d95c2fd9f4929
    MODULE_PREFIX=${QT4_PREFIX:-/usr}
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-src
-      SOURCE_VFY=sha1:d6385a735e9a9060c8bdd8cc0a21e633abd29fa3
         WEB_SITE=http://tulip.labri.fr/TulipDrupal/
          ENTERED=20100507
-         UPDATED=20111006
+         UPDATED=20120108
            SHORT="Graph visualization software"
 
 cat << EOF