diff options
| author | Kyle Guinn <elyk03@gmail.com> | 2019-03-12 22:41:53 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2019-03-16 06:53:34 +0700 |
| commit | 33824d3bd20be67b54f59633f09d45d3604b6765 (patch) | |
| tree | f72a9563f661ffc0e654f975fc8fed0f58d69d38 /academic/octave/patches | |
| parent | ba1762ac762cf5e594dcb8b0f739fead615eae39 (diff) | |
academic/octave: Updated for version 5.1.0.
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'academic/octave/patches')
| -rw-r--r-- | academic/octave/patches/qt4opengl.diff | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/academic/octave/patches/qt4opengl.diff b/academic/octave/patches/qt4opengl.diff new file mode 100644 index 0000000000..4ed9f03d6b --- /dev/null +++ b/academic/octave/patches/qt4opengl.diff @@ -0,0 +1,89 @@ + +# HG changeset patch +# User John W. Eaton <jwe@octave.org> +# 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 + |