[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/

[Andreas Sturmlechner]

commit:     f0c36728afd0e9720c8efea527faa62670794755
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Fri Jul 13 06:19:44 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 05:28:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c36728

sci-mathematics/octave: Fix w/ media-gfx/graphicsmagick-1.3.30[imagemagick]

Closes: https://bugs.gentoo.org/661046

 sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
index 2f651e0995e..2aa6e5b9d8c 100644
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
@@ -1,16 +1,22 @@
 --- a/libinterp/corefcn/__magick_read__.cc	2018-05-22 12:25:37.688173855 +0200
 +++ a/libinterp/corefcn/__magick_read__.cc.new	2018-05-22 12:32:51.475172200 +0200
-@@ -817,10 +817,11 @@
+@@ -817,10 +817,19 @@
        // depth is 8, there's a good chance that we will be limited.  It
        // is also the GraphicsMagick recommended setting and the default
        // for ImageMagick.
--      if (QuantumDepth < 16)
++#ifdef QuantumDepth
+       if (QuantumDepth < 16)
++#else
 +      using namespace Magick;
 +      if (MAGICKCORE_QUANTUM_DEPTH < 16)
++#endif
          warning_with_id ("Octave:GraphicsMagick-Quantum-Depth",
                           "your version of %s limits images to %d bits per pixel\n",
--                         MagickPackageName, QuantumDepth);
++#ifdef QuantumDepth
+                          MagickPackageName, QuantumDepth);
++#else
 +                         MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
++#endif
  
        initialized = true;
      }

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/

[Sam James]

commit:     c9f89fde98fbb42678f1e168be438f99fe651473
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 00:10:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 00:11:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f89fde

sci-mathematics/octave: use configure.ac patch

More resilient and doesn't get blown away by subsequent autoreconf.

Bug: https://bugs.gentoo.org/839285
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/octave-7.1.0-omit-qtchooser-qtver.patch  | 77 +++++-----------------
 1 file changed, 18 insertions(+), 59 deletions(-)

diff --git a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch b/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
index 3dc9c3e1d191..2b16fbf411e1 100644
--- a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
+++ b/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
@@ -1,63 +1,22 @@
-diff -urNp octave-6.4.0-orig/configure octave-6.4.0-dwok/configure
---- octave-6.4.0-orig/configure	2022-04-19 20:45:23.112463584 +0200
-+++ octave-6.4.0-dwok/configure	2022-04-19 20:44:19.024774083 +0200
-@@ -77543,9 +77543,6 @@ esac
- fi
- 
-     if test -n "$MOC"; then
--      if test -n "$QTCHOOSER"; then
--        MOCFLAGS="-qt=$qt_version"
--      fi
-       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc"
-     else
-       QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc"
-@@ -77778,9 +77775,6 @@ esac
- fi
- 
-     if test -n "$UIC"; then
--      if test -n "$QTCHOOSER"; then
--        UICFLAGS="-qt=$qt_version"
--      fi
-       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic"
-     else
-       QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic"
-@@ -78013,9 +78007,6 @@ esac
- fi
- 
-     if test -n "$RCC"; then
--      if test -n "$QTCHOOSER"; then
--        RCCFLAGS="-qt=$qt_version"
--      fi
-       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc"
-     else
-       QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc"
-@@ -78248,9 +78239,6 @@ esac
- fi
- 
-     if test -n "$LRELEASE"; then
--      if test -n "$QTCHOOSER"; then
--        LRELEASEFLAGS="-qt=$qt_version"
--      fi
-       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease"
-     else
-       QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease"
-@@ -78483,9 +78471,6 @@ esac
- fi
- 
-     if test -n "$QCOLLECTIONGENERATOR"; then
+https://bugs.gentoo.org/839285
+--- a/m4/acinclude.m4
++++ b/m4/acinclude.m4
+@@ -2095,9 +2071,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [
+   if test -z "$m4_toupper([$1])_QTVER"; then
+     AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
+     if test -n "$m4_toupper([$1])"; then
 -      if test -n "$QTCHOOSER"; then
--        QCOLLECTIONGENERATORFLAGS="-qt=$qt_version"
+-        m4_toupper([$1])FLAGS="-qt=$qt_version"
 -      fi
-       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
+       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
      else
-       QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
-@@ -78718,9 +78703,6 @@ esac
- fi
+       QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
+@@ -2167,8 +2167,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1])
+   QT_TOOLS_MISSING=
  
-     if test -n "$QHELPGENERATOR"; then
--      if test -n "$QTCHOOSER"; then
--        QHELPGENERATORFLAGS="-qt=$qt_version"
--      fi
-       QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qhelpgenerator"
-     else
-       QT_TOOLS_MISSING="$QT_TOOLS_MISSING qhelpgenerator"
+   if test $build_qt_gui = yes; then
+-    AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
+-
+     OCTAVE_CHECK_QT_TOOL([moc])
+     OCTAVE_CHECK_QT_TOOL([uic])
+     OCTAVE_CHECK_QT_TOOL([rcc])