Update inicpp to version 1.2.1

Update inicpp to version 1.2.1 .

Includes our patches.

Changes from changelog:

* pkg-config support and cmake package on unix
* don't use deprected iterators
* small fixes

diff --git a/inicpp/Makefile b/inicpp/Makefile
index 3b5ec6ce062e587c36b43b73f95ea69669c53612..83b9117f4eb8a60da6a639c657208714172d8839 100644 (file)
--- a/inicpp/Makefile
+++ b/inicpp/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=      inicpp-1.2.0
+DISTNAME=      inicpp-1.2.1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=SemaiCZE/}
 GITHUB_TAG=    refs/tags/v${PKGVERSION_NOREV}

diff --git a/inicpp/distinfo b/inicpp/distinfo
index bb5d8a418a427f5fcc292fe247728318ddbb561d..d14dd6c1e247c9c28a791f1d5602ad84a9d7d0e5 100644 (file)
--- a/inicpp/distinfo
+++ b/inicpp/distinfo
@@ -1,7 +1,5 @@
 $NetBSD$
 
-BLAKE2s (inicpp-1.2.0.tar.gz) = 6d80d6df72544abb841a148536730dde8cc1d7b7b9f021a3699bfb905142eec8
-SHA512 (inicpp-1.2.0.tar.gz) = c843951723b611bb02be322f5abd0e373006541ab2c110e114b8890add7cb70f8c38c1031ce733c60a1dc43b88e7b3ff64124a6cd7c7f0b876101470d0c962e5
-Size (inicpp-1.2.0.tar.gz) = 64068 bytes
-SHA1 (patch-CMakeLists.txt) = 027a7b5d7c0ac3ec3922b30511700f22b65e14a1
-SHA1 (patch-inicpp.pc.in) = 85db9786a1ce3b802cdce11ccb388ed8b1194fe0
+BLAKE2s (inicpp-1.2.1.tar.gz) = 935f8873e503b7e0cac4f750d9008eee1c64a718afaf1d88811348718da7b855
+SHA512 (inicpp-1.2.1.tar.gz) = f98842fd7f415f45322fab2e3caa80d4c97f52847108712caa221dda79c579c377ccec0ce4ab7a86ae3036ae01aa6905caf5b1b34718fcaf2dbfa40168d2823b
+Size (inicpp-1.2.1.tar.gz) = 64411 bytes

diff --git a/inicpp/patches/patch-CMakeLists.txt b/inicpp/patches/patch-CMakeLists.txt
deleted file mode 100644 (file)
index c39ce8c..0000000
--- a/inicpp/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Install pkg-config and cmake package files
-Applied upstream: https://gitub.com/SemaiCZE/inicpp/pull/16
-
---- CMakeLists.txt.orig        2021-02-04 20:25:05.000000000 +0000
-+++ CMakeLists.txt
-@@ -1,5 +1,6 @@
- cmake_minimum_required(VERSION 3.1)
--project(inicpp)
-+project(inicpp
-+        VERSION 1.2.0)
- 
- set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
- set(INICPP_SRC_DIR src)
-@@ -86,12 +87,17 @@ endif()
- include(GNUInstallDirs)
- include(InstallRequiredSystemLibraries)
- if(UNIX)
-+      target_include_directories(${PROJECT_NAME} INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}>)
-+      install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_public_options ${PROJECT_NAME}_private_options EXPORT ${PROJECT_NAME}Config)
-       install(DIRECTORY ${INICPP_INCLUDE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-       if(INICPP_BUILD_SHARED)
-               install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library)
-       else()
-               install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library)
-       endif()
-+      configure_file(inicpp.pc.in inicpp.pc @ONLY)
-+      install(FILES ${CMAKE_BINARY_DIR}/inicpp.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+      install(EXPORT ${PROJECT_NAME}Config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} NAMESPACE ${PROJECT_NAME}::)
- elseif(WIN32)
-       install(DIRECTORY ${INICPP_INCLUDE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-       install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library)

diff --git a/inicpp/patches/patch-inicpp.pc.in b/inicpp/patches/patch-inicpp.pc.in
deleted file mode 100644 (file)
index 01c70ac..0000000
--- a/inicpp/patches/patch-inicpp.pc.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Install pkg-config and cmake package files
-Applied upstream: https://gitub.com/SemaiCZE/inicpp/pull/16
-
---- inicpp.pc.in.orig  2022-04-23 08:22:00.639992818 +0000
-+++ inicpp.pc.in
-@@ -0,0 +1,8 @@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+
-+Name: inicpp
-+Description: C++ parser of INI files with schema validation
-+Version: @inicpp_VERSION@
-+Cflags: -I${includedir}/inicpp
-+Libs: -L${libdir} -linicpp