[Lunar-commits] <moonbase-kde> qscintiall2: Some tweaks all around

[Dennis Veatch]

commit f4b3203b72be0528266199b3d1bca8152b8339f9
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Fri, 14 Nov 2014 10:38:52 -0500
URL: https://github.com/lunar-linux/moonbase-kde/commit/f4b3203b72be0528266199b3d1bca8152b8339f9

qscintiall2: Some tweaks all around
---
  qt4-apps/qscintilla2/BUILD   | +14/-14   
  qt4-apps/qscintilla2/DEPENDS | +1/-3     
  qt4-apps/qscintilla2/DETAILS | +3/-5     
  3 files changed, 18 insertions(+), 22 deletions(-)

--- a/qt4-apps/qscintilla2/BUILD
+++ b/qt4-apps/qscintilla2/BUILD
@@ -1,23 +1,23 @@
 
-# install the editor class
-
   export PATH=$QTDIR/bin:$PATH  &&
+  export CXXFLAGS+=" -I../Qt4Qt5" &&
+  export LDFLAGS+=" -L../Qt4Qt5" &&
+
   source /etc/profile.d/qt4.rc  &&
-  cd Qt4Qt5                     &&
 
-  qmake -o Makefile qscintilla.pro &&
+  pushd Qt4Qt5 > /dev/null
+  qmake qscintilla.pro &&
   default_make  &&
+  popd > /dev/null &&
 
+  pushd designer-Qt4Qt5 > /dev/null &&
+  qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 &&
+  default_make &&
+  popd > /dev/null &&
   
 # install the Python bindings
 
-  cd ../Python           &&
-  python ./configure.py  &&
-  default_make
-
-# Do Python-3
-  if in_depends $MODULE Python-3 ; then
-    devoke_installwatch &&
-    python3 ./configure.py &&
-    default_make
-  fi
+  pushd Python > /dev/null &&
+  python ./configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake &&
+  default_make &&
+  popd > /dev/null
--- a/qt4-apps/qscintilla2/DEPENDS
+++ b/qt4-apps/qscintilla2/DEPENDS
@@ -1,3 +1 @@
-depends  PyQt
-
-optional_depends Python-3 "" "" "For Python-3 bindings support"
+depends PyQt
--- a/qt4-apps/qscintilla2/DETAILS
+++ b/qt4-apps/qscintilla2/DETAILS
@@ -1,15 +1,13 @@
           MODULE=qscintilla2
-           MAJOR=2.8.4
-         VERSION=gpl-$MAJOR
+         VERSION=gpl-2.8.4
           SOURCE=QScintilla-$VERSION.tar.gz
-   SOURCE_URL[0]=http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$MAJOR
-   SOURCE_URL[1]=http://mirror.meleeweb.net/pub/linux/gentoo/distfiles
+      SOURCE_URL=http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-${VERSION##*-}/
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-$VERSION
       SOURCE_VFY=sha1:7e15c261a7c1842f3a75e4878a880ab667224494
    MODULE_PREFIX=${QTDIR:-/usr}
         WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
          ENTERED=20070528
-         UPDATED=20140929
+         UPDATED=20141114
            SHORT="Port to Qt of Scintilla C++ editor class"
 
 cat << EOF