commit: ae82e135b7c2db9f5ea81ad1291c81955ecf0793 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Sun Nov 9 12:54:31 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Sun Nov 9 12:54:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae82e135
media-gfx/fbida: drop 2.14-r6 USE=ghostscript is no longer used, therefore, its description is removed from metadata.xml. Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> media-gfx/fbida/Manifest | 1 - media-gfx/fbida/fbida-2.14-r6.ebuild | 126 ---------------------- media-gfx/fbida/files/fbida-2.10-giflib-4.2.patch | 17 --- media-gfx/fbida/files/fbida-2.14-Autoconf.patch | 11 -- media-gfx/fbida/files/fbida-2.14-fno-common.patch | 53 --------- media-gfx/fbida/metadata.xml | 1 - 6 files changed, 209 deletions(-) diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index f337b367904b..d17af4837fda 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -1,3 +1,2 @@ -DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec DIST fbida-2.14_p20241216.tar.gz 308330 BLAKE2B d41769191bd0cf577a899a61fe492764b08c7ac8dff0f399e0fe471fd07174fc7aa3c8a85757125d56a2bfc0689ab2aa73ed3699ede18a17fda4f157bdacf5f3 SHA512 8213220a0fa1bd41078634e864783bf2ecff0e80f34326ef0e16cbab7e12765ed1c5e8916d14e699b9415bfa1cec2ff62d0843f8ca7174fa11c70c67d5ce9234 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 diff --git a/media-gfx/fbida/fbida-2.14-r6.ebuild b/media-gfx/fbida/fbida-2.14-r6.ebuild deleted file mode 100644 index 4a90f94055dc..000000000000 --- a/media-gfx/fbida/fbida-2.14-r6.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit desktop toolchain-funcs - -DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" -HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/"; -SRC_URI=" - https://www.kraxel.org/releases/${PN}/${P}.tar.gz - mirror://gentoo/ida.png.bz2 -" -LICENSE="GPL-2 IJG" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc x86" -IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" -REQUIRED_USE=" - ghostscript? ( tiff ) -" - -CDEPEND=" - !media-gfx/fbi - >=media-libs/fontconfig-2.2 - >=media-libs/freetype-2.0 - app-text/poppler - media-libs/libepoxy - media-libs/libexif - media-libs/libjpeg-turbo:= - virtual/ttf-fonts - x11-libs/cairo - curl? ( net-misc/curl ) - fbcon? ( - app-text/poppler[cairo] - media-libs/mesa[X(+),gbm(+)] - x11-libs/libdrm - x11-libs/pixman - ) - gif? ( media-libs/giflib:= ) - lirc? ( app-misc/lirc ) - png? ( media-libs/libpng:= ) - scanner? ( media-gfx/sane-backends ) - tiff? ( media-libs/tiff:= ) - webp? ( media-libs/libwebp:= ) - X? ( - >=x11-libs/motif-2.3:0[xft] - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt - ) -" - -DEPEND=" - ${CDEPEND} - X? ( x11-base/xorg-proto ) -" - -RDEPEND=" - ${CDEPEND} - ghostscript? ( - app-text/ghostscript-gpl - ) -" -PATCHES=( - "${FILESDIR}"/ida-desktop.patch - "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch - "${FILESDIR}"/${PN}-2.14-Autoconf.patch - "${FILESDIR}"/${PN}-2.14-fno-common.patch - "${FILESDIR}"/${PN}-2.14-cpp.patch -) - -src_configure() { - tc-export CC CPP - - # Let autoconf do its job and then fix things to build fbida - # according to our specifications - emake Make.config - - gentoo_fbida() { - local useflag=${1} - local config=${2} - - local option="no" - use ${useflag} && option="yes" - - sed -i \ - -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \ - "${S}/Make.config" || die - } - - gentoo_fbida X MOTIF - gentoo_fbida curl LIBCURL - gentoo_fbida fbcon LINUX_FB_H - gentoo_fbida gif LIBUNGIF - gentoo_fbida lirc LIBLIRC - gentoo_fbida ghostscript LIBTIFF - gentoo_fbida png LIBPNG - gentoo_fbida scanner LIBSANE - gentoo_fbida tiff LIBTIFF - gentoo_fbida webp LIBWEBP -} - -src_compile() { - emake verbose=yes -} - -src_install() { - emake \ - DESTDIR="${ED}" \ - STRIP="" \ - prefix=/usr \ - install - - dodoc README - - if use fbcon && ! use ghostscript; then - rm \ - "${ED}"/usr/bin/fbgs \ - "${ED}"/usr/share/man/man1/fbgs.1 \ - || die - fi - - if use X ; then - doicon "${WORKDIR}"/ida.png - domenu desktop/ida.desktop - fi -} diff --git a/media-gfx/fbida/files/fbida-2.10-giflib-4.2.patch b/media-gfx/fbida/files/fbida-2.10-giflib-4.2.patch deleted file mode 100644 index 1e21b8af2bd7..000000000000 --- a/media-gfx/fbida/files/fbida-2.10-giflib-4.2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/rd/read-gif.c -+++ b/rd/read-gif.c -@@ -14,6 +14,14 @@ - } - #else - #define GIF5DATA(x) -+// v4.2 removed PrintGifError in favor of GifErrorString, but with a different -+// prototype than v5 -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && (GIFLIB_MAJOR == 4) && (GIFLIB_MINOR == 2) -+static void PrintGifError() -+{ -+ fprintf(stderr, "GIF library error: %s\n", GifErrorString()); -+} -+#endif - #define PrintGifError(e) PrintGifError() - #define DGifOpenFileHandle(x,e) DGifOpenFileHandle(x) - #define DGifCloseFile(x,e) DGifCloseFile(x) diff --git a/media-gfx/fbida/files/fbida-2.14-Autoconf.patch b/media-gfx/fbida/files/fbida-2.14-Autoconf.patch deleted file mode 100644 index 9aefdcd2fe61..000000000000 --- a/media-gfx/fbida/files/fbida-2.14-Autoconf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/mk/Autoconf.mk -+++ b/mk/Autoconf.mk -@@ -162,7 +162,7 @@ - @true - - Make.config: $(srcdir)/GNUmakefile -- @/bin/echo -e "$(make-config-q)" > $@ -+ @printf "$(make-config-q)" > $@ - @echo - @echo "Make.config written, edit if needed" - @echo diff --git a/media-gfx/fbida/files/fbida-2.14-fno-common.patch b/media-gfx/fbida/files/fbida-2.14-fno-common.patch deleted file mode 100644 index e2f29f6be7f7..000000000000 --- a/media-gfx/fbida/files/fbida-2.14-fno-common.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/fbi.c -+++ b/fbi.c -@@ -86,7 +86,6 @@ static int img_mem, max_mem_mb; - - /* graphics interface */ - gfxstate *gfx; --int debug; - - /* framebuffer */ - char *fbdev = NULL; ---- a/filter.c -+++ b/filter.c -@@ -6,8 +6,6 @@ - #include "readers.h" - #include "filter.h" - --int debug = 0; -- - /* ----------------------------------------------------------------------- */ - - static void ---- a/idaconfig.h -+++ b/idaconfig.h -@@ -17,7 +17,7 @@ - - /* -------------------------------------------------------------------------- */ - --char *ida_lists; -+extern char *ida_lists; - - void ida_init_config(void); - void ida_read_config(void); ---- a/readers.c -+++ b/readers.c -@@ -7,6 +7,8 @@ - #include "readers.h" - #include "byteorder.h" - -+int debug=0; -+ - /* ----------------------------------------------------------------------- */ - - void load_bits_lsb(unsigned char *dst, unsigned char *src, int width, ---- a/viewer.c -+++ b/viewer.c -@@ -38,7 +38,6 @@ - - #define PROCESS_LINES 16 - --int debug; - Cursor ptrs[POINTER_COUNT]; - - /* ----------------------------------------------------------------------- */ diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml index 39ce38297f2d..dfc52ef64401 100644 --- a/media-gfx/fbida/metadata.xml +++ b/media-gfx/fbida/metadata.xml @@ -4,7 +4,6 @@ <!-- maintainer-needed --> <use> <flag name="fbcon">Install the framebuffer image viewer "fbi"</flag> - <flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag> <flag name="X">Install the Motif based image viewer "ida"</flag> </use> <upstream>
