From 8828e3e1d66d0e1386cd2c7f50fca751d93c25e8 Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Thu, 12 Dec 2024 15:43:30 +0000 Subject: automatic import of leatherman --- .gitignore | 1 + leatherman-gcc11.patch | 38 +++++++++++++++++++ leatherman.spec | 57 ++++++++++++++++++++++++++++ shared_nowide.patch | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + system-catch.patch | 10 +++++ 6 files changed, 208 insertions(+) create mode 100644 leatherman-gcc11.patch create mode 100644 leatherman.spec create mode 100644 shared_nowide.patch create mode 100644 sources create mode 100644 system-catch.patch diff --git a/.gitignore b/.gitignore index e69de29..287645a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/leatherman-1.12.13.tar.gz diff --git a/leatherman-gcc11.patch b/leatherman-gcc11.patch new file mode 100644 index 0000000..4ef6eee --- /dev/null +++ b/leatherman-gcc11.patch @@ -0,0 +1,38 @@ +diff --git a/curl/src/client.cc b/curl/src/client.cc +index 558db6d..d27bb36 100644 +--- a/curl/src/client.cc ++++ b/curl/src/client.cc +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +diff --git a/util/src/posix/scoped_descriptor.cc b/util/src/posix/scoped_descriptor.cc +index 6fd1495..8294d0b 100644 +--- a/util/src/posix/scoped_descriptor.cc ++++ b/util/src/posix/scoped_descriptor.cc +@@ -1,3 +1,5 @@ ++#include ++ + #include + + using namespace std; +diff --git a/util/src/scope_exit.cc b/util/src/scope_exit.cc +index 764c2fb..441855a 100644 +--- a/util/src/scope_exit.cc ++++ b/util/src/scope_exit.cc +@@ -1,3 +1,4 @@ ++#include + #include + + using namespace std; +diff --git a/util/src/scoped_env.cc b/util/src/scoped_env.cc +index 6c6a041..df26645 100644 +--- a/util/src/scoped_env.cc ++++ b/util/src/scoped_env.cc +@@ -1,3 +1,5 @@ ++#include ++ + #include + #include + diff --git a/leatherman.spec b/leatherman.spec new file mode 100644 index 0000000..e589ba0 --- /dev/null +++ b/leatherman.spec @@ -0,0 +1,57 @@ +Name: leatherman +Version: 1.12.13 +Release: 2 +Summary: Collection of C++ and CMake utility libraries +License: Apache-2.0 and MIT +URL: https://github.com/puppetlabs/leatherman +Source: https://github.com/puppetlabs/leatherman/archive/%{version}/leatherman-%{version}.tar.gz +Patch0: shared_nowide.patch +Patch1: system-catch.patch +Patch2: leatherman-gcc11.patch +BuildRequires: cmake >= 3.2.2 make gcc-c++ boost-devel >= 1.73 libcurl-devel gettext catch1-devel +Provides: bundled(rapidjson) = 1.0.2 +%description +%{summary}. + +%package devel +Summary: Development files for leatherman +Requires: leatherman%{?_isa} = %{version}-%{release} boost-devel libcurl-devel%{?_isa} +%description devel +The leatherman-devel package contains libraries and header files for +developing applications that use leatherman. + +%prep +%autosetup -p1 +sed -i -e "s/\s*-Werror\s*//g" cmake/cflags.cmake + +%build +%cmake \ + -DLEATHERMAN_SHARED=ON \ + -DLEATHERMAN_DEBUG=ON \ + -DLEATHERMAN_CATCH_INCLUDE=%{_includedir}/catch \ + %{nil} +%cmake_build + +%install +%cmake_install +%find_lang leatherman_logging +%find_lang leatherman_locale + +%files -f leatherman_logging.lang -f leatherman_locale.lang +%license LICENSE +%{_libdir}/leatherman*.so.* + +%files devel +%{_includedir}/leatherman +%{_libdir}/leatherman*.so +%{_libdir}/cmake/leatherman + +%changelog +* Thu Dec 12 2024 Funda Wang - 1.12.13-2 +- adopt to new cmake macro + +* Fri May 24 2024 wulei - 1.12.13-1 +- Upgrade package + +* Fri Aug 14 2020 yaokai - 1.12.0-1 +- package init diff --git a/shared_nowide.patch b/shared_nowide.patch new file mode 100644 index 0000000..74a12a4 --- /dev/null +++ b/shared_nowide.patch @@ -0,0 +1,101 @@ +--- a/nowide/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/nowide/CMakeLists.txt 2021-03-09 08:57:57.469391575 -0600 +@@ -1,7 +1,5 @@ + find_package(Boost 1.54 REQUIRED) + +-add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include") +-add_leatherman_headers(../vendor/nowide/include/boost) + if(WIN32) + add_leatherman_library(../vendor/nowide/src/iostream.cpp) + endif() +--- a/execution/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/execution/CMakeLists.txt 2021-03-09 08:59:46.136860198 -0600 +@@ -1,4 +1,4 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) ++find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide) + + add_leatherman_deps("${Boost_LIBRARIES}") + if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS") +@@ -10,7 +10,6 @@ + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + + leatherman_dependency(util) +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(file_util) +--- a/file_util/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/file_util/CMakeLists.txt 2021-03-09 09:00:26.641683668 -0600 +@@ -1,9 +1,8 @@ +-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system) ++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide) + + add_leatherman_deps("${Boost_LIBRARIES}") + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(util) +--- a/logging/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/logging/CMakeLists.txt 2021-03-09 09:01:03.565522737 -0600 +@@ -4,7 +4,6 @@ + add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + + if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS") +--- a/tests/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/tests/CMakeLists.txt 2021-03-09 09:01:47.352331908 -0600 +@@ -1,8 +1,8 @@ +-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex) ++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide) + if (LEATHERMAN_USE_LOCALES) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale) + endif() +-find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) ++find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) + + include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS}) + add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS}) +--- a/file_util/src/file.cc~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/file_util/src/file.cc 2021-03-09 09:02:58.297022731 -0600 +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include + #include + #include +--- a/util/src/environment.cc~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/util/src/environment.cc 2021-03-09 09:03:39.013845293 -0600 +@@ -1,5 +1,5 @@ + #include +-#include ++#include + #include + + using namespace std; +--- a/util/tests/environment.cc~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/util/tests/environment.cc 2021-03-09 09:04:22.487655817 -0600 +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + + using namespace std; + using namespace leatherman::util; +--- a/util/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/util/CMakeLists.txt 2021-03-18 09:40:55.004699613 -0500 +@@ -1,6 +1,6 @@ + find_package(Boost 1.54 REQUIRED date_time chrono system) + +-add_leatherman_deps(${Boost_LIBRARIES}) ++add_leatherman_deps(${Boost_LIBRARIES} -lboost_nowide) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + + leatherman_dependency(nowide) diff --git a/sources b/sources new file mode 100644 index 0000000..91cc804 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +68a9b2fb8f9dcc0b375d43a6baa32d56 leatherman-1.12.13.tar.gz diff --git a/system-catch.patch b/system-catch.patch new file mode 100644 index 0000000..8d42459 --- /dev/null +++ b/system-catch.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt~ 2020-12-09 04:17:13.000000000 -0600 ++++ b/CMakeLists.txt 2021-03-09 09:33:46.038471009 -0600 +@@ -65,7 +65,6 @@ + file(GLOB_RECURSE ALL_LEATHERMAN_SOURCES */src/*.cc */inc/*.hpp) + add_subdirectory(locales) + +-add_leatherman_dir(catch EXCLUDE_FROM_VARS) + add_leatherman_dir(nowide) + add_leatherman_dir(util) + add_leatherman_dir(locale) -- cgit v1.2.3