From 6e8d3793323b8f24be801a4aaf31cdd31a8483e9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Mar 2024 12:47:43 +0000 Subject: gentoo auto-resync : 15:03:2024 - 12:47:43 --- .../files/octave-4.2.2-ncurses-pkgconfig.patch | 37 ------------------ .../octave/files/octave-6.4.0-slibtool.patch | 37 ------------------ .../files/octave-7.3.0-docs-texinfo-7.0.patch | 45 ---------------------- 3 files changed, 119 deletions(-) delete mode 100644 sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch delete mode 100644 sci-mathematics/octave/files/octave-6.4.0-slibtool.patch delete mode 100644 sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch (limited to 'sci-mathematics/octave/files') diff --git a/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch b/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch deleted file mode 100644 index d20fef5c56e9..000000000000 --- a/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -1327,32 +1327,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. diff --git a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch deleted file mode 100644 index 1558b334d522..000000000000 --- a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch +++ /dev/null @@ -1,37 +0,0 @@ - -# HG changeset patch -# User Markus Mützel -# Date 1647451226 -3600 -# Node ID 2d394460429ff8313004ddaeea31437e90d16799 -# Parent d3123b682f63723c111a50b77716fe9349d8fb7d -build: Parse .la files in build tree when installing .oct files (bug #61905). - -* Makefile.am (install-oct): Parse .la files in build tree when installing .oct -files. That should improve compatibility with tools like `slibtool` that don't -install .la files. - -diff --git a/Makefile.am b/Makefile.am ---- a/Makefile.am -+++ b/Makefile.am -@@ -460,17 +460,18 @@ - if [ -n "`cat $(OCT_FILE_PKG_ADD_FILES)`" ]; then \ - $(INSTALL_DATA) oct-file-pkg-add $(DESTDIR)$(octfiledir)/PKG_ADD; \ - fi -+ top_build_dir=`pwd` && \ - cd $(DESTDIR)$(octlibdir) && \ - for ltlib in $(OCT_FILE_LIBS); do \ - f=`echo $$ltlib | $(SED) 's,.*/,,'`; \ -- dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \ -+ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \ - if [ -n "$$dl" ]; then \ - $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \ - else \ - echo "error: dlname is empty in $$ltlib!"; \ - exit 1; \ - fi; \ -- lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \ -+ lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$top_build_dir/$$ltlib`; \ - if [ -n "$$lnames" ]; then \ - rm -f $$f $$lnames $$dl; \ - fi \ - diff --git a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch deleted file mode 100644 index 7a6249ae80d4..000000000000 --- a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://savannah.gnu.org/bugs/?62648#comment22 -https://bugs.gentoo.org/880623 - -# HG changeset patch -# User Rik -# Date 1668451079 28800 -# Mon Nov 14 10:37:59 2022 -0800 -# Node ID 67d5b2d119e254efc3d9f2658de47b293ac1f6eb -# Parent 9f4a9dd4a6ee34ddc6e8d0a87d0c703782af7358 -doc: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648) - -* mk-qthelp.pl: Update regular expressions that find the start of data in -index.html and Function-index.html to include additional pattern generated by -Texinfo 7.0. - ---- a/doc/interpreter/mk-qthelp.pl -+++ b/doc/interpreter/mk-qthelp.pl -@@ -26,8 +26,11 @@ if ($#ARGV != 1) - open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname"; - - # Skip through preamble of file to find start of list --while (($_ = <$HTML>) !~ /^
/ ) {;} --while (($_ = <$HTML>) !~ /^
    / ) {;} -+while (defined ($_ = <$HTML>) and ! /^
    / ) {;} -+while (defined ($_ = <$HTML>) -+ and ! /^
      / ) {;} -+ -+die "index.html: reached EOF without finding data start pattern" if eof ($HTML); - - $level = 0; - while (<$HTML>) -@@ -68,7 +71,11 @@ die "Failed to parse index.html" if ($le - open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname"; - - # Skip through preamble of file to find start of list --while (($_ = <$HTML>) !~ /^) - { - -- cgit v1.2.3