git: 1960cf93a7ab - main - cad/librepcb: update 1.0.0 → 1.1.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sat, 15 Jun 2024 09:12:51 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1960cf93a7abc9d0a74107fc72099e66365cddcf

commit 1960cf93a7abc9d0a74107fc72099e66365cddcf
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-06-15 03:20:45 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-06-15 09:12:39 +0000

    cad/librepcb: update 1.0.0 → 1.1.0
---
 cad/librepcb/Makefile                              | 14 +++++---
 cad/librepcb/distinfo                              |  6 ++--
 .../files/patch-cmake_FindOpenCascade.cmake        | 39 ----------------------
 cad/librepcb/pkg-plist                             | 15 +++++++++
 4 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/cad/librepcb/Makefile b/cad/librepcb/Makefile
index 9623bce62494..ce7052cd6f46 100644
--- a/cad/librepcb/Makefile
+++ b/cad/librepcb/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	librepcb
-DISTVERSION=	1.0.0
+DISTVERSION=	1.1.0
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	https://download.librepcb.org/releases/${DISTVERSION}/
 
@@ -16,9 +15,10 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg4 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreeimage.so:graphics/freeimage \
 		libfreetype.so:print/freetype2 \
+		libtbb.so:devel/onetbb \
 		libTKService.so:cad/opencascade
 
-USES=		cmake compiler:c++11-lang desktop-file-utils gl \
+USES=		cmake:testing compiler:c++11-lang desktop-file-utils gl \
 		localbase:ldflags qt:5 shared-mime-info xorg zip
 USE_QT=		concurrent core declarative gui network \
 		opengl printsupport quickcontrols2 sql svg xml widgets \
@@ -28,6 +28,12 @@ USE_XORG=	x11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-CMAKE_ARGS=	-DCMAKE_PREFIX_PATH=${LOCALBASE}/lib # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274834
+CMAKE_ARGS=		-DCMAKE_PREFIX_PATH=${LOCALBASE}/lib # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=274834
+CMAKE_OFF=		BUILD_TESTS
+CMAKE_TESTING_ON=	BUILD_TESTS
+CMAKE_TESTING_TARGET=
+
+post-test: # run tests
+	@${BUILD_WRKSRC}/tests/unittests/librepcb-unittests
 
 .include <bsd.port.mk>
