Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Nov 2023 17:57:00 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 4f988333945c - main - devel/trompeloeil: update 45 =?utf-8?Q?=E2=86=92?= 46
Message-ID:  <202311071757.3A7Hv0qh087031@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4f988333945c183b3376f90f10318decb6a41d06

commit 4f988333945c183b3376f90f10318decb6a41d06
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-11-07 16:47:57 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-11-07 17:56:53 +0000

    devel/trompeloeil: update 45 → 46
    
    Reported by:    portscout
---
 devel/trompeloeil/Makefile                   |  7 ++++---
 devel/trompeloeil/distinfo                   |  6 +++---
 devel/trompeloeil/files/patch-CMakeLists.txt | 11 -----------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/devel/trompeloeil/Makefile b/devel/trompeloeil/Makefile
index 7cda44d58e6a..a73bedf53391 100644
--- a/devel/trompeloeil/Makefile
+++ b/devel/trompeloeil/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	trompeloeil
 DISTVERSIONPREFIX=	v
-DISTVERSION=	45
+DISTVERSION=	46
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -13,11 +13,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 TEST_DEPENDS=	${LOCALBASE}/include/catch2/catch.hpp:devel/catch \
 		criterion>0:devel/criterion
 
-USES=		cmake:testing
+USES=		cmake:testing compiler:c++14-lang
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rollbear
 
+CMAKE_TESTING_ON=	TROMPELOEIL_BUILD_TESTS
 CMAKE_TESTING_TARGET=	self_test thread_terror custom_recursive_mutex # see the README
 
 NO_BUILD=	yes
@@ -33,7 +34,7 @@ post-install:
 		${MV} docs/* . && \
 		${RMDIR} docs
 
-post-test: # run tests
+post-test: # run tests (tests fail to compile, see https://github.com/rollbear/trompeloeil/issues/322)
 .for exe in ${CMAKE_TESTING_TARGET}
 	${ECHO} "==> Running tests executable ${exe}"
 	@cd ${TEST_WRKSRC} && test/${exe}
diff --git a/devel/trompeloeil/distinfo b/devel/trompeloeil/distinfo
index 41bce4689275..74b57c03d240 100644
--- a/devel/trompeloeil/distinfo
+++ b/devel/trompeloeil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690004321
-SHA256 (rollbear-trompeloeil-v45_GH0.tar.gz) = 124b0aa45d84415193719376b6557fc1f1180cbfebf4dc4f7ca247cb404d6bd8
-SIZE (rollbear-trompeloeil-v45_GH0.tar.gz) = 308207
+TIMESTAMP = 1699375057
+SHA256 (rollbear-trompeloeil-v46_GH0.tar.gz) = dc2c856ab7716ef659f8df7fc5f6740a40e736089f05e0a8251d4ad3ad17ad83
+SIZE (rollbear-trompeloeil-v46_GH0.tar.gz) = 316447
diff --git a/devel/trompeloeil/files/patch-CMakeLists.txt b/devel/trompeloeil/files/patch-CMakeLists.txt
deleted file mode 100644
index 4ae4dffb8b2a..000000000000
--- a/devel/trompeloeil/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2023-06-18 08:43:43 UTC
-+++ CMakeLists.txt
-@@ -37,7 +37,7 @@ endif()
- option(TROMPELOEIL_INSTALL_TARGETS "Sets whether trompeloeil should be installed" ${MASTER_PROJECT})
- option(TROMPELOEIL_INSTALL_DOCS "Install documentation" ${TROMPELOEIL_INSTALL_TARGETS})
- 
--if (MASTER_PROJECT AND CMAKE_BUILD_TYPE MATCHES Debug)
-+if (BUILD_TESTING)
-   add_subdirectory(test)
- 
- endif() # MASTER_PROJECT AND CMAKE_BUILD_TYPE MATCHES Debug



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311071757.3A7Hv0qh087031>