git: fa06ee8c63e5 - main - www/davix: update 0_8_7 → 0_8_8
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 22 Jan 2025 09:54:51 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fa06ee8c63e5c94d3ebe77a2bf8486a30293d199
commit fa06ee8c63e5c94d3ebe77a2bf8486a30293d199
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2025-01-22 08:38:08 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2025-01-22 09:53:56 +0000
www/davix: update 0_8_7 → 0_8_8
Reported by: portscout
---
www/davix/Makefile | 8 +++++---
www/davix/distinfo | 8 +++-----
.../patch-cmake_modules_CMakeCXX11Support.cmake | 22 ++++++++++++++++++++++
.../files/patch-src_libs_rapidjson_document.h | 11 -----------
www/davix/files/patch-test_unit_CMakeLists.txt | 6 +++---
5 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/www/davix/Makefile b/www/davix/Makefile
index f7c45f54311e..72883fbd762c 100644
--- a/www/davix/Makefile
+++ b/www/davix/Makefile
@@ -1,11 +1,12 @@
PORTNAME= davix
DISTVERSIONPREFIX= R_
-DISTVERSION= 0_8_7
+DISTVERSION= 0_8_8
CATEGORIES= www
MAINTAINER= yuri@FreeBSD.org
COMMENT= Make the task of managing files over HTTP-based protocols simple
-WWW= https://dmc-docs.web.cern.ch/dmc-docs/davix.html
+WWW= https://dmc-docs.web.cern.ch/dmc-docs/davix.html \
+ https://github.com/cern-fts/davix
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -20,7 +21,6 @@ USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= cern-fts
-GH_TUPLE= google:googletest:f570b27:googletest/deps/googletest
CMAKE_OFF= EMBEDDED_LIBCURL DAVIX_TESTS
CMAKE_TESTING_ON= DAVIX_TESTS UNIT_TESTS BENCH_TESTS # 1 test fails, and several tests hang, see https://github.com/cern-fts/davix/issues/108
@@ -32,4 +32,6 @@ PORTSCOUT= limit:^[0-9\.]*$$ # prevent versions like N.N.N-el7.x86_64
post-install:
@${RM} -r ${STAGEDIR}${DOCSDIR}
+# tests as of 0.8.8: tests freeze, see https://github.com/cern-fts/davix/issues/133
+
.include <bsd.port.mk>
diff --git a/www/davix/distinfo b/www/davix/distinfo
index 0e0384e90c32..e76ed48d2ee7 100644
--- a/www/davix/distinfo
+++ b/www/davix/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1719289376
-SHA256 (cern-fts-davix-R_0_8_7_GH0.tar.gz) = 4863c92ecc1bd671f384e72aad2baac3bac737c3a9d7a6cf8706147ecbff5b0e
-SIZE (cern-fts-davix-R_0_8_7_GH0.tar.gz) = 3084358
-SHA256 (google-googletest-f570b27_GH0.tar.gz) = b8e523ec837300ed501b4a7ad35fc5238384667dc7d31879a2f102f9d38742e0
-SIZE (google-googletest-f570b27_GH0.tar.gz) = 1279326
+TIMESTAMP = 1737531638
+SHA256 (cern-fts-davix-R_0_8_8_GH0.tar.gz) = b9d30d49254097887cd896314a00883643f8706ca6e51bd274e74b80e07e93a5
+SIZE (cern-fts-davix-R_0_8_8_GH0.tar.gz) = 3086847
diff --git a/www/davix/files/patch-cmake_modules_CMakeCXX11Support.cmake b/www/davix/files/patch-cmake_modules_CMakeCXX11Support.cmake
new file mode 100644
index 000000000000..0484069c2969
--- /dev/null
+++ b/www/davix/files/patch-cmake_modules_CMakeCXX11Support.cmake
@@ -0,0 +1,22 @@
+- https://github.com/cern-fts/davix/issues/132
+
+--- cmake/modules/CMakeCXX11Support.cmake.orig 2025-01-22 08:00:31 UTC
++++ cmake/modules/CMakeCXX11Support.cmake
+@@ -13,7 +13,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
+ message(STATUS "C++11 partial support")
+ SET(HAVE_CXX011_PARTIAL_SUPPORT TRUE)
+- SET(CXX11_FLAG_ENABLE "-std=c++0x")
++ SET(CXX11_FLAG_ENABLE "-std=c++14")
+ else ()
+ message(STATUS "C++11 no support ")
+ SET(CXX11_FLAG_ENABLE "")
+@@ -22,7 +22,7 @@ else(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "C++11 activated full")
+ SET(HAVE_CXX011_FULL_SUPPORT TRUE)
+ SET(HAVE_CXX011_PARTIAL_SUPPORT TRUE)
+- SET(CXX11_FLAG_ENABLE "-std=c++0x")
++ SET(CXX11_FLAG_ENABLE "-std=c++14")
+ endif(CMAKE_COMPILER_IS_GNUCXX)
+
+ ## Check TR1
diff --git a/www/davix/files/patch-src_libs_rapidjson_document.h b/www/davix/files/patch-src_libs_rapidjson_document.h
deleted file mode 100644
index 346bcdd112a0..000000000000
--- a/www/davix/files/patch-src_libs_rapidjson_document.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libs/rapidjson/document.h.orig 2024-06-24 15:50:44 UTC
-+++ src/libs/rapidjson/document.h
-@@ -316,8 +316,6 @@ struct GenericStringRef {
-
- GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
-
-- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
--
- //! implicit conversion to plain CharType pointer
- operator const Ch *() const { return s; }
-
diff --git a/www/davix/files/patch-test_unit_CMakeLists.txt b/www/davix/files/patch-test_unit_CMakeLists.txt
index e3caac8bea1c..3e5343307ed6 100644
--- a/www/davix/files/patch-test_unit_CMakeLists.txt
+++ b/www/davix/files/patch-test_unit_CMakeLists.txt
@@ -1,7 +1,7 @@
---- test/unit/CMakeLists.txt.orig 2018-11-04 01:48:17 UTC
+--- test/unit/CMakeLists.txt.orig 2025-01-21 08:32:57 UTC
+++ test/unit/CMakeLists.txt
-@@ -43,6 +43,7 @@ target_link_libraries(davix-unit-tests
- gtest_main
+@@ -42,6 +42,7 @@ target_link_libraries(davix-unit-tests
+ GTest::Main
${CMAKE_THREAD_LIBS_INIT}
${LIBSSL_PKG_LIBRARIES}
+ uuid