[Lunar-commits] <moonbase-other> PyQt: Adjusting the BUILD. We do not want to be specific about things like --enable=QtCore.

[Dennis Veatch]

commit 0aa9fd7121528437149244d7c14379aaa20799a7
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 14 Nov 2014 09:07:56 -0500
URL: https://github.com/lunar-linux/moonbase-other/commit/0aa9fd7121528437149244d7c14379aaa20799a7

PyQt: Adjusting the BUILD. We do not want to be specific about things like --enable=QtCore.

If you do then all the PyQt modules have to be specified as --enabled=$WHATEVER.
So we let it find what it wants on its own. The --qsci-api is OK to use and does not
force a pendanticy about manually enabling the rest of the modules.
---
  python/PyQt/BUILD   | +4/-4     
  python/PyQt/DEPENDS | +1/-1     
  2 files changed, 5 insertions(+), 5 deletions(-)

--- a/python/PyQt/BUILD
+++ b/python/PyQt/BUILD
@@ -6,11 +6,11 @@
   # Use new kde phonon - fixes build break when qt4 is built without old phonon
   sed -i "/generate_code(\"phonon\")/s:phonon\":&,extra_include_dirs=[\"/usr/include/phonon\"]:" configure.py &&
 
-  OPTS+=" --enable=QtCore--enable=QtNetwork --enable=QtXml  --qsci-api" &&
+  if module_installed qscintilla2 ; then
+    OPTS+=" --qsci-api"
+  fi &&
 
-  python ./configure.py      \
-         --confirm-license   \
-         $OPTS              &&
+  python ./configure.py --confirm-license $OPTS &&
 
   default_make                 &&
   mkdir -p /usr/share/$MODULE  &&
--- a/python/PyQt/DEPENDS
+++ b/python/PyQt/DEPENDS
@@ -1,4 +1,4 @@
 depends  sip
 depends  qt4
 
-optional_depends Python-3 "" "" "For Python-3 bindings support"
+optional_depends Python-3 "" "" "For Python-3 bindings support" n