CVS commit: pkgsrc/textproc/utf8-cpp

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov  1 20:08:03 UTC 2023

Modified Files:
        pkgsrc/textproc/utf8-cpp: Makefile PLIST distinfo
        pkgsrc/textproc/utf8-cpp/patches: patch-CMakeLists.txt

Log Message:
utf8-cpp: updated to 4.0.1

Release 4.0.1

Fix for broken utf8::unchecked::utf16to8()


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/utf8-cpp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/utf8-cpp/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/textproc/utf8-cpp/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/textproc/utf8-cpp/Makefile
diff -u pkgsrc/textproc/utf8-cpp/Makefile:1.6 pkgsrc/textproc/utf8-cpp/Makefile:1.7
--- pkgsrc/textproc/utf8-cpp/Makefile:1.6       Wed Sep 27 09:41:50 2023
+++ pkgsrc/textproc/utf8-cpp/Makefile   Wed Nov  1 20:08:03 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2023/09/27 09:41:50 adam Exp $
+# $NetBSD: Makefile,v 1.7 2023/11/01 20:08:03 adam Exp $
 
-DISTNAME=      utf8-cpp-3.2.5
+DISTNAME=      utf8-cpp-4.0.1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=nemtrif/}
 GITHUB_PROJECT=        utfcpp

Index: pkgsrc/textproc/utf8-cpp/PLIST
diff -u pkgsrc/textproc/utf8-cpp/PLIST:1.3 pkgsrc/textproc/utf8-cpp/PLIST:1.4
--- pkgsrc/textproc/utf8-cpp/PLIST:1.3  Sat Dec 31 22:00:16 2022
+++ pkgsrc/textproc/utf8-cpp/PLIST      Wed Nov  1 20:08:03 2023
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2022/12/31 22:00:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/11/01 20:08:03 adam Exp $
 include/utf8.h
 include/utf8/checked.h
 include/utf8/core.h
 include/utf8/cpp11.h
 include/utf8/cpp17.h
+include/utf8/cpp20.h
 include/utf8/unchecked.h
 lib/cmake/utf8cpp/utf8cppConfig.cmake
 lib/cmake/utf8cpp/utf8cppConfigVersion.cmake

Index: pkgsrc/textproc/utf8-cpp/distinfo
diff -u pkgsrc/textproc/utf8-cpp/distinfo:1.8 pkgsrc/textproc/utf8-cpp/distinfo:1.9
--- pkgsrc/textproc/utf8-cpp/distinfo:1.8       Wed Sep 27 09:41:50 2023
+++ pkgsrc/textproc/utf8-cpp/distinfo   Wed Nov  1 20:08:03 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2023/09/27 09:41:50 adam Exp $
+$NetBSD: distinfo,v 1.9 2023/11/01 20:08:03 adam Exp $
 
-BLAKE2s (utf8-cpp-3.2.5.tar.gz) = fa108d957b6bf61613e879345d078a8f3201a39724638779ef1e05072a6b0ee7
-SHA512 (utf8-cpp-3.2.5.tar.gz) = 1ce12c8158a2f3bcddec104ceacedaea4031b4c88fc0fa1f1fae8dfa8df81c846861df9d01e8f294d79b9e4ab8c51bd1289f404eed24d07abc760688fee13090
-Size (utf8-cpp-3.2.5.tar.gz) = 28865 bytes
-SHA1 (patch-CMakeLists.txt) = 41c4b9887c38811840adf362b3e9fcc12bda9415
+BLAKE2s (utf8-cpp-4.0.1.tar.gz) = f1c619f8148b5c0cecf8dc3ad8e18a9c2ba7742265392b58a05678569a678f01
+SHA512 (utf8-cpp-4.0.1.tar.gz) = ba5b1e25a1c9b90fbcbfeb404305b1a5b59cfa4cd7c6d9d6906e60ee16bb04e5e1ee0278df08f448c2252e891f52329ad99a9cd37b2515ccd31093f617af1050
+Size (utf8-cpp-4.0.1.tar.gz) = 32948 bytes
+SHA1 (patch-CMakeLists.txt) = d01184acc6de9f71f72ec42fea2902d2c04be8e3

Index: pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt
diff -u pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt:1.3 pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt:1.3   Sat Dec 31 22:00:17 2022
+++ pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt       Wed Nov  1 20:08:03 2023
@@ -1,24 +1,37 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2022/12/31 22:00:17 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2023/11/01 20:08:03 adam Exp $
 
 Do not install includes in a sub-directory.
+Install cmake files into lib/cmake.
 
---- CMakeLists.txt.orig        2022-12-28 17:47:32.000000000 +0000
+--- CMakeLists.txt.orig        2023-10-28 15:23:34.000000000 +0000
 +++ CMakeLists.txt
-@@ -14,7 +14,7 @@ option(UTF8_SAMPLES "Enable building sam
- add_library(utf8cpp INTERFACE)
+@@ -10,7 +10,7 @@ include(GNUInstallDirs)
+ 
  target_include_directories(utf8cpp INTERFACE
      "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/source>"
 -    $<INSTALL_INTERFACE:include/utf8cpp>
 +    $<INSTALL_INTERFACE:include>
  )
- add_library(utf8::cpp ALIAS utf8cpp)
  
-@@ -39,7 +39,7 @@ if(UTF8_INSTALL)
-         INSTALL_DESTINATION ${DEF_INSTALL_CMAKE_DIR}
-     )
+ include(CMakePackageConfigHelpers)
+@@ -32,17 +32,17 @@ install(TARGETS ${PROJECT_NAME}
+ configure_package_config_file(
+     "${PROJECT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in"
+     "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+-    INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake
++    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+ )
+ 
+ install(EXPORT ${PROJECT_NAME}Targets
+         FILE ${PROJECT_NAME}Targets.cmake
+         NAMESPACE ${PROJECT_NAME}::
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+ install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+               "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
  
--    install(DIRECTORY source/ DESTINATION include/utf8cpp)
-+    install(DIRECTORY source/ DESTINATION include)
-     install(TARGETS utf8cpp EXPORT utf8cppTargets)
-     install(EXPORT utf8cppTargets DESTINATION ${DEF_INSTALL_CMAKE_DIR})
-     install(
+ install(FILES ${PROJECT_SOURCE_DIR}/source/utf8.h DESTINATION include)
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/source/utf8 DESTINATION include)