commit: 239e38343df04f26115a3b414b3da80b2b220ec2 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Mar 26 10:56:50 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Mar 26 10:56:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=239e3834
media-gfx/fim: treeclean Closes: https://bugs.gentoo.org/796407 Closes: https://bugs.gentoo.org/855548 Closes: https://bugs.gentoo.org/889254 Closes: https://bugs.gentoo.org/889928 Closes: https://bugs.gentoo.org/896208 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-gfx/fim/Manifest | 1 - media-gfx/fim/files/fim-0.4_rc3-poppler031.patch | 12 --- media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch | 14 --- media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch | 26 ------ media-gfx/fim/files/fim-0.5_rc3-jpeg.patch | 13 --- media-gfx/fim/files/fim-0.5_rc3-libsdl.patch | 27 ------ media-gfx/fim/fim-0.5_rc3-r1.ebuild | 103 ----------------------- media-gfx/fim/metadata.xml | 15 ---- profiles/package.mask | 6 -- 9 files changed, 217 deletions(-) diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest deleted file mode 100644 index a9d84d33ea7e..000000000000 --- a/media-gfx/fim/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306 diff --git a/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch b/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch deleted file mode 100644 index 74ba50aa5155..000000000000 --- a/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN fim-0.4-rc3.orig/src/FbiStuffPdf.cpp fim-0.4-rc3/src/FbiStuffPdf.cpp ---- fim-0.4-rc3.orig/src/FbiStuffPdf.cpp 2014-12-22 23:54:29.000000000 +0100 -+++ fim-0.4-rc3/src/FbiStuffPdf.cpp 2015-05-18 21:13:07.058115455 +0200 -@@ -199,7 +199,7 @@ - if (!ds->od) - { - GBool bitmapTopDown = gTrue; -- ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown,gFalse/*antialias*/); -+ ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown); - if (ds->od) - #ifdef POPPLER_VERSION /* as of 0.20.2, from poppler/poppler-config.h */ - /* FIXME: this is an incomplete fix (triggered on 20120719's email on fim-devel); diff --git a/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch b/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch deleted file mode 100644 index dd34f80cbaa4..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/723462 ---- a/src/fim.cpp -+++ b/src/fim.cpp -@@ -343,8 +343,8 @@ - .P - .nf - Shift+D delete image -- R rotate 90° clockwise -- L rotate 90° counter-clock wise -+ R rotate 90 degree clockwise -+ L rotate 90 degree counter-clock wise - .fi - .P - The delete function actually wants a capital letter 'D', thus you have diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch deleted file mode 100644 index 3e0c3067a310..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://bugs.gentoo.org/670020 - ---- a/src/FbiStuffJpeg.cpp -+++ b/src/FbiStuffJpeg.cpp -@@ -115,7 +115,7 @@ - cinfo->src->bytes_in_buffer = h->tsize; - }*/ - --static int thumbnail_src_fill(struct jpeg_decompress_struct *cinfo) -+static boolean thumbnail_src_fill(struct jpeg_decompress_struct *cinfo) - { - FIM_FBI_PRINTF("jpeg: panic: no more thumbnail input data\n"); - exit(1); ---- a/src/FramebufferDevice.h -+++ b/src/FramebufferDevice.h -@@ -37,8 +37,8 @@ - #include "DisplayDevice.h" - - /* these are required by FbiStuffJpeg.cpp */ --#define FIM_FBI_TRUE 1 --#define FIM_FBI_FALSE 0 -+#define FIM_FBI_TRUE TRUE -+#define FIM_FBI_FALSE FALSE - - #ifndef FIM_WITH_NO_FRAMEBUFFER - diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch deleted file mode 100644 index 1887196f7cbf..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041&r2=1076 - ---- trunk/src/FbiStuffJpeg.cpp -+++ trunk/src/FbiStuffJpeg.cpp -@@ -179,7 +179,7 @@ - - if(nsp) - /* std::cout << "|" << title << "|\n", */ -- nsp->setVariable(string("EXIF_") + title,value); -+ nsp->setVariable(string("EXIF_") + string(title),value); - } - - static void fim_ExifDataForeachContentFunc (ExifContent *content, void * user_data) diff --git a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch deleted file mode 100644 index 0f1e6beb6feb..000000000000 --- a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474&r2=1521 - ---- trunk/configure.ac -+++ trunk/configure.ac -@@ -1128,15 +1128,17 @@ - fim_handle_sdl='no' - fi - else --dnl if test x$fim_cv_want_static == x1 ; then -- LIBSDL_CONFIG_FLAGS=--static-libs --dnl else --dnl LIBSDL_CONFIG_FLAGS=--libs --dnl fi - AC_MSG_NOTICE([Activating LIBSDL.]) - fim_handle_sdl='yes' - LIBSDL_CXXFLAGS=`$LIBSDL_CONFIG --cflags` - CXXFLAGS="$CXXFLAGS $LIBSDL_CXXFLAGS" -+ LIBSDL_CONFIG_FLAGS=--static-libs -+ if $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS ; then -+ LIBSDL_CONFIG_FLAGS=--static-libs -+ else -+ LIBSDL_CONFIG_FLAGS=--libs -+ fi -+ AC_MSG_NOTICE([Invoking $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS.]) - LIBS="$LIBS `$LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS`" - # finish this ! - #FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS SDLDevice.o" diff --git a/media-gfx/fim/fim-0.5_rc3-r1.ebuild b/media-gfx/fim/fim-0.5_rc3-r1.ebuild deleted file mode 100644 index 501dba88e50d..000000000000 --- a/media-gfx/fim/fim-0.5_rc3-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim" -HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"; -SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"; -S="${WORKDIR}"/${P/_rc/-rc} - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pcx pdf png postscript readline sdl static svg tiff xfig" - -RDEPEND="media-fonts/terminus-font - aalib? ( media-libs/aalib[slang] ) - dia? ( app-office/dia ) - djvu? ( app-text/djvu ) - exif? ( media-libs/libexif ) - gif? ( media-libs/giflib ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - imagemagick? ( virtual/imagemagick-tools ) - jpeg? ( media-libs/libjpeg-turbo:= ) - pdf? ( >=app-text/poppler-0.31 ) - png? ( media-libs/libpng:= ) - postscript? ( app-text/libspectre ) - readline? ( sys-libs/readline:= ) - sdl? ( media-libs/libsdl ) - svg? ( media-gfx/inkscape ) - tiff? ( media-libs/tiff:= ) - xfig? ( media-gfx/xfig )" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/bison - sys-devel/flex" - -PATCHES=( - "${FILESDIR}/${PN}-0.4_rc3-poppler031.patch" - "${FILESDIR}/${PN}-0.5_rc3-jpeg.patch" - "${FILESDIR}/${PN}-0.5_rc3-libsdl.patch" - "${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch" - "${FILESDIR}/${PN}-0.5_rc3-deg-symbol.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable aalib aa) \ - $(use_enable bmp) \ - $(use_enable dia) \ - $(use_enable djvu) \ - $(use_enable exif) \ - $(use_enable fbcon framebuffer) \ - $(use_enable gif) \ - $(use_enable graphicsmagick) \ - $(use_enable imagemagick convert) \ - $(use_enable jpeg) \ - $(use_enable pcx) \ - $(use_enable pdf poppler) \ - $(use_enable png) \ - $(use_enable postscript ps) \ - $(use_enable readline) \ - $(use_enable sdl) \ - $(use_enable static) \ - $(use_enable svg inkscape) \ - $(use_enable tiff) \ - $(use_enable xfig) \ - --disable-hardcoded-font \ - --disable-imlib2 \ - --disable-jasper \ - --disable-matrices-rendering \ - --disable-xcftopnm \ - --enable-fimrc \ - --enable-history \ - --enable-loader-string-specification \ - --enable-mark-and-dump \ - --enable-output-console \ - --enable-raw-bits-rendering \ - --enable-resize-optimizations \ - --enable-scan-consolefonts \ - --enable-screen \ - --enable-scripting \ - --enable-seek-magic \ - --enable-stdin-image-reading \ - --enable-unicode \ - --enable-warnings \ - --enable-windows \ - --with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz -} - -src_compile() { - emake -j1 -} - -src_install() { - emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install -} diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml deleted file mode 100644 index cb428df6f061..000000000000 --- a/media-gfx/fim/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <use> - <flag name="bmp">Enable BMP file support</flag> - <flag name="dia">Enable DIA file support via <pkg>app-office/dia</pkg></flag> - <flag name="imagemagick">Use convert from <pkg>media-gfx/imagemagick</pkg> as fallback file opener</flag> - <flag name="pcx">Enable PCX file support</flag> - <flag name="xfig">Enable FIG file support via <pkg>media-gfx/xfig</pkg></flag> - </use> - <upstream> - <remote-id type="savannah-nongnu">fbi-improved</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index ae3bbb4da4ed..46652d4ebd75 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -259,12 +259,6 @@ x11-libs/libcryptui # Removal on 2023-03-27. Bug 896898 and 888444 dev-python/trio-asyncio -# Michał Górny <mgo...@gentoo.org> (2023-02-24) -# Unmaintained with multiple reported bugs. Last release is a RC -# from 2017, upstream recommends using trunk. -# Removal on 2023-03-26. Bug #855548. -media-gfx/fim - # Ben Kohler <bkoh...@gentoo.org> (2023-01-30) # Breaks too many revdeps for now =app-text/discount-3*
