From 247e85d986f8237efa02417e65b3dfd42ef07df2 Mon Sep 17 00:00:00 2001 From: "Daisuke Fujimura (fd0)" Date: Thu, 30 Jan 2025 23:37:03 +0900 Subject: [PATCH] docopt.cpp-0.6.3 (rebuild with gcc-12.4.0) --- docopt.cpp/README | 30 ++++++++------ ....cygport => docopt.cpp-0.6.3-1bl2.cygport} | 15 ++++++- ....patch => docopt.cpp-0.6.3-1bl2.src.patch} | 40 +++++++++++-------- 3 files changed, 53 insertions(+), 32 deletions(-) rename docopt.cpp/{docopt.cpp-0.6.3-1bl1.cygport => docopt.cpp-0.6.3-1bl2.cygport} (54%) rename docopt.cpp/{docopt.cpp-0.6.3-1bl1.src.patch => docopt.cpp-0.6.3-1bl2.src.patch} (50%) diff --git a/docopt.cpp/README b/docopt.cpp/README index 78bcdf1f3..ea8c53671 100644 --- a/docopt.cpp/README +++ b/docopt.cpp/README @@ -3,28 +3,29 @@ docopt.cpp docopt creates beautiful command-line interfaces Runtime requirements: - cygwin-3.1.6-1 + cygwin-3.5.7-1 libboost_regex1.66-1.66.0-1 - libdocopt-devel-0.6.3-1bl1 - libdocopt0-0.6.3-1bl1 - libgcc1-9.3.0-2 - libstdc++6-9.3.0-2 - pkg-config-1.6.3-1 + libdocopt-devel-0.6.3-1bl2 + libdocopt0-0.6.3-1bl2 + libgcc1-12.4.0-3 + libstdc++6-12.4.0-3 + pkg-config-2.3.0-1 Build requirements: (besides corresponding -devel packages) - binutils-2.34+1git.de9c1b7cfe-1 - cmake-3.14.5-1 - cygport-0.34.0-1 - gcc-core-9.3.0-2 - gcc-g++-9.3.0-2 - ninja-1.10.0-2 + binutils-2.43.1-1 + cmake-3.28.3-1 + cygport-0.36.9-1 + gcc-core-12.4.0-3 + gcc-g++-12.4.0-3 + libboost-devel-1.66.0-1 + ninja-1.12.1-1 Canonical website: https://github.com/docopt/docopt.cpp Canonical download: - https://github.com/docopt/docopt.cpp/archive/v0.6.3.tar.gz + https://github.com/docopt/docopt.cpp/archive/refs/tags/v0.6.3.tar.gz ------------------------------------------- @@ -70,6 +71,9 @@ Files included in the binary package: Port Notes: +----- version 0.6.3-1bl2 ----- +Rebuild with gcc-12.4.0 + ----- version 0.6.3-1bl1 ----- Version bump. diff --git a/docopt.cpp/docopt.cpp-0.6.3-1bl1.cygport b/docopt.cpp/docopt.cpp-0.6.3-1bl2.cygport similarity index 54% rename from docopt.cpp/docopt.cpp-0.6.3-1bl1.cygport rename to docopt.cpp/docopt.cpp-0.6.3-1bl2.cygport index b4df3ee3c..8f353c802 100644 --- a/docopt.cpp/docopt.cpp-0.6.3-1bl1.cygport +++ b/docopt.cpp/docopt.cpp-0.6.3-1bl2.cygport @@ -1,10 +1,21 @@ HOMEPAGE="https://github.com/docopt/${PN}" -SRC_URI="https://github.com/docopt/${PN}/archive/v${PV}.tar.gz" +SRC_URI="https://github.com/docopt/${PN}/archive/refs/tags/v${PV}.tar.gz" +PATCH_URI=" + https://sources.debian.org/data/main/d/docopt.cpp/0.6.3-5/debian/patches/version-bump.patch + https://sources.debian.org/data/main/d/docopt.cpp/0.6.3-5/debian/patches/increase_cmake_minimum_required.patch + https://src.fedoraproject.org/rpms/docopt-cpp/raw/rawhide/f/docopt-0.6.3-run-tests.patch +" CATEGORY="Libs" SUMMARY="C++11 port of docopt" DESCRIPTION="docopt creates beautiful command-line interfaces" +LICENSE="BSL-1.0 AND MIT" +LICENSE_SPDX="SPDX-License-Identifier: BSL-1.0 AND MIT" +# LICENSE_URI="" + +BUILD_REQUIRES="libboost-devel" + inherit cmake CYGCMAKE_ARGS=" @@ -33,7 +44,7 @@ docopt_cpp_CONTENTS=" usr/share " libdocopt0_CONTENTS=" - usr/bin + usr/bin/cyg*-0.dll " libdocopt_devel_CONTENTS=" usr/include diff --git a/docopt.cpp/docopt.cpp-0.6.3-1bl1.src.patch b/docopt.cpp/docopt.cpp-0.6.3-1bl2.src.patch similarity index 50% rename from docopt.cpp/docopt.cpp-0.6.3-1bl1.src.patch rename to docopt.cpp/docopt.cpp-0.6.3-1bl2.src.patch index 1f2d3169d..af397d5c9 100644 --- a/docopt.cpp/docopt.cpp-0.6.3-1bl1.src.patch +++ b/docopt.cpp/docopt.cpp-0.6.3-1bl2.src.patch @@ -1,35 +1,44 @@ ---- origsrc/docopt.cpp-0.6.3/CMakeLists.txt 2020-05-12 02:23:10.000000000 +0900 -+++ src/docopt.cpp-0.6.3/CMakeLists.txt 2020-08-07 11:19:45.564866000 +0900 -@@ -54,11 +54,15 @@ else() +--- origsrc/docopt.cpp-0.6.3/CMakeLists.txt 2025-01-30 21:05:21.761506600 +0900 ++++ src/docopt.cpp-0.6.3/CMakeLists.txt 2025-01-30 21:07:16.925753900 +0900 +@@ -42,7 +42,6 @@ if(MSVC OR XCODE) + # Xcode does not support libraries with only object files as sources. + # See https://cmake.org/cmake/help/v3.0/command/add_library.html?highlight=add_library + add_library(docopt SHARED ${docopt_SOURCES} ${docopt_HEADERS}) +- add_library(docopt_s STATIC ${docopt_SOURCES} ${docopt_HEADERS}) + else() + # If not using MSVC or Xcode, we will create an intermediate object target + # to avoid compiling the source code twice. +@@ -54,11 +53,9 @@ else() VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR} ) - add_library(docopt_s STATIC $) -+ if(NOT CYGWIN) -+ add_library(docopt_s STATIC $) -+ endif() endif() target_include_directories(docopt PUBLIC $ $) -target_include_directories(docopt_s PUBLIC $ $) -+if(NOT CYGWIN) -+ target_include_directories(docopt_s PUBLIC $ $) -+endif() if(MSVC) # DOCOPT_DLL: Must be specified when building *and* when using the DLL. -@@ -71,7 +75,9 @@ endif() +@@ -71,7 +68,6 @@ endif() if(NOT MSVC) set_target_properties(docopt PROPERTIES OUTPUT_NAME docopt) - set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt) -+ if(NOT CYGWIN) -+ set_target_properties(docopt_s PROPERTIES OUTPUT_NAME docopt) -+ endif() endif() if(USE_BOOST_REGEX) -@@ -117,10 +123,12 @@ endif() +@@ -82,9 +78,6 @@ if(USE_BOOST_REGEX) + find_package(Boost 1.53 REQUIRED COMPONENTS regex) + include_directories(${Boost_INCLUDE_DIRS}) + target_link_libraries(docopt ${Boost_LIBRARIES}) +- if(WITH_STATIC) +- target_link_libraries(docopt_s ${Boost_LIBRARIES}) +- endif() + endif() + + #============================================================================ +@@ -117,10 +110,9 @@ endif() set(export_name "docopt-targets") # Runtime package @@ -38,9 +47,6 @@ # Development package -install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+if(NOT CYGWIN) -+ install(TARGETS docopt_s EXPORT ${export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+endif() install(FILES ${docopt_HEADERS} DESTINATION include/docopt) # CMake Package