[Lunar-commits] <moonbase-kde> polkit-qt-1: An adjustment to accomodate qt5

[Dennis Veatch]

commit 175092b5ce4994a14fb8423d3662d3638277c81f
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Wed, 12 Nov 2014 05:41:22 -0500
URL: https://github.com/lunar-linux/moonbase-kde/commit/175092b5ce4994a14fb8423d3662d3638277c81f

polkit-qt-1: An adjustment to accomodate qt5
---
  qt4-apps/polkit-qt-1/BUILD   | +10/-2    
  qt4-apps/polkit-qt-1/DEPENDS | +2/-0     
  qt4-apps/qscintilla2/BUILD   | +8/-3     
  qt4-apps/qscintilla2/DEPENDS | +2/-0     
  4 files changed, 22 insertions(+), 5 deletions(-)

--- a/qt4-apps/polkit-qt-1/BUILD
+++ b/qt4-apps/polkit-qt-1/BUILD
@@ -1,8 +1,16 @@
-(
+
 
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 
+  OPTS+=" -DUSE_QT4=1 -DUSE_QT5=0" &&
+
   default_cmake_build
 
-) > $C_FIFO 2>&1
+# Do the qt5 part
+  if in_depends $MODULE qt5 ; then
+    . /etc/profile.d/qt5.rc &&
+    . /etc/profile.d/kde4.rc &&
+    OPTS+=" -DUSE_QT4=0 -DUSE_QT5=1" &&
+    default_cmake_build
+  fi
--- a/qt4-apps/polkit-qt-1/DEPENDS
+++ b/qt4-apps/polkit-qt-1/DEPENDS
@@ -1,3 +1,5 @@
 depends dbus
 depends qt4
 depends polkit
+
+optional_depends "qt5" "" "" "For qt5 polkit support" n
--- a/qt4-apps/qscintilla2/BUILD
+++ b/qt4-apps/qscintilla2/BUILD
@@ -1,4 +1,3 @@
-(
 
 # install the editor class
 
@@ -9,10 +8,16 @@
   qmake -o Makefile qscintilla.pro &&
   default_make  &&
 
-# install the Pythom bindings
+  
+# install the Python bindings
 
   cd ../Python           &&
   python ./configure.py  &&
   default_make
 
-) > $C_FIFO 2>&1
+# Do Python-3
+  if in_depends $MODULE Python-3 ; then
+    devoke_installwatch &&
+    python3 ./configure.py &&
+    default_make
+  fi
--- a/qt4-apps/qscintilla2/DEPENDS
+++ b/qt4-apps/qscintilla2/DEPENDS
@@ -1 +1,3 @@
 depends  PyQt
+
+optional_depends Python-3 "" "" "For Python-3 bindings support"