Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robert Figura (cfa1d4c3aed7a1412864764218ca8bcd82247ad0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robert Figura <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robert Figura (cfa1d4c3aed7a1412864764218ca8bcd82247ad0)
  • Date: Tue, 13 Sep 2011 15:02:59 -0500

GIT changes to master grimoire by Robert Figura <template AT sourcemage.org>:

x11-toolkits/qscintilla/BUILD | 14 ++++++++------
x11-toolkits/qscintilla/DEPENDS | 2 +-
x11-toolkits/qscintilla/HISTORY | 4 ++++
x11-toolkits/qscintilla/INSTALL | 23 +++++++++++++++++------
4 files changed, 30 insertions(+), 13 deletions(-)

New commits:
commit 3fb51a7602804226a60e8389011824f00446dd20
Author: Robert Figura <template AT sourcemage.org>
Commit: Robert Figura <template AT sourcemage.org>

revert broken python api changes (bug 197)

diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 38a0138..856a0a2 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -9,10 +9,12 @@ else
fi &&
cd $SOURCE_DIRECTORY/$QTSCINT &&
qmake qscintilla.pro &&
- make &&
+ make # &&

-if is_depends_enabled $SPELL python ; then
- cd $SOURCE_DIRECTORY/Python &&
- python configure.py &&
- make
-fi
+# todo: the following the c++ bindings to be installed,
+# better put it into another spell:
+# if is_depends_enabled $SPELL python ; then
+# cd $SOURCE_DIRECTORY/Python &&
+# python configure.py &&
+# make
+# fi
diff --git a/x11-toolkits/qscintilla/DEPENDS b/x11-toolkits/qscintilla/DEPENDS
index 37f1ba4..e8b612f 100755
--- a/x11-toolkits/qscintilla/DEPENDS
+++ b/x11-toolkits/qscintilla/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends python 'true' '' "python api" &&
+# optional_depends python 'true' '' "python api" &&
depends -sub CXX gcc &&
depends QT
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index 1072873..bdddf5a 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,7 @@
+
+2011-09-13 Robert Figura <template AT sourcemage.org>
+ * DEPENDS, BUILD, INSTALL: revert broken python api changes (bug 197)
+
2011-09-07 Robert Figura <template AT sourcemage.org>
* DETAILS: updated spell to 2.5.1
* INSTALL: added
diff --git a/x11-toolkits/qscintilla/INSTALL b/x11-toolkits/qscintilla/INSTALL
index 59b79b5..2f6b0db 100755
--- a/x11-toolkits/qscintilla/INSTALL
+++ b/x11-toolkits/qscintilla/INSTALL
@@ -1,7 +1,18 @@

- cd $SOURCE_DIRECTORY/$QTSCINT &&
- make install &&
-if is_depends_enabled $SPELL python ; then
- cd $SOURCE_DIRECTORY/Python &&
- make install
-fi
+QTDIR=/usr &&
+local QTSCINT &&
+if is_depends_enabled $SPELL qt4 ; then
+ PATH=$QTDIR/bin/qt4:$PATH
+ QTSCINT=Qt4
+else
+ QTSCINT=Qt3
+fi &&
+cd $SOURCE_DIRECTORY/$QTSCINT &&
+make install # &&
+
+# todo: the following the c++ bindings to be installed,
+# better put it into another spell:
+# if is_depends_enabled $SPELL python ; then
+# cd $SOURCE_DIRECTORY/Python &&
+# make install
+# fi



  • [SM-Commit] GIT changes to master grimoire by Robert Figura (cfa1d4c3aed7a1412864764218ca8bcd82247ad0), Robert Figura, 09/13/2011

Archive powered by MHonArc 2.6.24.

Top of Page