diff --git a/cad/librepcb/distinfo b/cad/librepcb/distinfo
index 50b9c6dfcc0d..7791e776813f 100644
--- a/cad/librepcb/distinfo
+++ b/cad/librepcb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698771946
-SHA256 (librepcb-1.0.0-source.zip) = 1bc57489367c8e0fafe23a88a6677c6c73d8f4cac3f2f9caa2f306dca0e70e0b
-SIZE (librepcb-1.0.0-source.zip) = 14000096
+TIMESTAMP = 1718394648
+SHA256 (librepcb-1.1.0-source.zip) = 102dcd713cf899af22e26b5e147592cc59d9330846f5bbdd98e5c1a77e958e83
+SIZE (librepcb-1.1.0-source.zip) = 15373750
diff --git a/cad/librepcb/files/patch-cmake_FindOpenCascade.cmake b/cad/librepcb/files/patch-cmake_FindOpenCascade.cmake
deleted file mode 100644
index d18e7215354f..000000000000
--- a/cad/librepcb/files/patch-cmake_FindOpenCascade.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
---- cmake/FindOpenCascade.cmake.orig	2023-09-24 10:47:05 UTC
-+++ cmake/FindOpenCascade.cmake
-@@ -1,6 +1,3 @@
--# Specify OpenCascade libraries needed for LibrePCB
--set(OCC_LIBRARIES TKXCAF TKXDESTEP)
--
- # Add library
- add_library(open_cascade INTERFACE)
- add_library(OpenCascade::OpenCascade ALIAS open_cascade)
-@@ -15,8 +12,16 @@ if(OpenCASCADE_FOUND)
- # Try to find OCCT shared library on the system
- find_package(OpenCASCADE CONFIG QUIET)
- if(OpenCASCADE_FOUND)
--  message(STATUS "Using system OpenCASCADE (OCCT)")
-+  message(STATUS "Using system OpenCASCADE (OCCT ${OpenCASCADE_VERSION})")
- 
-+  # Specify OpenCascade libraries needed for LibrePCB
-+  # https://github.com/LibrePCB/LibrePCB/issues/1315
-+  if(OpenCASCADE_VERSION VERSION_GREATER_EQUAL 7.8.0)
-+    set(OCC_LIBRARIES TKCAF TKDESTEP)
-+  else()
-+    set(OCC_LIBRARIES TKXCAF TKXDESTEP)
-+  endif()
-+
-   # Populate target
-   target_include_directories(
-     open_cascade SYSTEM INTERFACE "${OpenCASCADE_INCLUDE_DIR}"
-@@ -32,7 +37,10 @@ if(OCE_FOUND)
- # Try to find OCE shared library on the system
- find_package(OCE CONFIG QUIET)
- if(OCE_FOUND)
--  message(STATUS "Using system OpenCASCADE (OCE)")
-+  message(STATUS "Using system OpenCASCADE (OCE ${OCE_VERSION})")
-+
-+  # Specify OpenCascade libraries needed for LibrePCB
-+  set(OCC_LIBRARIES TKXCAF TKXDESTEP)
- 
-   # Populate target
-   target_include_directories(
diff --git a/cad/librepcb/pkg-plist b/cad/librepcb/pkg-plist
index 993679bd8c3d..46809a3a8812 100644
--- a/cad/librepcb/pkg-plist
+++ b/cad/librepcb/pkg-plist
@@ -24,7 +24,12 @@ share/icons/hicolor/scalable/mimetypes/org.librepcb.LibrePCB-project.svg
 %%DATADIR%%/i18n/librepcb_eo.qm
 %%DATADIR%%/i18n/librepcb_es.qm
 %%DATADIR%%/i18n/librepcb_fr.qm
+%%DATADIR%%/i18n/librepcb_gsw.qm
+%%DATADIR%%/i18n/librepcb_id.qm
+%%DATADIR%%/i18n/librepcb_is.qm
 %%DATADIR%%/i18n/librepcb_it.qm
+%%DATADIR%%/i18n/librepcb_ja.qm
+%%DATADIR%%/i18n/librepcb_jv.qm
 %%DATADIR%%/i18n/librepcb_ko_KR.qm
 %%DATADIR%%/i18n/librepcb_pl.qm
 %%DATADIR%%/i18n/librepcb_ru_RU.qm
@@ -40,8 +45,18 @@ share/icons/hicolor/scalable/mimetypes/org.librepcb.LibrePCB-project.svg
 %%DATADIR%%/library/gitignore_template
 %%DATADIR%%/library/readme_template
 %%DATADIR%%/licenses/cc-by-4.0.txt
+%%DATADIR%%/licenses/cc-by-nc-4.0.txt
+%%DATADIR%%/licenses/cc-by-nc-nd-4.0.txt
+%%DATADIR%%/licenses/cc-by-nc-sa-4.0.txt
+%%DATADIR%%/licenses/cc-by-nd-4.0.txt
 %%DATADIR%%/licenses/cc-by-sa-4.0.txt
 %%DATADIR%%/licenses/cc0-1.0.txt
+%%DATADIR%%/licenses/cern-ohl-p-2.0.txt
+%%DATADIR%%/licenses/cern-ohl-s-2.0.txt
+%%DATADIR%%/licenses/cern-ohl-w-2.0.txt
+%%DATADIR%%/licenses/tapr-ohl-1.0.txt
+%%DATADIR%%/opengl/3d-fragment-shader.glsl
+%%DATADIR%%/opengl/3d-vertex-shader.glsl
 %%DATADIR%%/project/gitattributes_template
 %%DATADIR%%/project/gitignore_template
 %%DATADIR%%/project/readme_template