Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ac89cb740780d786c621195d7b7f8b4c3f64e63d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ac89cb740780d786c621195d7b7f8b4c3f64e63d)
  • Date: Wed, 12 Oct 2016 21:57:49 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

x11-toolkits/qscintilla/BUILD | 16 +++++-----------
x11-toolkits/qscintilla/DETAILS | 9 +++++----
x11-toolkits/qscintilla/HISTORY | 4 ++++
3 files changed, 14 insertions(+), 15 deletions(-)

New commits:
commit ac89cb740780d786c621195d7b7f8b4c3f64e63d
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qscintilla 2.9.3

commit 91fec6a3db4b72da818abefba2827ca408725c68
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qscintilla: Fix build against Qt5

diff --git a/x11-toolkits/qscintilla/BUILD b/x11-toolkits/qscintilla/BUILD
index 10d36c53..54982b4 100755
--- a/x11-toolkits/qscintilla/BUILD
+++ b/x11-toolkits/qscintilla/BUILD
@@ -1,12 +1,6 @@
-
-QTDIR=/usr &&
-local QTSCINT &&
-if is_depends_enabled $SPELL qt4 ; then
- PATH=$QTDIR/bin/qt4:$PATH
- QTSCINT=Qt4Qt5
+cd $SOURCE_DIRECTORY/Qt4Qt5 &&
+if is_depends_enabled $SPELL qt4; then
+ qt4_build
else
- QTSCINT=Qt3
-fi &&
- cd $SOURCE_DIRECTORY/$QTSCINT &&
- PATH=$INSTALL_ROOT/opt/qt4/bin:$PATH qmake qscintilla.pro &&
- make
+ qt5_build
+fi
diff --git a/x11-toolkits/qscintilla/DETAILS b/x11-toolkits/qscintilla/DETAILS
index 3a5a0db..a58855f 100755
--- a/x11-toolkits/qscintilla/DETAILS
+++ b/x11-toolkits/qscintilla/DETAILS
@@ -1,8 +1,9 @@
SPELL=qscintilla
- VERSION=2.9
-
SOURCE_HASH=sha512:a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00
- SOURCE=QScintilla-gpl-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/QScintilla-gpl-$VERSION
+ SPELLX=QScintilla_gpl
+ VERSION=2.9.3
+
SOURCE_HASH=sha512:43c0edb91b7cf31f4cca71aae54d7bfea8ee66e296c0e99b694069eeedf394762b8a670952debfa2671363fd8ab5c46dd7a7da60e8f1234406a12d12afa503ab
+ SOURCE=$SPELLX-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION

WEB_SITE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/pyqt/QScintilla2/QScintilla-${VERSION}/${SOURCE}
LICENSE[0]=GPL
diff --git a/x11-toolkits/qscintilla/HISTORY b/x11-toolkits/qscintilla/HISTORY
index f4c3174..6036912 100644
--- a/x11-toolkits/qscintilla/HISTORY
+++ b/x11-toolkits/qscintilla/HISTORY
@@ -1,3 +1,7 @@
+2016-10-12 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: Fixed build against Qt5
+ * DETAILS: updated spell to 2.9.3
+
2015-06-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.9
* BUILD: fix build with qt4 in /opt



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ac89cb740780d786c621195d7b7f8b4c3f64e63d), Ismael Luceno, 10/12/2016

Archive powered by MHonArc 2.6.24.

Top of Page