From nobody Sun May 19 16:03:48 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 4Vj5912jCCz5KXqt; Sun, 19 May 2024 16:03:49 +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 4Vj5910NjRz4YDS; Sun, 19 May 2024 16:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716134629; 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=VLEWzBTSfb8O6zwzCd51yuefAyXZ2VoACsR3YMtlY8o=; b=Rek0rBIvDucEUsS2uTaW3r9w8+PPNp8U2THeMNCfAAA4V85N5HX308MsQIRL/WzYanqMWX 3t7Nkj7X8BsTBHav/vmQ8fuTvAD6NXRjQgbubMV4+9oB43NtAFtweC5Yy+MJJa15sDCB9J 1TIL3URNj3kepcvSct8Z4O10Ks/I3T+WVbQ5ZNQDDCDKXruGX6GZ1hGkzxUU5OLDgSjgTO GSkI4oYPi0rkoQzYQtakHor6cSnorJj3Sqp9DSXK4oGTku96X1kZ1U03uCGbdS+xWPFXpN OSYFXjv8Oq0vYoYPaEu+AIGx2YpC3lB1x3VJInulrrAV9XMmsjFCfKNFH9ytLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716134629; a=rsa-sha256; cv=none; b=Cx7/fyBv/Nes2CvUEKdq+ZqzezPIQoAXbtLx94Rixnqn+viLFVeqaRC+Q4HOD3ZpVovreH 6ATZNQDJjCvw+TX+vOEse63jMcaSAt9uY2lxv7/nupY3rcABAM5EPpSxMEMjsGuafA+gT7 KfpU1VVwL8zji02fkDZUFEmcTMa4zeokh5mcHt9q3h9kBtrv0G0vuasKyIg0+4f/SLF/Kn +qCb5ISCRzQil+Fz24XNIVDNxyQg1fg6GEaeiuilZPR+OIXNgf9BXW2HKcSyDiOeWUjZVO A+C5AIr9BfQVieJMglU8+WDwhJWzvQb0tIG5r1fgzfHMTvrXFoxdykPD+OeJLQ== 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=1716134629; 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=VLEWzBTSfb8O6zwzCd51yuefAyXZ2VoACsR3YMtlY8o=; b=G1VhPTdlXgZJOiBzYyADEQWdqhxmAglup5kBwXp+eEFWAtg0p84F5pmU/BMpryDcJX7XYk xBLkU8qdhu5t0hwaoULTAe8vmbHGUQVoFfUopTe3ZLR1slyUB/VkdWc3o72jUYaN+P6x/7 yjETviiFzHZZOMYmuqIJUuEEtximrhbdyFUFOMapLkXFFcjCe4en2yOK9Ah26ZFmeSbRss ighVMupVwelqJXKpuklj4QP9T2k3/4jC8xqgPQG8jcwRxRvfd3SyIylBQREXCpBtF7obzt Po+9SiSIAgL5o/Fcz166GI0dKv1uxtsjLAtNLsd9fP1/t0MGUOtyz2J2kwMVMw== 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 4Vj59073Ljz1Fpr; Sun, 19 May 2024 16:03:48 +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 44JG3mUX016885; Sun, 19 May 2024 16:03:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44JG3moj016882; Sun, 19 May 2024 16:03:48 GMT (envelope-from git) Date: Sun, 19 May 2024 16:03:48 GMT Message-Id: <202405191603.44JG3moj016882@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 87f0052e3ba8 - main - cad/horizon-eda: update 2.5.0 =?utf-8?Q?=E2=86=92?= 2.6.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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87f0052e3ba8ee07e48d6f0e7f669beab19e2d3f Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=87f0052e3ba8ee07e48d6f0e7f669beab19e2d3f commit 87f0052e3ba8ee07e48d6f0e7f669beab19e2d3f Author: Yuri Victorovich AuthorDate: 2024-05-19 15:43:50 +0000 Commit: Yuri Victorovich CommitDate: 2024-05-19 16:03:38 +0000 cad/horizon-eda: update 2.5.0 → 2.6.0 Reported by: portscout --- cad/horizon-eda/Makefile | 15 +++++---------- cad/horizon-eda/distinfo | 8 +++----- cad/horizon-eda/files/patch-Makefile | 35 ----------------------------------- cad/horizon-eda/pkg-plist | 2 ++ 4 files changed, 10 insertions(+), 50 deletions(-) diff --git a/cad/horizon-eda/Makefile b/cad/horizon-eda/Makefile index b2c3906c302b..3de933aafdaf 100644 --- a/cad/horizon-eda/Makefile +++ b/cad/horizon-eda/Makefile @@ -1,12 +1,8 @@ PORTNAME= horizon-eda DISTVERSIONPREFIX= v -DISTVERSION= 2.5.0 -PORTREVISION= 4 +DISTVERSION= 2.6.0 CATEGORIES= cad -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 1efad3028a1953af2cf62b518a54ffeb309977bc.patch:-p1 # https://github.com/horizon-eda/horizon/issues/727 - MAINTAINER= yuri@FreeBSD.org COMMENT= EDA package for printed circuit board design WWW= https://horizon-eda.org/ @@ -15,27 +11,26 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs \ + cmake:devel/cmake-core \ cppzmq>0:net/cppzmq \ glm>0:math/glm LIB_DEPENDS= libcurl.so:ftp/curl \ libepoxy.so:graphics/libepoxy \ + libfreeimage.so:graphics/freeimage \ libgit2.so:devel/libgit2 \ - libharfbuzz.so:print/harfbuzz \ libpng16.so:graphics/png \ libpodofo09.so:graphics/podofo09 \ + libspnav.so:misc/libspnav \ libTKDESTEP.so:cad/opencascade \ libuuid.so:misc/e2fsprogs-libuuid \ - libzip.so:archivers/libzip \ libzmq.so:net/libzmq4 -USES= desktop-file-utils gmake gnome libarchive llvm:15 localbase pkgconfig python:build sqlite # compiler:c++17-lang; llvm:15 is a workaround for bug#263870 +USES= desktop-file-utils gnome libarchive localbase meson pkgconfig python:build sqlite USE_GNOME= atkmm gdkpixbuf2 gtkmm30 librsvg2 USE_GITHUB= yes GH_PROJECT= horizon -MAKE_ARGS= DEBUGFLAGS= OPTIMIZE= - BINARY_ALIAS= python3=${PYTHON_CMD} # Patch sources to force using include files installed by graphics/podofo09 diff --git a/cad/horizon-eda/distinfo b/cad/horizon-eda/distinfo index ed510e2d1814..1b57d89a6c08 100644 --- a/cad/horizon-eda/distinfo +++ b/cad/horizon-eda/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1689033060 -SHA256 (horizon-eda-horizon-v2.5.0_GH0.tar.gz) = c5cbe54b5f58289e52e4a8d0ed0594cd88ed0cfcef89e1c5ecdd5b82449449b4 -SIZE (horizon-eda-horizon-v2.5.0_GH0.tar.gz) = 3971079 -SHA256 (1efad3028a1953af2cf62b518a54ffeb309977bc.patch) = 38f2dad9a730e03df02bb64972b398cd5a1c92dd85a338c432d36bb78510e97f -SIZE (1efad3028a1953af2cf62b518a54ffeb309977bc.patch) = 792 +TIMESTAMP = 1716104194 +SHA256 (horizon-eda-horizon-v2.6.0_GH0.tar.gz) = e7e680a05b92ac8ab4b6a32fb8e3b17bc298245d3d3d9224e9b3f7fb55b81256 +SIZE (horizon-eda-horizon-v2.6.0_GH0.tar.gz) = 4358268 diff --git a/cad/horizon-eda/files/patch-Makefile b/cad/horizon-eda/files/patch-Makefile deleted file mode 100644 index ab36a628a416..000000000000 --- a/cad/horizon-eda/files/patch-Makefile +++ /dev/null @@ -1,35 +0,0 @@ ---- Makefile.orig 2023-06-18 14:18:38 UTC -+++ Makefile -@@ -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 > $@ - -+# Force linking to podofo09 library provided by the graphics/podofo09 port - $(BUILDDIR)/horizon-imp: $(OBJ_COMMON) $(OBJ_ROUTER) $(OBJ_OCE) $(OBJ_IMP) - $(ECHO) " $@" -- $(QUIET)$(CXX) $^ $(LDFLAGS) $(LDFLAGS_GUI) $(LDFLAGS_OCE) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) gtkmm-3.0 epoxy cairomm-pdf-1.0 librsvg-2.0 libzmq libcurl libpng libarchive) -lpodofo -lTKHLR -lTKGeomBase $(EXTRA_LIBS) -o $@ -+ $(QUIET)$(CXX) $^ $(LDFLAGS) $(LDFLAGS_GUI) $(LDFLAGS_OCE) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) gtkmm-3.0 epoxy cairomm-pdf-1.0 librsvg-2.0 libzmq libcurl libpng libarchive) -lpodofo09 -lTKHLR -lTKGeomBase $(EXTRA_LIBS) -o $@ - - $(BUILDDIR)/horizon-pool: $(OBJ_COMMON) $(OBJ_POOL_UTIL) - $(ECHO) " $@" -@@ -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 $@ - -+# Force linking to podofo09 library provided by the graphics/podofo09 port - $(BUILDDIR)/horizon.so: $(OBJ_PYTHON) $(OBJ_SHARED) $(OBJ_SHARED_OCE) - $(ECHO) " $@" -- $(QUIET)$(CXX) $^ $(LDFLAGS) $(INC) $(CXXFLAGS) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) python3 glibmm-2.4 giomm-2.4 cairomm-1.0 py3cairo libpng libarchive) -lpodofo $(OCE_LIBDIRS) -lTKXDESTEP -lOSMesa -shared -o $@ -+ $(QUIET)$(CXX) $^ $(LDFLAGS) $(INC) $(CXXFLAGS) $(shell $(PKG_CONFIG) --libs $(LIBS_COMMON) python3 glibmm-2.4 giomm-2.4 cairomm-1.0 py3cairo libpng libarchive) -lpodofo09 $(OCE_LIBDIRS) -lTKXDESTEP -lOSMesa -shared -o $@ - - $(OBJDIR)/%.o: %.c - $(QUIET)$(MKDIR) $(dir $@) diff --git a/cad/horizon-eda/pkg-plist b/cad/horizon-eda/pkg-plist index 3536617092c2..ef30c0547a16 100644 --- a/cad/horizon-eda/pkg-plist +++ b/cad/horizon-eda/pkg-plist @@ -6,4 +6,6 @@ share/icons/hicolor/256x256/apps/org.horizon_eda.HorizonEDA.png share/icons/hicolor/32x32/apps/org.horizon_eda.HorizonEDA.png share/icons/hicolor/64x64/apps/org.horizon_eda.HorizonEDA.png share/icons/hicolor/scalable/apps/org.horizon_eda.HorizonEDA.svg +share/man/man1/horizon-eda.1.gz +share/man/man1/horizon-imp.1.gz share/metainfo/org.horizon_eda.HorizonEDA.metainfo.xml