[Lunar-commits] <moonbase-kde> Merge branch 'master' of github.com:lunar-linux/moonbase-kde

[Florin Braescu]

commit 365d1818f6cbdb6bedfa34e3da7be572370d0584
Author: Florin Braescu <florin at lunar-linux.org>
Date: Sun, 15 Jul 2012 18:23:53 -0700
URL: https://github.com/lunar-linux/moonbase-kde/commit/365d1818f6cbdb6bedfa34e3da7be572370d0584

Merge branch 'master' of github.com:lunar-linux/moonbase-kde
---
  graphics/digikam/BUILD                                       +0/-2     
  graphics/digikam/DETAILS                                     +3/-6     
  libs/libbluedevil/BUILD                                      +5/-0     
  libs/libbluedevil/DEPENDS                                    +1/-0     
  libs/libbluedevil/DETAILS                                    +13/-0    
  qt4-apps/qt-creator/DETAILS                                  +3/-3     
  qt4-apps/qtscriptgenerator/BUILD                             +3/-0     
  7 files changed, 0 insertions (+), 0 deletions (-)

--- a/graphics/digikam/BUILD
+++ b/graphics/digikam/BUILD
@@ -3,8 +3,6 @@
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
-  patch_it $SOURCE2 1 &&
-
   OPTS+=" -Wno-dev -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS:BOOL=1" &&
 
   default_cmake_build
--- a/graphics/digikam/DETAILS
+++ b/graphics/digikam/DETAILS
@@ -1,15 +1,12 @@
           MODULE=digikam
-         VERSION=2.5.0
+         VERSION=2.7.0
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=digikam-2.5.0-boost-1.48.0.patch
       SOURCE_URL=$SFORGE_URL/digikam
-     SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:6cadb838669d1bdcbd6abb677889f7d68d696383
-     SOURCE2_VFY=sha1:f3e850f9a1b7235445a51a3626884475db7d3215
+      SOURCE_VFY=sha1:43f51c389984538025f185acf8902a923eb0268b
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://www.digikam.org
          ENTERED=20090318
-         UPDATED=20120222
+         UPDATED=20120715
            SHORT="kde4 version of digikam"
 
 cat << EOF
--- /dev/null
+++ b/libs/libbluedevil/BUILD
@@ -0,0 +1,5 @@
+(
+
+  default_cmake_build
+
+) > $C_FIFO 2>&1
--- /dev/null
+++ b/libs/libbluedevil/DEPENDS
@@ -0,0 +1 @@
+depends cmake
--- /dev/null
+++ b/libs/libbluedevil/DETAILS
@@ -0,0 +1,13 @@
+          MODULE=libbluedevil
+         VERSION=1.9.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$KDE_URL/stable/$MODULE/$VERSION/src/
+      SOURCE_VFY=sha1:44aa52071d8b43e61dde27de5980471608362854
+        WEB_SITE=http://blog.ereslibre.es/?p=281
+         ENTERED=20100728
+         UPDATED=20120712
+           SHORT="library for the kde bluetooth stack"
+
+cat << EOF
+A library for the kde bluetooth stack.
+EOF
--- a/qt4-apps/qt-creator/DETAILS
+++ b/qt4-apps/qt-creator/DETAILS
@@ -1,12 +1,12 @@
           MODULE=qt-creator
-         VERSION=2.4.1-src
+         VERSION=2.5.0-src
           SOURCE=$MODULE-$VERSION.zip
       SOURCE_URL=http://get.qt.nokia.com/qtcreator
-      SOURCE_VFY=sha1:fd50249618c726fb51a10ed1f89078856670e4dd
+      SOURCE_VFY=sha1:e2ca9e29cb5dd3d6265bfe6eb307fad49dcf051c
    MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://qt.nokia.com/products/developer-tools
          ENTERED=20090303
-         UPDATED=20120203
+         UPDATED=20120715
            SHORT="cross-platform integrated development environment"
 
 cat << EOF
--- a/qt4-apps/qtscriptgenerator/BUILD
+++ b/qt4-apps/qtscriptgenerator/BUILD
@@ -7,6 +7,9 @@
 # A qucik gcc-4.4.1 hack. Revisit when this module gets a version bump
   sed -i "33i #include <cstdio>" generator/parser/rpp/pp.h &&
 
+# sed this out so you do not have to recompile qt4 with its version of phonon.
+  sed -i 9d qtbindings/qtbindings.pro &&
+
   cd generator      &&
   qmake             &&
   make release      &&