From nobody Tue May 24 08:50:22 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 213201B42D3A; Tue, 24 May 2022 08:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6nvz09Qqz4v0p; Tue, 24 May 2022 08:50:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653382223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Le/LgWqrSXja32ZclYULAAM6YybuBby8kI4lX0LqeWM=; b=uxOrWBhpxfv5UFzwfNUWJxrSvprUhRHYUGZNnurR+JZmDwNZQ4Nizeksk3REDkZtBB7puF qSA/vS+36tqeUwduK8z3jeOL/pfKKSYFOAvMf8xKqKjweL3WsBXUm+4GRgYlbVjT1KA/6h yPTwoExp0CDGilw7f1Fpaq4yj6Z433pK0DyAAy5lBjc1Luca8X//r2emMk0G1I3PY3e2yo jAZ9GXhq52p5JrIAFhPYHVcBU4vtTpvg6OeKz4CeHqatQWEHxbu6Y0EPG7YRE3NTE5f1kL ihI7WUfMUQpDnUSFLN3w2iscjMZ59FvnCsnRaaNptx44g0p2ZU7JKBqSCHNkuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D6FDE214A6; Tue, 24 May 2022 08:50:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24O8oMO5055897; Tue, 24 May 2022 08:50:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24O8oMNL055896; Tue, 24 May 2022 08:50:22 GMT (envelope-from git) Date: Tue, 24 May 2022 08:50:22 GMT Message-Id: <202205240850.24O8oMNL055896@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: a092955dc3ad - main - devel/leatherman: unbreak build after recent boost upgrade (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a092955dc3ad12241f9fcaf490bb8c498a4a7ba6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653382223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Le/LgWqrSXja32ZclYULAAM6YybuBby8kI4lX0LqeWM=; b=NkVr+RltJj/b0dcM0ZM9otLtckwL/WuZd8+eWNl6qmPqDC0cB4KYk/4r6PzTsN4mZ8uIa3 2n4vxDkW3Fcgs9QXr3JxobT0ItKMKKirtLqO3QZfKRA6uax7ZyuO714JB1QS5EMyxcizET 8lp0ujaI39IbyZC5zSi2rYujYuB9UrdlPeMoWR9f6BpARQP3Q2Qpg7wZZ66b0lJc/WwyEQ P5y3J7cHnqn3m6D0MlYhQ979WjWqJ5fSBI7Kt5d09PfUBaeCE7TXxOhsDY1OtynaMfO8dA B5TrWa4Id/YXy7rq01sHENH8m1/K1ikFoOEUxA+FqwHYmQ2CDxt1dawBMSbZ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653382223; a=rsa-sha256; cv=none; b=VSBO+AfRqSnlYgww6kboxFZVB4Vn1Svx+gUPvipqR6COL7ju/otF9WN86F7/918Q/z5DyR DGXns4AxB+o1lnzBEn0ldx5UY0kCY9LEaBFtC7MLjFGM1f/ycQ68fsbORgh7hZTWTxA964 +fEg4dpZkkekSZkLHtE5ZaDCLGuslU7tiC2BC1BCLrPFNsGX8c5mnqfiqI6/dL7/NDBQtn bI6WInPeLa3CYOWqWbeGPXMdx8w/eMsqyg2qAWOVZEao4XUOrV7g416enRmYgqs9fx6JCD nNCb3EbTBWgQEXmXqQQFBlFU+Lj4jjRf8h6a9sg4C7jIkHkntKxlz9zaKakWhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a092955dc3ad12241f9fcaf490bb8c498a4a7ba6 commit a092955dc3ad12241f9fcaf490bb8c498a4a7ba6 Author: Dima Panov AuthorDate: 2022-05-24 08:48:24 +0000 Commit: Dima Panov CommitDate: 2022-05-24 08:48:24 +0000 devel/leatherman: unbreak build after recent boost upgrade (+) nowide library now included in main Boost package. PR: 246106 --- devel/leatherman/files/patch-shared_nowide | 108 +++++++++++++++++++++++++++++ devel/leatherman/pkg-plist | 14 ---- 2 files changed, 108 insertions(+), 14 deletions(-) diff --git a/devel/leatherman/files/patch-shared_nowide b/devel/leatherman/files/patch-shared_nowide new file mode 100644 index 000000000000..5bb169147065 --- /dev/null +++ b/devel/leatherman/files/patch-shared_nowide @@ -0,0 +1,108 @@ +diff --git ./nowide/CMakeLists.txt ./nowide/CMakeLists.txt +index ff9dba6..5d1b9ce 100644 +--- ./nowide/CMakeLists.txt ++++ ./nowide/CMakeLists.txt +@@ -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() +--- ./execution/CMakeLists.txt~ 2020-06-03 10:30:05.027479897 +0100 ++++ ./execution/CMakeLists.txt 2020-06-03 10:30:18.871483297 +0100 +@@ -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) +--- ./file_util/CMakeLists.txt~ 2020-06-03 10:30:05.031479898 +0100 ++++ ./file_util/CMakeLists.txt 2020-06-03 10:31:04.550494516 +0100 +@@ -1,9 +1,8 @@ +-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}") + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) + leatherman_dependency(locale) + leatherman_dependency(logging) + leatherman_dependency(util) +--- ./logging/CMakeLists.txt~ 2020-06-03 10:30:05.035479898 +0100 ++++ ./logging/CMakeLists.txt 2020-06-03 10:30:19.092483352 +0100 +@@ -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") +--- ./tests/CMakeLists.txt~ 2020-06-02 23:24:17.146002133 +0100 ++++ ./tests/CMakeLists.txt 2020-06-02 23:26:17.780054923 +0100 +@@ -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}) +--- ./util/CMakeLists.txt~ 2020-06-03 10:05:44.277172451 +0100 ++++ ./util/CMakeLists.txt 2020-06-03 10:06:52.969185017 +0100 +@@ -1,10 +1,8 @@ +-find_package(Boost 1.54 REQUIRED date_time chrono system) ++find_package(Boost 1.73 REQUIRED date_time chrono system nowide) + + add_leatherman_deps(${Boost_LIBRARIES}) + add_leatherman_includes("${Boost_INCLUDE_DIRS}") + +-leatherman_dependency(nowide) +- + if(WIN32) + set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc") + set(PLATFORM_TESTS "tests/windows/environment.cc") +--- ./file_util/src/file.cc~ 2019-12-14 20:46:29.000000000 +0000 ++++ ./file_util/src/file.cc 2020-06-02 22:42:45.100963441 +0100 +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + #include + #include + #include +--- ./util/src/environment.cc~ 2019-12-14 20:46:29.000000000 +0000 ++++ ./util/src/environment.cc 2020-06-02 22:42:45.101963441 +0100 +@@ -1,5 +1,6 @@ + #include +-#include ++#include ++#include + #include + + using namespace std; +--- ./util/tests/environment.cc~ 2019-12-14 20:46:29.000000000 +0000 ++++ ./util/tests/environment.cc 2020-06-02 22:42:45.103963442 +0100 +@@ -1,6 +1,6 @@ + #include + #include +-#include ++#include + + using namespace std; + using namespace leatherman::util; diff --git a/devel/leatherman/pkg-plist b/devel/leatherman/pkg-plist index c097597fd217..c2df2ba0ee6b 100644 --- a/devel/leatherman/pkg-plist +++ b/devel/leatherman/pkg-plist @@ -1,17 +1,3 @@ -include/boost/nowide/args.hpp -include/boost/nowide/cenv.hpp -include/boost/nowide/config.hpp -include/boost/nowide/convert.hpp -include/boost/nowide/cstdio.hpp -include/boost/nowide/cstdlib.hpp -include/boost/nowide/filebuf.hpp -include/boost/nowide/fstream.hpp -include/boost/nowide/integration/filesystem.hpp -include/boost/nowide/iostream.hpp -include/boost/nowide/stackstring.hpp -include/boost/nowide/system.hpp -include/boost/nowide/utf8_codecvt.hpp -include/boost/nowide/windows.hpp include/leatherman/curl/client.hpp include/leatherman/curl/export.h include/leatherman/curl/request.hpp