From eeec38179fc37b346020709be5ce33ceb743736a Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Wed, 7 Mar 2018 09:34:09 +0000
Subject: librime: Fix compilation with gcc 6.

Return boolean where the function definition has boolean return type.
---
 inputmethod/librime/Makefile                       |  6 ++--
 inputmethod/librime/distinfo                       |  3 +-
 .../librime/patches/patch-src_dict_mapped__file.cc | 42 ++++++++++++++++++++++
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 inputmethod/librime/patches/patch-src_dict_mapped__file.cc

(limited to 'inputmethod')

diff --git a/inputmethod/librime/Makefile b/inputmethod/librime/Makefile
index 57da7b3feec..f94f199835c 100644
--- a/inputmethod/librime/Makefile
+++ b/inputmethod/librime/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2018/01/01 21:18:09 adam Exp $
+# $NetBSD: Makefile,v 1.12 2018/03/07 09:34:09 wiz Exp $
 
 DISTNAME=	librime-1.0
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	inputmethod chinese
 MASTER_SITES=	http://rimeime.googlecode.com/files/
 #MASTER_SITES=	http://dl.bintray.com/lotem/rime/
@@ -26,5 +26,5 @@ PKGCONFIG_OVERRIDE+=	rime.pc.in
 .include "../../devel/google-glog/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/yaml-cpp/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/librime/distinfo b/inputmethod/librime/distinfo
index 6f9ea2856d2..1cf4ceb0da6 100644
--- a/inputmethod/librime/distinfo
+++ b/inputmethod/librime/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 22:13:37 agc Exp $
+$NetBSD: distinfo,v 1.5 2018/03/07 09:34:09 wiz Exp $
 
 SHA1 (librime-1.0.tar.gz) = 5fd6db95b039e08dadfe547e3e63962aeaa97d8c
 RMD160 (librime-1.0.tar.gz) = 0e5972bfcf179d464a8e58f9ddce3bf55708865b
 SHA512 (librime-1.0.tar.gz) = 79f51174043e0ff524f8af090fd1d0a21301b4e5e530c772648ff59894d39135d15c53c0f4d197895c301defca2e084635eb222464dd20859ab3bdbc6ae8fb2c
 Size (librime-1.0.tar.gz) = 2576401 bytes
 SHA1 (patch-CMakeLists.txt) = 3e478dda0da10ecfc31f1cb7849a5fd0bd21a065
+SHA1 (patch-src_dict_mapped__file.cc) = b5b181ef102b47aad837d52703bba4c807bf6483
 SHA1 (patch-src_dict_table.cc) = d8c952bd5b897d8d05b86b6c515daa3d19b2ba6d
diff --git a/inputmethod/librime/patches/patch-src_dict_mapped__file.cc b/inputmethod/librime/patches/patch-src_dict_mapped__file.cc
new file mode 100644
index 00000000000..ef71a5babe2
--- /dev/null
+++ b/inputmethod/librime/patches/patch-src_dict_mapped__file.cc
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_dict_mapped__file.cc,v 1.1 2018/03/07 09:34:09 wiz Exp $
+
+Return bool where the return value type needs it.
+
+--- src/dict/mapped_file.cc.orig	2013-11-10 10:20:21.000000000 +0000
++++ src/dict/mapped_file.cc
+@@ -106,7 +106,7 @@ bool MappedFile::Create(size_t capacity)
+   LOG(INFO) << "opening file for read/write access.";
+   file_.reset(new MappedFileImpl(file_name_, MappedFileImpl::kOpenReadWrite));
+   size_ = 0;
+-  return file_;
++  return file_ != NULL;
+ }
+ 
+ bool MappedFile::OpenReadOnly() {
+@@ -116,7 +116,7 @@ bool MappedFile::OpenReadOnly() {
+   }
+   file_.reset(new MappedFileImpl(file_name_, MappedFileImpl::kOpenReadOnly));
+   size_ = file_->get_size();
+-  return file_;
++  return file_ != NULL;
+ }
+ 
+ bool MappedFile::OpenReadWrite() {
+@@ -126,7 +126,7 @@ bool MappedFile::OpenReadWrite() {
+   }
+   file_.reset(new MappedFileImpl(file_name_, MappedFileImpl::kOpenReadWrite));
+   size_ = 0;
+-  return file_;
++  return file_ != NULL;
+ }
+ 
+ void MappedFile::Close() {
+@@ -137,7 +137,7 @@ void MappedFile::Close() {
+ }
+ 
+ bool MappedFile::IsOpen() const {
+-  return file_;
++  return file_ != NULL;
+ }
+ 
+ bool MappedFile::Flush() {
-- 
cgit v1.2.3