From nobody Mon Jan 02 12:14:33 2023 X-Original-To: dev-commits-ports-main@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 4Nlvtf2kr9z2pG7g; Mon, 2 Jan 2023 12:14:34 +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 4Nlvtf2DjRz49FR; Mon, 2 Jan 2023 12:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672661674; 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=d1RkZdmZB1DEUqfYVAoA/Y2W7Tsyc8JXuEpMbHOKMUA=; b=rfbIr535wr/NQAU0s8osaQb0g2++ODQOZPjiXEc1xRwxdbGmzzqsuUhV6OPqGs3jN9rm1v 8Jqb+zWuf1sfUCIV4T4RZLGvIrf4m6MrE6bIn4dbEaa/cunBVPSe2g6xfGbO1EQrtRItcD iFRJPiQXRfg8yY6Vb0a2g4Z9+uG1vuF1Y8ZQGmpS4wToEjNwHd3lA1I3tTPgnGKF/WJs+S hlxIcPgz7z863o9CyAdx6E1zsUg0fklC8bdZa4BisZe8DTpbwAaIJyOp9I6FouCJLRNsOv Eb9ppaYAuFWm08WFpMBSnFDG9k8Jg9tMw+yVP5SWHNxWvhQCBSt8suiBXKTWHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672661674; 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=d1RkZdmZB1DEUqfYVAoA/Y2W7Tsyc8JXuEpMbHOKMUA=; b=neamTuTpcC3X5Qc2Zi3mdcJQBlU4V0u/s8gd5CtlMoW63CvKQgB8MjuOYB88iohebPnqDQ LpogZYc2+18qd8TZI1p0yXS5jBKLcjzjY6b9yDcVgo7uurqUOkNLH1SdMVWwMukEf1Yqbt +8qZinoqSvdxW5nab0b/2SaO/0YyNJeQEb6ImFjrv+TsRRe5lrFWG1pM49CIx4Z1Dviu2L dMLKnoI+NC9HXSUZ7zgi09jd4jcOWcOgbqVYcphsevYXKRd26zscTBjQISZpWjQqMpym47 7fwyUfpTWBd+rHjup05z2iDzan6K+BIh0iouKxPnwZBchr1LZZuLrUFHKo42RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672661674; a=rsa-sha256; cv=none; b=WodMFanXfxqP8Z9lZW2IwjdDMysw+F5NyvEjqetJLC7QTxmAzO4kKBuNufi3IVZbjS02uP PkoKaGfQk/e2/ZOZQOv8trCFiSd+uLagHn/3Kdx/fphPuXFWumC+5T9PSRvhSgLD6wyE6+ CE1JTbwRwxGGwe55igGYFr5IR/F4UVz3pXsLC9G2cOTJPqUG5VWcWf23mERoI/edHJSyOv 2ENQrTFkGq1fNy3cKSupLSUCPCMcGs9hK6QBSUONvVd4D6lae6txWtAsf0cyesquh9DKMA l9dsI76fBTywgXVOKyFdSVo9uDnDsCnOM713g1wOtQRx9d72fkcVpAq7H+B37A== 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 4Nlvtf12kTz16Qc; Mon, 2 Jan 2023 12:14:34 +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 302CEXDY074264; Mon, 2 Jan 2023 12:14:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 302CEXaG074263; Mon, 2 Jan 2023 12:14:33 GMT (envelope-from git) Date: Mon, 2 Jan 2023 12:14:33 GMT Message-Id: <202301021214.302CEXaG074263@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Max Brazhnikov Subject: git: 763124badcba - main - cad/freecad: fix desktop integration List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: makc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 763124badcba812eb72f72397357062296d7bd72 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by makc: URL: https://cgit.FreeBSD.org/ports/commit/?id=763124badcba812eb72f72397357062296d7bd72 commit 763124badcba812eb72f72397357062296d7bd72 Author: Max Brazhnikov AuthorDate: 2023-01-02 12:10:02 +0000 Commit: Max Brazhnikov CommitDate: 2023-01-02 12:11:11 +0000 cad/freecad: fix desktop integration - Install XDG files to the standard path, where DE can find them - Install freecad-thumbnailer - Add missing USES PR: 268094 Approved by: maintainer timeout (18 days) --- cad/freecad/Makefile | 16 ++++++++++++---- cad/freecad/pkg-plist | 27 +++++++++++++++------------ 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/cad/freecad/Makefile b/cad/freecad/Makefile index d76e9f774dea..ba1cc6a4ea8f 100644 --- a/cad/freecad/Makefile +++ b/cad/freecad/Makefile @@ -1,5 +1,6 @@ PORTNAME= FreeCAD DISTVERSION= 0.20.2 +PORTREVISION= 1 # use these for bugfixes/snapshots # DISTVERSION= 0.18-16093 # git rev-list --count # DISTVERSIONSUFFIX= -g690774c0e @@ -35,7 +36,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pivy>0:graphics/py-pivy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} USES= dos2unix compiler:c++17-lang cmake cpe gl eigen:3 fortran jpeg \ - localbase:ldflags mpi:openmpi pkgconfig python:3.7+ localbase qt:5 xorg + localbase:ldflags mpi:openmpi pkgconfig python:3.7+ localbase qt:5 xorg \ + desktop-file-utils shared-mime-info shebangfix USE_GITHUB= yes USE_XORG= ice sm x11 xext xt USE_GL= gl glu @@ -49,6 +51,7 @@ CPE_VENDOR= freecad_project VTK_VER= 9.2 DOS2UNIX_GLOB= *.txt *.h *.cpp *.py *.qss *.csv *.pov *.stp *.ui *.wrl *.WRL +SHEBANG_FILES= src/Tools/freecad-thumbnailer CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DOPENMPI_INCLUDE_DIRS="${LOCALBASE}/mpi/openmpi/include" \ @@ -68,15 +71,14 @@ CMAKE_ARGS+= -DOCC_INCLUDE_DIR="${LOCALBASE}/include/OpenCASCADE" \ -DBUILD_ENABLE_CXX_STD=C++17 CMAKE_INSTALL_PREFIX= ${PREFIX}/${PORTNAME} +# Install XDG icons and files to the standard path +CMAKE_ARGS+= -DXDG_DATADIR="${PREFIX}/share" OPTIONS_DEFINE= COLLADA COLLADA_DESC= Install pycollada for Collada files import COLLADA_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycollada>0:graphics/py-pycollada@${PY_FLAVOR} -DESKTOP_ENTRIES=${PORTNAME} "" "${PREFIX}/FreeCAD/data/freecad.svg" \ - ${PORTNAME} "Graphics;Engineering;" false - .include .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 @@ -88,9 +90,15 @@ USE_QT+= webkit post-patch: @${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \ ${WRKSRC}/src/Tools/SubWCRev.py +# Install XDG icons and files to the standard path + @${REINPLACE_CMD} -e 's/CMAKE_INSTALL_DATAROOTDIR/XDG_DATADIR/g' \ + ${WRKSRC}/src/XDGData/CMakeLists.txt \ + ${WRKSRC}/src/Gui/CMakeLists.txt post-install: ${LN} -s ../${PORTNAME}/bin/FreeCAD ${STAGEDIR}${LOCALBASE}/bin/FreeCAD ${LN} -s ../${PORTNAME}/bin/FreeCADCmd ${STAGEDIR}${LOCALBASE}/bin/FreeCADCmd + ${INSTALL_SCRIPT} ${WRKSRC}/src/Tools/freecad-thumbnailer \ + ${STAGEDIR}${PREFIX}/bin/freecad-thumbnailer .include diff --git a/cad/freecad/pkg-plist b/cad/freecad/pkg-plist index 84d77dfdc2b8..7bd8392bfc8d 100644 --- a/cad/freecad/pkg-plist +++ b/cad/freecad/pkg-plist @@ -1959,7 +1959,8 @@ FreeCAD/share/Mod/TechDraw/Templates/zh_CN/portrait/A3_Portrait_CN_CLIP.svg FreeCAD/share/Mod/TechDraw/Templates/zh_CN/portrait/A4_Portrait_CN_CLIP.svg FreeCAD/share/Mod/Test/Resources/icons/TestWorkbench.svg FreeCAD/share/Mod/Web/Resources/icons/WebWorkbench.svg -FreeCAD/share/applications/org.freecadweb.FreeCAD.desktop +@comment FreeCAD/share/doc/FreeCAD/LICENSE.html +@comment FreeCAD/share/doc/FreeCAD/ThirdPartyLibraries.html FreeCAD/share/examples/ArchDetail.FCStd FreeCAD/share/examples/EngineBlock.FCStd FreeCAD/share/examples/FemCalculixCantilever2D.FCStd @@ -1969,19 +1970,21 @@ FreeCAD/share/examples/PartDesignExample.FCStd FreeCAD/share/examples/RobotExample.FCStd FreeCAD/share/examples/Schenkel.stp FreeCAD/share/examples/draft_test_objects.FCStd -FreeCAD/share/icons/hicolor/16x16/apps/freecad.png -FreeCAD/share/icons/hicolor/32x32/apps/freecad.png -FreeCAD/share/icons/hicolor/48x48/apps/freecad.png -FreeCAD/share/icons/hicolor/64x64/apps/freecad.png -FreeCAD/share/icons/hicolor/scalable/apps/freecad.svg -FreeCAD/share/icons/hicolor/scalable/apps/org.freecadweb.FreeCAD.svg -FreeCAD/share/icons/hicolor/scalable/mimetypes/application-x-extension-fcstd.svg -FreeCAD/share/metainfo/org.freecadweb.FreeCAD.appdata.xml -FreeCAD/share/mime/packages/org.freecadweb.FreeCAD.xml -FreeCAD/share/pixmaps/freecad.xpm -FreeCAD/share/thumbnailers/FreeCAD.thumbnailer bin/FreeCAD bin/FreeCADCmd +bin/freecad-thumbnailer +share/applications/org.freecadweb.FreeCAD.desktop +share/icons/hicolor/16x16/apps/freecad.png +share/icons/hicolor/32x32/apps/freecad.png +share/icons/hicolor/48x48/apps/freecad.png +share/icons/hicolor/64x64/apps/freecad.png +share/icons/hicolor/scalable/apps/freecad.svg +share/icons/hicolor/scalable/apps/org.freecadweb.FreeCAD.svg +share/icons/hicolor/scalable/mimetypes/application-x-extension-fcstd.svg +share/metainfo/org.freecadweb.FreeCAD.appdata.xml +share/mime/packages/org.freecadweb.FreeCAD.xml +share/pixmaps/freecad.xpm +share/thumbnailers/FreeCAD.thumbnailer @dir FreeCAD @dir FreeCAD/share @dir FreeCAD/share/Mod/Material/StandardMaterial/Tools