CVS commit: pkgsrc/www/cppcms

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri May 22 01:17:25 UTC 2020

Modified Files:
        pkgsrc/www/cppcms: distinfo
Added Files:
        pkgsrc/www/cppcms/patches: patch-src_cache__storage.cpp

Log Message:
Use std::unsorted_map to avoid issues with newer boost


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/cppcms/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/cppcms/patches/patch-src_cache__storage.cpp

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

Modified files:

Index: pkgsrc/www/cppcms/distinfo
diff -u pkgsrc/www/cppcms/distinfo:1.6 pkgsrc/www/cppcms/distinfo:1.7
--- pkgsrc/www/cppcms/distinfo:1.6      Thu Mar 23 17:07:01 2017
+++ pkgsrc/www/cppcms/distinfo  Fri May 22 01:17:25 2020
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.6 2017/03/23 17:07:01 joerg Exp $
+$NetBSD: distinfo,v 1.7 2020/05/22 01:17:25 joerg Exp $
 
 SHA1 (cppcms-1.0.4.tar.bz2) = 470a3eedbd568b457fe6516b78a9c1f464cdc276
 RMD160 (cppcms-1.0.4.tar.bz2) = 6efa445f8da113ba870010c3a770592587e4198f
 SHA512 (cppcms-1.0.4.tar.bz2) = 04c783d608f306071f8a77808547ec6c45e4f0bcaf8211737159e569d13b3aae5c9d0be7b109e582a9f7bea94584e36081056b225d709af29583100591721cf7
 Size (cppcms-1.0.4.tar.bz2) = 2331505 bytes
 SHA1 (patch-bin_cppcms__run) = 2b9033c82fab2c9aa11acbb200e9a44f9c6364cb
-SHA1 (patch-bin_cppcms__tmpl_cc) = 288265f4657de90d1b05e976d190087707b1bcdb
 SHA1 (patch-booster_CMakeLists.txt) = 25bfe48385f06f88a2edb10879da4ed53fdd2297
 SHA1 (patch-booster_lib_locale_test_test__std__formatting.cpp) = 62564e7e8bfcb90cd19195f5ce2296b8b03c02d6
 SHA1 (patch-booster_lib_system_src_posix__error.cpp) = 8f1e050ffb1b37b664893864d29508984e82e42c
@@ -15,6 +14,7 @@ SHA1 (patch-cppcms__boost_cppcms__boost_
 SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_interprocess__fwd.hpp) = 2a17e6659095d5406f63743479aab8f259086ffd
 SHA1 (patch-cppcms_string__key.h) = 5532ffc158c6c8d7766a69a7600eea351382a7f4
 SHA1 (patch-private_posix__util.h) = 87b7af8f1aee64f74b002a837f3ae4a456d116d8
+SHA1 (patch-src_cache__storage.cpp) = 0d3e6f559032a0e6aa352c5d88664edc02890d4e
 SHA1 (patch-src_json.cpp) = 4ef9bc4d65c493046b3847a85892ab65cab74add
 SHA1 (patch-src_util.cpp) = a27f4b164555d68aad950460ffd66fc9329ced62
 SHA1 (patch-tests_encryptor__test.cpp) = c05549567c2b93572efa77be4891f9853db75377

Added files:

Index: pkgsrc/www/cppcms/patches/patch-src_cache__storage.cpp
diff -u /dev/null pkgsrc/www/cppcms/patches/patch-src_cache__storage.cpp:1.1
--- /dev/null   Fri May 22 01:17:25 2020
+++ pkgsrc/www/cppcms/patches/patch-src_cache__storage.cpp      Fri May 22 01:17:25 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_cache__storage.cpp,v 1.1 2020/05/22 01:17:25 joerg Exp $
+
+--- src/cache_storage.cpp.orig 2020-05-21 23:28:18.301370981 +0000
++++ src/cache_storage.cpp
+@@ -25,13 +25,13 @@
+ #endif
+ 
+ #include <map>
++#include <unordered_map>
+ #include <list>
+ #include <limits>
+ #include <time.h>
+ #include <cppcms/cstdint.h>
+ 
+ 
+-#include <cppcms_boost/unordered/unordered_map.hpp>
+ namespace boost = cppcms_boost;
+ 
+ namespace cppcms {
+@@ -137,10 +137,10 @@ class mem_cache : public base_cache {
+ 
+       typedef std::basic_string<char,std::char_traits<char>,allocator > string_type;
+ 
+-      typedef boost::unordered_map<
++      typedef std::unordered_map<
+                       string_type,
+                       container,
+-                      boost::hash<string_type>,
++                      std::hash<string_type>,
+                       std::equal_to<string_type>,
+                       typename allocator::template rebind<std::pair<const string_type,container> >::other
+               > map_type;