[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/, profiles/, media-gfx/fim/files/
commit: 239e38343df04f26115a3b414b3da80b2b220ec2
Author: David Seifert gentoo org>
AuthorDate: Sun Mar 26 10:56:50 2023 +
Commit: David Seifert gentoo org>
CommitDate: Sun Mar 26 10:56:50 2023 +
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 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..
--- 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..
--- 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.0
+0100
-+++ fim-0.4-rc3/src/FbiStuffPdf.cpp2015-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..
--- 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..
--- 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_TRUE1
--#define FIM_FBI_FALSE 0
-+#define FIM_FBI_TRUETRUE
-+#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..
--- 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=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);
- }
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/, media-gfx/fim/files/
commit: bdb615e918a51a6190c7f81a020a78ac3c71a9e7
Author: Sam James gentoo org>
AuthorDate: Wed Jun 16 18:48:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 16 18:48:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdb615e9
media-gfx/fim: update EAPI 6 -> 7
Closes: https://bugs.gentoo.org/723462
Signed-off-by: Sam James gentoo.org>
media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch | 14 ++
media-gfx/fim/fim-0.5_rc3.ebuild | 12 ++--
2 files changed, 20 insertions(+), 6 deletions(-)
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
new file mode 100644
index 000..dd34f80cbaa
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch
@@ -0,0 +1,14 @@
+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/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index dc44d837674..777a28a7dd6 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+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"
@@ -31,17 +32,16 @@ RDEPEND="media-fonts/terminus-font
svg? ( media-gfx/inkscape )
tiff? ( media-libs/tiff:0 )
xfig? ( media-gfx/xfig )"
-DEPEND="${RDEPEND}
- sys-devel/bison
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/bison
sys-devel/flex"
-S=${WORKDIR}/${P/_rc/-rc}
-
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() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/
commit: a3122039c90f02184b82602a5aab60e6a2398775
Author: David Seifert gentoo org>
AuthorDate: Wed Aug 28 08:18:52 2019 +
Commit: David Seifert gentoo org>
CommitDate: Wed Aug 28 08:18:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3122039
media-gfx/fim: [QA] Remove media-libs/jasper dep
Bug: https://bugs.gentoo.org/689784
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert gentoo.org>
media-gfx/fim/fim-0.5_rc3.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index 3e4bdf97f88..dc44d837674 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -12,7 +12,7 @@
SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k
pcx pdf png postscript readline sdl static svg tiff xfig"
+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] )
@@ -23,7 +23,6 @@ RDEPEND="media-fonts/terminus-font
graphicsmagick? ( media-gfx/graphicsmagick )
imagemagick? ( virtual/imagemagick-tools )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
pdf? ( >=app-text/poppler-0.31 )
png? ( media-libs/libpng:0= )
postscript? ( app-text/libspectre )
@@ -62,7 +61,6 @@ src_configure() {
$(use_enable graphicsmagick) \
$(use_enable imagemagick convert) \
$(use_enable jpeg) \
- $(use_enable jpeg2k jasper) \
$(use_enable pcx) \
$(use_enable pdf poppler) \
$(use_enable png) \
@@ -75,6 +73,7 @@ src_configure() {
$(use_enable xfig) \
--disable-hardcoded-font \
--disable-imlib2 \
+ --disable-jasper \
--disable-matrices-rendering \
--disable-xcftopnm \
--enable-fimrc \
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/, media-gfx/fim/files/
commit: 4cc76e18945d3d9030d3c7cf18b5900b39ade4f2
Author: David Seifert gentoo org>
AuthorDate: Thu Apr 11 22:17:36 2019 +
Commit: David Seifert gentoo org>
CommitDate: Thu Apr 11 22:17:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc76e18
media-gfx/fim: Remove old
Closes: https://bugs.gentoo.org/651266
Closes: https://github.com/gentoo/gentoo/pull/11658
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert gentoo.org>
media-gfx/fim/Manifest | 1 -
media-gfx/fim/files/fim-0.4_rc3-gcc6.patch | 44 --
media-gfx/fim/fim-0.4_rc3-r2.ebuild| 94 --
3 files changed, 139 deletions(-)
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index 590f31a3f2c..a9d84d33ea7 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1,2 +1 @@
-DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B
6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737
SHA512
82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf
DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B
117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e
SHA512
946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
diff --git a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
deleted file mode 100644
index 7f5388b63b3..000
--- a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Bug: https://bugs.gentoo.org/595832
-Commit:
http://svn.savannah.gnu.org/viewvc/fbi-improved?view=revision=735
-
a/src/fim.cpp
-+++ b/src/fim.cpp
-@@ -114,7 +114,7 @@
- {"device", required_argument, NULL, 'd',"specify a {framebuffer
device}","{framebuffer device}",
- "Framebuffer device to use. Default is the one your vc is mapped to (as in
fbi)."
- },
--{"dump-reference-help", optional_argument /*no_argument*/,
NULL, 0xd15cbab3,"dump reference info","[=man]",
-+{"dump-reference-help", optional_argument /*no_argument*/,
NULL, 0x6472690a,"dump reference info","[=man]",
- "Will dump to stdout the language reference help."
- },
- {"dump-default-fimrc", no_argument, NULL, 'D',"dump on
standard output the default configuration",NULL,
-@@ -182,7 +182,7 @@
- /* FIXME: shall document this */
- #endif /* FIM_WITH_LIBIMLIB2 */
- },
--{"offset", required_argument, NULL, 0xFFD8FFE0,"will open the
first image file at the specified offset","{bytes-offset}",
-+{"offset", required_argument, NULL, 0x6f0a, "will open
the first image file at the specified offset","{bytes-offset}",
- "Will use the specified \\fBoffset\\fP (in bytes) for opening the specified
files (useful for viewing images on damaged file systems; however, since the
internal variables representation is sizeof(int) bytes based, you have a
limited offset range: using already chopped image files may be a workaround to
this limitation)."
- },/* NEW */
- {"text-reading", no_argument, NULL, 'P',"proceed scrolling as
reading through a text document",NULL,
-@@ -979,9 +979,8 @@
- cc.pre_autocmd_add(FIM_VID_SCALE_STYLE"='1';" "autocmd \""
FIM_ACM_POSTSCALE "\" \"\" \"" FIM_FLT_DISPLAY "'resize';\";");
- #endif /* FIM_AUTOCMDS */
- break;
-- case 0xFFD8FFE0:
-- //fbi's
-- // NEW
-+ case 0x6f0a:
-+ //fim's
- #ifdef FIM_AUTOCMDS
- {
- int ipeppe_offset;
-@@ -1191,7 +1190,7 @@
- }
- #endif /* FIM_WANT_OUTPUT_DEVICE_STRING_CASE_INSENSITIVE */
- break;
-- case 0xd15cbab3:
-+ case 0x6472690a:
- //fim's
- {
- args_t args;
\ No newline at end of file
diff --git a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
deleted file mode 100644
index 8f78c3df9c2..000
--- a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-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;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aalib dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pdf png
postscript readline sdl static svg tiff xfig"
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/files/, media-gfx/fim/
commit: 343ed2ea158c870e3fe36e4c05e7c916e38bae36
Author: David Seifert gentoo org>
AuthorDate: Thu Apr 11 21:53:02 2019 +
Commit: David Seifert gentoo org>
CommitDate: Thu Apr 11 21:53:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343ed2ea
media-gfx/fim: Fix building with media-libs/jpeg
Closes: https://bugs.gentoo.org/670020
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert gentoo.org>
media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch | 26 ++
media-gfx/fim/fim-0.5_rc3.ebuild | 1 +
2 files changed, 27 insertions(+)
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
new file mode 100644
index 000..3e0c3067a31
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
@@ -0,0 +1,26 @@
+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_TRUE1
+-#define FIM_FBI_FALSE 0
++#define FIM_FBI_TRUETRUE
++#define FIM_FBI_FALSE FALSE
+
+ #ifndef FIM_WITH_NO_FRAMEBUFFER
+
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index 95f133f017f..3e4bdf97f88 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -42,6 +42,7 @@ 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"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/
commit: a43e3b9e3ab341fc7f980c91ef08f64e5fb95f01
Author: David Seifert gentoo org>
AuthorDate: Thu Apr 11 21:21:56 2019 +
Commit: David Seifert gentoo org>
CommitDate: Thu Apr 11 21:22:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43e3b9e
media-gfx/fim: [QA] Remove unrecognized configure options
Closes: https://bugs.gentoo.org/670540
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert gentoo.org>
media-gfx/fim/fim-0.5_rc3.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index 1fc260ca524..95f133f017f 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -82,8 +82,6 @@ src_configure() {
--enable-mark-and-dump \
--enable-output-console \
--enable-raw-bits-rendering \
- --enable-read-dirs \
- --enable-recursive-dirs \
--enable-resize-optimizations \
--enable-scan-consolefonts \
--enable-screen \
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/files/, media-gfx/fim/
commit: aeded3688ae9bda56646423b6993965d128a17b0
Author: Tim Harder gentoo org>
AuthorDate: Sat Mar 24 15:29:43 2018 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Mar 24 15:31:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeded368
media-gfx/fim: version bump to 0.5_rc3
Add graphics as another maintainer.
Closes: https://bugs.gentoo.org/636656
media-gfx/fim/Manifest | 1 +
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.ebuild | 105 +++
media-gfx/fim/metadata.xml | 24 +++---
5 files changed, 161 insertions(+), 9 deletions(-)
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index 01899175238..590f31a3f2c 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1 +1,2 @@
DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B
6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737
SHA512
82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf
+DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B
117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e
SHA512
946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
new file mode 100644
index 000..1887196f7cb
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
@@ -0,0 +1,13 @@
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041=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
new file mode 100644
index 000..0f1e6beb6fe
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch
@@ -0,0 +1,27 @@
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474=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.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
new file mode 100644
index 000..1fc260ca524
--- /dev/null
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k
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? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper:= )
+ pdf? ( >=app-text/poppler-0.31 )
+ png? ( media-libs/libpng:0= )
+ postscript? ( app-text/libspectre )
+ readline? (
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/files/, media-gfx/fim/
commit: e684ddde94c30411ce0bec22bf774812e7b1b401
Author: Peter Levine gmail com>
AuthorDate: Wed Oct 11 03:00:57 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sun Nov 5 15:41:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e684ddde
media-gfx/fim: fix building with GCC-6.
Closes: https://bugs.gentoo.org/595832
Closes: https://github.com/gentoo/gentoo/pull/5914
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-gfx/fim/files/fim-0.4_rc3-gcc6.patch | 44 ++
media-gfx/fim/fim-0.4_rc3-r2.ebuild| 1 +
2 files changed, 45 insertions(+)
diff --git a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
new file mode 100644
index 000..7f5388b63b3
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
@@ -0,0 +1,44 @@
+Bug: https://bugs.gentoo.org/595832
+Commit:
http://svn.savannah.gnu.org/viewvc/fbi-improved?view=revision=735
+
+--- a/src/fim.cpp
b/src/fim.cpp
+@@ -114,7 +114,7 @@
+ {"device", required_argument, NULL, 'd',"specify a {framebuffer
device}","{framebuffer device}",
+ "Framebuffer device to use. Default is the one your vc is mapped to (as in
fbi)."
+ },
+-{"dump-reference-help", optional_argument /*no_argument*/,
NULL, 0xd15cbab3,"dump reference info","[=man]",
++{"dump-reference-help", optional_argument /*no_argument*/,
NULL, 0x6472690a,"dump reference info","[=man]",
+ "Will dump to stdout the language reference help."
+ },
+ {"dump-default-fimrc", no_argument, NULL, 'D',"dump on
standard output the default configuration",NULL,
+@@ -182,7 +182,7 @@
+ /* FIXME: shall document this */
+ #endif /* FIM_WITH_LIBIMLIB2 */
+ },
+-{"offset", required_argument, NULL, 0xFFD8FFE0,"will open the
first image file at the specified offset","{bytes-offset}",
++{"offset", required_argument, NULL, 0x6f0a, "will open
the first image file at the specified offset","{bytes-offset}",
+ "Will use the specified \\fBoffset\\fP (in bytes) for opening the specified
files (useful for viewing images on damaged file systems; however, since the
internal variables representation is sizeof(int) bytes based, you have a
limited offset range: using already chopped image files may be a workaround to
this limitation)."
+ },/* NEW */
+ {"text-reading", no_argument, NULL, 'P',"proceed scrolling as
reading through a text document",NULL,
+@@ -979,9 +979,8 @@
+ cc.pre_autocmd_add(FIM_VID_SCALE_STYLE"='1';" "autocmd \""
FIM_ACM_POSTSCALE "\" \"\" \"" FIM_FLT_DISPLAY "'resize';\";");
+ #endif /* FIM_AUTOCMDS */
+ break;
+- case 0xFFD8FFE0:
+- //fbi's
+- // NEW
++ case 0x6f0a:
++ //fim's
+ #ifdef FIM_AUTOCMDS
+ {
+ int ipeppe_offset;
+@@ -1191,7 +1190,7 @@
+ }
+ #endif /* FIM_WANT_OUTPUT_DEVICE_STRING_CASE_INSENSITIVE */
+ break;
+- case 0xd15cbab3:
++ case 0x6472690a:
+ //fim's
+ {
+ args_t args;
\ No newline at end of file
diff --git a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
index 9559c4739fa..8f78c3df9c2 100644
--- a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
+++ b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
@@ -39,6 +39,7 @@ S=${WORKDIR}/${P/_rc/-rc}
src_prepare() {
epatch "${FILESDIR}/${P}-poppler031.patch"
+ epatch "${FILESDIR}/${PN}-0.4_rc3-gcc6.patch"
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/fim/files/
commit: 99aae06b15b9d835d665f7fe38dc29b220a703bd
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Mon Dec 19 19:49:34 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Dec 22 15:12:33 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99aae06b
media-gfx/fim: remove unused patches
media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch | 13 -
media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch | 10 --
media-gfx/fim/files/fim-0.4_pre-nosvn.patch | 11 ---
media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch | 19 ---
media-gfx/fim/files/fim-0.4_rc1-nosvn.patch | 11 ---
5 files changed, 64 deletions(-)
diff --git a/media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch
b/media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch
deleted file mode 100644
index 7629fd1..
--- a/media-gfx/fim/files/fim-0.4_pre-automake-1.12.patch
+++ /dev/null
@@ -1,13 +0,0 @@
fim-0.3/configure.ac
-+++ fim-0.3/configure.ac
-@@ -86,10 +86,6 @@
- AC_MSG_RESULT($fim_cv_prefix)
-
- AC_ISC_POSIX
--AM_C_PROTOTYPES
--if test "x$U" != "x"; then
-- AC_MSG_ERROR(Compiler not ANSI compliant)
--fi
- #AC_PROG_CPP
- AC_PROG_MAKE_SET
-
diff --git a/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch
b/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch
deleted file mode 100644
index 952e800..
--- a/media-gfx/fim/files/fim-0.4_pre-graphicsmagick.patch
+++ /dev/null
@@ -1,10 +0,0 @@
fim-0.4-trunk/configure.ac
-+++ fim-0.4-trunk/configure.ac
-@@ -123,6 +123,7 @@
- FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS FbiStuffMagick.o";
- LIBS="$LIBS `GraphicsMagick-config --cppflags --ldflags --libs|tr '\n' ' '`
";
- CXXFLAGS="$CXXFLAGS `GraphicsMagick-config --cppflags |tr '\n' ' '` ";
-+ CXXFLAGS="$CXXFLAGS -I`GraphicsMagick-config --prefix |tr -d
'\n'`/include/GraphicsMagick ";
- AC_DEFINE([HAVE_LIBGRAPHICSMAGICK],[1],[We have libGraphicsMagick])
- fi
- ], [])
diff --git a/media-gfx/fim/files/fim-0.4_pre-nosvn.patch
b/media-gfx/fim/files/fim-0.4_pre-nosvn.patch
deleted file mode 100644
index ba414aa..
--- a/media-gfx/fim/files/fim-0.4_pre-nosvn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
fim-0.4-trunk/configure.ac
-+++ fim-0.4-trunk/configure.ac
-@@ -10,7 +10,7 @@
- #AC_PROG_CC(cc gcc)
- #AC_PROG_CXX(CC g++ gcc c++ cxx)
-
--define([svnversion],esyscmd([sh -c "svnversion | tr -c '[0-9]' ' ' | sed 's/
*//g;s/^$/-1/g' "]))dnl
-+define([svnversion],esyscmd([sh -c "echo -n '-1'"]))dnl
- # WARNING : here 0.0 denotes the package version, which will be corrected
some lines after this.
- AC_INIT([fim],[0.4],[dezperado_FOobAr_autistici_Baz_org, by replacing
_FOobAr_ with a @ and _Baz_ with a .])
-
diff --git a/media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch
b/media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch
deleted file mode 100644
index 2e5da2a..
--- a/media-gfx/fim/files/fim-0.4_rc1-giflib-4.2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
fim-0.4-rc1/src/FbiStuffGif.cpp.orig 2014-05-27 13:06:10.521394320
+0200
-+++ fim-0.4-rc1/src/FbiStuffGif.cpp2014-05-27 13:13:48.754866607 +0200
-@@ -58,14 +58,14 @@
- #if FIM_GIFLIB_RETIRED_PrintGifError
- void
- FimPrintGifError(struct gif_state * gs) {
--int ErrorCode = gs->gif->Error;
-+int ErrorCode = GifError();
- /* On the basis of giflib-5.0.5/util/qprintf.c suggestion, after
retirement of PrintGifError */
- char *Err = NULL;
-
- if(ErrorCode == 0)
- return;
-
--Err = GifErrorString(ErrorCode);
-+Err = GifErrorString();
-
- if (Err != NULL)
- fprintf(stderr, "GIF-LIB error: %s.\n", Err);
diff --git a/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch
b/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch
deleted file mode 100644
index ec7a7e6..
--- a/media-gfx/fim/files/fim-0.4_rc1-nosvn.patch
+++ /dev/null
@@ -1,11 +0,0 @@
fim-0.4-rc1/configure.ac
-+++ fim-0.4-rc1/configure.ac
-@@ -10,7 +10,7 @@
- #AC_PROG_CC(cc gcc)
- #AC_PROG_CXX(CC g++ gcc c++ cxx)
-
--define([svnversion],esyscmd([sh -c "svnversion | tr -c '[0-9]' ' ' | sed 's/
*//g;s/^$/-1/g' "]))dnl
-+define([svnversion],esyscmd([sh -c "echo -n -1"]))dnl
- AC_INIT([fim],[0.4-rc1],[dezperado_FOobAr_autistici_Baz_org, by replacing
_FOobAr_ with a @ and _Baz_ with a .])
- AC_CONFIG_SRCDIR([src/fim.cpp])
-
