[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/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() {
