diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-07 19:56:46 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-07 22:48:42 +0200 |
| commit | dfc6d810f76e3d9777f622a8108b0cbf060b1c04 (patch) | |
| tree | 2dbddac355524246a367fbac8902c9b59d446eb7 /sci-mathematics/octave/files | |
| parent | virtual/python-funcsigs-1: ppc64 stable, bug 649350 (diff) | |
| download | gentoo-dfc6d810f76e3d9777f622a8108b0cbf060b1c04.tar.gz gentoo-dfc6d810f76e3d9777f622a8108b0cbf060b1c04.tar.bz2 gentoo-dfc6d810f76e3d9777f622a8108b0cbf060b1c04.zip | |
sci-mathematics/octave: Drop 4.2.1
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'sci-mathematics/octave/files')
3 files changed, 0 insertions, 67 deletions
diff --git a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch deleted file mode 100644 index ea714ecbfbbf..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch +++ /dev/null @@ -1,14 +0,0 @@ -In Gentoo, QScintilla for Qt5 has the same library name -as its Qt4 variant. - ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -1327,7 +1327,7 @@ - ;; - 5) - QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" -- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" -+ octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2" - ;; - *) - AC_MSG_ERROR([Unrecognized Qt version $qt_version]) diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch deleted file mode 100644 index d5b2870185bb..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1560,11 +1560,11 @@ - MAGICK_LIBS= - - PKG_CHECK_EXISTS([$magick++], [ -- ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ -+ ## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++ - ## packages add extra flags that are useful when building - ## Graphics/ImageMagick++ extentions. These extra flags break the - ## Octave build. -- MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` -+ MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'` - MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` - MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` - diff --git a/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch b/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch deleted file mode 100644 index 89f6f6e7014d..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -1194,32 +1194,8 @@ - dnl Find a suitable termlib to use. - dnl - AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [ -- TERM_LIBS= -- ac_octave_save_LIBS="$LIBS" -- AC_SEARCH_LIBS([tputs], -- [ncurses curses termcap terminfo termlib], -- [], []) -- LIBS="$ac_octave_save_LIBS" -- case "$ac_cv_search_tputs" in -- -l*) -- TERM_LIBS="$ac_cv_search_tputs" -- ;; -- no) -- warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses, -lcurses, or -ltermlib!" -- AC_MSG_WARN([$warn_termlibs]) -- ;; -- esac -- --dnl Old code (9/9/2012). Delete when new code is definitely proven. --dnl --dnl for _termlib in ncurses curses termcap terminfo termlib; do --dnl AC_CHECK_LIB([${_termlib}], [tputs], [ --dnl TERM_LIBS="-l${termlib}" --dnl octave_cv_lib_found_termlib=yes --dnl break]) --dnl done -- -- AC_SUBST(TERM_LIBS) -+ PKG_CHECK_MODULES([TERM], [ncurses]) -+ CPPFLAGS="${CPPFLAGS} ${TERM_CFLAGS}" - ]) - dnl - dnl Check for the Qhull version. |