Mercurial > mxe-octave

changeset 2935:8cf0cbcdaeea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include qscintilla as a dependency of Octave
author John W. Eaton <jwe@octave.org>
date Wed, 02 Jan 2013 20:43:23 -0500
parents 90f9826eb4d6
children fc124629c527
files index.html src/octave.mk src/qscintilla.mk
diffstat 3 files changed, 29 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Wed Jan 02 20:22:45 2013 -0500
+++ b/index.html	Wed Jan 02 20:43:23 2013 -0500
@@ -1854,6 +1854,11 @@
         <td id="qrupdate-website"><a href="http://sourceforge.net/projects/qrupdate/">qrupdate</a></td>
     </tr>
     <tr>
+        <td id="qscintilla-package">qscintilla</td>
+        <td id="qscintilla-version">2.7</td>
+        <td id="qscintilla-website"><a href="http://www.riverbankcomputing.com/software/qscintilla/intro">QScintilla</a></td>
+    </tr>
+    <tr>
         <td id="qt-package">qt</td>
         <td id="qt-version">4.8.3</td>
         <td id="qt-website"><a href="http://qt.nokia.com/">Qt</a></td>
--- a/src/octave.mk	Wed Jan 02 20:22:45 2013 -0500
+++ b/src/octave.mk	Wed Jan 02 20:43:23 2013 -0500
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack llvm pcre qhull qrupdate qt readline suitesparse zlib
+$(PKG)_DEPS     := arpack blas curl fftw fltk gcc glpk gnuplot graphicsmagick lapack llvm pcre qhull qrupdate qscintilla qt readline suitesparse zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/qscintilla.mk	Wed Jan 02 20:43:23 2013 -0500
@@ -0,0 +1,23 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := qscintilla
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 296c03343f5d84f0c06a16eb3fb706e0eb735ea6
+$(PKG)_SUBDIR   := QScintilla-gpl-$($(PKG)_VERSION)/Qt4Qt5
+$(PKG)_FILE     := QScintilla-gpl-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-2.7/$($(PKG)_FILE)
+$(PKG)_DEPS     := qt
+
+define $(PKG)_UPDATE
+    echo 'Warning: Updates are temporarily disabled for package qscintilla.' >&2;
+    echo $(qscintilla_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && '$(PREFIX)/$(TARGET)/bin/qmake' -makefile -spec '$(PREFIX)/$(TARGET)/mkspecs/win32-g++'
+
+    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    $(MAKE) -C '$(1)' -j 1 install
+    $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/lib/qscintilla2.dll' '$(PREFIX)/$(TARGET)/bin/qscintilla2.dll'
+endef