[pkgsrc/pkgsrc-2019Q2]: pkgsrc/misc/fbreader Pullup ticket #6057 - requested ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1a0be34c55b5
branches:  pkgsrc-2019Q2
changeset: 408222:1a0be34c55b5
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Sep 21 18:40:05 2019 +0000

description:
Pullup ticket #6057 - requested by maya
misc/fbreader: build fix

Revisions pulled up:
- misc/fbreader/distinfo                                        1.13
- misc/fbreader/patches/patch-fbreader_src_formats_doc_OleStorage.cpp 1.1

---
   Module Name: pkgsrc
   Committed By:        maya
   Date:                Mon Sep  9 13:31:53 UTC 2019

   Modified Files:
        pkgsrc/misc/fbreader: distinfo
   Added Files:
        pkgsrc/misc/fbreader/patches:
            patch-fbreader_src_formats_doc_OleStorage.cpp

   Log Message:
   fbreader: avoid narrowing conversion warning. Taken from gentoo.

   Fixes PR pkg/54107: pkgsrc-2019Q1/misc/fbreader doesn't build with
   newer compiler(s)

diffstat:

 misc/fbreader/distinfo                                              |   3 +-
 misc/fbreader/patches/patch-fbreader_src_formats_doc_OleStorage.cpp |  16 ++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 53c05978611c -r 1a0be34c55b5 misc/fbreader/distinfo
--- a/misc/fbreader/distinfo    Fri Sep 20 19:23:33 2019 +0000
+++ b/misc/fbreader/distinfo    Sat Sep 21 18:40:05 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2016/12/03 09:06:37 maya Exp $
+$NetBSD: distinfo,v 1.12.24.1 2019/09/21 18:40:05 bsiegert Exp $
 
 SHA1 (fbreader-sources-0.99.4.tgz) = 7e6f0acbac5d8111fcda14a576ae4fdc93eef292
 RMD160 (fbreader-sources-0.99.4.tgz) = 90825fcb6b026785dd3a7329899b54a02b08e4ed
@@ -10,6 +10,7 @@
 SHA1 (patch-fbreader_Makefile) = b34214a6a725527f312969c12f3c79fcda193233
 SHA1 (patch-fbreader_src_fbreader_FBReaderActions.cpp) = ac2d5937d3628abd6db2e4b2fe869d95262d2689
 SHA1 (patch-fbreader_src_fbreader_FBView.cpp) = f9018b813b92d31c67e13eb68d6e50c8a7637a5c
+SHA1 (patch-fbreader_src_formats_doc_OleStorage.cpp) = 177d42ebe721a2de1e3342fd35a8e4b4c0c93677
 SHA1 (patch-fbreader_src_formats_html_HtmlReader.cpp) = fe0ebe4dff97a11581a6d7b079f8f19f4e3be019
 SHA1 (patch-makefiles_qsubdir.mk) = a139410def61e793b193cb54716b9ffb339b5692
 SHA1 (patch-makefiles_subdir.mk) = b9c7d0339e86b9cd6010d4156f35233320a14436
diff -r 53c05978611c -r 1a0be34c55b5 misc/fbreader/patches/patch-fbreader_src_formats_doc_OleStorage.cpp
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/misc/fbreader/patches/patch-fbreader_src_formats_doc_OleStorage.cpp       Sat Sep 21 18:40:05 2019 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-fbreader_src_formats_doc_OleStorage.cpp,v 1.1.2.2 2019/09/21 18:40:05 bsiegert Exp $
+
+Fix narrowing conversion error
+
+--- fbreader/src/formats/doc/OleStorage.cpp.orig       2012-11-30 12:41:25.000000000 +0000
++++ fbreader/src/formats/doc/OleStorage.cpp
+@@ -59,7 +59,8 @@ bool OleStorage::init(shared_ptr<ZLInput
+               clear();
+               return false;
+       }
+-      static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
++      static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11,
++              (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
+       if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
+               clear();
+               return false;