diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-26 18:05:24 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2024-12-26 18:05:24 +0000 |
| commit | cb5e13e885c4e26f03bd44b963bc4087aabf65f5 (patch) | |
| tree | 555c45e09826731632b34dc51d14a45c6393eb22 | |
| parent | 2024-12-26 17:50:26 UTC (diff) | |
| parent | x11-misc/xdiskusage: add binding := to fltk, soname changed (diff) | |
| download | gentoo-cb5e13e885c4e26f03bd44b963bc4087aabf65f5.tar.gz gentoo-cb5e13e885c4e26f03bd44b963bc4087aabf65f5.tar.bz2 gentoo-cb5e13e885c4e26f03bd44b963bc4087aabf65f5.zip | |
Merge updates from master
78 files changed, 352 insertions, 902 deletions
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3-r1.ebuild index f3c15f0bc3f0..03d758514c35 100644 --- a/app-text/flpsed/flpsed-0.7.3.ebuild +++ b/app-text/flpsed/flpsed-0.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ RDEPEND=" x11-libs/libX11 x11-libs/libXext x11-libs/libXft - >=x11-libs/fltk-1.3.0:1 + x11-libs/fltk:1= app-text/ghostscript-gpl[X]" DEPEND="${RDEPEND}" diff --git a/app-text/htmldoc/htmldoc-1.9.16.ebuild b/app-text/htmldoc/htmldoc-1.9.16-r1.ebuild index ec6a43befe4d..b8b0c0252702 100644 --- a/app-text/htmldoc/htmldoc-1.9.16.ebuild +++ b/app-text/htmldoc/htmldoc-1.9.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ DEPEND=" >=media-libs/libpng-1.4:0= sys-libs/zlib ssl? ( net-libs/gnutls:= ) - fltk? ( x11-libs/fltk:1 ) + fltk? ( x11-libs/fltk:1= ) " RDEPEND="${DEPEND}" diff --git a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild index ebb83fce663a..3c35af98da4d 100644 --- a/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild +++ b/dev-games/openscenegraph-openmw/openscenegraph-openmw-3.6_p20221115-r1.ebuild @@ -49,7 +49,7 @@ RDEPEND=" collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( - fltk? ( x11-libs/fltk:1[opengl] ) + fltk? ( x11-libs/fltk:1=[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) sdl2? ( media-libs/libsdl2 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild index f1e25ba3592f..06525d8ef4b1 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r114.ebuild @@ -49,7 +49,7 @@ RDEPEND=" collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( - fltk? ( x11-libs/fltk:1[opengl] ) + fltk? ( x11-libs/fltk:1=[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) diff --git a/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild index ee7b9e55301c..4fa510fea12b 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.5-r115.ebuild @@ -49,7 +49,7 @@ RDEPEND=" collada? ( dev-libs/collada-dom:= ) curl? ( net-misc/curl ) examples? ( - fltk? ( x11-libs/fltk:1[opengl] ) + fltk? ( x11-libs/fltk:1=[opengl] ) fox? ( x11-libs/fox:1.6[opengl] ) glut? ( media-libs/freeglut ) sdl2? ( media-libs/libsdl2 ) diff --git a/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild b/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild index 4b321cb51bfc..a64a2cf3bb9c 100644 --- a/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild +++ b/dev-libs/nativefiledialog-extended/nativefiledialog-extended-1.2.1.ebuild @@ -35,7 +35,7 @@ PATCHES=( src_configure() { local mycmakeargs=( - # tests are non-automated examples that open interactive dialogues + # tests are non-automated examples that open interactive dialogs -DNFD_BUILD_TESTS=no -DNFD_PORTAL=$(usex desktop-portal) ) diff --git a/games-emulation/nestopia/nestopia-1.52.1.ebuild b/games-emulation/nestopia/nestopia-1.52.1-r1.ebuild index f052df2b46cc..d859412937c6 100644 --- a/games-emulation/nestopia/nestopia-1.52.1.ebuild +++ b/games-emulation/nestopia/nestopia-1.52.1-r1.ebuild @@ -22,7 +22,7 @@ RDEPEND=" media-libs/libglvnd media-libs/libsdl2[joystick,sound] sys-libs/zlib:= - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[opengl] " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/games-emulation/nestopia/nestopia-1.53.0.ebuild b/games-emulation/nestopia/nestopia-1.53.0-r1.ebuild index bfe33153ee28..443027ed1239 100644 --- a/games-emulation/nestopia/nestopia-1.53.0.ebuild +++ b/games-emulation/nestopia/nestopia-1.53.0-r1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" media-libs/libsamplerate media-libs/libsdl2[joystick,sound] sys-libs/zlib:= - x11-libs/fltk:1[opengl] + >=x11-libs/fltk-1.4:1=[opengl] " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/games-engines/odamex/odamex-10.6.0.ebuild b/games-engines/odamex/odamex-10.6.0-r2.ebuild index 4a70b03acc25..c5b40b14bfe1 100644 --- a/games-engines/odamex/odamex-10.6.0.ebuild +++ b/games-engines/odamex/odamex-10.6.0-r2.ebuild @@ -29,7 +29,7 @@ RDEPEND=" media-libs/sdl2-mixer net-misc/curl x11-libs/libX11 - !hidpi? ( x11-libs/fltk:1 ) + !hidpi? ( x11-libs/fltk:1= ) portmidi? ( media-libs/portmidi ) ) odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) diff --git a/games-engines/odamex/odamex-10.6.0-r1.ebuild b/games-engines/odamex/odamex-10.6.0-r3.ebuild index 504ec274d098..2cb5b49ef1cd 100644 --- a/games-engines/odamex/odamex-10.6.0-r1.ebuild +++ b/games-engines/odamex/odamex-10.6.0-r3.ebuild @@ -27,7 +27,7 @@ RDEPEND=" media-libs/sdl2-mixer net-misc/curl x11-libs/libX11 - !hidpi? ( x11-libs/fltk:1 ) + !hidpi? ( x11-libs/fltk:1= ) portmidi? ( media-libs/portmidi ) ) odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER} ) diff --git a/games-simulation/crashtest/crashtest-1.1-r2.ebuild b/games-simulation/crashtest/crashtest-1.1-r3.ebuild index 4f9ff6d8d1b2..9157646d6f34 100644 --- a/games-simulation/crashtest/crashtest-1.1-r2.ebuild +++ b/games-simulation/crashtest/crashtest-1.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ RDEPEND=" media-libs/plib virtual/glu virtual/opengl - x11-libs/fltk:1[opengl]" + x11-libs/fltk:1=[opengl]" DEPEND="${RDEPEND}" PATCHES=( diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild index f296653e14c9..28db1e673105 100644 --- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r1.ebuild +++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.21.0-r2.ebuild @@ -193,7 +193,6 @@ DEPEND=" >=dev-libs/miniaudio-0.11.11 >=dev-libs/rapidjson-1.1.0 media-libs/libsdl2[X,sound,video] - >=x11-libs/fltk-1.3.5[opengl] " RDEPEND=" ${DEPEND} diff --git a/games-util/eureka/eureka-1.27b.ebuild b/games-util/eureka/eureka-1.27b-r1.ebuild index ef94dc07a656..5abf2cbbf180 100644 --- a/games-util/eureka/eureka-1.27b.ebuild +++ b/games-util/eureka/eureka-1.27b-r1.ebuild @@ -17,7 +17,7 @@ IUSE="+opengl" DEPEND=" sys-libs/zlib - x11-libs/fltk:1[opengl?] + x11-libs/fltk:1=[opengl?] opengl? ( media-libs/glu virtual/opengl diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24-r1.ebuild index d1dfbf4aca7b..f2accf2462e3 100644 --- a/games-util/glbsp/glbsp-2.24.ebuild +++ b/games-util/glbsp/glbsp-2.24-r1.ebuild @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="fltk" -DEPEND="fltk? ( x11-libs/fltk:1 )" +DEPEND="fltk? ( x11-libs/fltk:1= )" RDEPEND="${DEPEND}" PATCHES=( diff --git a/media-gfx/monica/monica-3.7-r1.ebuild b/media-gfx/monica/monica-3.7-r2.ebuild index b6be41461371..e93b87dfeff1 100644 --- a/media-gfx/monica/monica-3.7-r1.ebuild +++ b/media-gfx/monica/monica-3.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ppc x86" -DEPEND=">=x11-libs/fltk-1.1:1" +DEPEND="x11-libs/fltk:1=" RDEPEND="${DEPEND} x11-apps/xgamma" diff --git a/media-gfx/quat/files/quat-1.20-fltk1.4.patch b/media-gfx/quat/files/quat-1.20-fltk1.4.patch new file mode 100644 index 000000000000..d3426b2db0b0 --- /dev/null +++ b/media-gfx/quat/files/quat-1.20-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/gui/MainWindow.cxx ++++ b/gui/MainWindow.cxx +@@ -56 +56 @@ +-#include <FL/fl_file_chooser.H> ++#include <FL/Fl_File_Chooser.H> diff --git a/media-gfx/quat/quat-1.20-r3.ebuild b/media-gfx/quat/quat-1.20-r4.ebuild index f237c96e4554..da95cfeec35c 100644 --- a/media-gfx/quat/quat-1.20-r3.ebuild +++ b/media-gfx/quat/quat-1.20-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ IUSE="X debug" DEPEND=" >=sys-libs/zlib-1.1.4 X? ( - =x11-libs/fltk-1* + x11-libs/fltk:1= x11-libs/libX11 x11-libs/libXext x11-libs/libXft @@ -25,7 +25,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-fix-build-for-clang16.patch" ) +PATCHES=( + "${FILESDIR}/${P}-fix-build-for-clang16.patch" + "${FILESDIR}/${P}-fltk1.4.patch" +) src_configure() { # throws tons of warnings otherwise diff --git a/media-radio/fldigi/fldigi-4.2.05.ebuild b/media-radio/fldigi/fldigi-4.2.05-r3.ebuild index aa2d0d47b2cd..bb65c55744f8 100644 --- a/media-radio/fldigi/fldigi-4.2.05.ebuild +++ b/media-radio/fldigi/fldigi-4.2.05-r3.ebuild @@ -16,7 +16,7 @@ IUSE="hamlib nls pulseaudio" IUSE_CPU_FLAGS=" sse sse2 sse3" IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" -RDEPEND="x11-libs/fltk:1[threads,xft] +RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils diff --git a/media-radio/fldigi/fldigi-4.2.05-r2.ebuild b/media-radio/fldigi/fldigi-4.2.05-r4.ebuild index 6f0e742ae1a0..0000e5a5d512 100644 --- a/media-radio/fldigi/fldigi-4.2.05-r2.ebuild +++ b/media-radio/fldigi/fldigi-4.2.05-r4.ebuild @@ -16,7 +16,7 @@ IUSE="hamlib nls pulseaudio" IUSE_CPU_FLAGS=" sse sse2 sse3" IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" -RDEPEND="x11-libs/fltk:1[threads,xft] +RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)] x11-libs/libX11 virtual/libudev:= media-libs/libsamplerate diff --git a/media-radio/fldigi/fldigi-4.2.06.ebuild b/media-radio/fldigi/fldigi-4.2.06-r1.ebuild index 70988d0dc8ed..b0b75c7dc433 100644 --- a/media-radio/fldigi/fldigi-4.2.06.ebuild +++ b/media-radio/fldigi/fldigi-4.2.06-r1.ebuild @@ -16,7 +16,7 @@ IUSE="hamlib nls pulseaudio" IUSE_CPU_FLAGS=" sse sse2 sse3" IUSE+=" ${IUSE_CPU_FLAGS// / cpu_flags_x86_}" -RDEPEND="x11-libs/fltk:1[threads,xft] +RDEPEND="x11-libs/fltk:1=[threads(+),xft(+)] x11-libs/libX11 virtual/libudev:= media-libs/libsamplerate diff --git a/media-radio/flrig/flrig-2.0.05.ebuild b/media-radio/flrig/flrig-2.0.05-r1.ebuild index 25bc5e2d23c2..9733acc79669 100644 --- a/media-radio/flrig/flrig-2.0.05.ebuild +++ b/media-radio/flrig/flrig-2.0.05-r1.ebuild @@ -17,7 +17,7 @@ IUSE="nls" DOCS=(AUTHORS ChangeLog README) RDEPEND="x11-libs/libX11 - x11-libs/fltk:1 + x11-libs/fltk:1= x11-misc/xdg-utils" DEPEND="${RDEPEND} diff --git a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild b/media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild index 800ea4ac7faf..1046768052a0 100644 --- a/media-sound/alsa-tools/alsa-tools-1.2.11.ebuild +++ b/media-sound/alsa-tools/alsa-tools-1.2.11-r1.ebuild @@ -22,7 +22,7 @@ alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr" DEPEND=" >=media-libs/alsa-lib-${PV} >=dev-python/pyalsa-1.0.26 - fltk? ( >=x11-libs/fltk-1.3.0:1 ) + fltk? ( x11-libs/fltk:1= ) gtk? ( dev-libs/gobject-introspection x11-libs/gtk+:2 diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild index aed21c078e94..77b3fbda7a70 100644 --- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild +++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r5.ebuild @@ -19,7 +19,7 @@ KEYWORDS="amd64 arm ppc ppc64 sparc x86" RDEPEND=" media-libs/alsa-lib:= media-sound/alsa-utils - x11-libs/fltk:1" + x11-libs/fltk:1=" DEPEND="${RDEPEND}" PATCHES=( diff --git a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild b/media-sound/gmorgan/gmorgan-0.79-r4.ebuild index c89a4bf0972a..56367ad31493 100644 --- a/media-sound/gmorgan/gmorgan-0.79-r3.ebuild +++ b/media-sound/gmorgan/gmorgan-0.79-r4.ebuild @@ -16,7 +16,7 @@ IUSE="nls" RDEPEND=" media-libs/alsa-lib - x11-libs/fltk:1" + x11-libs/fltk:1=" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" diff --git a/media-sound/horgand/files/horgand-1.14-fltk1.4.patch b/media-sound/horgand/files/horgand-1.14-fltk1.4.patch new file mode 100644 index 000000000000..df106161e1fb --- /dev/null +++ b/media-sound/horgand/files/horgand-1.14-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/src/organ.C ++++ b/src/organ.C +@@ -31 +31 @@ +-#include <Fl/Fl_Preferences.H> ++#include <FL/Fl_Preferences.H> diff --git a/media-sound/horgand/horgand-1.14-r2.ebuild b/media-sound/horgand/horgand-1.14-r3.ebuild index 6506e49d4be4..b4bd54ce0304 100644 --- a/media-sound/horgand/horgand-1.14-r2.ebuild +++ b/media-sound/horgand/horgand-1.14-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,13 +18,16 @@ RDEPEND=" media-libs/libsndfile media-sound/alsa-utils virtual/jack - x11-libs/fltk:1 + x11-libs/fltk:1= x11-libs/libXpm " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-overflow.patch" ) +PATCHES=( + "${FILESDIR}/${P}-overflow.patch" + "${FILESDIR}/${P}-fltk1.4.patch" +) src_compile() { emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \ diff --git a/media-sound/lmms/lmms-1.2.2-r2.ebuild b/media-sound/lmms/lmms-1.2.2-r3.ebuild index 775db25c1d67..3623cf5241fc 100644 --- a/media-sound/lmms/lmms-1.2.2-r2.ebuild +++ b/media-sound/lmms/lmms-1.2.2-r3.ebuild @@ -38,7 +38,7 @@ COMMON_DEPEND=" >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib - >=x11-libs/fltk-1.3.0_rc3:1 + x11-libs/fltk:1= alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild index f003402e4f33..8e4208f20432 100644 --- a/media-sound/lmms/lmms-9999.ebuild +++ b/media-sound/lmms/lmms-9999.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=" >=media-libs/libsndfile-1.0.11 sci-libs/fftw:3.0 sys-libs/zlib - >=x11-libs/fltk-1.3.0_rc3:1 + x11-libs/fltk:1= alsa? ( media-libs/alsa-lib ) fluidsynth? ( media-sound/fluidsynth ) jack? ( virtual/jack ) diff --git a/media-sound/mup/files/mup-6.9-fltk1.4.patch b/media-sound/mup/files/mup-6.9-fltk1.4.patch new file mode 100644 index 000000000000..f01ebc012e5b --- /dev/null +++ b/media-sound/mup/files/mup-6.9-fltk1.4.patch @@ -0,0 +1,11 @@ +Main.C:751:9: error: 'fl_register_images' was not declared ... +--- a/src/mupmate/Main.C ++++ b/src/mupmate/Main.C +@@ -68,6 +68,7 @@ + + #include <FL/Fl.H> + #include <FL/fl_ask.H> ++#include <FL/Fl_Shared_Image.H> + #include <FL/Fl_Tooltip.H> + + #include "globals.H" diff --git a/media-sound/mup/mup-6.9.ebuild b/media-sound/mup/mup-6.9-r1.ebuild index 64e1202d55d3..2f88bd35ad21 100644 --- a/media-sound/mup/mup-6.9.ebuild +++ b/media-sound/mup/mup-6.9-r1.ebuild @@ -19,7 +19,7 @@ RDEPEND=" media-libs/libpng:= x11-libs/libX11 x11-libs/libXext - >=x11-libs/fltk-1.3:1 + x11-libs/fltk:1= x11-libs/libXpm " DEPEND=" @@ -35,6 +35,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.9-build-system.patch + "${FILESDIR}"/${PN}-6.9-fltk1.4.patch ) src_prepare() { diff --git a/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch new file mode 100644 index 000000000000..e3266ce7af7a --- /dev/null +++ b/media-sound/yoshimi/files/yoshimi-2.3.3.1-fltk1.4.patch @@ -0,0 +1,15 @@ +MiscGui.cpp:1434:18: error: 'fl_display' was not declared ... + +Other files are using x.H, but that header is deprecated and +the correct one is platform.H. fl_display is X-specific, so +this likely cannot work without fltk[X] at the moment. +--- a/UI/MiscGui.cpp ++++ b/UI/MiscGui.cpp +@@ -28,6 +28,7 @@ + + #include <FL/Fl.H> + #include <FL/fl_draw.H> ++#include <FL/platform.H> + + #include <cairo.h> + #include <cairo-xlib.h> diff --git a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild index d52b5bb9ab3d..d25e3732e7d9 100644 --- a/media-sound/yoshimi/yoshimi-2.3.3.1.ebuild +++ b/media-sound/yoshimi/yoshimi-2.3.3.1-r1.ebuild @@ -27,13 +27,17 @@ DEPEND=" sys-libs/zlib virtual/jack x11-libs/cairo[X] - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[X(+),opengl] lv2? ( media-libs/lv2 ) " RDEPEND="${DEPEND}" DOCS=( ../Changelog ../README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + src_prepare() { cmake_src_prepare sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die diff --git a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild index 42acb9b39317..67ffcae93119 100644 --- a/media-sound/yoshimi/yoshimi-2.3.3.2.ebuild +++ b/media-sound/yoshimi/yoshimi-2.3.3.2-r1.ebuild @@ -27,13 +27,17 @@ DEPEND=" sys-libs/zlib virtual/jack x11-libs/cairo[X] - x11-libs/fltk:1[opengl] + x11-libs/fltk:1=[X(+),opengl] lv2? ( media-libs/lv2 ) " RDEPEND="${DEPEND}" DOCS=( ../Changelog ../README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.3.1-fltk1.4.patch +) + src_prepare() { cmake_src_prepare sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch new file mode 100644 index 000000000000..db1bd93ece30 --- /dev/null +++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.6-fltk1.4.patch @@ -0,0 +1,20 @@ +MasterUI.cxx:2377:3: error: 'fl_open_display' was not declared ... + +Other files are using x.H, but that header is deprecated and the +correct one is platform.H. fl_display that it alse needs platform.H +for is X-specific, so this likely cannot work without fltk[X] at +the moment. + +(next revision of the ebuild removes fltk, so it won't matter much) +--- a/src/UI/MasterUI.fl ++++ b/src/UI/MasterUI.fl +@@ -76,6 +76,9 @@ + decl {\#include "common.H"} {public local + } + ++decl {\#include "FL/platform.H"} {public local ++} ++ + decl {\#if USE_NSM + \#include "NSM.H" + extern NSM_Client *nsm; diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild index da2c1db9b0e1..5a6403763d41 100644 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r3.ebuild +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r5.ebuild @@ -24,7 +24,7 @@ DEPEND=" doc? ( dev-texlive/texlive-fontutils ) dssi? ( media-libs/dssi ) fltk? ( - x11-libs/fltk:1 + x11-libs/fltk:1=[X(+)] x11-libs/libX11 x11-libs/libXpm ) @@ -42,6 +42,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${P}-docs.patch "${FILESDIR}"/${P}-stdint.patch + "${FILESDIR}"/${P}-fltk1.4.patch ) DOCS=( AUTHORS.txt NEWS.txt README.adoc ) diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild index 0f9fbe9e9d5c..0f9fbe9e9d5c 100644 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r4.ebuild +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.6-r6.ebuild diff --git a/media-video/sonic-snap/files/sonic-snap-1.7-fltk1.4.patch b/media-video/sonic-snap/files/sonic-snap-1.7-fltk1.4.patch new file mode 100644 index 000000000000..f081d51aa426 --- /dev/null +++ b/media-video/sonic-snap/files/sonic-snap-1.7-fltk1.4.patch @@ -0,0 +1,6 @@ +Deprecated compatibility symlinks are removed. +--- a/sonic-snap-gui.cxx ++++ b/sonic-snap-gui.cxx +@@ -22 +22 @@ +-#include <FL/fl_file_chooser.H> ++#include <FL/Fl_File_Chooser.H> diff --git a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild b/media-video/sonic-snap/sonic-snap-1.7-r2.ebuild index 0d703945f44d..117786115bce 100644 --- a/media-video/sonic-snap/sonic-snap-1.7-r1.ebuild +++ b/media-video/sonic-snap/sonic-snap-1.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ IUSE="mpeg" DEPEND=" sys-libs/zlib - x11-libs/fltk:1 + x11-libs/fltk:1= x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp @@ -31,6 +31,10 @@ CONFIG_CHECK="~USB_SN9C102" ERROR_USB_SN9C102="Please make sure the SN9C1xx PC Camera Controller driver is \ enabled, under V4L USB devices, as a module in your kernel." +PATCHES=( + "${FILESDIR}"/${P}-fltk1.4.patch +) + src_prepare() { # fix bad assumptions sed -i \ diff --git a/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild index d935ad0c303f..8268a5a44c3a 100644 --- a/net-misc/tigervnc/tigervnc-1.14.1-r2.ebuild +++ b/net-misc/tigervnc/tigervnc-1.14.1-r3.ebuild @@ -32,6 +32,7 @@ REQUIRED_USE=" " # TODO: sys-libs/libselinux +# <fltk-1.4: https://github.com/TigerVNC/tigervnc/pull/1887#issuecomment-2545662546 COMMON_DEPEND=" dev-libs/gmp:= dev-libs/nettle:= @@ -68,7 +69,7 @@ COMMON_DEPEND=" ) viewer? ( media-video/ffmpeg:= - x11-libs/fltk:1 + <x11-libs/fltk-1.4:1= x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index 0569447b5b6c..e6b48ddae8b5 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -68,7 +68,7 @@ COMMON_DEPEND=" ) viewer? ( media-video/ffmpeg:= - x11-libs/fltk:1 + x11-libs/fltk:1= x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] diff --git a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild index d4afe5bd484f..019bcb9aec30 100644 --- a/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild +++ b/net-p2p/ed2k_hash/ed2k_hash-0.4.0-r3.ebuild @@ -16,7 +16,8 @@ IUSE="" # fltk support is broken, bug #359643 RESTRICT="mirror" -#DEPEND="fltk? ( x11-libs/fltk:1 )" +#DEPEND="fltk? ( x11-libs/fltk:1= )" +#RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/ed2k_64bit.patch" diff --git a/net-wireless/limesuite/limesuite-23.11.0.ebuild b/net-wireless/limesuite/limesuite-23.11.0.ebuild index 5dc765b3cd1a..4b4cae7cffd2 100644 --- a/net-wireless/limesuite/limesuite-23.11.0.ebuild +++ b/net-wireless/limesuite/limesuite-23.11.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" DEPEND=" - x11-libs/fltk:1 + x11-libs/fltk:1= x11-libs/wxGTK:${WX_GTK_VER} net-wireless/soapysdr:= virtual/opengl diff --git a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild b/net-wireless/wepdecrypt/wepdecrypt-0.8-r3.ebuild index 33ea4d37940a..65a7d3c7e449 100644 --- a/net-wireless/wepdecrypt/wepdecrypt-0.8-r2.ebuild +++ b/net-wireless/wepdecrypt/wepdecrypt-0.8-r3.ebuild @@ -16,7 +16,7 @@ RDEPEND=" dev-libs/openssl:= net-libs/libpcap sys-libs/zlib - X? ( x11-libs/fltk:1 )" + X? ( x11-libs/fltk:1= )" DEPEND="${RDEPEND}" PATCHES=( diff --git a/sci-biology/seaview/seaview-4.6-r1.ebuild b/sci-biology/seaview/seaview-4.6-r2.ebuild index 469f88728120..d02cb1b027e6 100644 --- a/sci-biology/seaview/seaview-4.6-r1.ebuild +++ b/sci-biology/seaview/seaview-4.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ RDEPEND=" sci-biology/muscle ) sys-libs/zlib - x11-libs/fltk:1[xft?] + x11-libs/fltk:1=[xft(+)?] x11-libs/libX11 xft? ( x11-libs/libXft )" DEPEND="${RDEPEND}" diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r2.ebuild index e0628f111574..9addf38da980 100644 --- a/sci-chemistry/vmd/vmd-1.9.4_alpha57.ebuild +++ b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r2.ebuild @@ -35,7 +35,7 @@ CDEPEND="${PYTHON_DEPS} dev-libs/expat sci-libs/netcdf:0= virtual/opengl - >=x11-libs/fltk-1.1.10-r2:1 + x11-libs/fltk:1= x11-libs/libXft x11-libs/libXi cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) diff --git a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r1.ebuild b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r3.ebuild index 18bdb88a4c0c..cc5a157bf69a 100644 --- a/sci-chemistry/vmd/vmd-1.9.4_alpha57-r1.ebuild +++ b/sci-chemistry/vmd/vmd-1.9.4_alpha57-r3.ebuild @@ -35,7 +35,7 @@ CDEPEND="${PYTHON_DEPS} dev-libs/expat sci-libs/netcdf:0= virtual/opengl - >=x11-libs/fltk-1.1.10-r2:1 + x11-libs/fltk:1= x11-libs/libXft x11-libs/libXi cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1:= ) diff --git a/sci-electronics/Stage/Stage-4.3.0-r1.ebuild b/sci-electronics/Stage/Stage-4.3.0-r2.ebuild index 9012058a44da..eb173c8f8685 100644 --- a/sci-electronics/Stage/Stage-4.3.0-r1.ebuild +++ b/sci-electronics/Stage/Stage-4.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ RDEPEND=" dev-libs/libltdl:0 media-libs/libpng:0= sys-libs/zlib:0= - x11-libs/fltk[opengl] + x11-libs/fltk:1=[opengl] virtual/glu virtual/jpeg:0 virtual/opengl diff --git a/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild b/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild index deffafdf47c5..8a1ae97616cf 100644 --- a/sci-libs/gmsh/gmsh-4.11.1-r2.ebuild +++ b/sci-libs/gmsh/gmsh-4.11.1-r3.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RDEPEND=" virtual/fortran - X? ( x11-libs/fltk:1[xft] ) + X? ( x11-libs/fltk:1=[xft(+)] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas diff --git a/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild b/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild index 60c811c184fd..e334c37e2aa2 100644 --- a/sci-libs/gmsh/gmsh-4.12.2-r1.ebuild +++ b/sci-libs/gmsh/gmsh-4.12.2-r2.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RDEPEND=" virtual/fortran - X? ( x11-libs/fltk:1[xft] ) + X? ( x11-libs/fltk:1=[xft(+)] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas diff --git a/sci-libs/gmsh/gmsh-4.13.1.ebuild b/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild index 5f67d86017b6..0b0e0ad7fea4 100644 --- a/sci-libs/gmsh/gmsh-4.13.1.ebuild +++ b/sci-libs/gmsh/gmsh-4.13.1-r1.ebuild @@ -33,7 +33,7 @@ REQUIRED_USE=" RDEPEND=" virtual/fortran - X? ( x11-libs/fltk:1[xft] ) + X? ( x11-libs/fltk:1=[xft(+)] ) alglib? ( sci-libs/alglib ) blas? ( virtual/blas diff --git a/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild b/sci-libs/mathgl/mathgl-8.0.1-r2.ebuild index 96df3e08c15a..53318c93823a 100644 --- a/sci-libs/mathgl/mathgl-8.0.1-r1.ebuild +++ b/sci-libs/mathgl/mathgl-8.0.1-r2.ebuild @@ -24,7 +24,7 @@ unset l RDEPEND=" virtual/opengl - fltk? ( x11-libs/fltk:1 ) + fltk? ( x11-libs/fltk:1= ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( >=sci-libs/gsl-2:= ) diff --git a/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild index f4967f08420e..157b280018c3 100644 --- a/sci-mathematics/giac/giac-1.9.0.29-r1.ebuild +++ b/sci-mathematics/giac/giac-1.9.0.29-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ done # nauty and cliquer are automagical dependencies RDEPEND="dev-libs/gmp:=[cxx(+)] sys-libs/readline:= - gui? ( x11-libs/fltk[opengl] + gui? ( x11-libs/fltk:1=[opengl] media-libs/libpng:= ) ao? ( media-libs/libao ) dev-libs/mpfr:= diff --git a/sci-mathematics/giac/giac-1.9.0.995-r1.ebuild b/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild index 6a9a85a14f05..a0a875aadaa6 100644 --- a/sci-mathematics/giac/giac-1.9.0.995-r1.ebuild +++ b/sci-mathematics/giac/giac-1.9.0.995-r2.ebuild @@ -44,7 +44,7 @@ RDEPEND="dev-libs/gmp:=[cxx(+)] glpk? ( sci-mathematics/glpk ) gui? ( media-libs/libpng:= - x11-libs/fltk[opengl] + x11-libs/fltk:1=[opengl] x11-libs/gl2ps )" diff --git a/sci-mathematics/octave/octave-8.3.0-r2.ebuild b/sci-mathematics/octave/octave-8.3.0-r2.ebuild index d13104f9342f..c6a00868c4b6 100644 --- a/sci-mathematics/octave/octave-8.3.0-r2.ebuild +++ b/sci-mathematics/octave/octave-8.3.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,7 +38,7 @@ RDEPEND=" virtual/lapack curl? ( net-misc/curl:= ) fftw? ( sci-libs/fftw:3.0= ) - fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] ) + fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft(+)] ) glpk? ( sci-mathematics/glpk:= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( 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 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 " diff --git a/www-client/dillo/dillo-3.1.1.ebuild b/www-client/dillo/dillo-3.1.1-r1.ebuild index c196f5231273..53222bcbf650 100644 --- a/www-client/dillo/dillo-3.1.1.ebuild +++ b/www-client/dillo/dillo-3.1.1-r1.ebuild @@ -24,7 +24,7 @@ REQUIRED_USE=" " RDEPEND=" - >=x11-libs/fltk-1.3:1 + =x11-libs/fltk-1.3*:1= sys-libs/zlib x11-libs/libX11 jpeg? ( media-libs/libjpeg-turbo:= ) diff --git a/www-client/dillo/dillo-9999.ebuild b/www-client/dillo/dillo-9999.ebuild index a4d9441358ee..6afd97ac6375 100644 --- a/www-client/dillo/dillo-9999.ebuild +++ b/www-client/dillo/dillo-9999.ebuild @@ -24,7 +24,7 @@ REQUIRED_USE=" " RDEPEND=" - >=x11-libs/fltk-1.3:1 + =x11-libs/fltk-1.3*:1= sys-libs/zlib x11-libs/libX11 jpeg? ( media-libs/libjpeg-turbo:= ) diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index 3864bc146832..db1f593a38b8 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -1,2 +1,2 @@ -DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821 DIST fltk-1.3.8-source.tar.gz 5335306 BLAKE2B 8c2d2fca4243c0e7c5a8aa46083940f99c8b3e7873d39d6e590a4b66587876393f209e5e7e5eaf4a4cc13f0f97cb03671d97129853b0146eeab409aaf687935e SHA512 5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb +DIST fltk-1.4.1-source.tar.bz2 8456879 BLAKE2B 0301cfa7f47cde892b390ccabc1724d055cee2544cec6afe60cb1d62fed644d0100865e1889b70c06b8c4169a1af4285500a746e4c82ecb4908567c5887fc084 SHA512 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037 diff --git a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch deleted file mode 100644 index ca7607afa4fc..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/fltk-config.in -+++ b/fltk-config.in -@@ -42,9 +42,8 @@ - - # flags for C++ compiler: - ARCHFLAGS="@ARCHFLAGS@" --CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" --CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@" --LDFLAGS="@LDFLAGS@" -+CFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@" -+CXXFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@" - LDLIBS="@LIBS@" - OPTIM="@OPTIM@" - CAIROFLAGS="@CAIROFLAGS@" diff --git a/x11-libs/fltk/files/fltk-1.3.5-AR.patch b/x11-libs/fltk/files/fltk-1.3.5-AR.patch deleted file mode 100644 index 34dbc8769f09..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen) - - dnl How do we make libraries? - AC_PROG_RANLIB --AC_PATH_TOOL(AR, ar) -+AC_CHECK_TOOL(AR, ar) - - if test "x$AR" = "x:"; then - AC_MSG_ERROR([Configure could not find the library archiver, aborting.]) diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch deleted file mode 100644 index 1eac250248d2..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -57,6 +57,7 @@ - FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} - FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0 - FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION} -+FLTK_VERSION_FULL=${FL_VERSION} - - AC_SUBST(FL_MAJOR_VERSION) - AC_SUBST(FL_MINOR_VERSION) -@@ -64,6 +65,7 @@ - AC_SUBST(FL_DSO_VERSION) - AC_SUBST(FL_ABI_VERSION) - AC_SUBST(FL_VERSION) -+AC_SUBST(FLTK_VERSION_FULL) - - AC_SUBST(ARCHFLAGS) - AC_SUBST(OPTIM) -@@ -1576,10 +1578,13 @@ - BINARY_DIR= - AC_SUBST(BINARY_DIR) - -+INCLUDE_DIRS="${includedir}" -+AC_SUBST(INCLUDE_DIRS) -+ - dnl Write all of the files... - AC_CONFIG_HEADER(config.h:configh.in) - AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in) --AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile]) -+AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake]) - AC_OUTPUT - - dnl Make sure the fltk-config script is executable... diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch deleted file mode 100644 index 4d1512d749dd..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-optim.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1265,7 +1265,7 @@ - if test "x$with_optim" != x; then - OPTIM="$with_optim $OPTIM" - else -- OPTIM="-Os $OPTIM" -+ OPTIM=" $OPTIM" - fi - fi - diff --git a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch deleted file mode 100644 index 994df56ad361..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -100,9 +103,6 @@ - touch config.h - chmod +x fltk-config - --configure: configure.ac -- autoconf -- - config.guess config.sub: - -automake --add-missing 2> /dev/null - if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -84,11 +84,6 @@ - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ - fi - echo "Installing man pages in $(DESTDIR)$(mandir) ..." -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 -@@ -96,10 +91,6 @@ - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - - install-linux install-osx: -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 -@@ -108,17 +99,11 @@ - - uninstall: - $(RMDIR) $(DESTDIR)$(docdir) -- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 -- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 -- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) - $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 - - uninstall-linux uninstall-osx: -- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 - $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 - $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 diff --git a/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch new file mode 100644 index 000000000000..ee933b46b4df --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch @@ -0,0 +1,25 @@ +The "CFLAGS" variable here concatenates user's CFLAGS (unwanted in +fltk-config's @CFLAGS@) and FLTK_CFLAGS a bit below (wanted). + +So prevent addition of CMAKE_C_FLAGS_* and keep the rest. + +CXXFLAGS not touched given it does set(CXXFLAGS "${CFLAGS}"). + +Also drop @LDFLAGS@ as a precaution, it's not currently set by cmake +but it's likely an oversight. @LARGEFILE@ (currently still in .in) and +such are only used by autoconf (cmake appends into @CFLAGS@). +--- a/CMake/variables.cmake ++++ b/CMake/variables.cmake +@@ -139,6 +139 @@ +-string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_UPPER) +-if(${BUILD_UPPER}) +- set(CFLAGS "${CMAKE_C_FLAGS_${BUILD_UPPER}} ${CFLAGS}") +-endif(${BUILD_UPPER}) +- +-set(CFLAGS "${FLTK_OPTION_OPTIM} ${CMAKE_C_FLAGS} ${CFLAGS}") ++set(CFLAGS "${FLTK_OPTION_OPTIM} ${CFLAGS}") +--- a/fltk-config.in ++++ b/fltk-config.in +@@ -38 +38 @@ +-LDFLAGS="@LDFLAGS@" ++LDFLAGS="" diff --git a/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch new file mode 100644 index 000000000000..7243efa21fcd --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch @@ -0,0 +1,9 @@ +We only use the unittests-shared example and this unused one has ODR +violations. Skip building it for now rather than filter-lto w/ tests +to avoid triggering -Werror=odr -flto CI (ideally would want to only +build unittests and not have to worry about build time + quirks of +all examples). +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -100 +99,0 @@ +-fl_create_example(coordinates coordinates.cxx fltk::fltk) diff --git a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch deleted file mode 100644 index 3f576d501ece..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 6b64110b0..1330d3f27 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1878,10 +1878,13 @@ dnl Set empty BINARY_DIR variable for fltk-config.in (CMake compatibility) - BINARY_DIR= - AC_SUBST([BINARY_DIR]) - -+INCLUDE_DIRS="${includedir}" -+AC_SUBST(INCLUDE_DIRS) -+ - dnl Write all of the files... - AC_CONFIG_HEADERS([config.h:configh.in]) - AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in]) --AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile]) -+AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake]) - AC_OUTPUT - - dnl Make sure the fltk-config script is executable... diff --git a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch deleted file mode 100644 index 47db8d03c8d2..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/Makefile b/Makefile -index 2d99808d9..283f825dd 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,9 +103,6 @@ makeinclude: configure configh.in makeinclude.in - touch config.h - chmod +x fltk-config - --configure: configure.ac -- autoconf -- - portable-dist: - epm -v -s fltk.xpm fltk - -diff --git a/documentation/Makefile b/documentation/Makefile -index 0b176246b..882fbf8a4 100644 ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -91,12 +91,6 @@ install: $(MANPAGES) - $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \ - fi - echo "Installing man pages in $(DESTDIR)$(mandir) ..." -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1 -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3 -- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1 - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1 -@@ -105,10 +99,6 @@ install: $(MANPAGES) - $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3 - - install-linux install-osx: -- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 -- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6 - -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6 - $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6 - $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6 diff --git a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch deleted file mode 100644 index e49aa7408cca..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Makefile b/Makefile -index c02de0972..2d99808d9 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,8 +16,7 @@ - - include makeinclude - --DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \ -- documentation -+DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fltk-options - - all: makeinclude fltk-config - for dir in $(DIRS); do\ diff --git a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch deleted file mode 100644 index a1e18bbb74b2..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1330d3f27..c76dba26f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1552,7 +1552,7 @@ AS_IF([test -n "$GCC"], [ - AS_IF([test "x$with_optim" != x], [ - OPTIM="$with_optim $OPTIM" - ], [ -- OPTIM="-Os $OPTIM" -+ OPTIM="$OPTIM" - ]) - ]) - diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild deleted file mode 100644 index 69b47fc0d881..000000000000 --- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXt[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] ) - games? ( !sys-block/blocks ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES - CHANGES_1.0 - CHANGES_1.1 - CREDITS - README - README.abi-version.txt - README.Cairo.txt - README.CMake.txt - README.MSWindows.txt - README.OSX.txt - README.Unix.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.3.3-fltk-config.patch - "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch - "${FILESDIR}"/${PN}-1.3.3-visibility.patch - "${FILESDIR}"/${PN}-1.3.4-conf-tests.patch - "${FILESDIR}"/${PN}-1.3.5-cmake.patch - "${FILESDIR}"/${PN}-1.3.5-optim.patch - "${FILESDIR}"/${PN}-1.3.5-AR.patch -) - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - # also in Makefile:config.guess config.sub: - cp misc/config.{guess,sub} . || die - - cp fluid/{,x-}fluid.desktop || die - - eaclocal - eautoconf - multilib_copy_sources -} - -multilib_src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/881107 - # Seems to be fixed in git (1.4.9999) - filter-lto - - unset FLTK_LIBDIRS - - local FLTK_INCDIR=${EPREFIX}/usr/include/fltk - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid DESTDIR="${D}" install-linux install - - use doc && \ - emake -C documentation DESTDIR="${D}" install - - use games && \ - emake -C test DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild index af7fb86ee352..d9363b758188 100644 --- a/x11-libs/fltk/fltk-1.3.8.ebuild +++ b/x11-libs/fltk/fltk-1.3.8.ebuild @@ -9,8 +9,8 @@ DESCRIPTION="C++ user interface toolkit for X and OpenGL" HOMEPAGE="https://www.fltk.org/" SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" -SLOT="1" LICENSE="FLTK LGPL-2" +SLOT="1" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild deleted file mode 100644 index 8362de128971..000000000000 --- a/x11-libs/fltk/fltk-1.3.9999.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -EGIT_REPO_URI="https://github.com/fltk/fltk" -EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXt[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] ) - games? ( !sys-block/blocks ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES - CHANGES_1.0 - CHANGES_1.1 - CREDITS - README - README.abi-version.txt - README.Cairo.txt - README.CMake.txt - README.MSWindows.txt - README.OSX.txt - README.Unix.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch - "${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch - "${FILESDIR}"/${PN}-1.3.3-visibility.patch - "${FILESDIR}"/${PN}-1.3.5-cmake.patch - "${FILESDIR}"/${PN}-1.3.5-optim.patch -) - -pkg_setup() { - unset FLTK_LIBDIRS -} - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - sed -i \ - -e '/x-fluid/d' fluid/Makefile || die - sed -i \ - -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ - -e '/^LDFLAGS=/d' \ - "${S}/fltk-config.in" || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - # also in Makefile:config.guess config.sub: - cp misc/config.{guess,sub} . || die - - eautoconf - multilib_copy_sources -} - -multilib_src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/881107 - # Seems to be fixed in git (1.4.9999) - filter-lto - - local FLTK_INCDIR=${EPREFIX}/usr/include/fltk - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid \ - DESTDIR="${D}" install-linux install - - use doc && - emake -C documentation \ - DESTDIR="${D}" install - - use games && - emake -C test \ - DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/fltk-1.4.1.ebuild b/x11-libs/fltk/fltk-1.4.1.ebuild new file mode 100644 index 000000000000..c783579112e2 --- /dev/null +++ b/x11-libs/fltk/fltk-1.4.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo xdg + +DESCRIPTION="Fast Light GUI Toolkit" +HOMEPAGE="https://www.fltk.org/" +SRC_URI="https://github.com/fltk/fltk/releases/download/release-${PV}/${P}-source.tar.bz2" + +LICENSE="FLTK LGPL-2 MIT ZLIB" +SLOT="1/$(ver_cut 1-2)" # README.abi-version.txt +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X +cairo doc examples opengl static-libs test wayland" +REQUIRED_USE=" + || ( X wayland ) + wayland? ( cairo ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib:= + X? ( + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXinerama + !cairo? ( + media-libs/fontconfig + x11-libs/libXft + x11-libs/libXrender + ) + ) + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + x11-libs/pango[X?] + ) + opengl? ( + media-libs/glu + media-libs/libglvnd[X] + ) + wayland? ( + dev-libs/wayland + gui-libs/libdecor + sys-apps/dbus + x11-libs/libxkbcommon + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + wayland? ( dev-libs/wayland-protocols ) +" +BDEPEND=" + doc? ( app-text/doxygen ) + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.1-fltk-config.patch + "${FILESDIR}"/${PN}-1.4.1-tests-odr.patch +) + +src_prepare() { + cmake_src_prepare + + # fluid can optionally use html docs at runtime, adjust path + sed -i "s|\${FLTK_DOCDIR}/fltk|&-${PVR}/html|" CMake/export.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DFLTK_BACKEND_WAYLAND=$(usex wayland) + -DFLTK_BACKEND_X11=$(usex X) + -DFLTK_BUILD_FLUID=yes + -DFLTK_BUILD_FLUID_DOCS=no + -DFLTK_BUILD_GL=$(usex opengl) + -DFLTK_BUILD_HTML_DOCS=$(usex doc) + -DFLTK_BUILD_PDF_DOCS=no + -DFLTK_BUILD_SHARED_LIBS=yes + -DFLTK_BUILD_TEST=$(usex test) + -DFLTK_GRAPHICS_CAIRO=$(usex cairo) + -DFLTK_OPTION_STD=yes # will be removed & forced ON in fltk-1.5 + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile all $(usev doc docs) +} + +src_test() { + # same that upstream's CI does except with the shared version + edo "${BUILD_DIR}"/bin/test/unittests-shared --core +} + +src_install() { + local DOCS=( + ANNOUNCEMENT CHANGES* CREDITS.txt README* + $(usev examples) + # simpler than using -DFLTK_INSTALL_HTML_DOCS for the location + $(usev doc "${BUILD_DIR}"/documentation/html) + ) + cmake_src_install + + # currently no option to disable building static libs + use static-libs || rm -- "${ED}"/usr/$(get_libdir)/*.a || die +} diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild deleted file mode 100644 index 74b44b10b0b6..000000000000 --- a/x11-libs/fltk/fltk-1.4.9999.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -EGIT_REPO_URI="https://github.com/fltk/fltk" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXt[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] ) - games? ( !sys-block/blocks ) - opengl? ( - virtual/glu[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES.txt - CHANGES_1.0.txt - CHANGES_1.1.txt - CHANGES_1.3.txt - CREDITS.txt - README.CMake.txt - README.Cairo.txt - README.IDE.txt - README.Unix.txt - README.Windows.txt - README.abi-version.txt - README.macOS.md - README.md - README.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.4.9999-makefile-dirs.patch - "${FILESDIR}"/${PN}-1.4.9999-conf-tests.patch - "${FILESDIR}"/${PN}-1.4.9999-cmake.patch - "${FILESDIR}"/${PN}-1.4.9999-optim.patch -) - -pkg_setup() { - unset FLTK_LIBDIRS -} - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - sed -i \ - -e '/x-fluid/d' fluid/Makefile || die - sed -i \ - -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ - -e '/^LDFLAGS=/d' \ - "${S}/fltk-config.in" || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - eautoconf - multilib_copy_sources -} - -multilib_src_configure() { - local FLTK_INCDIR=${EPREFIX}/usr/include/fltk - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid \ - DESTDIR="${D}" install-linux install - - use doc && - emake -C documentation \ - DESTDIR="${D}" install - - use games && - emake -C test \ - DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml index cc385decf7fd..9c84f80f4c14 100644 --- a/x11-libs/fltk/metadata.xml +++ b/x11-libs/fltk/metadata.xml @@ -1,18 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -<longdescription> - The Fast Light ToolKit is a cross-platform C++ user interface - toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI - functionality and supports 3D graphics via OpenGL and its built-in - GLUT emulation. FLTK also includes a UI builder called FLUID that - can be used to create applications. -</longdescription> -<upstream> - <remote-id type="github">fltk/fltk</remote-id> -</upstream> -<use> - <flag name="games">Builds and installs some extra games</flag> -</use> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> + <longdescription> + The Fast Light ToolKit is a cross-platform C++ user interface + toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides + GUI functionality and supports 3D graphics via OpenGL and its + built-in GLUT emulation. FLTK also includes a UI builder called + FLUID that can be used to create applications. + </longdescription> + <upstream> + <remote-id type="github">fltk/fltk</remote-id> + </upstream> + <use> + <flag name="games">Builds and installs some extra games</flag> + </use> </pkgmetadata> diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild index deb5d693b990..2d797dfa7f0d 100644 --- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild +++ b/x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~arm64 ~ppc x86" -RDEPEND=">=x11-libs/fltk-1.3:1" +RDEPEND="x11-libs/fltk:1=" BDEPEND="${RDEPEND}" DEPEND="${RDEPEND}" |