1 |
commit: 8f57005559c5aa0c9596f9ded42186b7e82410f2 |
2 |
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 1 03:17:16 2016 +0000 |
4 |
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 1 03:17:16 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f570055 |
7 |
|
8 |
app-text/fbreader: make gcc6 happy |
9 |
|
10 |
Bug: 592588 |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
|
14 |
app-text/fbreader/fbreader-0.99.4-r2.ebuild | 2 ++ |
15 |
app-text/fbreader/files/fbreader-0.99.4-gcc6.patch | 11 +++++++++++ |
16 |
2 files changed, 13 insertions(+) |
17 |
|
18 |
diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild |
19 |
index 6d5c310..a05caff 100644 |
20 |
--- a/app-text/fbreader/fbreader-0.99.4-r2.ebuild |
21 |
+++ b/app-text/fbreader/fbreader-0.99.4-r2.ebuild |
22 |
@@ -74,6 +74,8 @@ src_prepare() { |
23 |
epatch "${FILESDIR}"/${P}-mimetypes.patch |
24 |
# bug #437262 |
25 |
epatch "${FILESDIR}"/${P}-ld-bfd.patch |
26 |
+ # bug #592588 |
27 |
+ epatch "${FILESDIR}"/${P}-gcc6.patch |
28 |
} |
29 |
|
30 |
src_compile() { |
31 |
|
32 |
diff --git a/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch b/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch |
33 |
new file mode 100644 |
34 |
index 00000000..c6f87a2 |
35 |
--- /dev/null |
36 |
+++ b/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch |
37 |
@@ -0,0 +1,11 @@ |
38 |
+--- fbreader/src/formats/doc/OleStorage.cpp 2012-11-30 13:41:25.000000000 +0100 |
39 |
++++ fbreader/src/formats/doc/OleStorage.cpp-new 2016-08-31 17:23:18.232536401 +0200 |
40 |
+@@ -59,7 +59,7 @@ |
41 |
+ clear(); |
42 |
+ return false; |
43 |
+ } |
44 |
+- static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0}; |
45 |
++ static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0}; |
46 |
+ if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) { |
47 |
+ clear(); |
48 |
+ return false; |