From nobody Mon Mar 13 19:02:08 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pb5cd0Jp6z3y53F; Mon, 13 Mar 2023 19:02:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pb5cc6q18z4YZJ; Mon, 13 Mar 2023 19:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678734129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2/o4P4x9RpaQCwFowT/ewy84NWA9csYC4RKxq03lD8=; b=lX07O/8qYEY7KWhdUF18eDG84OclAxg+9m4MHUBiI5aLaduDdFwPrpFRd8Fh/Y5C24b8hE y7wT/AIdc3E8x30YDaxeC7eQbdMOAKdcIWReGg+zCS0TqWe/QW6Gl4hQP3vx6Q6NnaDjbG buAiM/LT4/aStrFlX50sTQ/bg2UMRpoZ0XY1Rd9aYr2uW25NKd17aR4hwsj/aZ4HyAJBag XbJZUpQj7IaZ5fmq9yerrYAVl0DK/iapHWRCngKOHrLK6OXNsL9nkaGWnUo7AiKzP1q6Dn cUNkcQb5annVkZEML5aK+f9Emo2nuROniTkCGYFW+JHGWFDKla+207GJHqUL9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678734129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D2/o4P4x9RpaQCwFowT/ewy84NWA9csYC4RKxq03lD8=; b=k/8C0zd35bwxGyxdYi3//Zp3veCSlji/uIqxwhzPIjYuuvJfbOzJUM29r0SBVd8Z5w2cqH Qd15mPZNSSjsC8NT3RoIhw0Vcme1VdtgBlt00AZoPtjNQm8IEcM2ew7TKNhGK0TohgGchy VmUfe2vlJqj2W++C9vdt5M7cloXuYBtqwAzqBP4LBqt7Yh3RcMxdjBerDlWWr5hl0GV6S1 EhEinuzVn7cK4GFkXFEtRaFwXbIxKJ2i76wx/N0+2gVuADOfIMFaDrOeHeURCToSNP2L6V BpJE02fimLJEqjYuPTEMPpb5OGjWNN/wzOZi0Xy/A60OvoxHE0T/736iG6O5fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678734129; a=rsa-sha256; cv=none; b=UN8T3EJJHgFF0LUPdBnrSdI28APCOKzQZAZorhLJmQxLyZjcQ66j+yL6WLxGz1IXrZ9a9Y 98h27kC4JcTszVIMUYmYzgCO92BzpGi5Un8fhwC14AvGFRirH0B0goMUxjR0MO+nEHI0ly 9ne3BFLK6/hqJtQ7sS9VDI6Rqh43H3PDDl1NsZQEeYauFRdB6QYQQyZWv4xjhsLZ28xqnY Kv/e/ekttOwPGuK44nMirDAp0nalGyWuUz9i25zk97ewlt3iEGt/pkFO0sugPCyOTEhXaJ j6cGvSyeVs1n7GM6tsrCblkXgp2hhTJDYsGi8OckLAIB3uKrEpR6hrqF2Su5hQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pb5cc5tqjz14cj; Mon, 13 Mar 2023 19:02:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32DJ28Bd051276; Mon, 13 Mar 2023 19:02:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DJ284I051275; Mon, 13 Mar 2023 19:02:08 GMT (envelope-from git) Date: Mon, 13 Mar 2023 19:02:08 GMT Message-Id: <202303131902.32DJ284I051275@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 3850a032099b - main - cad/zcad: try to unbreak the build of the port's Qt5 flavor List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3850a032099b4d3deb354b185b640c1f478b7a9d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3850a032099b4d3deb354b185b640c1f478b7a9d commit 3850a032099b4d3deb354b185b640c1f478b7a9d Author: Alexey Dokuchaev AuthorDate: 2023-03-13 18:57:32 +0000 Commit: Alexey Dokuchaev 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}