svn commit: r448837 - in head/devel/leatherman: . files
Romain Tartière
romain at FreeBSD.org
Sun Aug 27 19:23:45 UTC 2017
Author: romain
Date: Sun Aug 27 19:23:44 2017
New Revision: 448837
URL: https://svnweb.freebsd.org/changeset/ports/448837
Log:
Update to 1.1.2
ChangeLog:
https://github.com/puppetlabs/leatherman/blob/master/CHANGELOG.md#112
While here, add a workaround that prevented `make test` do succeed on some
environments. Regenerate all patches via `make makepatch`.
With hat: puppet
Added:
head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc (contents, props changed)
Modified:
head/devel/leatherman/Makefile
head/devel/leatherman/distinfo
head/devel/leatherman/files/patch-cmake_cflags.cmake
head/devel/leatherman/files/patch-cmake_leatherman.cmake.in
Modified: head/devel/leatherman/Makefile
==============================================================================
--- head/devel/leatherman/Makefile Sun Aug 27 18:33:02 2017 (r448836)
+++ head/devel/leatherman/Makefile Sun Aug 27 19:23:44 2017 (r448837)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= leatherman
-PORTVERSION= 1.1.1
+PORTVERSION= 1.1.2
CATEGORIES= devel
MAINTAINER= puppet at FreeBSD.org
Modified: head/devel/leatherman/distinfo
==============================================================================
--- head/devel/leatherman/distinfo Sun Aug 27 18:33:02 2017 (r448836)
+++ head/devel/leatherman/distinfo Sun Aug 27 19:23:44 2017 (r448837)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503479577
-SHA256 (puppetlabs-leatherman-1.1.1_GH0.tar.gz) = 5c277b094cdfd8bfec43aef57bd02443d8789e85c203821acb7d0fbe42fa20c3
-SIZE (puppetlabs-leatherman-1.1.1_GH0.tar.gz) = 429468
+TIMESTAMP = 1503861160
+SHA256 (puppetlabs-leatherman-1.1.2_GH0.tar.gz) = 1feca2ba8472252132ad90c6bcc3fba6dbb85ee912b1cbcde9853d812d54729f
+SIZE (puppetlabs-leatherman-1.1.2_GH0.tar.gz) = 430545
Modified: head/devel/leatherman/files/patch-cmake_cflags.cmake
==============================================================================
--- head/devel/leatherman/files/patch-cmake_cflags.cmake Sun Aug 27 18:33:02 2017 (r448836)
+++ head/devel/leatherman/files/patch-cmake_cflags.cmake Sun Aug 27 19:23:44 2017 (r448837)
@@ -1,4 +1,4 @@
---- cmake/cflags.cmake.orig
+--- cmake/cflags.cmake.orig 2017-08-25 18:32:21 UTC
+++ cmake/cflags.cmake
@@ -2,7 +2,7 @@
# Each of our project dirs sets CMAKE_CXX_FLAGS based on these. We do
@@ -9,7 +9,7 @@
# Clang warns that 'register' is deprecated; 'register' is used throughout boost, so it can't be an error yet.
# The warning flag is different on different clang versions so we need to extract the clang version.
-@@ -41,7 +41,7 @@
+@@ -41,7 +41,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQ
set(CMAKE_CXX_FLAGS "-Wno-maybe-uninitialized ${CMAKE_CXX_FLAGS}")
# missing-field-initializers is disabled because GCC can't make up their mind how to treat C++11 initializers
Modified: head/devel/leatherman/files/patch-cmake_leatherman.cmake.in
==============================================================================
--- head/devel/leatherman/files/patch-cmake_leatherman.cmake.in Sun Aug 27 18:33:02 2017 (r448836)
+++ head/devel/leatherman/files/patch-cmake_leatherman.cmake.in Sun Aug 27 19:23:44 2017 (r448837)
@@ -1,6 +1,6 @@
---- cmake/leatherman.cmake.in.orig
+--- cmake/leatherman.cmake.in.orig 2017-08-25 18:32:21 UTC
+++ cmake/leatherman.cmake.in
-@@ -83,11 +83,6 @@
+@@ -83,11 +83,6 @@ macro(leatherman_install)
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX})
Added: head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/leatherman/files/patch-json__container_tests_json__container__test.cc Sun Aug 27 19:23:44 2017 (r448837)
@@ -0,0 +1,13 @@
+This is a workaround for this bug:
+https://github.com/philsquared/Catch/blob/master/docs/limitations.md#clangg----skipping-leaf-sections-after-an-exception
+--- json_container/tests/json_container_test.cc.orig 2017-08-25 18:32:21 UTC
++++ json_container/tests/json_container_test.cc
+@@ -80,7 +80,7 @@ TEST_CASE("JsonContainer::JsonContainer
+ json_value = "null";
+ }
+
+- REQUIRE_NOTHROW(JsonContainer { json_value });
++ REQUIRE_NOTHROW(if (json_value != "") { JsonContainer { json_value };});
+ }
+
+ SECTION("it should throw a data_parse_error in case of empty string") {
More information about the svn-ports-head
mailing list