CVS commit: pkgsrc/textproc/utf8-cpp

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Dec 29 17:00:24 UTC 2021

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

Log Message:
utf8-cpp: updated to 3.2.1

Release 3.2.1
The release contains the fix the inclusion of both cpp11 and cpp17 headers on C++17 compilation. Also some additional tests for using string literals and string objects with modern compilers.

Release 3.2
Optional support for C++ 17 std::string_view.

Release 3.1.2
Fix for Issue 72.

Release 3.1.1
Include the commits from the previous year.

Release 3.1
This release adds one new API call: unchecked::replace_invalid().

Other changes are mostly about testing and installation.

Release 3.0.3
A minor release that contains fix for Issue 31 Program fails to link when including utf8.h in multiple files.

Release 3.0.2
This minor release contains:

Fix of the project version number at CMakeLists.txt
Continuous Integration with Google Tests and CircleCI

Release 3.0.1
A minor release with a fix for a header guard.

Release 3.0
This is a major release that introduces the following functionality:

New convenience API for C++ 11 and later compilers. The library still works with C++ 98/03 compliant compilers, just without the new functions.
advance() function works in both directions.
The following deprecated functions were removed:

previous() - deprecated since version 1.02.
is_bom() - deprecated since version 2.3.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/utf8-cpp/Makefile \
    pkgsrc/textproc/utf8-cpp/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/utf8-cpp/distinfo
cvs rdiff -u -r0 -r1.1 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.1 pkgsrc/textproc/utf8-cpp/Makefile:1.2
--- pkgsrc/textproc/utf8-cpp/Makefile:1.1       Tue May  4 14:24:33 2021
+++ pkgsrc/textproc/utf8-cpp/Makefile   Wed Dec 29 17:00:23 2021
@@ -1,26 +1,19 @@
-# $NetBSD: Makefile,v 1.1 2021/05/04 14:24:33 prlw1 Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/29 17:00:23 adam Exp $
 
-DISTNAME=      utf8-cpp-2.3.4
+DISTNAME=      utf8-cpp-3.2.1
 CATEGORIES=    textproc
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=jjones646/}
-GITHUB_TAG=    v2.3.4
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=nemtrif/}
+GITHUB_PROJECT=        utfcpp
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    prlw1%cam.ac.uk@localhost
-HOMEPAGE=      https://github.com/jjones646/utf8-cpp/
+HOMEPAGE=      https://github.com/nemtrif/utfcpp
 COMMENT=       UTF-8 header library for C++
 LICENSE=       boost-license
 
-USE_LANGUAGES= # none
-
-NO_CONFIGURE=  yes
-NO_BUILD=      yes
-
-INSTALLATION_DIRS+=    include/utf8
-
-do-install:
-       ${INSTALL_DATA} ${WRKSRC}/source/utf8.h ${DESTDIR}${PREFIX}/include
-.for f in checked.h core.h unchecked.h
-       ${INSTALL_DATA} ${WRKSRC}/source/utf8/${f} ${DESTDIR}${PREFIX}/include/utf8
-.endfor
+USE_CMAKE=     yes
+USE_LANGUAGES= c++
+CMAKE_ARGS+=   -DUTF8_SAMPLES=OFF
+CMAKE_ARGS+=   -DUTF8_TESTS=OFF
 
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/textproc/utf8-cpp/PLIST
diff -u pkgsrc/textproc/utf8-cpp/PLIST:1.1 pkgsrc/textproc/utf8-cpp/PLIST:1.2
--- pkgsrc/textproc/utf8-cpp/PLIST:1.1  Tue May  4 14:24:33 2021
+++ pkgsrc/textproc/utf8-cpp/PLIST      Wed Dec 29 17:00:23 2021
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2021/05/04 14:24:33 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.2 2021/12/29 17:00:23 adam Exp $
 include/utf8.h
 include/utf8/checked.h
 include/utf8/core.h
+include/utf8/cpp11.h
+include/utf8/cpp17.h
 include/utf8/unchecked.h
+lib/cmake/utf8cpp/utf8cppConfig.cmake

Index: pkgsrc/textproc/utf8-cpp/distinfo
diff -u pkgsrc/textproc/utf8-cpp/distinfo:1.3 pkgsrc/textproc/utf8-cpp/distinfo:1.4
--- pkgsrc/textproc/utf8-cpp/distinfo:1.3       Tue Oct 26 11:23:38 2021
+++ pkgsrc/textproc/utf8-cpp/distinfo   Wed Dec 29 17:00:23 2021
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:23:38 nia Exp $
+$NetBSD: distinfo,v 1.4 2021/12/29 17:00:23 adam Exp $
 
-BLAKE2s (utf8-cpp-2.3.4.tar.gz) = a0210a847b72b6e5cf9c03ebbca463a3290626c69612d6a31e66176ed350a562
-SHA512 (utf8-cpp-2.3.4.tar.gz) = c454513321b22658afe7c2c8fbba3f5d113f230b1f110c6c402f61f7bffa5c51d6442c4783e5d26a5f358c0ee4ee9d7f7fb9573db1c2cd1271ec2ae06666f8c6
-Size (utf8-cpp-2.3.4.tar.gz) = 18083 bytes
+BLAKE2s (utf8-cpp-3.2.1.tar.gz) = e77f7ac01eb99bb89b176314af7dcda8cc281dde19cace10393632fb878fc4a4
+SHA512 (utf8-cpp-3.2.1.tar.gz) = 5798487f12b1bc55d3e06aed38f7604271ca3402963efcf85d181fd590d8a088d21e961e77698e60dc2cdae8cf4506645903442c45fd328201752d9589180e0d
+Size (utf8-cpp-3.2.1.tar.gz) = 27377 bytes
+SHA1 (patch-CMakeLists.txt) = c343d5e42d119c2a247a4103714890ba119f5441

Added files:

Index: pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed Dec 29 17:00:24 2021
+++ pkgsrc/textproc/utf8-cpp/patches/patch-CMakeLists.txt       Wed Dec 29 17:00:23 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/12/29 17:00:23 adam Exp $
+
+Do not install includes in a sub-directory.
+
+--- CMakeLists.txt.orig        2021-12-28 18:19:18.000000000 +0000
++++ CMakeLists.txt
+@@ -14,7 +14,7 @@ option(UTF8_SAMPLES "Enable building sam
+ add_library(utf8cpp INTERFACE)
+ 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)
+ 
+@@ -26,7 +26,7 @@ if(UTF8_INSTALL)
+         set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp)
+     endif()
+ 
+-    install(DIRECTORY source/ DESTINATION include/utf8cpp)
++    install(DIRECTORY source/ DESTINATION include)
+     install(TARGETS utf8cpp EXPORT utf8cppConfig)
+     install(EXPORT utf8cppConfig DESTINATION ${DEF_INSTALL_CMAKE_DIR})
+ endif()