Date: Mon, 13 Mar 2023 19:02:08 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3850a032099b - main - cad/zcad: try to unbreak the build of the port's Qt5 flavor Message-ID: <202303131902.32DJ284I051275@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3850a032099b4d3deb354b185b640c1f478b7a9d commit 3850a032099b4d3deb354b185b640c1f478b7a9d Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-03-13 18:57:32 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-03-13 18:57:32 +0000 cad/zcad: try to unbreak the build of the port's Qt5 flavor - OpenGL components must be fixed in a slightly different way now - Bring back the comment accidentally removed in r497396 (that is commit 0c124531331c) Reported by: pkg-fallout --- cad/zcad/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cad/zcad/Makefile b/cad/zcad/Makefile index 5b26dfd6f2b1..fb70eaea1fb9 100644 --- a/cad/zcad/Makefile +++ b/cad/zcad/Makefile @@ -56,8 +56,6 @@ OPTIONS_DEFINE= DOCS .if ${FLAVOR:Ugtk2:Mgtk2} MAKE_ENV+= GUI=gtk2 -.elif ${FLAVOR:Ugtk2:Mqt5} -BROKEN= fails to build .endif post-patch: @@ -77,13 +75,15 @@ post-patch: post-configure: # OpenGL component must be fixed and rebuilt locally (to avoid touching # filesystem outside working directory) - ${SED} -e 's,Linux,${OPSYS},' \ - ${LAZARUS_DIR}/components/opengl/openglcontext.pas \ - > ${BUILD_WRKSRC}/openglcontext.pas + ${SED} -e 's,@paintGL,paintGL,' \ + ${LAZARUS_DIR}/components/opengl/qlclopenglwidget.pas \ + > ${BUILD_WRKSRC}/qlclopenglwidget.pas ${CP} ${LAZARUS_DIR}/components/opengl/glgtkglxcontext.pas \ ${LAZARUS_DIR}/components/opengl/glqtcontext.pas \ - ${LAZARUS_DIR}/components/opengl/openglcontext.res \ + ${LAZARUS_DIR}/components/opengl/openglcontext.* \ ${BUILD_WRKSRC} +# Build components that do not come with precompiled *.ppu files (also +# copy them locally first for the same reason as above) ${CP} -a ${LAZARUS_DIR}/components/fpvectorial \ ${LAZARUS_DIR}/components/anchordocking \ ${LAZARUS_DIR}/components/lclextensions ${BUILD_WRKSRC}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303131902.32DJ284I051275>