diff options
| author |   Sam James <sam@gentoo.org> | 2022-05-05 01:38:40 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-05-05 01:39:06 +0100 |
| commit | cefa83cc9eafe62faf7785efaafe4d0b2640c7cf (patch) | |
| tree | e5bd25b417b92404a1e9eb1de6142f3fbbc5b8d0 /sci-mathematics/octave | |
| parent | sci-mathematics/octave: use configure.ac patch (diff) | |
| download | gentoo-cefa83cc9eafe62faf7785efaafe4d0b2640c7cf.tar.gz gentoo-cefa83cc9eafe62faf7785efaafe4d0b2640c7cf.tar.bz2 gentoo-cefa83cc9eafe62faf7785efaafe4d0b2640c7cf.zip | |
sci-mathematics/octave: patch 6.4.0 for Qt as well
... given 7 doesn't seem to build with SSL?
Bug: https://bugs.gentoo.org/839285
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-mathematics/octave')
| -rw-r--r-- | sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch (renamed from sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch) | 0 | ||||
| -rw-r--r-- | sci-mathematics/octave/octave-6.4.0-r2.ebuild (renamed from sci-mathematics/octave/octave-6.4.0-r1.ebuild) | 4 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch index 2b16fbf411e1..2b16fbf411e1 100644 --- a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch +++ b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch diff --git a/sci-mathematics/octave/octave-6.4.0-r1.ebuild b/sci-mathematics/octave/octave-6.4.0-r2.ebuild index 3ef75b4b879f..23efecfc1a2a 100644 --- a/sci-mathematics/octave/octave-6.4.0-r1.ebuild +++ b/sci-mathematics/octave/octave-6.4.0-r2.ebuild @@ -99,9 +99,12 @@ PATCHES=( "${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch "${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch "${FILESDIR}/${PN}-6.4.0-slibtool.patch" + "${FILESDIR}"/${PN}-7.1.0-omit-qtchooser-qtver.patch ) src_prepare() { + default + # nasty prefix hacks for fltk:1 linking if use prefix; then use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1" @@ -110,7 +113,6 @@ src_prepare() { # occasional fail on install, force regeneration (bug #401189) rm doc/interpreter/contributors.texi || die - default eautoreconf } |