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

[Ronald van Haren]

    Date: Monday, March 19, 2018 @ 15:14:48
  Author: ronald
Revision: 309168

upgpkg: octave 4.2.2-1

update to 4.2.2; remove upstream included patch

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

------------------------------+
 PKGBUILD                     |   22 +++++-----------------
 octave-qscintilla-2.10.patch |   11 -----------
 2 files changed, 5 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-19 14:13:16 UTC (rev 309167)
+++ PKGBUILD	2018-03-19 15:14:48 UTC (rev 309168)
@@ -4,8 +4,8 @@
 # Contributor : cyberdune <cyberdune at gmail.com>
 
 pkgname=octave
-pkgver=4.2.1
-pkgrel=9
+pkgver=4.2.2
+pkgrel=1
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org"
@@ -17,25 +17,13 @@
             'gnuplot: alternative plotting'
             'portaudio: audio support'
             'java-runtime: java support')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig} octave-qscintilla-2.10.patch
-        octave-abort-exit.patch::"http://hg.savannah.gnu.org/hgweb/octave/raw-rev/16fae04366b2")
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
 options=('!emptydirs')
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
-sha1sums=('3d60e860d97c2497ec42de67f85a1eea2c79cdfd'
-          'SKIP'
-          'ba53969f6fd923051cd306f414af0646ed7dc526'
-          'e9a3cd2cd5938fc71bfeb05ea34bcd40a1b040db')
+sha512sums=('b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2'
+            'SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
 
-  # Fix abort on exit https://savannah.gnu.org/bugs/?49515
-  patch -p1 -i ../octave-abort-exit.patch
-  # Fix qscintilla 2.10 detection
-  patch -p1 -i ../octave-qscintilla-2.10.patch
-  autoreconf -vi
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: octave-qscintilla-2.10.patch
===================================================================
--- octave-qscintilla-2.10.patch	2018-03-19 14:13:16 UTC (rev 309167)
+++ octave-qscintilla-2.10.patch	2018-03-19 15:14:48 UTC (rev 309168)
@@ -1,11 +0,0 @@
---- 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])