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

[Florin Braescu]

commit a53c13778d29a4da8dd71af9554ec43239972862
Author: Florin Braescu <florin at lunar-linux.org>
Date: Wed, 22 Oct 2014 16:49:01 +0300
URL: https://github.com/lunar-linux/moonbase-kde/commit/a53c13778d29a4da8dd71af9554ec43239972862

Merge branch 'master' of github.com:lunar-linux/moonbase-kde
---
  development/kdevelop-pg-qt/BUILD   | +2/-3     
  development/kdevelop-pg-qt/DETAILS | +4/-1     
  utils/krusader/BUILD               | +1/-9     
  utils/krusader/DETAILS             | +4/-4     
  4 files changed, 11 insertions(+), 17 deletions(-)

--- a/development/kdevelop-pg-qt/BUILD
+++ b/development/kdevelop-pg-qt/BUILD
@@ -1,8 +1,7 @@
-(
+
+  patch_it $SOURCE2 1 &&
 
   source /etc/profile.d/qt4.rc &&
   source /etc/profile.d/kde4.rc &&
 
   default_cmake_build
-
-) > $C_FIFO 2>&1
--- a/development/kdevelop-pg-qt/DETAILS
+++ b/development/kdevelop-pg-qt/DETAILS
@@ -1,12 +1,15 @@
           MODULE=kdevelop-pg-qt
          VERSION=1.0.0
           SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=kdevelop-pg-qt-1.0.0-bison3.patch
       SOURCE_URL=$KDE_URL/stable/$MODULE/$VERSION/src
+     SOURCE2_URL=http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-util/kdevelop-pg-qt/files
       SOURCE_VFY=sha1:468bc91c5be16061dc265e9471f75462b32b73d5
+     SOURCE2_VFY=sha1:f226df0b9c73f73667b442b473508d5d61a2b487
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://techbase.kde.org/Development/KDevelop-PG-Qt_Introduction
          ENTERED=20100419
-         UPDATED=20120719
+         UPDATED=20141022
            SHORT="parser-generator from KDevplatform"
 
 cat << EOF
--- a/utils/krusader/BUILD
+++ b/utils/krusader/BUILD
@@ -1,13 +1,5 @@
-(
-
-  OOSB_DIR="$SOURCE_DIRECTORY/$MODULE-build"
 
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
-  cmake $SOURCE_DIRECTORY/ -DCMAKE_INSTALL_PREFIX=$MODULE_PREFIX  \
-                           -DCMAKE_BUILD_TYPE=RELEASE .          &&
-
-  default_make
-
-) > $C_FIFO 2>&1
+  default_cmake_build
--- a/utils/krusader/DETAILS
+++ b/utils/krusader/DETAILS
@@ -1,13 +1,13 @@
           MODULE=krusader
-         VERSION=2.4.0-beta1
+         VERSION=2.4.0-beta3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
-      SOURCE_VFY=sha1:fd2975b9f8ec5b1a903090b2d60733cbefd2f942
+      SOURCE_VFY=sha1:935b99b42dbf0a7e3b7721a5bf8cbdc2b86900ce
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://krusader.sourceforge.net
          ENTERED=20090412
-         UPDATED=20110626
-           SHORT="KDE Twin-Panel filemanager"
+         UPDATED=20141022
+           SHORT="KDE Twin-Panel filemanager ala commander style"
 
 cat << EOF
 Krusader is an "old-school" file manager. Its twin-panel look follows in