From nobody Thu Mar 21 18:02:15 2024 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 4V0tZv5tR9z5FB4c; Thu, 21 Mar 2024 18:02:15 +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 4V0tZv3z6gz45jX; Thu, 21 Mar 2024 18:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044135; 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=Tc3BS5C7XCYauxDB2n089Aa8bxfVLDUs7eVyWzKMlis=; b=TcUs+uFt4BNi0bEfZRGR7KtIRHUk1Y9It9hiagHalpXBFV7y8TVBAcv2rna8avseJkRx2r Vr52jw411RRiJSGw4QbX25T47YClfDEvdoh3h5s3+z6knkyG/pO0FJmo5+wXLcUfq1nKc5 sWB1jKqhtdCVgcoOoh6x4px6/w/QD9GGoSpfedpdTuq7elQ++tD0u/U9rOoT3Xt9EtCdq0 wzNQGNQgBhHRBixB9p/9qQ2aAGbdKfU/+v/AOGecsx9M3RepMfYcRX43gqU0dJrXWEV7Ov RcofiYIuA4TvQzODDLMU7KsQY9ZB5N2eR6av3SEw0oZp2MdsjQUDNWwFWWmtQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711044135; a=rsa-sha256; cv=none; b=w66jy4VOVLgb2APAT2tl2Jnap2g3FAZMR2l3465FX4s4DoMYU7nAL/kQdEfAlmX/23bVo3 PGf15+eD+mDx4P7T1T16LPuWvwHEQpctlbkIlpE4FNFmoW95TnqfhOn2A+hE+m0drsylOg 7hfp78Yy7LgHlflXChF/3oU0yCrspjJuRrBIk+bKePWdZbfN/6yUUvT0HFjmmmg6tuIDEC CPAxRvHcT1KV4n0wxcndlF8NsXDrKunLojpK00kgdKqlDHvdBeQ+Ace8EI4D35YvAto/v0 28dDWiNJcQqiOe9rqzVoYVAXjlSwV+GckMzZQH9SqAwl2Gu89TE00mlPXWWAww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711044135; 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=Tc3BS5C7XCYauxDB2n089Aa8bxfVLDUs7eVyWzKMlis=; b=Z+3mhJqvOhBKPhJZvIl/AkQc9Ki59c+mhD6vrbRmU37r84s1ogKPp/J9zrRXGJ9xQkVOBt kJjL9r/8BRYdc2MfDNtF8su1j4/efdF8k7Ekts1GL6eZGQWcV3g/y91ztZvw8ulnFKhqgm aqrkLR+iMNW/sjS9qjQv7ts9ZRdp+wCDUeU2PPoEpMGUG8fJ//PA74Io7rNsdHCgCL2C8y wTDDOhUsTtU6xPUAOOeA6qw9K6FZHJq+mg2Y/+60Tkth0VaM5lmPLT+/jAI5qj1769PBLQ 6t7d8G1kEaeUzT1HIu/5PqjUZzuwsgXJdJBRREYtW03tkvh2HZL5G9co5JiA7g== 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 4V0tZv3M7QzmK5; Thu, 21 Mar 2024 18:02:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42LI2FVB023363; Thu, 21 Mar 2024 18:02:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LI2FQG023360; Thu, 21 Mar 2024 18:02:15 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:02:15 GMT Message-Id: <202403211802.42LI2FQG023360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 54b0b4f006fc - main - cad/horizon-eda: fix with OpenCascade 7.8.0 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b0b4f006fc9df6a76baa40eb23d746b4ae1f2d Auto-Submitted: auto-generated The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=54b0b4f006fc9df6a76baa40eb23d746b4ae1f2d commit 54b0b4f006fc9df6a76baa40eb23d746b4ae1f2d Author: Thierry Thomas AuthorDate: 2024-03-11 20:04:45 +0000 Commit: Thierry Thomas CommitDate: 2024-03-21 18:01:18 +0000 cad/horizon-eda: fix with OpenCascade 7.8.0 --- cad/horizon-eda/Makefile | 6 +++--- cad/horizon-eda/files/patch-Makefile | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile index cd4ce2aeef61..b2c3906c302b 100644 --- a/cad/horizon-eda/Makefile +++ b/cad/horizon-eda/Makefile @@ -1,7 +1,7 @@ PORTNAME= horizon-eda DISTVERSIONPREFIX= v DISTVERSION= 2.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -23,7 +23,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libharfbuzz.so:print/harfbuzz \ libpng16.so:graphics/png \ libpodofo09.so:graphics/podofo09 \ - libTKSTEP.so:cad/opencascade \ + libTKDESTEP.so:cad/opencascade \ libuuid.so:misc/e2fsprogs-libuuid \ libzip.so:archivers/libzip \ libzmq.so:net/libzmq4 @@ -39,7 +39,7 @@ MAKE_ARGS= DEBUGFLAGS= OPTIMIZE= BINARY_ALIAS= python3=${PYTHON_CMD} # Patch sources to force using include files installed by graphics/podofo09 -post-patch: +pre-configure: @${REINPLACE_CMD} -e '/^#include/s|podofo/podofo.h|podofo09/podofo.h|' \ ${WRKSRC}/src/export_pdf/export_pdf.cpp \ ${WRKSRC}/src/export_pdf/export_pdf_board.cpp \ diff --git a/cad/horizon-eda/files/patch-Makefile b/cad/horizon-eda/files/patch-Makefile index f683e29eb4b2..ab36a628a416 100644 --- a/cad/horizon-eda/files/patch-Makefile +++ b/cad/horizon-eda/files/patch-Makefile @@ -1,6 +1,15 @@ ---- Makefile.orig 2022-10-15 16:47:51 UTC +--- Makefile.orig 2023-06-18 14:18:38 UTC +++ Makefile -@@ -1071,9 +1071,10 @@ $(BUILDDIR)/gen/help_texts.hpp: scripts/make_help.py s +@@ -1037,7 +1037,7 @@ OCE_LIBDIRS = -L/opt/opencascade/lib/ -L${CASROOT}/lib + INC_OCE ?= -isystem /opt/opencascade/inc/ -isystem /mingw64/include/oce/ -isystem /usr/include/oce -isystem /usr/include/opencascade -isystem ${CASROOT}/include/opencascade -isystem ${CASROOT}/include/oce -isystem /usr/local/include/OpenCASCADE + INC_PYTHON = $(shell $(PKG_CONFIG) --cflags python3 py3cairo) + OCE_LIBDIRS = -L/opt/opencascade/lib/ -L${CASROOT}/lib +-LDFLAGS_OCE = $(OCE_LIBDIRS) -lTKSTEP -lTKernel -lTKXCAF -lTKXSBase -lTKBRep -lTKCDF -lTKXDESTEP -lTKLCAF -lTKMath -lTKMesh -lTKTopAlgo -lTKPrim -lTKBO -lTKShHealing -lTKBRep -lTKG3d ++LDFLAGS_OCE = $(OCE_LIBDIRS) -lTKDESTEP -lTKernel -lTKXCAF -lTKXSBase -lTKBRep -lTKCDF -lTKXSDRAWSTEP -lTKLCAF -lTKMath -lTKMesh -lTKTopAlgo -lTKPrim -lTKBO -lTKShHealing -lTKBRep -lTKG3d + ifeq ($(OS),Windows_NT) + LDFLAGS_OCE += -lTKV3d + endif +@@ -1084,9 +1084,10 @@ $(BUILDDIR)/gen/help_texts.hpp: scripts/make_help.py s $(ECHO) " $@" $(QUIET)python3 scripts/make_help.py h src/help_texts.txt > $@ @@ -12,7 +21,7 @@ $(BUILDDIR)/horizon-pool: $(OBJ_COMMON) $(OBJ_POOL_UTIL) $(ECHO) " $@" -@@ -1103,9 +1104,10 @@ $(BUILDDIR)/horizon-pr-review: $(OBJ_COMMON) $(OBJ_PR_ +@@ -1116,9 +1117,10 @@ $(BUILDDIR)/horizon-pr-review: $(OBJ_COMMON) $(OBJ_PR_ $(ECHO) " $@" $(QUIET)$(CXX) $^ $(LDFLAGS) $(INC) $(CXXFLAGS) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) glibmm-2.4 giomm-2.4 cairomm-1.0 libgit2 libpng) -lOSMesa $(LDFLAGS_OCE) -o $@