[Lunar-commits] <moonbase-kde> Merge pull request #25 from stumbles/master

[Dennis Veatch]

commit 8425b2ec4f7647a35819ccb47c2da0a03425d181
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Tue, 12 Aug 2014 09:23:00 -0400
URL: https://github.com/lunar-linux/moonbase-kde/commit/8425b2ec4f7647a35819ccb47c2da0a03425d181

Merge pull request #25 from stumbles/master

tulip: version bump to 4.5.0
---
  qt4-apps/tulip/BUILD     | +3/-10    
  qt4-apps/tulip/CONFIGURE | +0/-1     
  qt4-apps/tulip/DEPENDS   | +5/-4     
  qt4-apps/tulip/DETAILS   | +4/-4     
  4 files changed, 12 insertions(+), 19 deletions(-)

--- a/qt4-apps/tulip/BUILD
+++ b/qt4-apps/tulip/BUILD
@@ -1,17 +1,10 @@
 
   source /etc/profile.d/qt4.rc &&
 
-# Recent changes to binutils improperly requires binutils config.h to 
-# be present for external source code when using bfd.h. This sedit just
-# deletes cmake looking for bfd.h.
-  sedit "12d" software/crash_handling/CMakeLists.txt &&
+  sedit "s:FTGL/FTGL.h:FTGL/ftgl.h:g" FindFTGL.cmake &&
 
-# Another cmake base build type that is case sensitive. Using all
-# upper case confuses it into thinking parts built as debug with
-# others as Release.
-  OPTS+=" -DCMAKE_BUILD_TYPE=Release" &&
-
-  sedit "s:ADD_SUBDIRECTORY(doc)::" CMakeLists.txt &&
+#If not specify Release it thinks it is using debug and make will fail
+  OPTS+=" -DCMAKE_BUILD_TYPE=Release -DBUILD_DOC=0" &&
 
   default_cmake_build &&
 
--- a/qt4-apps/tulip/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery ENABLE_RENDER "Enable the rendering time display?" n "-DENABLE_RENDERING_TIME_DISPLAY=ON" "-DENABLE_RENDERING_TIME_DISPLAY=OFF"
--- a/qt4-apps/tulip/DEPENDS
+++ b/qt4-apps/tulip/DEPENDS
@@ -1,10 +1,11 @@
-depends zlib
+depends glew
+depends cmake
+depends freetype2
+depends ftgl
 depends %JPEG
 depends libpng
 depends libxml2
 depends Python
-depends cmake
 depends Sphinx
 depends Jinja2
-
-optional_depends ftgl "" "" "for ftgl support"
+depends qt4
--- a/qt4-apps/tulip/DETAILS
+++ b/qt4-apps/tulip/DETAILS
@@ -1,13 +1,13 @@
           MODULE=tulip
-         VERSION=4.3.0_src
+         VERSION=4.5.0_src
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=$SFORGE_URL/auber/tulip/tulip_${VERSION%_*}/
+      SOURCE_URL=$SFORGE_URL/auber/tulip/tulip-${VERSION%_*}/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_VFY=sha1:44f031133074f0109243a0f439a4d16fa99519b3
+      SOURCE_VFY=sha1:1853bb8ab876b443cacd8e60eca9923a112dcea7
    MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://tulip.labri.fr/TulipDrupal/
          ENTERED=20100507
-         UPDATED=20130803
+         UPDATED=20140812
            SHORT="Graph visualization software"
 
 cat << EOF