Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Jun 2023 21:43:08 GMT
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bfb91962e471 - main - graphics/inkscape: Revert Fix build with llvm16
Message-ID:  <202306252143.35PLh8UF056911@gitrepo.freebsd.org>

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

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

commit bfb91962e471bf0c38bc0d8af3bc2b47de399585
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-06-25 20:06:49 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-06-25 21:42:43 +0000

    graphics/inkscape: Revert Fix build with llvm16
    
    This reverts commit ef47f050967e7eca60771fbe1a4c3f681e5d0c9b which was
    a mid air collision. The problem was fixed with upstream patch.
---
 graphics/inkscape/Makefile | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index bce060ec99d5..44b0a206e7e6 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -29,7 +29,6 @@ LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt
 LICENSE_FILE_MPL11  =	${WRKSRC}/LICENSES/MPL-1.1.txt
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
-		libenchant-2.so:textproc/enchant2 \
 		libpopt.so:devel/popt \
 		libgc.so:devel/boehm-gc \
 		libgdl-3.so:x11-toolkits/gdl \
@@ -124,8 +123,6 @@ GSPELL_DESC=		Support for spell checking through gspell
 GSPELL_CMAKE_BOOL= 	WITH_GSPELL
 GSPELL_LIB_DEPENDS=	libgspell-1.so:textproc/gspell
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|COMMAND python3|COMMAND ${PYTHON_VERSION}|g' \
 		${WRKSRC}/share/*/CMakeLists.txt
@@ -133,13 +130,5 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|"python3"|"${PYTHON_VERSION}"|g' \
 		${WRKSRC}/src/extension/implementation/script.cpp
 	@${TOUCH} ${WRKSRC}/share/extensions/gcodetools_check_for_updates.inx.h
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function| ; s|std::binary_function|std::__binary_function|' \
-		${WRKSRC}/src/device-manager.cpp \
-		${WRKSRC}/src/libnrtype/FontFactory.h \
-		${WRKSRC}/src/ui/dialog/undo-history.h \
-		${WRKSRC}/src/ui/tool/multi-path-manipulator.cpp \
-		${WRKSRC}/src/util/units.h
-.endif
 
 .include <bsd.port.mk>



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