CVS commit: pkgsrc/inputmethod/librime

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri May 22 13:45:29 UTC 2020

Modified Files:
        pkgsrc/inputmethod/librime: distinfo
        pkgsrc/inputmethod/librime/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/inputmethod/librime/patches:
            patch-src_lever_deployment__tasks.cc

Log Message:
Fix boost fallout


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/inputmethod/librime/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/librime/patches/patch-src_lever_deployment__tasks.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/inputmethod/librime/distinfo
diff -u pkgsrc/inputmethod/librime/distinfo:1.5 pkgsrc/inputmethod/librime/distinfo:1.6
--- pkgsrc/inputmethod/librime/distinfo:1.5     Wed Mar  7 09:34:09 2018
+++ pkgsrc/inputmethod/librime/distinfo Fri May 22 13:45:28 2020
@@ -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

Index: pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt
diff -u pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.1 pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt:1.1 Sat Nov 29 09:31:49 2014
+++ pkgsrc/inputmethod/librime/patches/patch-CMakeLists.txt     Fri May 22 13:45:28 2020
@@ -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()

Added files:

Index: pkgsrc/inputmethod/librime/patches/patch-src_lever_deployment__tasks.cc
diff -u /dev/null pkgsrc/inputmethod/librime/patches/patch-src_lever_deployment__tasks.cc:1.1
--- /dev/null   Fri May 22 13:45:29 2020
+++ pkgsrc/inputmethod/librime/patches/patch-src_lever_deployment__tasks.cc     Fri May 22 13:45:29 2020
@@ -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);