gentoo resync : 28.04.2019

2 files changed, 26 insertions, 44 deletions

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 7f5388b63b35..000000000000
--- 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&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,  0x6f66660a, "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 0x6f66660a:
-+		    //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/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 000000000000..3e0c3067a310
--- /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_TRUE            1
+-#define FIM_FBI_FALSE           0
++#define FIM_FBI_TRUE            TRUE
++#define FIM_FBI_FALSE           FALSE
+ 
+ #ifndef FIM_WITH_NO_FRAMEBUFFER
+