From d3725636c425a4fd51bacf83b07c0ff0a2a41e91 Mon Sep 17 00:00:00 2001 From: Kyle Guinn Date: Sun, 16 Feb 2020 19:27:04 -0600 Subject: academic/octave: Updated for version 5.2.0. Signed-off-by: Kyle Guinn --- academic/octave/octave.SlackBuild | 5 +- academic/octave/octave.info | 6 +-- academic/octave/patches/qt4opengl.diff | 89 ---------------------------------- 3 files changed, 5 insertions(+), 95 deletions(-) delete mode 100644 academic/octave/patches/qt4opengl.diff diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index b0424312d4..fb2d909a46 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for octave -# Copyright 2012-2019 Kyle Guinn +# Copyright 2012-2020 Kyle Guinn # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=octave -VERSION=${VERSION:-5.1.0} +VERSION=${VERSION:-5.2.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -92,7 +92,6 @@ chown -R root:root . chmod -R u+w,go-w,a+rX-st . patch -p1 < $CWD/patches/imagemagick.diff # https://savannah.gnu.org/bugs/?49653 -patch -p1 < $CWD/patches/qt4opengl.diff # https://savannah.gnu.org/bugs/?55735 patch -p1 < $CWD/patches/atlas-lib-rename.diff autoreconf -vif diff --git a/academic/octave/octave.info b/academic/octave/octave.info index 7e90413013..a4ea3e666a 100644 --- a/academic/octave/octave.info +++ b/academic/octave/octave.info @@ -1,8 +1,8 @@ PRGNAM="octave" -VERSION="5.1.0" +VERSION="5.2.0" HOMEPAGE="https://www.gnu.org/software/octave/" -DOWNLOAD="https://ftp.gnu.org/gnu/octave/octave-5.1.0.tar.lz" -MD5SUM="2eb0d159b60c3fc2eb9068b2c7395050" +DOWNLOAD="https://ftp.gnu.org/gnu/octave/octave-5.2.0.tar.lz" +MD5SUM="3c621e85026d4a807f5639901a41ae71" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README% lapack" diff --git a/academic/octave/patches/qt4opengl.diff b/academic/octave/patches/qt4opengl.diff deleted file mode 100644 index 4ed9f03d6b..0000000000 --- a/academic/octave/patches/qt4opengl.diff +++ /dev/null @@ -1,89 +0,0 @@ - -# HG changeset patch -# User John W. Eaton -# Date 1552335463 0 -# Node ID 4af9840f9ce517ba4b591cfec0907731787a0bbc -# Parent 6c25c714bec436f70098355ab9d81d3b2fb083af -make building with Qt4 QGLWidget work again (bug #55735) - -* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Also set and substitute -QT_OPENGL_CPPFLAGS and QT_OPENGL_LDFLAGS variables. -(OCTAVE_CHECK_QT_OPENGL_OK, OCTAVE_CHECK_QT_OPENGL_OFFSCREEN): -Add QT_OPENGL_CPPFLAGS to CPPFLAGS for tests, not QT_CPPFLAGS. - -* libgui/graphics/module.mk %canon_reldir%___init_qt___la_CPPFLAGS): -Use QT_OPENGL_CPPFLAGS instead of QT_CPPFLAGS. -(%canon_reldir%___init_qt___la_LDFLAGS): Also include -$(QT_OPENGL_LDFLAGS) in the list. - -diff --git a/libgui/graphics/module.mk b/libgui/graphics/module.mk ---- a/libgui/graphics/module.mk -+++ b/libgui/graphics/module.mk -@@ -138,7 +138,7 @@ - $(FONTCONFIG_CPPFLAGS) \ - $(HDF5_CPPFLAGS) \ - @OCTGUI_DLL_DEFS@ \ -- @QT_CPPFLAGS@ \ -+ @QT_OPENGL_CPPFLAGS@ \ - -Ilibgui/graphics -I$(srcdir)/libgui/graphics \ - -Isrc -I$(srcdir)/libgui/src \ - -Iliboctave \ -@@ -153,7 +153,9 @@ - -I$(srcdir)/libinterp/octave-value - - %canon_reldir%___init_qt___la_LDFLAGS = \ -- -avoid-version -module $(NO_UNDEFINED_LDFLAG) $(WARN_LDFLAGS) -+ -avoid-version -module $(NO_UNDEFINED_LDFLAG) \ -+ $(QT_OPENGL_LDFLAGS) \ -+ $(WARN_LDFLAGS) - - DLD_LIBOCTGUI_LIBADD = $(OCT_GUI_LINK_DEPS) - -diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -1820,7 +1820,7 @@ - AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" -- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" -+ CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_CHECK_HEADERS([QOffscreenSurface]) - AC_CACHE_CHECK([whether Qt supports full offscreen OpenGL rendering], -@@ -1874,7 +1874,7 @@ - AC_LANG_PUSH(C++) - ac_octave_save_CPPFLAGS="$CPPFLAGS" - ac_octave_save_CXXFLAGS="$CXXFLAGS" -- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS" -+ CPPFLAGS="$QT_OPENGL_CPPFLAGS $CXXPICFLAG $CPPFLAGS" - CXXFLAGS="$CXXPICFLAG $CXXFLAGS" - AC_CHECK_HEADERS([QOpenGLWidget QGLWidget QGLFunctions_1_1]) - AC_CACHE_CHECK([whether Qt works with OpenGL and GLU], -@@ -2009,6 +2009,8 @@ - QT_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_MODULES | $SED -e 's/^ *$//')" - QT_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_MODULES | $SED -e 's/^ *$//')" - QT_LIBS="$($PKG_CONFIG --libs-only-l $QT_MODULES | $SED -e 's/^ *$//')" -+ QT_OPENGL_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" -+ QT_OPENGL_LDFLAGS="$($PKG_CONFIG --libs-only-L $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" - QT_OPENGL_LIBS="$($PKG_CONFIG --libs-only-l $QT_OPENGL_MODULE | $SED -e 's/^ *$//')" - - case $host_os in -@@ -2017,6 +2019,7 @@ - if test -z "$QT_LIBS"; then - QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" - QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" -+ QT_OPENGL_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" - QT_OPENGL_LIBS="`$PKG_CONFIG --libs-only-other $QT_OPENGL_MODULE | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" - ## Enabling link_all_deps works around libtool's imperfect handling - ## of the -F flag -@@ -2173,6 +2176,8 @@ - AC_SUBST(QT_CPPFLAGS) - AC_SUBST(QT_LDFLAGS) - AC_SUBST(QT_LIBS) -+ AC_SUBST(QT_OPENGL_CPPFLAGS) -+ AC_SUBST(QT_OPENGL_LDFLAGS) - AC_SUBST(QT_OPENGL_LIBS) - ]) - dnl - -- cgit v1.2.3