[arch-commits] Commit in octave/trunk (PKGBUILD octave-qscintilla-2.10.patch)

[Antonio Rojas]

    Date: Wednesday, March 1, 2017 @ 11:33:49
  Author: arojas
Revision: 289753

Fix qscintilla 2.10 support (FS#53122)

Added:
  octave/trunk/octave-qscintilla-2.10.patch
Modified:
  octave/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   15 ++++++++++++---
 octave-qscintilla-2.10.patch |   11 +++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-01 08:48:23 UTC (rev 289752)
+++ PKGBUILD	2017-03-01 11:33:49 UTC (rev 289753)
@@ -5,7 +5,7 @@
 
 pkgname=octave
 pkgver=4.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64')
 url="http://www.octave.org"
@@ -16,12 +16,21 @@
 optdepends=('texinfo: for help-support in octave'
             'gnuplot: alternative plotting'
             'portaudio: audio support')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig} octave-qscintilla-2.10.patch)
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
 sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
-          'SKIP')
+          'SKIP'
+          'ba53969f6fd923051cd306f414af0646ed7dc526')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix qscintilla 2.10 detection
+  patch -p1 -i ../octave-qscintilla-2.10.patch
+  autoreconf -vi
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: octave-qscintilla-2.10.patch
===================================================================
--- octave-qscintilla-2.10.patch	                        (rev 0)
+++ octave-qscintilla-2.10.patch	2017-03-01 11:33:49 UTC (rev 289753)
@@ -0,0 +1,11 @@
+--- octave-4.2.1/m4/acinclude.m4.orig	2017-03-01 11:05:40.106105555 +0000
++++ octave-4.2.1/m4/acinclude.m4	2017-03-01 11:06:05.612735530 +0000
+@@ -1346,7 +1346,7 @@
+     ;;
+     5)
+       QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+-      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2_qt5"
+     ;;
+     *)
+       AC_MSG_ERROR([Unrecognized Qt version $qt_version])