commit: c08bd80c7767e50558567b6469286d2b2a9cca03
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 16:17:30 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 17:48:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c08bd80c
sci-visualization/spyview: add binding := to fltk & fix build with 1.4
1.4.x drops the case sensitivity compat symlinks by default
and upstream strongly recommends to fix packages rather than
re-enable them.
:= due to new soname
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../spyview/files/spyview-2018.12.24-fltk1.4.patch | 33 ++++++++++++++++++++++
...8.12.24.ebuild => spyview-2018.12.24-r1.ebuild} | 3 +-
sci-visualization/spyview/spyview-9999.ebuild | 2 +-
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch
b/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch
new file mode 100644
index 000000000000..eb690101afca
--- /dev/null
+++ b/sci-visualization/spyview/files/spyview-2018.12.24-fltk1.4.patch
@@ -0,0 +1,33 @@
+Deprecated compatibility symlinks are removed.
+--- a/spyview/ImageData.C
++++ b/spyview/ImageData.C
+@@ -4 +4 @@
+-#include <Fl/filename.H>
++#include <FL/filename.H>
+--- a/spyview/spybrowse.C
++++ b/spyview/spybrowse.C
+@@ -5,2 +5,2 @@
+-#include <Fl/filename.H>
+-#include <Fl/fl_ask.H>
++#include <FL/filename.H>
++#include <FL/fl_ask.H>
+--- a/spyview/spybrowse_ui.fl
++++ b/spyview/spybrowse_ui.fl
+@@ -11 +11 @@
+-decl {\#include <Fl/Fl_File_Chooser.H>} {public
++decl {\#include <FL/Fl_File_Chooser.H>} {public
+--- a/spyview/spybrowse_ui.h
++++ b/spyview/spybrowse_ui.h
+@@ -8 +8 @@
+-#include <Fl/Fl_File_Chooser.H>
++#include <FL/Fl_File_Chooser.H>
+--- a/spyview/spyview.C
++++ b/spyview/spyview.C
+@@ -13 +13 @@
+-#include <Fl/fl_ask.H>
++#include <FL/fl_ask.H>
+@@ -15,2 +15,2 @@
+-#include <Fl/Fl_File_Chooser.H>
+-#include <Fl/filename.H>
++#include <FL/Fl_File_Chooser.H>
++#include <FL/filename.H>
diff --git a/sci-visualization/spyview/spyview-2018.12.24.ebuild
b/sci-visualization/spyview/spyview-2018.12.24-r1.ebuild
similarity index 96%
rename from sci-visualization/spyview/spyview-2018.12.24.ebuild
rename to sci-visualization/spyview/spyview-2018.12.24-r1.ebuild
index 6dcdb79c891f..e838a3ecc23f 100644
--- a/sci-visualization/spyview/spyview-2018.12.24.ebuild
+++ b/sci-visualization/spyview/spyview-2018.12.24-r1.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
COMMON_DEPEND="
dev-libs/boost:=
media-libs/netpbm
- x11-libs/fltk:1[opengl]
+ x11-libs/fltk:1=[opengl]
app-text/ghostscript-gpl
virtual/glu
"
@@ -35,6 +35,7 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/spyview-no-user-dirs.patch"
+ "${FILESDIR}/${P}-fltk1.4.patch"
)
src_unpack() {
diff --git a/sci-visualization/spyview/spyview-9999.ebuild
b/sci-visualization/spyview/spyview-9999.ebuild
index ca495102a00e..e68c6227f788 100644
--- a/sci-visualization/spyview/spyview-9999.ebuild
+++ b/sci-visualization/spyview/spyview-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
COMMON_DEPEND="
dev-libs/boost:=
media-libs/netpbm
- x11-libs/fltk:1[opengl]
+ x11-libs/fltk:1=[opengl]
app-text/ghostscript-gpl
virtual/glu
"
