[pkgsrc/trunk]: pkgsrc/inputmethod/librime Fix boost fallout

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fc78b3a44ef
branches:  trunk
changeset: 432465:5fc78b3a44ef
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 22 13:45:28 2020 +0000

description:
Fix boost fallout

diffstat:

 inputmethod/librime/distinfo                                     |   5 ++-
 inputmethod/librime/patches/patch-CMakeLists.txt                 |  15 ++++++++-
 inputmethod/librime/patches/patch-src_lever_deployment__tasks.cc |  15 ++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)

diffs (61 lines):

diff -r 95c80c1aa7a8 -r 5fc78b3a44ef inputmethod/librime/distinfo
--- a/inputmethod/librime/distinfo      Fri May 22 13:45:11 2020 +0000
+++ b/inputmethod/librime/distinfo      Fri May 22 13:45:28 2020 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2018/03/07 09:34:09 wiz Exp $
+$NetBSD: distinfo,v 1.6 2020/05/22 13:45:28 joerg 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-CMakeLists.txt) = dd02c2b1945657ad0374dec539aa62babe3abbac
 SHA1 (patch-src_dict_mapped__file.cc) = b5b181ef102b47aad837d52703bba4c807bf6483
 SHA1 (patch-src_dict_table.cc) = d8c952bd5b897d8d05b86b6c515daa3d19b2ba6d
+SHA1 (patch-src_lever_deployment__tasks.cc) = c65375a6473649e747962882fb77e008368d0962
diff -r 95c80c1aa7a8 -r 5fc78b3a44ef inputmethod/librime/patches/patch-CMakeLists.txt
--- a/inputmethod/librime/patches/patch-CMakeLists.txt  Fri May 22 13:45:11 2020 +0000
+++ b/inputmethod/librime/patches/patch-CMakeLists.txt  Fri May 22 13:45:28 2020 +0000
@@ -1,9 +1,20 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2014/11/29 09:31:49 obache Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2020/05/22 13:45:28 joerg Exp $
 
-* No reason to restrct only for Linux. 
+* No reason to restrict only for Linux. 
+* Do not search for signals, it no longer exist. cmake doesn't support
+  signals2 as component, so just skip for now.
 
 --- CMakeLists.txt.orig        2013-11-10 10:20:21.000000000 +0000
 +++ CMakeLists.txt
+@@ -32,7 +32,7 @@ set(Boost_USE_MULTITHREADED ON)
+ if(MSVC)
+   set(Boost_USE_STATIC_RUNTIME ON)
+ endif(MSVC)
+-find_package(Boost 1.46.0 REQUIRED COMPONENTS filesystem regex signals system thread)
++find_package(Boost 1.46.0 REQUIRED COMPONENTS filesystem regex system thread)
+ if(Boost_FOUND)
+   include_directories(${Boost_INCLUDE_DIRS})
+   link_directories(${Boost_LIBRARY_DIRS})
 @@ -98,7 +98,7 @@ if(NOT DEFINED BIN_INSTALL_DIR)
      set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
  endif()
diff -r 95c80c1aa7a8 -r 5fc78b3a44ef inputmethod/librime/patches/patch-src_lever_deployment__tasks.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/inputmethod/librime/patches/patch-src_lever_deployment__tasks.cc  Fri May 22 13:45:28 2020 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_lever_deployment__tasks.cc,v 1.1 2020/05/22 13:45:29 joerg Exp $
+
+boost no longer uses boost::placeholders by default.
+
+--- src/lever/deployment_tasks.cc.orig 2020-05-22 12:32:26.730921261 +0000
++++ src/lever/deployment_tasks.cc
+@@ -291,7 +291,7 @@ bool SchemaUpdate::Run(Deployer* deploye
+   }
+   LOG(INFO) << "preparing dictionary '" << dict_name << "'.";
+   DictFileFinder finder =
+-      boost::bind(&find_dict_file, _1, shared_data_path, user_data_path);
++      boost::bind(&find_dict_file, boost::placeholders::_1, shared_data_path, user_data_path);
+   DictCompiler dict_compiler(dict.get(), finder);
+   if (verbose_) {
+     dict_compiler.set_options(DictCompiler::kRebuild | DictCompiler::kDump);