opensourcemirror
/
opnsense-ports
mirror of https://github.com/opnsense/ports.git
1
0
Fork 0
Code Issues Releases Wiki Activity

*/*: sync with upstream 

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2024-03-22 08:28:46 +01:00
parent 471bf0aaa9
commit f403dd80c6
555 changed files with 8768 additions and 6280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accessibility/wl-gammarelay-rs/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= wl-gammarelay-rs
DISTVERSIONPREFIX= v
DISTVERSION= 0.4.0
PORTREVISION= 1
DISTVERSION= 0.4.1
CATEGORIES= accessibility wayland
MAINTAINER= jbeich@FreeBSD.org

4
accessibility/wl-gammarelay-rs/Makefile.crates
View File

@ -34,5 +34,5 @@ CARGO_CRATES= anstyle-1.0.6 \
wayrs-protocols-0.13.2 \
wayrs-scanner-0.13.2 \
winnow-0.5.40 \
rustbus-service,rustbus-service-macros@git+https://github.com/MaxVerevkin/rustbus-service?rev=7401913\#7401913977ccf665748b1f4dee033921e1c86afd \
rustbus,rustbus_derive@git+https://github.com/KillingSpark/rustbus?rev=20af8f2\#20af8f2a4296196779e1044c0c08d4e5f784fc61
rustbus-service,rustbus-service-macros@git+https://github.com/MaxVerevkin/rustbus-service?rev=1bd3aef\#1bd3aef5fe2a646685c8e640c0f67a645eeaf41d \
rustbus,rustbus_derive@git+https://github.com/KillingSpark/rustbus?rev=5875f1f\#5875f1fefc054ed4e2d91641f59a55b9eaee5be9

14
accessibility/wl-gammarelay-rs/distinfo
View File

@ -1,4 +1,4 @@
TIMESTAMP = 1710763688
TIMESTAMP = 1711040534
SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
@ -71,9 +71,9 @@ SHA256 (rust/crates/wayrs-scanner-0.13.2.crate) = e387d47549e37bd2a6f03973a77578
SIZE (rust/crates/wayrs-scanner-0.13.2.crate) = 7925
SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
SIZE (rust/crates/winnow-0.5.40.crate) = 159316
SHA256 (MaxVerevkin-rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd_GH0.tar.gz) = 2873f4b850994111add4864c91244520795a47e4b5303cc64a1cb5b081bc338e
SIZE (MaxVerevkin-rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd_GH0.tar.gz) = 6941
SHA256 (KillingSpark-rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61_GH0.tar.gz) = f1c6747329d1c48eef33d0ebb09f93a04b6ba3bf6bec0c5167158f1544d4227b
SIZE (KillingSpark-rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61_GH0.tar.gz) = 94055
SHA256 (MaxVerevkin-wl-gammarelay-rs-v0.4.0_GH0.tar.gz) = f73a8616663e86d5579aa649fb3da2b1afb3202b94873b3d5ad57b350ef3dfdf
SIZE (MaxVerevkin-wl-gammarelay-rs-v0.4.0_GH0.tar.gz) = 27153
SHA256 (MaxVerevkin-rustbus-service-1bd3aef5fe2a646685c8e640c0f67a645eeaf41d_GH0.tar.gz) = 2c8b9a1f96582a811ce82d91b05699c9ba3ddb30e037f87d367aa24c484f9a54
SIZE (MaxVerevkin-rustbus-service-1bd3aef5fe2a646685c8e640c0f67a645eeaf41d_GH0.tar.gz) = 7267
SHA256 (KillingSpark-rustbus-5875f1fefc054ed4e2d91641f59a55b9eaee5be9_GH0.tar.gz) = 687911471c0259cab103b683b1c7772600728b0a41d48c1401571d66d50817f3
SIZE (KillingSpark-rustbus-5875f1fefc054ed4e2d91641f59a55b9eaee5be9_GH0.tar.gz) = 94248
SHA256 (MaxVerevkin-wl-gammarelay-rs-v0.4.1_GH0.tar.gz) = 42eec83de003c5f8c9c6c5abce3f0eadb80f5abb027d266bcc77183ecce14edc
SIZE (MaxVerevkin-wl-gammarelay-rs-v0.4.1_GH0.tar.gz) = 27220

39
accessibility/wl-gammarelay-rs/files/patch-rustbus
View File

@ -1,39 +0,0 @@
https://github.com/MaxVerevkin/wl-gammarelay-rs/issues/21
https://github.com/KillingSpark/rustbus/pull/119
--- ../rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61/rustbus/src/auth.rs.orig 2024-03-05 15:13:03 UTC
+++ ../rustbus-20af8f2a4296196779e1044c0c08d4e5f784fc61/rustbus/src/auth.rs
@@ -1,7 +1,9 @@
//! Deals with authentication to the other side. You probably do not need this.
+use nix::sys::socket::{self, sendmsg};
use nix::unistd::getuid;
-use std::io::{Read, Write};
+use std::io::{IoSlice, Read, Write};
+use std::os::fd::AsRawFd;
use std::os::unix::net::UnixStream;
fn write_message(msg: &str, stream: &mut UnixStream) -> std::io::Result<()> {
@@ -79,8 +81,21 @@ pub fn do_auth(stream: &mut UnixStream) -> std::io::Re
}
pub fn do_auth(stream: &mut UnixStream) -> std::io::Result<AuthResult> {
+ // The D-Bus daemon expects an SCM_CREDS first message on FreeBSD and Dragonfly
+ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
+ let cmsgs = [socket::ControlMessage::ScmCreds];
+ #[cfg(not(any(target_os = "freebsd", target_os = "dragonfly")))]
+ let cmsgs = [];
+
// send a null byte as the first thing
- stream.write_all(&[0])?;
+ sendmsg::<()>(
+ stream.as_raw_fd(),
+ &[IoSlice::new(&[0])],
+ &cmsgs,
+ socket::MsgFlags::empty(),
+ None,
+ )?;
+
write_message(&format!("AUTH EXTERNAL {}", get_uid_as_hex()), stream)?;
let mut read_buf = Vec::new();

21
accessibility/wl-gammarelay-rs/files/patch-rustbus-service
View File

@ -1,21 +0,0 @@
https://github.com/MaxVerevkin/wl-gammarelay-rs/issues/22
https://github.com/MaxVerevkin/rustbus-service/commit/681b783ff093
--- ../rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd/src/lib.rs.orig 2024-03-17 08:14:31 UTC
+++ ../rustbus-service-7401913977ccf665748b1f4dee033921e1c86afd/src/lib.rs
@@ -114,7 +114,14 @@ impl<D: 'static> Service<D> {
MessageType::Signal => {
eprintln!("todo: handle signal: {:?}", msg.dynheader.member);
}
- MessageType::Error => todo!(),
+ MessageType::Error => {
+ let error_name = msg.dynheader.error_name.expect("error without error_name");
+ let error_message = msg.body.parser().get::<&str>().ok();
+ eprintln!(
+ "dbus error: {error_name}: {}",
+ error_message.unwrap_or("<no message>")
+ );
+ }
MessageType::Call => {
if let Some(cb) = get_call_handler(&self.root, &msg) {
cb(MethodContext {

3
archivers/lz4json/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= lz4json
PORTVERSION= 20191229
PORTREVISION= 1
CATEGORIES= archivers www
MAINTAINER= mi@aldan.algebra.com
@ -13,7 +14,7 @@ USES= uidfix
USE_GITHUB= yes
GH_ACCOUNT= andikleen
GH_TAGNAME= c44c5100
PLIST_FILES= bin/lz4jsoncat man/man1/lz4jsoncat.1${COMPRESS_EXT}
PLIST_FILES= bin/lz4jsoncat share/man/man1/lz4jsoncat.1${COMPRESS_EXT}
MAKEFILE= ${FILESDIR}/BSDmakefile

8
archivers/lz4json/files/BSDmakefile
View File

@ -1,11 +1,11 @@
PROG= lz4jsoncat
BINDIR= ${LOCALBASE}/bin
MANDIR= ${LOCALBASE}/man/man
BINDIR= ${PREFIX}/bin
MANDIR= ${PREFIX}/share/man/man
WARNS= 3
CFLAGS+=-isystem ${PREFIX}/include
LDADD= -L${PREFIX}/lib -llz4
CFLAGS+=-isystem ${LOCALBASE}/include
LDADD= -L${LOCALBASE}/lib -llz4
.include <bsd.prog.mk>

1
audio/Makefile
View File

@ -579,6 +579,7 @@
SUBDIR += paman
SUBDIR += pamixer
SUBDIR += paprefs
SUBDIR += pasystray
SUBDIR += patchage
SUBDIR += pavucontrol
SUBDIR += pavucontrol-qt

42
audio/pasystray/Makefile Normal file
View File

@ -0,0 +1,42 @@
PORTNAME= pasystray
PORTVERSION= 0.8.2
CATEGORIES= audio
MAINTAINER= julien+freebsdports@delhaye.me
COMMENT= System tray applet to control PulseAudio
WWW= https://github.com/christophgysin/pasystray
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libpulse.so:audio/pulseaudio
USES= autoreconf gnome pkgconfig
USE_GNOME= cairo gdkpixbuf2
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
USE_GITHUB= yes
GH_ACCOUNT= christophgysin
OPTIONS_DEFINE= APPINDICATOR AVAHI GTK2 NOTIFY
OPTIONS_DEFAULT= APPINDICATOR AVAHI NOTIFY
APPINDICATOR_DESC= AppIndicator support
APPINDICATOR_LIB_DEPENDS= libappindicator3.so:devel/libappindicator
APPINDICATOR_CONFIGURE_OFF= --disable-appindicator
AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app
AVAHI_CONFIGURE_OFF= --disable-avahi
GTK2_DESC= Use GTK 2 instead of GTK 3
GTK2_CONFIGURE_ON= --with-gtk=2
GTK2_USE= GNOME=gtk20
GTK2_USE_OFF= GNOME=gtk30
GTK2_PLIST_FILES= ${DATADIR_REL}/${PORTNAME}.gtk2.glade
GTK2_PLIST_FILES_OFF= ${DATADIR_REL}/${PORTNAME}.gtk3.glade
GTK2_PREVENTS= APPINDICATOR
NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify
NOTIFY_CONFIGURE_OFF= --disable-notify
.include <bsd.port.mk>

3
audio/pasystray/distinfo Normal file
View File

@ -0,0 +1,3 @@
TIMESTAMP = 1676063460
SHA256 (christophgysin-pasystray-0.8.2_GH0.tar.gz) = 9c6fc5859a203f0a6dd8ce2038fea85b7bac44b1baff5c4cf73643229fafa641
SIZE (christophgysin-pasystray-0.8.2_GH0.tar.gz) = 59654

5
audio/pasystray/pkg-descr Normal file
View File

@ -0,0 +1,5 @@
PulseAudio system tray, a replacement for the deprecated padevchooser.
pasystray allows setting the default PulseAudio source/sink and moving
streams on the fly between sources/sinks without restarting the client
applications.

6
audio/pasystray/pkg-plist Normal file
View File

@ -0,0 +1,6 @@
bin/pasystray
etc/xdg/autostart/pasystray.desktop
share/applications/pasystray.desktop
share/icons/hicolor/scalable/apps/pasystray.svg
share/man/man1/pasystray.1.gz
share/pixmaps/pasystray.png

3
biology/prodigy-lig/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= prodigy-lig
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.1
PORTREVISION= 2
DISTVERSION= 1.1.0
CATEGORIES= biology python
MAINTAINER= yuri@FreeBSD.org

6
biology/prodigy-lig/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1674435581
SHA256 (haddocking-prodigy-lig-v1.0.1_GH0.tar.gz) = 157a0c404949f08f191bb005f23f9d44a714cea9884e83ed6778114afbc0f818
SIZE (haddocking-prodigy-lig-v1.0.1_GH0.tar.gz) = 155897
TIMESTAMP = 1711007516
SHA256 (haddocking-prodigy-lig-v1.1.0_GH0.tar.gz) = 66991015aff86fee6f5cbbc7c28107843083223d3d1aa18b67a658f2bd54bcd4
SIZE (haddocking-prodigy-lig-v1.1.0_GH0.tar.gz) = 156624

6
cad/PrusaSlicer/Makefile
View File

@ -1,7 +1,7 @@
PORTNAME= PrusaSlicer
DISTVERSIONPREFIX=version_
DISTVERSION= 2.6.0
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= cad
DIST_SUBDIR= PrusaSlicer
@ -12,8 +12,6 @@ WWW= https://www.prusa3d.com/prusaslicer/
LICENSE= AGPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to build, error: no member named 'prior' in namespace 'boost'
BUILD_DEPENDS= cereal>=1.3.0.10:devel/cereal \
cgal>=5.0.2:math/cgal \
opencascade>=7.7.0:cad/opencascade
@ -31,7 +29,7 @@ LIB_DEPENDS= libtbb.so:devel/onetbb \
libmpfr.so:math/mpfr \
libdbus-1.so:devel/dbus \
libpng.so:graphics/png \
libTKXDESTEP.so:cad/opencascade \
libTKXSDRAWSTEP.so:cad/opencascade \
libtiff.so:graphics/tiff \
libfontconfig.so:x11-fonts/fontconfig \
libfreeimage.so:graphics/freeimage \

4
cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvg.h
View File

@ -1,5 +1,5 @@
--- src/libnanosvg/nanosvg.h.orig 1970-01-01 01:00:00.000000000 +0100
+++ src/libnanosvg/nanosvg.h 2022-12-22 00:42:08.000000000 +0100
--- src/libnanosvg/nanosvg.h.orig 2024-03-17 16:57:39 UTC
+++ src/libnanosvg/nanosvg.h
@@ -0,0 +1,3106 @@
+/*
+ * Copyright (c) 2013-14 Mikko Mononen memon@inside.org

4
cad/PrusaSlicer/files/patch-src_libnanosvg_nanosvgrast.h
View File

@ -1,5 +1,5 @@
--- src/libnanosvg/nanosvgrast.h.orig 1970-01-01 01:00:00.000000000 +0100
+++ src/libnanosvg/nanosvgrast.h 2022-12-22 00:42:08.000000000 +0100
--- src/libnanosvg/nanosvgrast.h.orig 2024-03-17 16:57:40 UTC
+++ src/libnanosvg/nanosvgrast.h
@@ -0,0 +1,1482 @@
+/*
+ * Copyright (c) 2013-14 Mikko Mononen memon@inside.org

17
cad/PrusaSlicer/files/patch-src_occt__wrapper_CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- src/occt_wrapper/CMakeLists.txt.orig 2023-06-19 12:07:14 UTC
+++ src/occt_wrapper/CMakeLists.txt
@@ -19,9 +19,11 @@ generate_export_header(OCCTWrapper)
@@ -19,14 +19,13 @@ generate_export_header(OCCTWrapper)
generate_export_header(OCCTWrapper)
@ -9,11 +9,18 @@
+find_package(OpenCASCADE REQUIRED)
set(OCCT_LIBS
- TKXDESTEP
- TKSTEP
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
+ -L${CMAKE_INSTALL_PREFIX}/lib
TKXDESTEP
TKSTEP
TKSTEP209
@@ -58,5 +60,5 @@ include(GNUInstallDirs)
+ TKXSDRAWSTEP
+ TKDESTEP
TKXCAF
TKXSBase
TKVCAF
@@ -58,5 +57,5 @@ include(GNUInstallDirs)
include(GNUInstallDirs)

12
cad/freecad/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= FreeCAD
DISTVERSION= 0.21.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= cad
MAINTAINER= cmt@FreeBSD.org
@ -18,7 +18,9 @@ BUILD_DEPENDS= doxygen:devel/doxygen \
${PYTHON_INCLUDEDIR}/CXX/Config.hxx:devel/py-cxx \
swig:devel/swig
LIB_DEPENDS= libexpat.so:textproc/expat2 \
libyaml-cpp.so:devel/yaml-cpp \
libfreetype.so:print/freetype2 \
libtbb.so:devel/onetbb \
${PY_BOOST} \
libpyside2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/pyside2@${PY_FLAVOR} \
libCoin.so:graphics/Coin \
@ -29,6 +31,9 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
libTKernel.so:cad/opencascade \
libxerces-c.so:textproc/xerces-c3 \
libboost_thread.so:devel/boost-libs \
libfontconfig.so:x11-fonts/fontconfig \
libfreeimage.so:graphics/freeimage \
libavutil.so:multimedia/ffmpeg4 \
libmed.so:french/med \
libshiboken2.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}.so:devel/shiboken2@${PY_FLAVOR} \
libhdf5.so:science/hdf5
@ -36,10 +41,11 @@ LIB_DEPENDS= libexpat.so:textproc/expat2 \
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 \
USES= dos2unix compiler:c++17-lang cmake cpe gl eigen:3 fortran gmake jpeg \
localbase:ldflags mpi:openmpi pkgconfig python localbase qt:5 xorg \
desktop-file-utils shared-mime-info shebangfix
USE_GITHUB= yes
GH_TAGNAME= 8abd09398a010337c3b294e687e0666b60bceacf # PR #11909 Add support for OCCT 7.8.0
USE_XORG= ice sm x11 xext xt
USE_GL= gl glu
USE_QT= buildtools concurrent core declarative designer gui \
@ -105,7 +111,7 @@ CMAKE_ARGS+= -DBUILD_WEB:BOOL=OFF
PLIST_SUB= WEBENGINE="@comment "
.endif
post-patch:
pre-configure:
@${REINPLACE_CMD} -e '/self\.rev/s/Unknown/${DISTVERSION:C/.*-//}/' \
${WRKSRC}/src/Tools/SubWCRev.py
# Install XDG icons and files to the standard path

6
cad/freecad/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1699978922
SHA256 (FreeCAD-FreeCAD-0.21.2_GH0.tar.gz) = ceaf77cd12e8ad533d1535cc27ae4ca2a6e80778502dc9cdec906415d674b674
SIZE (FreeCAD-FreeCAD-0.21.2_GH0.tar.gz) = 66124278
TIMESTAMP = 1710958473
SHA256 (FreeCAD-FreeCAD-0.21.2-8abd09398a010337c3b294e687e0666b60bceacf_GH0.tar.gz) = 05023d52a60b01d5c108a71279d21eb1c1b50db169016b0510ef39c7bbb2361d
SIZE (FreeCAD-FreeCAD-0.21.2-8abd09398a010337c3b294e687e0666b60bceacf_GH0.tar.gz) = 67392556

4
cad/freecad/files/patch-cMake_FreeCAD__Helpers_SetupSalomeSMESH.cmake
View File

@ -1,6 +1,6 @@
--- cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake.orig 2022-06-14 23:16:43 +0200
--- cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake.orig 2024-01-10 01:47:25 UTC
+++ cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake
@@ -26,7 +26,7 @@
@@ -26,7 +26,7 @@ macro(SetupSalomeSMESH)
# check which modules are available
if(UNIX OR WIN32)

4
cad/freecad/files/patch-src_3rdParty_libE57Format_src_CheckedFile.cpp
View File

@ -1,4 +1,4 @@
--- src/3rdParty/libE57Format/src/CheckedFile.cpp.orig 2022-06-14 16:52:22 +0200
--- src/3rdParty/libE57Format/src/CheckedFile.cpp.orig 2024-03-20 18:17:18 UTC
+++ src/3rdParty/libE57Format/src/CheckedFile.cpp
@@ -25,6 +25,11 @@
* DEALINGS IN THE SOFTWARE.
@ -23,7 +23,7 @@
#else
#error "no supported OS platform defined"
#endif
@@ -483,7 +492,7 @@
@@ -483,7 +492,7 @@ uint64_t CheckedFile::lseek64( int64_t offset, int whe
#endif
#elif defined( __linux__ )
int64_t result = ::lseek64( fd_, offset, whence );

11
cad/freecad/files/patch-src_3rdParty_salomesmesh_src_SMDS_SMDS__Mesh.cpp
View File

@ -1,11 +0,0 @@
--- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp.orig 2016-09-07 14:39:54 UTC
+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp
@@ -57,7 +57,7 @@
using namespace std;
#ifndef WIN32
-#if !(defined(__MACH__) && defined(__APPLE__))
+#ifdef __linux__
#include <sys/sysinfo.h>
#endif
#include <sys/wait.h>

4
cad/freecad/files/patch-src_Gui_CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- src/Gui/CMakeLists.txt.orig 2019-03-15 18:36:43 UTC
--- src/Gui/CMakeLists.txt.orig 2024-03-20 18:17:17 UTC
+++ src/Gui/CMakeLists.txt
@@ -71,7 +71,7 @@ else(MSVC)
@@ -73,7 +73,7 @@ else(MSVC)
FreeCADApp
${COIN3D_LIBRARIES}
${Boost_LIBRARIES}

4
cad/freecad/files/patch-src_Gui_Selection.h
View File

@ -1,5 +1,5 @@
--- src/Gui/Selection.h.orig 2023-01-21 23:23:47.647852000 +0100
+++ src/Gui/Selection.h 2023-01-21 23:24:04.167678000 +0100
--- src/Gui/Selection.h.orig 2024-03-20 18:17:17 UTC
+++ src/Gui/Selection.h
@@ -25,6 +25,7 @@
#define GUI_SELECTION_H

18
cad/freecad/files/patch-src_Gui_SoFCCSysDragger.cpp
View File

@ -1,8 +1,6 @@
diff --git src/Gui/SoFCCSysDragger.cpp src/Gui/SoFCCSysDragger.cpp
index 0c47d086a7..cf07f7f010 100644
--- src/Gui/SoFCCSysDragger.cpp
--- src/Gui/SoFCCSysDragger.cpp.orig 2024-03-20 18:17:18 UTC
+++ src/Gui/SoFCCSysDragger.cpp
@@ -90,7 +90,7 @@ TDragger::TDragger()
@@ -94,7 +94,7 @@ TDragger::TDragger()
{
SO_KIT_CONSTRUCTOR(TDragger);
@ -11,23 +9,23 @@ index 0c47d086a7..cf07f7f010 100644
this->ref();
#endif
@@ -379,7 +379,7 @@ RDragger::RDragger()
@@ -696,7 +696,7 @@ RDragger::RDragger()
RDragger::RDragger()
{
SO_KIT_CONSTRUCTOR(RDragger);
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
this->ref();
#endif
@@ -674,6 +674,10 @@ SoFCCSysDragger::SoFCCSysDragger()
@@ -1005,6 +1005,10 @@ SoFCCSysDragger::SoFCCSysDragger()
: axisScale(1.0f, 1.0f, 1.0f)
{
SO_KIT_CONSTRUCTOR(SoFCCSysDragger);
+
+#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
+ this->ref();
+#endif
+
SO_KIT_ADD_CATALOG_ENTRY(annotation, SoAnnotation, TRUE, geomSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(scaleNode, SoScale, TRUE, annotation, "", TRUE);

528
cad/freecad/pkg-plist
View File

@ -6,11 +6,8 @@ FreeCAD/Ext/PySide/QtUiTools.py
FreeCAD/Ext/PySide/QtWebEngineWidgets.py
FreeCAD/Ext/PySide/QtWidgets.py
FreeCAD/Ext/PySide/__init__.py
FreeCAD/Ext/freecad/UiTools.py
FreeCAD/Ext/freecad/__init__.py
FreeCAD/Ext/freecad/gui/RemoteDebugger.py
FreeCAD/Ext/freecad/gui/RemoteDebugger.ui
FreeCAD/Ext/freecad/project_utility.py
FreeCAD/Ext/lazy_loader/__init__.py
FreeCAD/Ext/lazy_loader/lazy_loader.py
FreeCAD/Mod/AddonManager/ALLOWED_PYTHON_PACKAGES.txt
@ -24,6 +21,7 @@ FreeCAD/Mod/AddonManager/AddonManagerTest/__init__.py
FreeCAD/Mod/AddonManager/AddonManagerTest/app/__init__.py
FreeCAD/Mod/AddonManager/AddonManagerTest/app/mocks.py
FreeCAD/Mod/AddonManager/AddonManagerTest/app/test_addon.py
FreeCAD/Mod/AddonManager/AddonManagerTest/app/test_cache.py
FreeCAD/Mod/AddonManager/AddonManagerTest/app/test_dependency_installer.py
FreeCAD/Mod/AddonManager/AddonManagerTest/app/test_freecad_interface.py
FreeCAD/Mod/AddonManager/AddonManagerTest/app/test_git.py
@ -61,12 +59,12 @@ FreeCAD/Mod/AddonManager/AddonManagerTest/data/workbench_only.xml
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/__init__.py
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/gui_mocks.py
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/test_gui.py
FreeCAD/Mod/AddonManager/AddonManagerTest/test_information.md
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/test_installer_gui.py
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/test_uninstaller_gui.py
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/test_update_all_gui.py
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/test_workers_startup.py
FreeCAD/Mod/AddonManager/AddonManagerTest/gui/test_workers_utility.py
FreeCAD/Mod/AddonManager/AddonManagerTest/test_information.md
FreeCAD/Mod/AddonManager/AddonManager_rc.py
FreeCAD/Mod/AddonManager/Init.py
FreeCAD/Mod/AddonManager/InitGui.py
@ -75,6 +73,7 @@ FreeCAD/Mod/AddonManager/PythonDependencyUpdateDialog.ui
FreeCAD/Mod/AddonManager/TestAddonManagerApp.py
FreeCAD/Mod/AddonManager/TestAddonManagerGui.py
FreeCAD/Mod/AddonManager/add_toolbar_button_dialog.ui
FreeCAD/Mod/AddonManager/addonmanager_cache.py
FreeCAD/Mod/AddonManager/addonmanager_connection_checker.py
FreeCAD/Mod/AddonManager/addonmanager_dependency_installer.py
FreeCAD/Mod/AddonManager/addonmanager_devmode.py
@ -158,6 +157,7 @@ FreeCAD/Mod/Arch/ArchRoof.py
FreeCAD/Mod/Arch/ArchSchedule.py
FreeCAD/Mod/Arch/ArchSectionPlane.py
FreeCAD/Mod/Arch/ArchSite.py
FreeCAD/Mod/Arch/ArchSketchObject.py
FreeCAD/Mod/Arch/ArchSpace.py
FreeCAD/Mod/Arch/ArchStairs.py
FreeCAD/Mod/Arch/ArchStructure.py
@ -268,6 +268,7 @@ FreeCAD/Mod/Draft/draftguitools/gui_grid.py
FreeCAD/Mod/Draft/draftguitools/gui_groups.py
FreeCAD/Mod/Draft/draftguitools/gui_hatch.py
FreeCAD/Mod/Draft/draftguitools/gui_heal.py
FreeCAD/Mod/Draft/draftguitools/gui_hyperlink.py
FreeCAD/Mod/Draft/draftguitools/gui_join.py
FreeCAD/Mod/Draft/draftguitools/gui_labels.py
FreeCAD/Mod/Draft/draftguitools/gui_layers.py
@ -398,6 +399,7 @@ FreeCAD/Mod/Draft/draftutils/gui_utils.py
FreeCAD/Mod/Draft/draftutils/init_draft_statusbar.py
FreeCAD/Mod/Draft/draftutils/init_tools.py
FreeCAD/Mod/Draft/draftutils/messages.py
FreeCAD/Mod/Draft/draftutils/params.py
FreeCAD/Mod/Draft/draftutils/todo.py
FreeCAD/Mod/Draft/draftutils/translate.py
FreeCAD/Mod/Draft/draftutils/units.py
@ -884,6 +886,11 @@ FreeCAD/Mod/Fem/femviewprovider/view_mesh_region.py
FreeCAD/Mod/Fem/femviewprovider/view_mesh_result.py
FreeCAD/Mod/Fem/femviewprovider/view_result_mechanical.py
FreeCAD/Mod/Fem/femviewprovider/view_solver_ccxtools.py
FreeCAD/Mod/Help/Help.py
FreeCAD/Mod/Help/Help_rc.py
FreeCAD/Mod/Help/InitGui.py
FreeCAD/Mod/Help/default.css
FreeCAD/Mod/Help/dlgPreferencesHelp.ui
FreeCAD/Mod/Idf/Idf.py
FreeCAD/Mod/Idf/Idflibs/0603_SMD.stp
FreeCAD/Mod/Idf/Idflibs/0805_SMD.stp
@ -927,14 +934,18 @@ FreeCAD/Mod/Inspection/Init.py
FreeCAD/Mod/Inspection/InitGui.py
FreeCAD/Mod/Material/Init.py
FreeCAD/Mod/Material/InitGui.py
FreeCAD/Mod/Material/Material.py
FreeCAD/Mod/Material/MaterialEditor.py
FreeCAD/Mod/Material/Material_rc.py
FreeCAD/Mod/Material/Resources/icons/preview-rendered.svg
FreeCAD/Mod/Material/Resources/icons/preview-vector.svg
FreeCAD/Mod/Material/Templatematerial.yml
FreeCAD/Mod/Material/TestMaterialsApp.py
FreeCAD/Mod/Material/importFCMat.py
FreeCAD/Mod/Material/materials-editor.ui
FreeCAD/Mod/Material/materialtests/TestMaterials.py
FreeCAD/Mod/Material/materialtests/TestModels.py
FreeCAD/Mod/Material/materialtests/__init__.py
FreeCAD/Mod/Material/materialtools/MaterialModels.py
FreeCAD/Mod/Material/materialtools/__init__.py
FreeCAD/Mod/Material/materialtools/cardutils.py
FreeCAD/Mod/Measure/Init.py
@ -1013,6 +1024,7 @@ FreeCAD/Mod/Part/PartEnums.py
FreeCAD/Mod/Part/TestPartApp.py
FreeCAD/Mod/Part/TestPartGui.py
FreeCAD/Mod/Part/parttests/ColorPerFaceTest.py
FreeCAD/Mod/Part/parttests/Geom2d_tests.py
FreeCAD/Mod/Part/parttests/TopoShapeListTest.py
FreeCAD/Mod/Part/parttests/__init__.py
FreeCAD/Mod/Part/parttests/part_test_objects.py
@ -1028,6 +1040,7 @@ FreeCAD/Mod/PartDesign/PartDesignTests/TestChamfer.py
FreeCAD/Mod/PartDesign/PartDesignTests/TestDatum.py
FreeCAD/Mod/PartDesign/PartDesignTests/TestDraft.py
FreeCAD/Mod/PartDesign/PartDesignTests/TestFillet.py
FreeCAD/Mod/PartDesign/PartDesignTests/TestHelix.py
FreeCAD/Mod/PartDesign/PartDesignTests/TestHole.py
FreeCAD/Mod/PartDesign/PartDesignTests/TestInvoluteGear.py
FreeCAD/Mod/PartDesign/PartDesignTests/TestLinearPattern.py
@ -1138,6 +1151,10 @@ FreeCAD/Mod/Path/Path/Main/Gui/JobCmd.py
FreeCAD/Mod/Path/Path/Main/Gui/JobDlg.py
FreeCAD/Mod/Path/Path/Main/Gui/PreferencesJob.py
FreeCAD/Mod/Path/Path/Main/Gui/Sanity.py
FreeCAD/Mod/Path/Path/Main/Gui/Sanity_Bulb.svg
FreeCAD/Mod/Path/Path/Main/Gui/Sanity_Caution.svg
FreeCAD/Mod/Path/Path/Main/Gui/Sanity_Note.svg
FreeCAD/Mod/Path/Path/Main/Gui/Sanity_Warning.svg
FreeCAD/Mod/Path/Path/Main/Gui/Simulator.py
FreeCAD/Mod/Path/Path/Main/Gui/__init__.py
FreeCAD/Mod/Path/Path/Main/Job.py
@ -1235,6 +1252,7 @@ FreeCAD/Mod/Path/Path/Post/scripts/rrf_post.py
FreeCAD/Mod/Path/Path/Post/scripts/slic3r_pre.py
FreeCAD/Mod/Path/Path/Post/scripts/smoothie_post.py
FreeCAD/Mod/Path/Path/Post/scripts/uccnc_post.py
FreeCAD/Mod/Path/Path/Post/scripts/wedm_post.py
FreeCAD/Mod/Path/Path/Preferences.py
FreeCAD/Mod/Path/Path/Tool/Bit.py
FreeCAD/Mod/Path/Path/Tool/Controller.py
@ -1298,6 +1316,8 @@ FreeCAD/Mod/Path/PathTests/TestRefactoredGrblPost.py
FreeCAD/Mod/Path/PathTests/TestRefactoredLinuxCNCPost.py
FreeCAD/Mod/Path/PathTests/TestRefactoredMach3Mach4Post.py
FreeCAD/Mod/Path/PathTests/TestRefactoredTestPost.py
FreeCAD/Mod/Path/PathTests/TestRefactoredTestPostGCodes.py
FreeCAD/Mod/Path/PathTests/TestRefactoredTestPostMCodes.py
FreeCAD/Mod/Path/PathTests/Tools/Bit/test-path-tool-bit-bit-00.fctb
FreeCAD/Mod/Path/PathTests/Tools/Library/test-path-tool-bit-library-00.fctl
FreeCAD/Mod/Path/PathTests/Tools/Shape/test-path-tool-bit-shape-00.fcstd
@ -1412,14 +1432,20 @@ FreeCAD/Mod/TechDraw/TDTest/TestSymbol.svg
FreeCAD/Mod/TechDraw/TDTest/TestTemplate.svg
FreeCAD/Mod/TechDraw/TDTest/__init__.py
FreeCAD/Mod/TechDraw/TechDrawTools/CommandAxoLengthDimension.py
FreeCAD/Mod/TechDraw/TechDrawTools/CommandFillTemplateFields.py
FreeCAD/Mod/TechDraw/TechDrawTools/CommandHoleShaftFit.py
FreeCAD/Mod/TechDraw/TechDrawTools/CommandMoveView.py
FreeCAD/Mod/TechDraw/TechDrawTools/CommandPositionSectionView.py
FreeCAD/Mod/TechDraw/TechDrawTools/CommandShareView.py
FreeCAD/Mod/TechDraw/TechDrawTools/CommandVertexCreations.py
FreeCAD/Mod/TechDraw/TechDrawTools/Gui/DlgPageChooser.ui
FreeCAD/Mod/TechDraw/TechDrawTools/Gui/TaskAddOffsetVertex.ui
FreeCAD/Mod/TechDraw/TechDrawTools/Gui/TaskHoleShaftFit.ui
FreeCAD/Mod/TechDraw/TechDrawTools/Gui/TaskMoveView.ui
FreeCAD/Mod/TechDraw/TechDrawTools/TDToolsMovers.py
FreeCAD/Mod/TechDraw/TechDrawTools/TDToolsUtil.py
FreeCAD/Mod/TechDraw/TechDrawTools/TaskAddOffsetVertex.py
FreeCAD/Mod/TechDraw/TechDrawTools/TaskFillTemplateFields.py
FreeCAD/Mod/TechDraw/TechDrawTools/TaskHoleShaftFit.py
FreeCAD/Mod/TechDraw/TechDrawTools/TaskMoveView.py
FreeCAD/Mod/TechDraw/TechDrawTools/TaskShareView.py
@ -1432,6 +1458,7 @@ FreeCAD/Mod/Test/Init.py
FreeCAD/Mod/Test/InitGui.py
FreeCAD/Mod/Test/Menu.py
FreeCAD/Mod/Test/Metadata.py
FreeCAD/Mod/Test/StringHasher.py
FreeCAD/Mod/Test/TestApp.py
FreeCAD/Mod/Test/TestData/bad_root_node.xml
FreeCAD/Mod/Test/TestData/bad_version.xml
@ -1507,6 +1534,8 @@ FreeCAD/lib/Import.so
FreeCAD/lib/ImportGui.so
FreeCAD/lib/Inspection.so
FreeCAD/lib/InspectionGui.so
FreeCAD/lib/MatGui.so
FreeCAD/lib/Material.so
FreeCAD/lib/Measure.so
FreeCAD/lib/Mesh.so
FreeCAD/lib/MeshGui.so
@ -1543,14 +1572,6 @@ FreeCAD/lib/cmake/GTest/GTestConfig.cmake
FreeCAD/lib/cmake/GTest/GTestConfigVersion.cmake
FreeCAD/lib/cmake/GTest/GTestTargets-%%CMAKE_BUILD_TYPE%%.cmake
FreeCAD/lib/cmake/GTest/GTestTargets.cmake
FreeCAD/lib/libgmock.a
FreeCAD/lib/libgmock_main.a
FreeCAD/lib/libgtest.a
FreeCAD/lib/libgtest_main.a
FreeCAD/lib/pkgconfig/gmock.pc
FreeCAD/lib/pkgconfig/gmock_main.pc
FreeCAD/lib/pkgconfig/gtest.pc
FreeCAD/lib/pkgconfig/gtest_main.pc
FreeCAD/lib/flatmesh.so
FreeCAD/lib/libDriver.so
FreeCAD/lib/libDriverDAT.so
@ -1566,6 +1587,14 @@ FreeCAD/lib/libSMESH.so
FreeCAD/lib/libSMESHDS.so
FreeCAD/lib/libStdMeshers.so
FreeCAD/lib/libarea-native.so
FreeCAD/lib/libgmock.a
FreeCAD/lib/libgmock_main.a
FreeCAD/lib/libgtest.a
FreeCAD/lib/libgtest_main.a
FreeCAD/lib/pkgconfig/gmock.pc
FreeCAD/lib/pkgconfig/gmock_main.pc
FreeCAD/lib/pkgconfig/gtest.pc
FreeCAD/lib/pkgconfig/gtest_main.pc
FreeCAD/share/3Dconnexion/3DConnexion.xml
FreeCAD/share/Gui/PreferencePackTemplates/Arch_Colors.cfg
FreeCAD/share/Gui/PreferencePackTemplates/Console_Colors.cfg
@ -1581,32 +1610,23 @@ FreeCAD/share/Gui/PreferencePackTemplates/Start_Colors.cfg
FreeCAD/share/Gui/PreferencePackTemplates/TechDraw_Colors.cfg
FreeCAD/share/Gui/PreferencePackTemplates/View.cfg
FreeCAD/share/Gui/PreferencePackTemplates/Window_Colors.cfg
FreeCAD/share/Gui/PreferencePacks/Classic theme/Classic theme.cfg
FreeCAD/share/Gui/PreferencePacks/Dark theme/Dark theme.cfg
FreeCAD/share/Gui/PreferencePacks/Light theme/Light theme.cfg
FreeCAD/share/Gui/PreferencePacks/Classic/Classic.cfg
FreeCAD/share/Gui/PreferencePacks/Dark behave/Dark behave.cfg
FreeCAD/share/Gui/PreferencePacks/Dark contrast/Dark contrast.cfg
FreeCAD/share/Gui/PreferencePacks/Dark modern/Dark modern.cfg
FreeCAD/share/Gui/PreferencePacks/Dark/Dark.cfg
FreeCAD/share/Gui/PreferencePacks/Darker/Darker.cfg
FreeCAD/share/Gui/PreferencePacks/Light modern/Light modern.cfg
FreeCAD/share/Gui/PreferencePacks/Light/Light.cfg
FreeCAD/share/Gui/PreferencePacks/ProDark/ProDark.cfg
FreeCAD/share/Gui/PreferencePacks/package.xml
FreeCAD/share/Gui/Stylesheets/Behave-dark.qss
FreeCAD/share/Gui/Stylesheets/Dark-blue.qss
FreeCAD/share/Gui/Stylesheets/Dark-contrast.qss
FreeCAD/share/Gui/Stylesheets/Dark-green.qss
FreeCAD/share/Gui/Stylesheets/Dark-modern-blue.qss
FreeCAD/share/Gui/Stylesheets/Dark-modern-green.qss
FreeCAD/share/Gui/Stylesheets/Dark-modern-orange.qss
FreeCAD/share/Gui/Stylesheets/Dark-modern-pink.qss
FreeCAD/share/Gui/Stylesheets/Dark-orange.qss
FreeCAD/share/Gui/Stylesheets/Dark-pink.qss
FreeCAD/share/Gui/Stylesheets/Darker-blue.qss
FreeCAD/share/Gui/Stylesheets/Darker-green.qss
FreeCAD/share/Gui/Stylesheets/Darker-orange.qss
FreeCAD/share/Gui/Stylesheets/Darker-pink.qss
FreeCAD/share/Gui/Stylesheets/Light-blue.qss
FreeCAD/share/Gui/Stylesheets/Light-green.qss
FreeCAD/share/Gui/Stylesheets/Light-modern-blue.qss
FreeCAD/share/Gui/Stylesheets/Light-modern-green.qss
FreeCAD/share/Gui/Stylesheets/Light-modern-orange.qss
FreeCAD/share/Gui/Stylesheets/Light-modern-pink.qss
FreeCAD/share/Gui/Stylesheets/Light-orange.qss
FreeCAD/share/Gui/Stylesheets/Light-pink.qss
FreeCAD/share/Gui/Stylesheets/Dark-modern.qss
FreeCAD/share/Gui/Stylesheets/Dark.qss
FreeCAD/share/Gui/Stylesheets/Darker.qss
FreeCAD/share/Gui/Stylesheets/Light-modern.qss
FreeCAD/share/Gui/Stylesheets/Light.qss
FreeCAD/share/Gui/Stylesheets/ProDark.qss
FreeCAD/share/Gui/Stylesheets/images_dark-light/Hmovetoolbar_dark.svg
FreeCAD/share/Gui/Stylesheets/images_dark-light/Hmovetoolbar_light.svg
@ -1696,6 +1716,36 @@ FreeCAD/share/Gui/Stylesheets/images_dark-light/up_arrow_disabled_dark.svg
FreeCAD/share/Gui/Stylesheets/images_dark-light/up_arrow_disabled_light.svg
FreeCAD/share/Gui/Stylesheets/images_dark-light/up_arrow_light.svg
FreeCAD/share/Gui/Stylesheets/images_dark-light/up_arrow_lighter.svg
FreeCAD/share/Gui/Stylesheets/overlay/Dark-Modern_overlay.qss
FreeCAD/share/Gui/Stylesheets/overlay/Dark-Outline.qss
FreeCAD/share/Gui/Stylesheets/overlay/Dark.qss
FreeCAD/share/Gui/Stylesheets/overlay/Dark_overlay.qss
FreeCAD/share/Gui/Stylesheets/overlay/Darker_overlay.qss
FreeCAD/share/Gui/Stylesheets/overlay/Light-Modern_overlay.qss
FreeCAD/share/Gui/Stylesheets/overlay/Light-Outline.qss
FreeCAD/share/Gui/Stylesheets/overlay/Light.qss
FreeCAD/share/Gui/Stylesheets/overlay/Light_overlay.qss
FreeCAD/share/Gui/Stylesheets/overlay/autohide.svg
FreeCAD/share/Gui/Stylesheets/overlay/close.svg
FreeCAD/share/Gui/Stylesheets/overlay/close_light.svg
FreeCAD/share/Gui/Stylesheets/overlay/close_lighter.svg
FreeCAD/share/Gui/Stylesheets/overlay/close_red.svg
FreeCAD/share/Gui/Stylesheets/overlay/edithide.svg
FreeCAD/share/Gui/Stylesheets/overlay/editshow.svg
FreeCAD/share/Gui/Stylesheets/overlay/float.svg
FreeCAD/share/Gui/Stylesheets/overlay/float_light.svg
FreeCAD/share/Gui/Stylesheets/overlay/float_lighter.svg
FreeCAD/share/Gui/Stylesheets/overlay/mode.svg
FreeCAD/share/Gui/Stylesheets/overlay/mode_light.svg
FreeCAD/share/Gui/Stylesheets/overlay/mode_lighter.svg
FreeCAD/share/Gui/Stylesheets/overlay/overlay.svg
FreeCAD/share/Gui/Stylesheets/overlay/overlay_light.svg
FreeCAD/share/Gui/Stylesheets/overlay/overlay_lighter.svg
FreeCAD/share/Gui/Stylesheets/overlay/taskshow.svg
FreeCAD/share/Gui/Stylesheets/overlay/taskshow_light.svg
FreeCAD/share/Gui/Stylesheets/overlay/transparent.svg
FreeCAD/share/Gui/Stylesheets/overlay/transparent_light.svg
FreeCAD/share/Gui/Stylesheets/overlay/transparent_lighter.svg
FreeCAD/share/Mod/Arch/Presets/ifc_contexts_IFC2X3.json
FreeCAD/share/Mod/Arch/Presets/ifc_contexts_IFC4.json
FreeCAD/share/Mod/Arch/Presets/ifc_products_IFC2X3.json
@ -1725,132 +1775,230 @@ FreeCAD/share/Mod/Import/DxfPlate/tables20.rub
FreeCAD/share/Mod/Import/DxfPlate/tables212.rub
FreeCAD/share/Mod/Import/DxfPlate/tables214.rub
FreeCAD/share/Mod/Inspection/Resources/icons/InspectionWorkbench.svg
FreeCAD/share/Mod/Material/FluidMaterial/Air.FCMat
FreeCAD/share/Mod/Material/FluidMaterial/Argon.FCMat
FreeCAD/share/Mod/Material/FluidMaterial/Carbon_dioxide.FCMat
FreeCAD/share/Mod/Material/FluidMaterial/Nitrogen.FCMat
FreeCAD/share/Mod/Material/FluidMaterial/None.FCMat
FreeCAD/share/Mod/Material/FluidMaterial/Water.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/ABS-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Acrylic-Glass-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/AlMg3F24.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/AlMgSi1F31.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/AlZn4-5Mg1F35.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Aluminum-6061-T6.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Aluminum-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/CalculiX-Steel.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Concrete-EN-C35_45.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Concrete-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Copper-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Glass-E-GlassFibre.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Glass-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Glass-S2-GlassFibre.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Graphite.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Invar-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Iron-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/None.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/PA6-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/PET-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/PLA-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/PP-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/PTFE-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/PVC-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Reinforcement-FIB-B500.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-15CrNi6.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-17CrNiMo6.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-1C22.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-1C35.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-1C45.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-1C60.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-20NiCrMo2.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-28Mn6.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-2C10.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-30CrNiMo8.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-34CrNiMo6.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-36CrNiMo4.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-36NiCrMo16.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-3C15.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-3C22.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-3C35.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-3V45.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C10.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C15.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C22E.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C25E.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C30E.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C40E.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C50E.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C55E.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-C60E.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-E295-GC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-E295.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-E335-GC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-E335.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-E360-GC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-E360.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJL-100.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJL-150.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJL-200.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJL-250.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJL-300.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJL-350.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJMB-350-10.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJMB-550-4.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJMB-650-2.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJMW-350-4.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJMW-360-12.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJMW-400-5.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJMW-450-7.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJS-400-15.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJS-500-7.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJS-600-3.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJS-700-2.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-EN-GJS-800-1.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-G16Mn5.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-G200.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-G20Mn5.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-G230.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-G260.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-G300.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-G30Mn5.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-Generic.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S185.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S235JO.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S235JR.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S235JRG1.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S260NC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S275JO.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S275JR.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S275N.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S335JO.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S335JR.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S335N.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S340MC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S355J2G3.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S380MC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S420MC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S420N.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S460MC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S460N.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S500MC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S550MC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-S690MC.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-St-37-2K.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-St-E-255.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-St-E-315.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-St-E-380.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-St-E-460.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-St-E-500.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-X2CrNiMoN17-13-3.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-X2CrNiN24-4.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-X39CrMo17-1.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-X3CrNiMo13-14.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-X5CrNi18-10.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-X5CrNiMo17-12-2.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Steel-X6CrNiTi18-10.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/TEMPLATE.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Ti-6Al-4V.FCMat
FreeCAD/share/Mod/Material/StandardMaterial/Wood-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Aluminum.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Brass.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Bronze.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Chrome.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Copper.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Default.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Emerald.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Gold.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Jade.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Metalized.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Neon GNC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Neon PHC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Obsidian.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Pewter.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Plaster.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Plastic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Ruby.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Satin.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Shiny Plastic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Silver.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Steel.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Appearance/Stone.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Fluid/Air.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Fluid/Argon.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Fluid/Carbon Dioxide.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Fluid/Nitrogen.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Fluid/None.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Fluid/Water.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Diagonal4.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Diagonal5.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Diamond.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Diamond2.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Diamond4.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Horizontal5.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Square.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/PAT/Vertical5.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/aluminum.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/brick01.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/concrete.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/cross.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/cuprous.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/diagonal1.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/diagonal2.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/earth.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/general_steel.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/glass.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/hatch45L.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/hatch45R.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/hbone.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/line.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/plastic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/plus.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/simple.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/solid.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/square.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/steel.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/titanium.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/wood.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/woodgrain.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Patterns/Pattern Files/zinc.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Aggregate/Concrete-EN-C35_45.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Aggregate/Concrete-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Aggregate/Reinforcement-FIB-B500.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Carbon/Graphite.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Glass/Glass-E-GlassFibre.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Glass/Glass-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Glass/Glass-S2-GlassFibre.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Alloys/Invar-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Aluminum/AlMg3F24.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Aluminum/AlMgSi1F31.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Aluminum/AlZn4-5Mg1F35.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Aluminum/Aluminum-6061-T6.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Aluminum/Aluminum-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Copper/Copper-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Iron/Iron-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/CalculiX-Steel.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-15CrNi6.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-17CrNiMo6.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-1C22.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-1C35.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-1C45.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-1C60.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-20NiCrMo2.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-28Mn6.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-2C10.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-30CrNiMo8.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-34CrNiMo6.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-36CrNiMo4.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-36NiCrMo16.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-3C15.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-3C22.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-3C35.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-3V45.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C10.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C15.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C22E.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C25E.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C30E.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C40E.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C50E.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C55E.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-C60E.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-E295-GC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-E295.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-E335-GC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-E335.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-E360-GC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-E360.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJL-100.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJL-150.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJL-200.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJL-250.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJL-300.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJL-350.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJMB-350-10.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJMB-550-4.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJMB-650-2.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJMW-350-4.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJMW-360-12.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJMW-400-5.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJMW-450-7.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJS-400-15.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJS-500-7.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJS-600-3.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJS-700-2.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-EN-GJS-800-1.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-G16Mn5.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-G200.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-G20Mn5.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-G230.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-G260.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-G300.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-G30Mn5.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S185.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S235JO.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S235JR.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S235JRG1.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S260NC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S275JO.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S275JR.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S275N.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S335JO.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S335JR.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S335N.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S340MC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S355J2G3.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S380MC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S420MC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S420N.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S460MC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S460N.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S500MC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S550MC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-S690MC.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-St-37-2K.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-St-E-255.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-St-E-315.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-St-E-380.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-St-E-460.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-St-E-500.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-X2CrNiMoN17-13-3.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-X2CrNiN24-4.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-X39CrMo17-1.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-X3CrNiMo13-14.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-X5CrNi18-10.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-X5CrNiMo17-12-2.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Steel/Steel-X6CrNiTi18-10.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Metal/Titanium/Ti-6Al-4V.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/ABS-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/Acrylic-Glass-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/PA6-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/PET-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/PLA-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/PP-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/PTFE-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Thermoplast/PVC-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Standard/Wood/Wood-Generic.FCMat
FreeCAD/share/Mod/Material/Resources/Materials/Test/Test Material.FCMat
FreeCAD/share/Mod/Material/Resources/Models/Architectural/Architectural.yml
FreeCAD/share/Mod/Material/Resources/Models/Architectural/ArchitecturalRendering.yml
FreeCAD/share/Mod/Material/Resources/Models/Costs/Costs.yml
FreeCAD/share/Mod/Material/Resources/Models/Electromagnetic/Electromagnetic.yml
FreeCAD/share/Mod/Material/Resources/Models/Fluid/Fluid.yml
FreeCAD/share/Mod/Material/Resources/Models/Legacy/Father.yml
FreeCAD/share/Mod/Material/Resources/Models/Legacy/MaterialStandard.yml
FreeCAD/share/Mod/Material/Resources/Models/Mechanical/Density.yml
FreeCAD/share/Mod/Material/Resources/Models/Mechanical/IsotropicLinearElastic.yml
FreeCAD/share/Mod/Material/Resources/Models/Mechanical/LinearElastic.yml
FreeCAD/share/Mod/Material/Resources/Models/Mechanical/OgdenYld2004p18.yml
FreeCAD/share/Mod/Material/Resources/Models/Mechanical/OrthotropicLinearElastic.yml
FreeCAD/share/Mod/Material/Resources/Models/Patterns/PAT.yml
FreeCAD/share/Mod/Material/Resources/Models/Patterns/Pattern File.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderAppleseed.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderCarpaint.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderCycles.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderDiffuse.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderDisney.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderEmission.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderGlass.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderLuxcore.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderLuxrender.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderMixed.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderOspray.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderPbrt.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderPovray.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderSubstancePBR.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderTexture.yml
FreeCAD/share/Mod/Material/Resources/Models/Render Workbench/RenderWB.yml
FreeCAD/share/Mod/Material/Resources/Models/Rendering/AdvancedRendering.yml
FreeCAD/share/Mod/Material/Resources/Models/Rendering/BasicRendering.yml
FreeCAD/share/Mod/Material/Resources/Models/Rendering/TextureRendering.yml
FreeCAD/share/Mod/Material/Resources/Models/Rendering/VectorRendering.yml
FreeCAD/share/Mod/Material/Resources/Models/Test/Test Model.yml
FreeCAD/share/Mod/Material/Resources/Models/Thermal/Thermal.yml
FreeCAD/share/Mod/Material/Resources/icons/MaterialWorkbench.svg
FreeCAD/share/Mod/Material/Resources/icons/Materials_Edit.svg
FreeCAD/share/Mod/Material/Resources/icons/list.svg
FreeCAD/share/Mod/Material/Resources/icons/multiline.svg
FreeCAD/share/Mod/Material/Resources/icons/preferences-material.svg
FreeCAD/share/Mod/Material/Resources/icons/preview-rendered.svg
FreeCAD/share/Mod/Material/Resources/icons/preview-vector.svg
FreeCAD/share/Mod/Material/Resources/icons/table.svg
FreeCAD/share/Mod/Material/Resources/images/default_image.png
FreeCAD/share/Mod/Mesh/Resources/icons/MeshWorkbench.svg
FreeCAD/share/Mod/OpenSCAD/Resources/icons/OpenSCADWorkbench.svg
FreeCAD/share/Mod/Part/Resources/icons/PartWorkbench.svg
@ -1894,13 +2042,30 @@ FreeCAD/share/Mod/Spreadsheet/Resources/icons/SpreadsheetWorkbench.svg
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/StartPage.js
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/developerhub.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/freecad.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/icon_activity.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/icon_blog.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/icon_documents.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/icon_help.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/icon_settings.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/installed.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/manual.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/new_2d_draft.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/new_architecture.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/new_csg_part.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/new_empty_file.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/new_file_thumbnail.svg
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/new_open_file.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/new_parametric_part.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/poweruserhub.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/settings.png
%%WEBENGINE%%FreeCAD/share/Mod/Start/StartPage/images/userhub.png
FreeCAD/share/Mod/Surface/Resources/icons/Surface_Workbench.svg
FreeCAD/share/Mod/TechDraw/CSVdata/FillTemplateFields.csv
FreeCAD/share/Mod/TechDraw/LineGroup/ANSI.Y14.2M.1992.ElementDef.csv
FreeCAD/share/Mod/TechDraw/LineGroup/ANSI.Y14.2M.1992.LineDef.csv
FreeCAD/share/Mod/TechDraw/LineGroup/ASME.Y14.2.2008.ElementDef.csv
FreeCAD/share/Mod/TechDraw/LineGroup/ASME.Y14.2.2008.LineDef.csv
FreeCAD/share/Mod/TechDraw/LineGroup/ISO.128.20.1996.ElementDef.csv
FreeCAD/share/Mod/TechDraw/LineGroup/ISO.128.20.1996.LineDef.csv
FreeCAD/share/Mod/TechDraw/LineGroup/LineGroup.csv
FreeCAD/share/Mod/TechDraw/PAT/FCPAT.pat
FreeCAD/share/Mod/TechDraw/Patterns/aluminium.svg
@ -2074,11 +2239,11 @@ FreeCAD/share/Mod/TechDraw/Templates/ANSIA_Landscape.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIA_Landscape_blank.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIA_Portrait.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIA_Portrait_blank.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIB.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIB_Landscape.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIB_Landscape_blank.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIB_Portrait_blank.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIB.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIB_Portrait.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIB_Portrait_blank.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIC_Landscape.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSIC_Portrait.svg
FreeCAD/share/Mod/TechDraw/Templates/ANSID_Landscape.svg
@ -2106,6 +2271,12 @@ FreeCAD/share/Mod/TechDraw/Templates/Arch_E3_Landscape.svg
FreeCAD/share/Mod/TechDraw/Templates/Arch_E3_Portrait.svg
FreeCAD/share/Mod/TechDraw/Templates/Arch_E_Landscape.svg
FreeCAD/share/Mod/TechDraw/Templates/Arch_E_Portrait.svg
FreeCAD/share/Mod/TechDraw/Templates/DE/A0_Landscape_ISO7200_DE.svg
FreeCAD/share/Mod/TechDraw/Templates/DE/A1_Landscape_ISO7200_DE.svg
FreeCAD/share/Mod/TechDraw/Templates/DE/A2_Landscape_ISO7200_DE.svg
FreeCAD/share/Mod/TechDraw/Templates/DE/A3_Landscape_ISO7200_DE.svg
FreeCAD/share/Mod/TechDraw/Templates/DE/A4_Landscape_ISO7200_DE.svg
FreeCAD/share/Mod/TechDraw/Templates/DE/A4_Portrait_ISO7200_DE.svg
FreeCAD/share/Mod/TechDraw/Templates/HowToExample.svg
FreeCAD/share/Mod/TechDraw/Templates/RU_GOST/Leading/Landscape_A0.svg
FreeCAD/share/Mod/TechDraw/Templates/RU_GOST/Leading/Landscape_A1.svg
@ -2159,19 +2330,24 @@ FreeCAD/share/examples/draft_test_objects.FCStd
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
%%PYTHON_SITELIBDIR%%/freecad/UiTools.py
%%PYTHON_SITELIBDIR%%/freecad/__init__.py
%%PYTHON_SITELIBDIR%%/freecad/part.py
%%PYTHON_SITELIBDIR%%/freecad/partdesign.py
%%PYTHON_SITELIBDIR%%/freecad/project_utility.py
%%PYTHON_SITELIBDIR%%/freecad/sketcher.py
%%PYTHON_SITELIBDIR%%/freecad/utils.py
%%QT_PLUGINDIR%%/designer/libFreeCAD_widgets.so
share/applications/org.freecad.FreeCAD.desktop
share/icons/hicolor/16x16/apps/org.freecad.FreeCAD.png
share/icons/hicolor/32x32/apps/org.freecad.FreeCAD.png
share/icons/hicolor/48x48/apps/org.freecad.FreeCAD.png
share/icons/hicolor/64x64/apps/org.freecad.FreeCAD.png
share/icons/hicolor/scalable/apps/org.freecad.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/metainfo/org.freecad.FreeCAD.metainfo.xml
share/mime/packages/org.freecad.FreeCAD.xml
share/pixmaps/freecad.xpm
share/thumbnailers/FreeCAD.thumbnailer
%%QT_PLUGINDIR%%/designer/libFreeCAD_widgets.so
@dir FreeCAD
@dir FreeCAD/share
@dir FreeCAD/share/Mod/Material/StandardMaterial/Tools

2
cad/gmsh/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= gmsh
DISTVERSION= 4.11.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= cad
MASTER_SITES= http://gmsh.info/src/
DISTNAME= ${PORTNAME}-${PORTVERSION}-source

170
cad/gmsh/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,170 @@
--- CMakeLists.txt.orig 2022-12-20 15:30:55 UTC
+++ CMakeLists.txt
@@ -1,4 +1,4 @@
-# Gmsh - Copyright (C) 1997-2022 C. Geuzaine, J.-F. Remacle
+# Gmsh - Copyright (C) 1997-2023 C. Geuzaine, J.-F. Remacle
#
# See the LICENSE.txt file in the Gmsh root directory for license information.
# Please report all issues on https://gitlab.onelab.info/gmsh/gmsh/issues.
@@ -107,8 +107,8 @@ set(GMSH_MAJOR_VERSION 4)
opt(ZIPPER "Enable Zip file compression/decompression" OFF)
set(GMSH_MAJOR_VERSION 4)
-set(GMSH_MINOR_VERSION 11)
-set(GMSH_PATCH_VERSION 1)
+set(GMSH_MINOR_VERSION 12)
+set(GMSH_PATCH_VERSION 0)
if(NOT GMSH_EXTRA_VERSION)
set(GMSH_EXTRA_VERSION "")
endif()
@@ -343,13 +343,19 @@ if(ENABLE_OPENMP)
"${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/local/include/libomp")
list(APPEND EXTERNAL_LIBRARIES "-L/opt/local/lib/libomp -lomp")
elseif(APPLE AND EXISTS "/usr/local/lib/libomp.dylib")
- # official Apple compiler with homebrew's libomp
+ # official Apple compiler with homebrew's libomp on Intel
set_config_option(HAVE_OPENMP "OpenMP[Homebrew]")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp")
+ list(APPEND EXTERNAL_LIBRARIES "-L/usr/local/lib -lomp")
+ elseif(APPLE AND EXISTS "/opt/homebrew/opt/libomp")
+ # official Apple compiler with homebrew's libomp on M processors
+ set_config_option(HAVE_OPENMP "OpenMP[Homebrew]")
set(CMAKE_C_FLAGS
- "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp")
+ "${CMAKE_C_FLAGS} -Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include")
set(CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp")
- list(APPEND EXTERNAL_LIBRARIES "-L/usr/local/lib -lomp")
+ "${CMAKE_CXX_FLAGS} -Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include")
+ list(APPEND EXTERNAL_LIBRARIES "-L/opt/homebrew/opt/libomp/lib -lomp")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND EXISTS "/usr/local/lib64/libgomp.a")
# custom static openmp for official linux builds
set_config_option(HAVE_OPENMP "OpenMP[static]")
@@ -1101,9 +1107,9 @@ if(HAVE_SOLVER)
string(REPLACE " " ";" PETSC_PACKAGES_INCLUDES ${PETSC_PACKAGES_INCLUDES})
foreach(VAR ${PETSC_PACKAGES_INCLUDES})
# seem to include unexisting directories (/usr/include/lib64)
- # check to avoid warnings
- if(EXISTS ${VAR})
- list(APPEND EXTERNAL_INCLUDES ${VAR})
+ # check to avoid warnings
+ if(EXISTS ${VAR})
+ list(APPEND EXTERNAL_INCLUDES ${VAR})
endif()
endforeach()
endif()
@@ -1119,10 +1125,10 @@ if(HAVE_SOLVER)
endif()
if(PETSC_LIBS)
set_config_option(HAVE_PETSC "PETSc")
- if(NOT HAVE_BLAS)
+ if(NOT HAVE_BLAS)
set_config_option(HAVE_BLAS "Blas[petsc]")
endif()
- if(NOT HAVE_LAPACK)
+ if(NOT HAVE_LAPACK)
set_config_option(HAVE_LAPACK "Lapack[petsc]")
endif()
endif()
@@ -1264,21 +1270,34 @@ if(ENABLE_OCC)
message(STATUS "Found OpenCASCADE version ${OCC_VERSION} in ${OCC_INC}")
endif()
endif()
- if(OCC_VERSION AND OCC_VERSION STRLESS ${OCC_MINIMAL_VERSION})
+ if(OCC_VERSION AND OCC_VERSION VERSION_LESS ${OCC_MINIMAL_VERSION})
message(WARNING "Gmsh requires OpenCASCADE >= ${OCC_MINIMAL_VERSION}. "
"Use CMAKE_PREFIX_PATH or the CASROOT environment variable "
"to explicitly specify the installation path of OpenCASCADE")
elseif(OCC_INC)
- set(OCC_LIBS_REQUIRED
- # subset of DataExchange
- TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
- # ModelingAlgorithms
- TKOffset TKFeat TKFillet TKBool TKMesh TKHLR TKBO TKPrim TKShHealing
- TKTopAlgo TKGeomAlgo
- # ModelingData
- TKBRep TKGeomBase TKG3d TKG2d
- # FoundationClasses
- TKMath TKernel)
+ if(OCC_VERSION AND OCC_VERSION VERSION_GREATER_EQUAL "7.8.0")
+ set(OCC_LIBS_REQUIRED
+ # subset of DataExchange
+ TKDESTEP TKDEIGES TKXSBase
+ # ModelingAlgorithms
+ TKOffset TKFeat TKFillet TKBool TKMesh TKHLR TKBO TKPrim TKShHealing
+ TKTopAlgo TKGeomAlgo
+ # ModelingData
+ TKBRep TKGeomBase TKG3d TKG2d
+ # FoundationClasses
+ TKMath TKernel)
+ else()
+ set(OCC_LIBS_REQUIRED
+ # subset of DataExchange
+ TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKIGES TKXSBase
+ # ModelingAlgorithms
+ TKOffset TKFeat TKFillet TKBool TKMesh TKHLR TKBO TKPrim TKShHealing
+ TKTopAlgo TKGeomAlgo
+ # ModelingData
+ TKBRep TKGeomBase TKG3d TKG2d
+ # FoundationClasses
+ TKMath TKernel)
+ endif()
if(ENABLE_OCC_TBB)
list(APPEND OCC_LIBS_REQUIRED tbb tbbmalloc)
endif()
@@ -1310,8 +1329,13 @@ if(ENABLE_OCC)
if(ENABLE_OCC_CAF)
find_package(Freetype)
if(FREETYPE_FOUND)
- set(OCC_CAF_LIBS_REQUIRED
- TKXDESTEP TKXDEIGES TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF)
+ if(OCC_VERSION AND OCC_VERSION VERSION_GREATER_EQUAL "7.8.0")
+ set(OCC_CAF_LIBS_REQUIRED
+ TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF)
+ else()
+ set(OCC_CAF_LIBS_REQUIRED
+ TKXDESTEP TKXDEIGES TKXCAF TKLCAF TKVCAF TKCAF TKV3d TKService TKCDF)
+ endif()
list(LENGTH OCC_CAF_LIBS_REQUIRED NUM_OCC_CAF_LIBS_REQUIRED)
set(OCC_CAF_LIBS)
foreach(OCC ${OCC_CAF_LIBS_REQUIRED})
@@ -1493,6 +1517,10 @@ if(WALL AND NOT MSVC)
# FIXME: remove this when GCC behaves more intelligently
set(WF "${WF} -Wno-attributes")
endif()
+ check_cxx_compiler_flag("-Wno-unused-but-set-variable" WUNUSED)
+ if(WUNUSED)
+ set(WF "${WF} -Wno-unused-but-set-variable")
+ endif()
if(WIN32 OR NOT HAVE_64BIT_SIZE_T)
# FIXME: remove printf family warnings on 32 bit systems and windows
check_cxx_compiler_flag("-Wno-format" WFORMAT)
@@ -1768,8 +1796,10 @@ elseif(APPLE)
elseif(MSVC)
set_target_properties(gmsh PROPERTIES LINK_FLAGS "/STACK:16777216 /SAFESEH:NO")
elseif(APPLE)
- # this remove ld warnings with PETSc+MUMPS on recent macOS versions
- # set_target_properties(gmsh PROPERTIES LINK_FLAGS "-Wl,-no_compact_unwind")
+ # this remove ld warnings with PETSc+MUMPS on recent macOS versions; but
+ # breaks exception handling
+ # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_compact_unwind")
+ # set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-no_compact_unwind")
endif()
# android target
@@ -2203,9 +2233,6 @@ if(ENABLE_TESTS AND NOT DISABLE_GMSH_TESTS)
set(FLAGS "${FLAGS} -mconsole")
endif()
set_target_properties(${TEST} PROPERTIES LINK_FLAGS "${FLAGS}")
- elseif(APPLE)
- # this remove ld warnings with PETSc+MUMPS on recent macOS versions
- # set_target_properties(${TEST} PROPERTIES LINK_FLAGS "-Wl,-no_compact_unwind")
endif()
add_test(${TEST} ${TEST} -nopopup)
endforeach()
@@ -2245,3 +2272,4 @@ mark_as_advanced(ANN_INC ANN_LIB CAIRO_LIB CAIRO_INC C
PETSC_LIBS SLEPC_INC SLEPC_INC2 SLEPC_LIB
BISON FLEX MAKEINFO TEXI2PDF FLTK_CONFIG_SCRIPT
GMSH_EXTERNAL_INCLUDE_DIRS GMSH_EXTERNAL_LIBRARIES)
+

6
cad/horizon-eda/Makefile
View File

@ -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 \

15
cad/horizon-eda/files/patch-Makefile
View File

@ -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 $@

2
cad/kicad-devel/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= kicad
DISTVERSION= r${GIT_SRC_DATE}
PORTREVISION= 7
PORTREVISION= 8
#PORTREVISION= 1
CATEGORIES= cad
PKGNAMESUFFIX= -devel

35
cad/kicad-devel/files/patch-cmake_FindOCC.cmake Normal file
View File

@ -0,0 +1,35 @@
--- cmake/FindOCC.cmake.orig 2023-06-22 13:35:48 UTC
+++ cmake/FindOCC.cmake
@@ -45,7 +45,7 @@ set( OCC_LIBS
TKGeomAlgo
TKGeomBase
TKHLR
- TKIGES
+ TKDEIGES
TKLCAF
TKMath
TKMesh
@@ -55,18 +55,15 @@ set( OCC_LIBS
TKPrim
TKService
TKShHealing
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
- TKSTEP
- TKSTL
+ TKDESTEP
+ TKDESTL
TKTObj
TKTopAlgo
TKV3d
- TKVRML
+ TKDEVRML
TKXCAF
- TKXDEIGES
- TKXDESTEP
+ TKXSDRAWIGES
+ TKXSDRAWSTEP
TKXMesh
TKXmlL
TKXml

4
cad/kicad-devel/files/patch-include-kiway.h
View File

@ -1,6 +1,6 @@
--- include/kiway.h.orig 2021-12-11 08:54:03 UTC
--- include/kiway.h.orig 2023-06-22 13:35:48 UTC
+++ include/kiway.h
@@ -114,7 +114,7 @@
@@ -115,7 +115,7 @@
#define KIFACE_INSTANCE_NAME_AND_VERSION "KIFACE_1"
#ifndef SWIG

20
cad/kicad-devel/files/patch-pcbnew_import_gfx_dxf_import_plugin.cpp → cad/kicad-devel/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp
View File

@ -1,27 +1,34 @@
--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig 2023-01-08 16:40:34.270267000 +0100
+++ pcbnew/import_gfx/dxf_import_plugin.cpp 2023-01-08 16:40:37.228586000 +0100
@@ -581,5 +581,5 @@
--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig 2023-06-22 13:35:48 UTC
+++ pcbnew/import_gfx/dxf_import_plugin.cpp
@@ -580,7 +580,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
// For now, we assume ellipses in the XY plane.
VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
- VECTOR2D major( mapX( majorCoords.x ), mapY( majorCoords.y ) );
+ VECTOR2D _major( mapX( majorCoords.x ), mapY( majorCoords.y ) );
// DXF elliptical arcs store their angles in radians (unlike circular arcs which use degrees)
@@ -599,5 +599,5 @@
// The arcs wind CCW as in KiCad. The end angle must be greater than the start angle, and if
@@ -598,7 +598,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
if( aData.ratio == 1.0 )
{
- double radius = major.EuclideanNorm();
+ double radius = _major.EuclideanNorm();
if( startAngle == endAngle )
@@ -617,5 +617,5 @@
{
@@ -616,7 +616,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
}
std::vector<BEZIER<double>> splines;
- ELLIPSE<double> ellipse( center, major, aData.ratio, startAngle, endAngle );
+ ELLIPSE<double> ellipse( center, _major, aData.ratio, startAngle, endAngle );
TransformEllipseToBeziers( ellipse, splines );
@@ -631,6 +631,6 @@
@@ -630,8 +630,8 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
bufferToUse->AddSpline( b.Start, b.C1, b.C2, b.End, lineWidth );
// Naive bounding
- updateImageLimits( center + major );
@ -30,3 +37,4 @@
+ updateImageLimits( center - _major );
}

6
cad/kicad-devel/files/patch-thirdparty_glew_CMakeLists.txt
View File

@ -1,10 +1,10 @@
--- thirdparty/glew/CMakeLists.txt.orig 2022-05-07 15:44:23 +0200
--- thirdparty/glew/CMakeLists.txt.orig 2023-06-22 13:35:48 UTC
+++ thirdparty/glew/CMakeLists.txt
@@ -5,6 +5,7 @@
@@ -5,6 +5,7 @@ target_include_directories( glew PRIVATE "${CMAKE_CURR
# The actual include directories will be added to the global include paths as
# system headers
target_include_directories( glew PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" )
+target_include_directories( glew SYSTEM PRIVATE "${CMAKE_INSTALL_PREFIX}/include" )
# Definitions for compiling GLEW staticly for EGL (extracted from the main GLEW CMakeLists.txt file)
add_definitions( -DGLEW_STATIC )
add_compile_definitions( GLEW_STATIC )

11
cad/kicad-devel/files/patch-thirdparty_nanodbc_CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- thirdparty/nanodbc/CMakeLists.txt.orig 2022-09-14 12:06:32 UTC
--- thirdparty/nanodbc/CMakeLists.txt.orig 2023-06-22 13:35:48 UTC
+++ thirdparty/nanodbc/CMakeLists.txt
@@ -165,16 +165,11 @@ elseif(MINGW)
@@ -155,16 +155,11 @@ endif()
endif()
########################################
@ -21,10 +21,3 @@
########################################
## library target
@@ -202,4 +197,4 @@ endif()
if(NANODBC_ENABLE_UNICODE)
add_compile_definitions(NANODBC_ENABLE_UNICODE)
target_compile_definitions(nanodbc PUBLIC NANODBC_ENABLE_UNICODE)
-endif()
\ No newline at end of file
+endif()

2
cad/kicad/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= kicad
PORTVERSION= 7.0.2
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 2
CATEGORIES= cad
MASTER_SITES= https://gitlab.com/${PORTNAME}/code/${PORTNAME}/-/archive/${DISTVERSION}${DISTVERSIONSUFFIX}/

35
cad/kicad/files/patch-cmake_FindOCC.cmake Normal file
View File

@ -0,0 +1,35 @@
--- cmake/FindOCC.cmake.orig 2023-04-13 20:27:39 UTC
+++ cmake/FindOCC.cmake
@@ -45,7 +45,7 @@ set( OCC_LIBS
TKGeomAlgo
TKGeomBase
TKHLR
- TKIGES
+ TKDEIGES
TKLCAF
TKMath
TKMesh
@@ -55,18 +55,15 @@ set( OCC_LIBS
TKPrim
TKService
TKShHealing
- TKSTEP209
- TKSTEPAttr
- TKSTEPBase
- TKSTEP
- TKSTL
+ TKDESTEP
+ TKDESTL
TKTObj
TKTopAlgo
TKV3d
- TKVRML
+ TKDEVRML
TKXCAF
- TKXDEIGES
- TKXDESTEP
+ TKXSDRAWIGES
+ TKXSDRAWSTEP
TKXMesh
TKXmlL
TKXml

4
cad/kicad/files/patch-CMakeModules_KiCadFullVersion.cmake → cad/kicad/files/patch-cmake_KiCadFullVersion.cmake
View File

@ -1,5 +1,5 @@
--- ./cmake/KiCadFullVersion.cmake.orig 2023-01-25 21:49:08.004539000 +0100
+++ ./cmake/KiCadFullVersion.cmake 2023-01-25 21:49:50.772285000 +0100
--- cmake/KiCadFullVersion.cmake.orig 2023-04-13 20:27:39 UTC
+++ cmake/KiCadFullVersion.cmake
@@ -27,10 +27,6 @@
# repository), or the version from KiCadVersion.cmake. The user-provided
# KICAD_VERSION_EXTRA is then appended to the base version string.

4
cad/kicad/files/patch-eeschema_sim_sim__plot__frame.cpp
View File

@ -1,5 +1,5 @@
--- eeschema/sim/sim_plot_frame.cpp.orig 2023-01-25 22:50:55.894239000 +0100
+++ eeschema/sim/sim_plot_frame.cpp 2023-01-27 00:25:46.086158000 +0100
--- eeschema/sim/sim_plot_frame.cpp.orig 2023-04-13 20:27:39 UTC
+++ eeschema/sim/sim_plot_frame.cpp
@@ -27,6 +27,8 @@
#include <wx/debug.h>
#include <wx/stc/stc.h>

40
cad/kicad/files/patch-job_use_dynamic_cast_for_updating
View File

@ -17,11 +17,9 @@ Date: Fri Mar 24 21:59:39 2023 +0100
Credits to Pero Orsolic for reporting the first cases of this in the
PDF export in https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270273 .
diff --git eeschema/eeschema_jobs_handler.cpp eeschema/eeschema_jobs_handler.cpp
index 61462793ee..ce312d5100 100644
--- eeschema/eeschema_jobs_handler.cpp
--- eeschema/eeschema_jobs_handler.cpp.orig 2023-04-13 20:27:39 UTC
+++ eeschema/eeschema_jobs_handler.cpp
@@ -111,7 +111,7 @@ REPORTER& EESCHEMA_JOBS_HANDLER::Report( const wxString& aText, SEVERITY aSeveri
@@ -111,7 +111,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
{
@ -30,7 +28,7 @@ index 61462793ee..ce312d5100 100644
if( !aPdfJob )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -147,7 +147,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPdf( JOB* aJob )
@@ -147,7 +147,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
{
@ -39,7 +37,7 @@ index 61462793ee..ce312d5100 100644
if( !aSvgJob )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -183,7 +183,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportSvg( JOB* aJob )
@@ -183,7 +183,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob
int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
{
@ -48,7 +46,7 @@ index 61462793ee..ce312d5100 100644
if( !aNetJob )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -281,7 +281,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportNetlist( JOB* aJob )
@@ -281,7 +281,7 @@ int EESCHEMA_JOBS_HANDLER::JobExportPythonBom( JOB* aJ
int EESCHEMA_JOBS_HANDLER::JobExportPythonBom( JOB* aJob )
{
@ -57,7 +55,7 @@ index 61462793ee..ce312d5100 100644
SCHEMATIC* sch = EESCHEMA_HELPERS::LoadSchematic( aNetJob->m_filename, SCH_IO_MGR::SCH_KICAD );
@@ -447,7 +447,7 @@ int EESCHEMA_JOBS_HANDLER::doSymExportSvg( JOB_SYM_EXPORT_SVG* aSvgJob,
@@ -447,7 +447,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob
int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob )
{
@ -66,7 +64,7 @@ index 61462793ee..ce312d5100 100644
wxFileName fn( svgJob->m_libraryPath );
fn.MakeAbsolute();
@@ -510,7 +510,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymExportSvg( JOB* aJob )
@@ -510,7 +510,7 @@ int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
int EESCHEMA_JOBS_HANDLER::JobSymUpgrade( JOB* aJob )
{
@ -75,11 +73,9 @@ index 61462793ee..ce312d5100 100644
wxFileName fn( upgradeJob->m_libraryPath );
fn.MakeAbsolute();
diff --git pcbnew/pcbnew_jobs_handler.cpp pcbnew/pcbnew_jobs_handler.cpp
index be0f806dea..e045f864de 100644
--- pcbnew/pcbnew_jobs_handler.cpp
--- pcbnew/pcbnew_jobs_handler.cpp.orig 2023-04-13 20:27:39 UTC
+++ pcbnew/pcbnew_jobs_handler.cpp
@@ -76,7 +76,7 @@ PCBNEW_JOBS_HANDLER::PCBNEW_JOBS_HANDLER()
@@ -76,7 +76,7 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
{
@ -88,7 +84,7 @@ index be0f806dea..e045f864de 100644
if( aStepJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -119,7 +119,7 @@ int PCBNEW_JOBS_HANDLER::JobExportStep( JOB* aJob )
@@ -119,7 +119,7 @@ int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob )
{
@ -97,7 +93,7 @@ index be0f806dea..e045f864de 100644
if( aSvgJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -152,7 +152,7 @@ int PCBNEW_JOBS_HANDLER::JobExportSvg( JOB* aJob )
@@ -152,7 +152,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
{
@ -106,7 +102,7 @@ index be0f806dea..e045f864de 100644
if( aDxfJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -207,7 +207,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDxf( JOB* aJob )
@@ -207,7 +207,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
{
@ -115,7 +111,7 @@ index be0f806dea..e045f864de 100644
if( aPdfJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -257,7 +257,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
@@ -257,7 +257,7 @@ int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportGerbers( JOB* aJob )
{
@ -124,7 +120,7 @@ index be0f806dea..e045f864de 100644
if( aGerberJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -368,7 +368,7 @@ void PCBNEW_JOBS_HANDLER::populateGerberPlotOptionsFromJob( PCB_PLOT_PARAMS&
@@ -368,7 +368,7 @@ int PCBNEW_JOBS_HANDLER::JobExportGerber( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportGerber( JOB* aJob )
{
@ -133,7 +129,7 @@ index be0f806dea..e045f864de 100644
if( aGerberJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -414,7 +414,7 @@ static DRILL_PRECISION precisionListForMetric( 3, 3 );
@@ -414,7 +414,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
{
@ -142,7 +138,7 @@ index be0f806dea..e045f864de 100644
if( aDrillJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -522,7 +522,7 @@ int PCBNEW_JOBS_HANDLER::JobExportDrill( JOB* aJob )
@@ -522,7 +522,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPos( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportPos( JOB* aJob )
{
@ -151,7 +147,7 @@ index be0f806dea..e045f864de 100644
if( aPosJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -597,7 +597,7 @@ extern FOOTPRINT* try_load_footprint( const wxFileName& aFileName, IO_MGR::PCB_F
@@ -597,7 +597,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob
int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob )
{
@ -160,7 +156,7 @@ index be0f806dea..e045f864de 100644
if( upgradeJob == nullptr )
return CLI::EXIT_CODES::ERR_UNKNOWN;
@@ -668,7 +668,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpUpgrade( JOB* aJob )
@@ -668,7 +668,7 @@ int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob )
int PCBNEW_JOBS_HANDLER::JobExportFpSvg( JOB* aJob )
{

12
cad/kicad/files/patch-pcbnew_import__gfx_dxf__import__plugin.cpp
View File

@ -1,5 +1,5 @@
--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig 2023-01-25 22:16:35.742131000 +0100
+++ pcbnew/import_gfx/dxf_import_plugin.cpp 2023-01-25 23:02:52.939723000 +0100
--- pcbnew/import_gfx/dxf_import_plugin.cpp.orig 2023-04-13 20:27:39 UTC
+++ pcbnew/import_gfx/dxf_import_plugin.cpp
@@ -28,6 +28,9 @@
// like void DXF_IMPORT_PLUGIN::addLine( const DL_LineData& data ) when a line is read.
// this function just add the BOARD entity from dxf parameters (start and end point ...)
@ -10,7 +10,7 @@
#include "dxf_import_plugin.h"
#include <wx/arrstr.h>
@@ -580,7 +583,7 @@
@@ -580,7 +583,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
// For now, we assume ellipses in the XY plane.
VECTOR2D center( mapX( centerCoords.x ), mapY( centerCoords.y ) );
@ -19,7 +19,7 @@
// DXF elliptical arcs store their angles in radians (unlike circular arcs which use degrees)
// The arcs wind CCW as in KiCad. The end angle must be greater than the start angle, and if
@@ -598,7 +601,7 @@
@@ -598,7 +601,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
if( aData.ratio == 1.0 )
{
@ -28,7 +28,7 @@
if( startAngle == endAngle )
{
@@ -616,7 +619,7 @@
@@ -616,7 +619,7 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
}
std::vector<BEZIER<double>> splines;
@ -37,7 +37,7 @@
TransformEllipseToBeziers( ellipse, splines );
@@ -630,8 +633,8 @@
@@ -630,8 +633,8 @@ void DXF_IMPORT_PLUGIN::addEllipse( const DL_EllipseDa
bufferToUse->AddSpline( b.Start, b.C1, b.C2, b.End, lineWidth );
// Naive bounding

4
cad/kicad/files/patch-thirdparty_glew_CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- thirdparty/glew/CMakeLists.txt.orig 2022-05-07 15:44:23 +0200
--- thirdparty/glew/CMakeLists.txt.orig 2023-04-13 20:27:39 UTC
+++ thirdparty/glew/CMakeLists.txt
@@ -5,6 +5,7 @@
@@ -5,6 +5,7 @@ target_include_directories( glew PRIVATE "${CMAKE_CURR
# The actual include directories will be added to the global include paths as
# system headers
target_include_directories( glew PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" )

1
cad/librepcb/Makefile
View File

@ -1,6 +1,7 @@
PORTNAME= librepcb
DISTVERSION= 1.0.0
DISTVERSIONSUFFIX= -source
PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= https://download.librepcb.org/releases/${DISTVERSION}/

39
cad/librepcb/files/patch-cmake_FindOpenCascade.cmake Normal file
View File

@ -0,0 +1,39 @@
--- 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(

63
cad/opencascade/Makefile
View File

@ -1,8 +1,7 @@
PORTNAME= opencascade
DISTVERSION= 7.7.0
PORTREVISION= 10
DISTVERSIONPREFIX= V
DISTVERSION= 7_8_0
CATEGORIES= cad science
MASTER_SITES= LOCAL/thierry
MAINTAINER= thierry@FreeBSD.org
COMMENT= Open CASCADE Technology, 3D modeling & numerical simulation
@ -18,6 +17,7 @@ BUILD_DEPENDS= rapidjson>0:devel/rapidjson \
${LOCALBASE}/lib/qt5/bin/moc:devel/qt5-buildtools
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libtbbmalloc.so:devel/onetbb \
libexpat.so:textproc/expat2 \
libdraco.so:archivers/draco \
libpng16.so:graphics/png \
@ -26,13 +26,17 @@ RUN_DEPENDS= bash:shells/bash
# Check ${WRKSRC}/dox/overview/overview.md
# and ${WRKSRC}/dox/dev_guides/building
USES= alias:10 cmake compiler:c++14-lang dos2unix gettext-runtime \
gl gnome localbase python qt:5 shebangfix tk tar:tgz xorg
USES= alias:10 cmake compiler:c++14-lang eigen:3 gettext-runtime \
gl gnome localbase python qt:5 shebangfix tk xorg
USE_XORG= ice sm x11 xau xcb xdmcp xext xft xi xmu xrender xscrnsaver xt
USE_GL= egl gl glesv2 glu
USE_GNOME= libxml2
USE_QT= core declarative gui network quick3d linguisttools widgets xml
USE_GITHUB= yes
GH_ACCOUNT= Open-Cascade-SAS
GH_PROJECT= OCCT
DOS2UNIX_FILES= adm/templates/*
SHEBANG_FILES= adm/templates/*.sh \
adm/templates/*.sh.in \
adm/templates/*.sh.main \
@ -57,11 +61,19 @@ CMAKE_ARGS+= -DINSTALL_DIR=${OCCROOT} \
-DINSTALL_DIR_SAMPLES=${OCCROOT}/samples \
-DINSTALL_DIR_TESTS=${OCCROOT}/tests \
-DINSTALL_TEST_CASES:BOOL=ON \
-DUSE_FREETYPE:BOOL=ON \
-DUSE_TBB:BOOL=OFF \
-DUSE_RAPIDJSON:BOOL=ON \
-DUSE_DRACO:BOOL=ON \
-DUSE_VTK:BOOL=ON \
-DBUILD_Inspector:BOOL=ON \
-DUSE_TCL:BOOL=ON \
-DCAN_USE_TK:BOOL=ON -DUSE_TK:BOOL=ON \
-DCAN_USE_XLIB:BOOL=ON -DUSE_XLIB:BOOL=ON \
-DCAN_USE_FREETYPE:BOOL=ON -DUSE_FREETYPE:BOOL=ON \
-DCAN_USE_VTK:BOOL=ON -DUSE_VTK:BOOL=ON \
-DCAN_USE_EIGEN:BOOL=ON -DUSE_EIGEN:BOOL=ON \
-DCAN_USE_RAPIDJSON:BOOL=ON -DUSE_RAPIDJSON:BOOL=ON \
-DCAN_USE_DRACO:BOOL=ON -DUSE_DRACO:BOOL=ON \
-DCAN_USE_TBB:BOOL=ON -DUSE_TBB:BOOL=ON \
-D3RDPARTY_QT_DIR:PATH=${QT_LIBDIR} \
-D3RDPARTY_DRACO_DIR:PATH=${LOCALBASE} \
-D3RDPARTY_DRACO_LIBRARY=libdraco.so \
-D3RDPARTY_DRACO_LIBRARY_DIR:PATH=${LOCALBASE}/lib \
-D3RDPARTY_DRACO_INCLUDE_DIR:PATH=${LOCALBASE}/include/draco \
-D3RDPARTY_VTK_INCLUDE_DIR:PATH=${LOCALBASE}/include/vtk-${VTK_VER}
@ -72,11 +84,6 @@ CMAKE_ARGS+= -DCMAKE_MESSAGE_CONTEXT_SHOW:BOOL=ON \
-DCMAKE_MESSAGE_LOG_LEVEL:STRING=DEBUG
.endif
# TODO: TBB to be replaced by onetbb later
#CMAKE_ARGS+= -DUSE_EIGEN:BOOL=ON -DUSE_TBB:BOOL=ON
#USES+= eigen:3
#LIB_DEPENDS+= libtbb.so:devel/tbb
USE_LDCONFIG= yes
CONFLICTS_INSTALL= opencascade740 # OpenCAS/bin/DRAWEXE
@ -84,9 +91,9 @@ CONFLICTS_INSTALL= opencascade740 # OpenCAS/bin/DRAWEXE
LOCCROOT= OpenCAS
OCCROOT= ${PREFIX}/${LOCCROOT}
PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \
VE=${PORTVERSION:R} VER=${DISTVERSION:C/-beta//}
VE=${PORTVERSION:R} VER=${PORTVERSION}
FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON \
FFMPEG_CMAKE_ON= -DCAN_USE_FFMPEG:BOOL=ON -DUSE_FFMPEG:BOOL=ON \
-D3RDPARTY_FFMPEG_INCLUDE_DIR=${LOCALBASE}/ffmpeg4/include \
-D3RDPARTY_FFMPEG_DIR=${LOCALBASE}/ffmpeg4
FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF
@ -114,15 +121,17 @@ FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \
libopus.so:audio/opus \
libgmp.so:math/gmp
VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON \
-DUSE_GLES2:BOOL=ON \
VIS_CMAKE_ON= -DCAN_USE_FREEIMAGE:BOOL=ON -DUSE_FREEIMAGE:BOOL=ON \
-DCAN_USE_OPENGL:BOOL=ON -DUSE_OPENGL:BOOL=ON \
-DCAN_USE_GLES2:BOOL=ON -DUSE_GLES2:BOOL=ON \
-D3RDPARTY_FREETYPE_DIR=${LOCALBASE}
VIS_CMAKE_OFF= -DUSE_FREEIMAGE:BOOL=OFF \
-DUSE_GLES2:BOOL=OFF
VIS_LIB_DEPENDS= libftgl.so:graphics/ftgl \
libfreeimageplus.so:graphics/freeimage
VIS_USE= GL=glesv2
VIS_USE= GL=glesv2,opengl
DOCS_DISTFILES= documentation.tar.xz
DOXYGEN_IMPLIES= DOCS
DOXYGEN_USES= tex
DOXYGEN_USE= TEX=latex:build
@ -132,6 +141,8 @@ DOXYGEN_BUILD_DEPENDS= bash:shells/bash \
pdftex:print/tex-basic-engines \
inkscape:graphics/inkscape
DOXYGEN_RUN_DEPENDS= ${LOCALBASE}/www/MathJax/MathJax.js:www/mathjax
DOXYGEN_CMAKE_ON= -DBUILD_DOC_Overview:BOOL=ON \
-DINSTALL_DOC_Overview:BOOL=ON
.include <bsd.port.options.mk>
@ -161,23 +172,17 @@ pre-configure:
${REINPLACE_CMD} -e 's|lin|bsd|' ${WRKSRC}/${es}
.endfor
post-build-DOXYGEN-on:
(cd ${WRKSRC} && ./gendoc -overview)
post-stage:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/cmake/OpenCASCADE
${MV} ${STAGEDIR}${PREFIX}/lib/cmake/*.cmake \
${STAGEDIR}${PREFIX}/lib/cmake/OpenCASCADE
post-install:
${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${DISTVERSION:C/-beta//} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
${MV} ${STAGEDIR}${OCCROOT}/bin/DRAWEXE-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/DRAWEXE
${RLN} ${STAGEDIR}${PREFIX}/bin/DRAWEXE ${STAGEDIR}${OCCROOT}/bin
post-install-DOXYGEN-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKSRC}/doc/overview && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
${RM} -r ${STAGEDIR}${DOCSDIR}/latex
${RM} ${STAGEDIR}${DOCSDIR}/html/build_upgrade_building_3rdparty.html.bak
${RLN} ${STAGEDIR}${OCCROOT}/${DOCSDIR_REL} ${STAGEDIR}${DOCSDIR}
.if defined(MAINTAINER_MODE)
regression-test: install

8
cad/opencascade/distinfo
View File

@ -1,3 +1,5 @@
TIMESTAMP = 1668069465
SHA256 (opencascade-7.7.0.tgz) = 40e8e0e78b56dd407192b4cabf55dd0bdd1fa9c0a292d263b12f7e21733cb07e
SIZE (opencascade-7.7.0.tgz) = 247268442
TIMESTAMP = 1701808276
SHA256 (documentation.tar.xz) = 3c5cdd70de9c82d9f0be4b9400d618494cfecd28f502d110111060c9aaaf50c7
SIZE (documentation.tar.xz) = 48428333
SHA256 (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 3c5cdd70de9c82d9f0be4b9400d618494cfecd28f502d110111060c9aaaf50c7
SIZE (Open-Cascade-SAS-OCCT-V7_8_0_GH0.tar.gz) = 48428333

8
cad/opencascade/files/patch-CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2022-09-30 11:53:39 UTC
--- CMakeLists.txt.orig 2023-12-04 15:53:08 UTC
+++ CMakeLists.txt
@@ -1005,7 +1005,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
@@ -1015,7 +1015,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
else()
install (FILES "${CMAKE_SOURCE_DIR}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION "${INSTALL_DIR_SCRIPT}"
@ -9,7 +9,7 @@
endif()
# copy draw script to CMake binary folder
@@ -1021,7 +1021,7 @@ endif()
@@ -1031,7 +1031,7 @@ endif()
endif()
# change custom.bat/sh
@ -18,7 +18,7 @@
file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
@@ -1265,7 +1265,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF
@@ -1275,7 +1275,7 @@ install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONF
endforeach()
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")

10
cad/opencascade/files/patch-adm_UDLIST Normal file
View File

@ -0,0 +1,10 @@
--- adm/UDLIST.orig 2023-12-04 15:53:08 UTC
+++ adm/UDLIST
@@ -32,6 +32,7 @@ r OS
n gp
n math
r OS
+n FlexLexer
t TKMath
t TKernel
n Adaptor2d

6
cad/opencascade/files/patch-adm_cmake_occt__macros.cmake
View File

@ -1,4 +1,4 @@
--- adm/cmake/occt_macros.cmake.orig 2022-09-30 11:53:39 UTC
--- adm/cmake/occt_macros.cmake.orig 2023-12-04 15:53:08 UTC
+++ adm/cmake/occt_macros.cmake
@@ -47,7 +47,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS)
elseif(APPLE)
@ -9,7 +9,7 @@
endif()
endmacro()
@@ -336,7 +336,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARG
@@ -338,7 +338,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARG
configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}" @ONLY)
endforeach()
@ -18,7 +18,7 @@
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
@@ -590,12 +590,12 @@ macro (OCCT_UPDATE_TARGET_FILE)
@@ -592,12 +592,12 @@ macro (OCCT_UPDATE_TARGET_FILE)
install (CODE
"string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)

4
cad/opencascade/files/patch-adm_templates_custom.install.sh.in
View File

@ -1,6 +1,6 @@
--- adm/templates/custom.install.sh.in.orig 2021-06-26 15:04:30 UTC
--- adm/templates/custom.install.sh.in.orig 2023-12-06 17:35:33 UTC
+++ adm/templates/custom.install.sh.in
@@ -20,14 +20,14 @@ if [ "$1" == "@BIN_LETTER@" ]; then
@@ -21,14 +21,14 @@ if [ "$1" == "@BIN_LETTER@" ]; then
export TCL_VERSION_WITH_DOT="@3RDPARTY_TCL_LIBRARY_VERSION_WITH_DOT@"
export TK_VERSION_WITH_DOT="@3RDPARTY_TK_LIBRARY_VERSION_WITH_DOT@"

6
cad/opencascade/files/patch-src_IVtkDraw_IVtkDraw__Interactor.cxx
View File

@ -1,6 +1,6 @@
- workaround for https://gitlab.kitware.com/vtk/vtk/-/issues/18683
--- src/IVtkDraw/IVtkDraw_Interactor.cxx.orig 2021-10-30 11:13:52 UTC
--- src/IVtkDraw/IVtkDraw_Interactor.cxx.orig 2023-12-04 15:53:08 UTC
+++ src/IVtkDraw/IVtkDraw_Interactor.cxx
@@ -26,6 +26,12 @@
#ifdef AllValues
@ -13,5 +13,5 @@
+#undef Success
+#endif
#include <vtkXRenderWindowInteractor.h>
#include <vtkXOpenGLRenderWindow.h>
// Resolve name collisions with X11 headers
#ifdef Status

10
cad/opencascade/files/patch-src_Message_Message__AttributeMeter.cxx Normal file
View File

@ -0,0 +1,10 @@
--- src/Message/Message_AttributeMeter.cxx.orig 2023-12-04 15:53:08 UTC
+++ src/Message/Message_AttributeMeter.cxx
@@ -253,6 +253,6 @@ void Message_AttributeMeter::DumpJson (Standard_OStrea
anIterator.More(); anIterator.Next())
{
OCCT_DUMP_VECTOR_CLASS (theOStream, Message::MetricToString (anIterator.Key()),
- 2, anIterator.Value(), anIterator.Value())
+ 2, anIterator.Value().first, anIterator.Value().second)
}
}

39
cad/opencascade/files/patch-src_NCollection_NCollection__Array1.hxx Normal file
View File

@ -0,0 +1,39 @@
--- src/NCollection/NCollection_Array1.hxx.orig 2023-12-04 15:53:08 UTC
+++ src/NCollection/NCollection_Array1.hxx
@@ -72,26 +72,10 @@ class NCollection_Array1 (public)
using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, false>;
using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_Array1, value_type, true>;
+ using Iterator = NCollection_Iterator<NCollection_Array1<TheItemType>>;
public:
- // Iterator class
- class Iterator : public NCollection_Iterator<NCollection_Array1>
- {
- public:
- using NCollection_Iterator<NCollection_Array1>::NCollection_Iterator;
-
- const_reference Value() const
- {
- return *NCollection_Iterator<NCollection_Array1>::ValueIter();
- }
-
- reference ChangeValue()
- {
- return *NCollection_Iterator<NCollection_Array1>::ChangeValueIter();
- }
- };
-
const_iterator begin() const
{
return const_iterator(*this);
@@ -150,7 +134,7 @@ class NCollection_Array1 (public)
mySize(theUpper - theLower + 1),
myPointer(nullptr),
myIsOwner(false),
- allocator_type(theAlloc)
+ myAllocator(theAlloc)
{
if (mySize == 0)
{

29
cad/opencascade/files/patch-src_NCollection_NCollection__DynamicArray.hxx Normal file
View File

@ -0,0 +1,29 @@
--- src/NCollection/NCollection_DynamicArray.hxx.orig 2023-12-04 15:53:08 UTC
+++ src/NCollection/NCollection_DynamicArray.hxx
@@ -77,25 +77,9 @@ class NCollection_DynamicArray (public)
using iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, false>;
using const_iterator = NCollection_IndexedIterator<std::random_access_iterator_tag, NCollection_DynamicArray, value_type, true>;
+ using Iterator = NCollection_Iterator<NCollection_DynamicArray<TheItemType>>;
public:
-
- // Iterator class
- class Iterator : public NCollection_Iterator<NCollection_DynamicArray>
- {
- public:
- using NCollection_Iterator<NCollection_DynamicArray>::NCollection_Iterator;
-
- const_reference Value() const
- {
- return *NCollection_Iterator<NCollection_DynamicArray>::ValueIter();
- }
-
- reference ChangeValue()
- {
- return *NCollection_Iterator<NCollection_DynamicArray>::ChangeValueIter();
- }
- };
const_iterator begin() const
{

19
cad/opencascade/files/patch-src_NCollection_NCollection__Iterator.hxx Normal file
View File

@ -0,0 +1,19 @@
--- src/NCollection/NCollection_Iterator.hxx.orig 2023-12-04 15:53:08 UTC
+++ src/NCollection/NCollection_Iterator.hxx
@@ -94,6 +94,16 @@ class NCollection_Iterator (public)
++(myCur);
}
+ const typename Container::const_reference Value() const
+ {
+ return *myCur;
+ }
+
+ const typename Container::reference ChangeValue()
+ {
+ return *myCur;
+ }
+
bool operator==(const NCollection_Iterator& theOther) { return myLast == theOther.myLast && myCur == theOther.myCur; }
bool operator!=(const NCollection_Iterator& theOther) { return myLast != theOther.myLast || myCur != theOther.myCur; }

21
cad/opencascade/files/patch-src_STEPCAFControl_STEPCAFControl__Reader.cxx Normal file
View File

@ -0,0 +1,21 @@
--- src/STEPCAFControl/STEPCAFControl_Reader.cxx.orig 2023-12-04 15:53:08 UTC
+++ src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -1996,7 +1996,8 @@ Handle(Poly_Triangulation) createMesh(const Handle(Ste
const Standard_Integer aNbNormals = theTriangulatedSufaceSet->NbNormals();
// Number of pairs (Point, Normal). It is possible for one point to have multiple normals. This is
// useful when the underlying surface is not C1 continuous.
- const Standard_Integer aNbPairs = aNbNormals > 1 ? theTriangulatedSufaceSet->NbPnindex() : aNodes->Length();
+ // Patch from https://git.dev.opencascade.org/gitweb/?p=occt.git;a=commitdiff;h=0f6f5b64d321a988399567f6b901bef385cc8d41
+ const Standard_Integer aNbPairs = aNbNormals > 1 ? theTriangulatedSufaceSet->Pnmax() : aNodes->Length();
const Standard_Boolean aHasNormals = aNbNormals > 0;
// Counting number of triangles in the triangle strips list.
@@ -2021,7 +2022,7 @@ Handle(Poly_Triangulation) createMesh(const Handle(Ste
for (Standard_Integer j = 1; j <= aNbPairs; ++j)
{
- const gp_XYZ& aPoint = aNodes->Value(aNbNormals > 1 ? theTriangulatedSufaceSet->PnindexValue(j) : j);
+ const gp_XYZ& aPoint = aNodes->Value((aNbNormals > 1 && theTriangulatedSufaceSet->NbPnindex() > 0) ? theTriangulatedSufaceSet->PnindexValue(j) : j);
aMesh->SetNode(j, theFact * aPoint);
}

4
cad/opencascade/files/patch-src_Standard_Standard__CString.cxx
View File

@ -1,6 +1,6 @@
--- src/Standard/Standard_CString.cxx.orig 2022-09-30 11:54:05 UTC
--- src/Standard/Standard_CString.cxx.orig 2023-12-04 15:53:08 UTC
+++ src/Standard/Standard_CString.cxx
@@ -80,7 +80,7 @@ Standard_Integer HashCodes (const Standard_CString the
@@ -50,7 +50,7 @@
// strtod, strtol, strtoll functions. For other system with locale-depended
// implementations problems may appear if "C" locale is not set explicitly.
#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__MINGW32__)

12
cad/opencascade/files/patch-src_Standard_Standard__MMgrTBBalloc.cxx
View File

@ -1,12 +0,0 @@
--- src/Standard/Standard_MMgrTBBalloc.cxx.orig 2017-08-30 13:28:31 UTC
+++ src/Standard/Standard_MMgrTBBalloc.cxx
@@ -18,6 +18,9 @@
// paralleling with Intel TBB
#ifdef HAVE_TBB
+#ifdef VERSION
+#undef VERSION
+#endif
#include <tbb/scalable_allocator.h>
using namespace tbb;
#else

3219
cad/opencascade/pkg-plist
View File

File diff suppressed because it is too large Load Diff

36
chinese/sourcehansans-sc-otf/Makefile
View File

@ -1,48 +1,18 @@
PORTNAME= sourcehansans
PORTVERSION= 2.000
DISTVERSIONSUFFIX= R
CATEGORIES= chinese x11-fonts
PKGNAMESUFFIX= -sc-otf
# Note: the following PKGNAMEPREFIX is here only for self-documenting purpose;
# actual prefixing is done by the `chinese' category itself.
#PKGNAMEPREFIX= zh-
MAINTAINER= hyun@caffeinated.codes
COMMENT= Simplified Chinese font by Adobe designed for user interfaces
WWW= https://github.com/adobe-fonts/source-han-sans
LICENSE= OFL11
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= fonts
USE_GITHUB= yes
GH_ACCOUNT= adobe-fonts
GH_PROJECT= source-han-sans
NO_ARCH= yes
NO_BUILD= yes
SUB_FILES= pkg-message
OPTIONS_DEFINE= HW
OPTIONS_SINGLE= TYPE
OPTIONS_SINGLE_TYPE= FULL SUBSET
OPTIONS_DEFAULT= FULL
OPTIONS_SUB= yes
HW_DESC= Install the half-width font in addition to the full font
FULL_DESC= Install the full font (can display all CJK)
SUBSET_DESC= Install the subset font (can display SC only)
SUBSET_PREVENTS= HW
SUBSET_PREVENTS_MSG= Half-width can only be installed in addition to the full font
FULL_VARS= FONTNAME=SourceHanSansSC SRCFONTSDIR=OTF/SimplifiedChinese
SUBSET_VARS= FONTNAME=SourceHanSansCN SRCFONTSDIR=SubsetOTF/CN
do-install:
@${MKDIR} ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} ${WRKSRC}/${SRCFONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR}
SHS_HW_LANG= SimplifiedChinese
post-install-HW-on:
${INSTALL_DATA} ${WRKSRC}/OTF/SimplifiedChineseHW/*.otf ${STAGEDIR}${FONTSDIR}
MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf
.include <bsd.port.mk>
.include "${MASTERDIR}/Makefile"

3
chinese/sourcehansans-sc-otf/distinfo
View File

@ -1,3 +0,0 @@
TIMESTAMP = 1543452538
SHA256 (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 3c4dae5225605a90f115570d1c6a86eea8e6b04057297a5566f72f4e48ed0aa8
SIZE (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 2093662207

7
chinese/sourcehansans-sc-otf/files/pkg-message.in
View File

@ -1,11 +1,4 @@
[
{ type: install
message: <<EOM
You can start using the font by following this instruction:
Add the following line to the "Files" section of your X.org configuration file:
FontPath "%%FONTSDIR%%/"
EOM
}
]

36
chinese/sourcehansans-tc-otf/Makefile
View File

@ -1,48 +1,18 @@
PORTNAME= sourcehansans
PORTVERSION= 2.000
DISTVERSIONSUFFIX= R
CATEGORIES= chinese x11-fonts
PKGNAMESUFFIX= -tc-otf
# Note: the following PKGNAMEPREFIX is here only for self-documenting purpose;
# actual prefixing is done by the `chinese' category itself.
#PKGNAMEPREFIX= zh-
MAINTAINER= hyun@caffeinated.codes
COMMENT= Traditional Chinese font by Adobe designed for user interfaces
WWW= https://github.com/adobe-fonts/source-han-sans
LICENSE= OFL11
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= fonts
USE_GITHUB= yes
GH_ACCOUNT= adobe-fonts
GH_PROJECT= source-han-sans
NO_ARCH= yes
NO_BUILD= yes
SUB_FILES= pkg-message
OPTIONS_DEFINE= HW
OPTIONS_SINGLE= TYPE
OPTIONS_SINGLE_TYPE= FULL SUBSET
OPTIONS_DEFAULT= FULL
OPTIONS_SUB= yes
HW_DESC= Install the half-width font in addition to the full font
FULL_DESC= Install the full font (can display all CJK)
SUBSET_DESC= Install the subset font (can display TC only)
SUBSET_PREVENTS= HW
SUBSET_PREVENTS_MSG= Half-width can only be installed in addition to the full font
FULL_VARS= FONTNAME=SourceHanSansTC SRCFONTSDIR=OTF/TraditionalChinese
SUBSET_VARS= FONTNAME=SourceHanSansTW SRCFONTSDIR=SubsetOTF/TW
do-install:
@${MKDIR} ${STAGEDIR}${FONTSDIR}
${INSTALL_DATA} ${WRKSRC}/${SRCFONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR}
SHS_HW_LANG= TraditionalChinese
post-install-HW-on:
${INSTALL_DATA} ${WRKSRC}/OTF/TraditionalChineseHW/*.otf ${STAGEDIR}${FONTSDIR}
MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf
.include <bsd.port.mk>
.include "${MASTERDIR}/Makefile"

3
chinese/sourcehansans-tc-otf/distinfo
View File

@ -1,3 +0,0 @@
TIMESTAMP = 1543452799
SHA256 (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 3c4dae5225605a90f115570d1c6a86eea8e6b04057297a5566f72f4e48ed0aa8
SIZE (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 2093662207

7
chinese/sourcehansans-tc-otf/files/pkg-message.in
View File

@ -1,11 +1,4 @@
[
{ type: install
message: <<EOM
You can start using the font by following this instruction:
Add the following line to the "Files" section of your X.org configuration file:
FontPath "%%FONTSDIR%%/"
EOM
}
]

3
databases/duckdb/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= duckdb
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.0
DISTVERSION= 0.10.1
CATEGORIES= databases
MAINTAINER= yuri@FreeBSD.org
@ -16,6 +16,7 @@ GH_TUPLE= duckdb:sqlite_scanner:c134346:sqlite/extension/sqlite_scanner
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_OFF= BUILD_UNITTESTS
CMAKE_ARGS= -DOVERRIDE_GIT_DESCRIBE=v${DISTVERSION}-g00000000
CMAKE_TESTING_ON= BUILD_UNITTESTS # 2 tests fail, see https://github.com/duckdb/duckdb/issues/10652
CMAKE_TESTING_TARGET= ${ALL_TARGET} # hack: works as empty target

6
databases/duckdb/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1707894531
SHA256 (duckdb-duckdb-v0.10.0_GH0.tar.gz) = 5a925b8607d00a97c1a3ffe6df05c0a62a4df063abd022ada82ac1e917792013
SIZE (duckdb-duckdb-v0.10.0_GH0.tar.gz) = 79037968
TIMESTAMP = 1710929931
SHA256 (duckdb-duckdb-v0.10.1_GH0.tar.gz) = 83bd4944c070fd0bd287fbe62919fa887f35d7422ba0fa66e13d4ed098f3791a
SIZE (duckdb-duckdb-v0.10.1_GH0.tar.gz) = 79870693
SHA256 (duckdb-sqlite_scanner-c134346_GH0.tar.gz) = 118ab8cb9fcc4e08eee661d2a146ed21c939e30b64123729fbdc90adbd2214f0
SIZE (duckdb-sqlite_scanner-c134346_GH0.tar.gz) = 4646975

28
databases/duckdb/files/patch-CMakeLists.txt
View File

@ -1,28 +0,0 @@
--- CMakeLists.txt.orig 2023-11-13 18:58:24 UTC
+++ CMakeLists.txt
@@ -240,7 +240,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
endif()
find_package(Git)
-if(Git_FOUND)
+if(FALSE AND Git_FOUND)
if (NOT DEFINED GIT_COMMIT_HASH)
execute_process(
COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
@@ -279,11 +279,11 @@ if(GIT_RESULT EQUAL "0")
endif()
else()
# fallback for when building from tarball
- set(DUCKDB_MAJOR_VERSION 0)
- set(DUCKDB_MINOR_VERSION 0)
- set(DUCKDB_PATCH_VERSION 1)
- set(DUCKDB_DEV_ITERATION 0)
- set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")
+ #set(DUCKDB_MAJOR_VERSION 0)
+ #set(DUCKDB_MINOR_VERSION 0)
+ #set(DUCKDB_PATCH_VERSION 1)
+ #set(DUCKDB_DEV_ITERATION 0)
+ set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}")
endif()
message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")

52
databases/duckdb/pkg-plist
View File

@ -54,6 +54,7 @@ include/duckdb/common/array.hpp
include/duckdb/common/arrow/appender/append_data.hpp
include/duckdb/common/arrow/appender/bool_data.hpp
include/duckdb/common/arrow/appender/enum_data.hpp
include/duckdb/common/arrow/appender/fixed_size_list_data.hpp
include/duckdb/common/arrow/appender/list.hpp
include/duckdb/common/arrow/appender/list_data.hpp
include/duckdb/common/arrow/appender/map_data.hpp
@ -90,6 +91,7 @@ include/duckdb/common/enum_class_hash.hpp
include/duckdb/common/enum_util.hpp
include/duckdb/common/enums/access_mode.hpp
include/duckdb/common/enums/aggregate_handling.hpp
include/duckdb/common/enums/catalog_lookup_behavior.hpp
include/duckdb/common/enums/catalog_type.hpp
include/duckdb/common/enums/compression_type.hpp
include/duckdb/common/enums/cte_materialize.hpp
@ -113,6 +115,7 @@ include/duckdb/common/enums/order_type.hpp
include/duckdb/common/enums/output_type.hpp
include/duckdb/common/enums/pending_execution_result.hpp
include/duckdb/common/enums/physical_operator_type.hpp
include/duckdb/common/enums/prepared_statement_mode.hpp
include/duckdb/common/enums/profiler_format.hpp
include/duckdb/common/enums/relation_type.hpp
include/duckdb/common/enums/scan_options.hpp
@ -368,26 +371,26 @@ include/duckdb/execution/operator/aggregate/physical_perfecthash_aggregate.hpp
include/duckdb/execution/operator/aggregate/physical_streaming_window.hpp
include/duckdb/execution/operator/aggregate/physical_ungrouped_aggregate.hpp
include/duckdb/execution/operator/aggregate/physical_window.hpp
include/duckdb/execution/operator/csv_scanner/buffer_manager/csv_buffer.hpp
include/duckdb/execution/operator/csv_scanner/buffer_manager/csv_buffer_manager.hpp
include/duckdb/execution/operator/csv_scanner/buffer_manager/csv_file_handle.hpp
include/duckdb/execution/operator/csv_scanner/options/csv_option.hpp
include/duckdb/execution/operator/csv_scanner/options/csv_reader_options.hpp
include/duckdb/execution/operator/csv_scanner/options/state_machine_options.hpp
include/duckdb/execution/operator/csv_scanner/scanner/base_scanner.hpp
include/duckdb/execution/operator/csv_scanner/scanner/column_count_scanner.hpp
include/duckdb/execution/operator/csv_scanner/scanner/scanner_boundary.hpp
include/duckdb/execution/operator/csv_scanner/scanner/skip_scanner.hpp
include/duckdb/execution/operator/csv_scanner/scanner/string_value_scanner.hpp
include/duckdb/execution/operator/csv_scanner/sniffer/csv_sniffer.hpp
include/duckdb/execution/operator/csv_scanner/sniffer/quote_rules.hpp
include/duckdb/execution/operator/csv_scanner/state_machine/csv_state.hpp
include/duckdb/execution/operator/csv_scanner/state_machine/csv_state_machine.hpp
include/duckdb/execution/operator/csv_scanner/state_machine/csv_state_machine_cache.hpp
include/duckdb/execution/operator/csv_scanner/table_function/csv_file_scanner.hpp
include/duckdb/execution/operator/csv_scanner/table_function/global_csv_state.hpp
include/duckdb/execution/operator/csv_scanner/util/csv_casting.hpp
include/duckdb/execution/operator/csv_scanner/util/csv_error.hpp
include/duckdb/execution/operator/csv_scanner/base_scanner.hpp
include/duckdb/execution/operator/csv_scanner/column_count_scanner.hpp
include/duckdb/execution/operator/csv_scanner/csv_buffer.hpp
include/duckdb/execution/operator/csv_scanner/csv_buffer_manager.hpp
include/duckdb/execution/operator/csv_scanner/csv_casting.hpp
include/duckdb/execution/operator/csv_scanner/csv_error.hpp
include/duckdb/execution/operator/csv_scanner/csv_file_handle.hpp
include/duckdb/execution/operator/csv_scanner/csv_file_scanner.hpp
include/duckdb/execution/operator/csv_scanner/csv_option.hpp
include/duckdb/execution/operator/csv_scanner/csv_reader_options.hpp
include/duckdb/execution/operator/csv_scanner/csv_sniffer.hpp
include/duckdb/execution/operator/csv_scanner/csv_state.hpp
include/duckdb/execution/operator/csv_scanner/csv_state_machine.hpp
include/duckdb/execution/operator/csv_scanner/csv_state_machine_cache.hpp
include/duckdb/execution/operator/csv_scanner/global_csv_state.hpp
include/duckdb/execution/operator/csv_scanner/quote_rules.hpp
include/duckdb/execution/operator/csv_scanner/scanner_boundary.hpp
include/duckdb/execution/operator/csv_scanner/skip_scanner.hpp
include/duckdb/execution/operator/csv_scanner/state_machine_options.hpp
include/duckdb/execution/operator/csv_scanner/string_value_scanner.hpp
include/duckdb/execution/operator/filter/physical_filter.hpp
include/duckdb/execution/operator/helper/physical_batch_collector.hpp
include/duckdb/execution/operator/helper/physical_buffered_collector.hpp
@ -408,6 +411,7 @@ include/duckdb/execution/operator/helper/physical_streaming_limit.hpp
include/duckdb/execution/operator/helper/physical_streaming_sample.hpp
include/duckdb/execution/operator/helper/physical_transaction.hpp
include/duckdb/execution/operator/helper/physical_vacuum.hpp
include/duckdb/execution/operator/helper/physical_verify_vector.hpp
include/duckdb/execution/operator/join/outer_join_marker.hpp
include/duckdb/execution/operator/join/perfect_hash_join_executor.hpp
include/duckdb/execution/operator/join/physical_asof_join.hpp
@ -426,6 +430,8 @@ include/duckdb/execution/operator/join/physical_range_join.hpp
include/duckdb/execution/operator/join/physical_right_delim_join.hpp
include/duckdb/execution/operator/order/physical_order.hpp
include/duckdb/execution/operator/order/physical_top_n.hpp
include/duckdb/execution/operator/persistent/batch_memory_manager.hpp
include/duckdb/execution/operator/persistent/batch_task_manager.hpp
include/duckdb/execution/operator/persistent/csv_rejects_table.hpp
include/duckdb/execution/operator/persistent/physical_batch_copy_to_file.hpp
include/duckdb/execution/operator/persistent/physical_batch_insert.hpp
@ -433,7 +439,6 @@ include/duckdb/execution/operator/persistent/physical_copy_database.hpp
include/duckdb/execution/operator/persistent/physical_copy_to_file.hpp
include/duckdb/execution/operator/persistent/physical_delete.hpp
include/duckdb/execution/operator/persistent/physical_export.hpp
include/duckdb/execution/operator/persistent/physical_fixed_batch_copy.hpp
include/duckdb/execution/operator/persistent/physical_insert.hpp
include/duckdb/execution/operator/persistent/physical_update.hpp
include/duckdb/execution/operator/projection/physical_pivot.hpp
@ -639,6 +644,7 @@ include/duckdb/optimizer/unnest_rewriter.hpp
include/duckdb/parallel/base_pipeline_event.hpp
include/duckdb/parallel/concurrentqueue.hpp
include/duckdb/parallel/event.hpp
include/duckdb/parallel/executor_task.hpp
include/duckdb/parallel/interrupt.hpp
include/duckdb/parallel/meta_pipeline.hpp
include/duckdb/parallel/pipeline.hpp
@ -691,7 +697,7 @@ include/duckdb/parser/parsed_data/alter_table_function_info.hpp
include/duckdb/parser/parsed_data/alter_table_info.hpp
include/duckdb/parser/parsed_data/attach_info.hpp
include/duckdb/parser/parsed_data/bound_pragma_info.hpp
include/duckdb/parser/parsed_data/comment_on_info.hpp
include/duckdb/parser/parsed_data/comment_on_column_info.hpp
include/duckdb/parser/parsed_data/copy_info.hpp
include/duckdb/parser/parsed_data/create_aggregate_function_info.hpp
include/duckdb/parser/parsed_data/create_collation_info.hpp
@ -871,7 +877,6 @@ include/duckdb/planner/operator/logical_get.hpp
include/duckdb/planner/operator/logical_insert.hpp
include/duckdb/planner/operator/logical_join.hpp
include/duckdb/planner/operator/logical_limit.hpp
include/duckdb/planner/operator/logical_limit_percent.hpp
include/duckdb/planner/operator/logical_materialized_cte.hpp
include/duckdb/planner/operator/logical_order.hpp
include/duckdb/planner/operator/logical_pivot.hpp
@ -1027,6 +1032,7 @@ include/duckdb/storage/table/update_segment.hpp
include/duckdb/storage/table/validity_column_data.hpp
include/duckdb/storage/table_io_manager.hpp
include/duckdb/storage/table_storage_info.hpp
include/duckdb/storage/temporary_file_manager.hpp
include/duckdb/storage/temporary_memory_manager.hpp
include/duckdb/storage/write_ahead_log.hpp
include/duckdb/transaction/append_info.hpp

4
databases/geoserver-mysql-plugin/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= geoserver
PORTVERSION= 2.24.2
PORTVERSION= 2.25.0
CATEGORIES= databases geography java
MASTER_SITES= SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
PKGNAMESUFFIX= -mysql-plugin
@ -22,7 +22,7 @@ NO_BUILD= yes
SUB_FILES= pkg-message
GSLIBDIR= geoserver/webapps/geoserver/WEB-INF/lib
PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-30.2.jar \
PLIST_FILES= ${GSLIBDIR}/gt-jdbc-mysql-31.0.jar \
${GSLIBDIR}/mysql-connector-java-8.0.28.jar
do-install:

6
databases/geoserver-mysql-plugin/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1706274824
SHA256 (geoserver-2.24.2-mysql-plugin.zip) = db5651e7b33d03f758152b51e945d1eab6cb3923f9e8989809bec9d311da5350
SIZE (geoserver-2.24.2-mysql-plugin.zip) = 2401167
TIMESTAMP = 1710925527
SHA256 (geoserver-2.25.0-mysql-plugin.zip) = 9fef356a3121d0b8b4fbd42b20cdba977852205d440c9f8f02490ae236658ae7
SIZE (geoserver-2.25.0-mysql-plugin.zip) = 2401181

2
databases/keydb/Makefile
View File

@ -10,6 +10,8 @@ WWW= https://docs.keydb.dev/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_i386= assertion failed: static_assert(sizeof(long) == sizeof(long long),"")
LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
liblz4.so:archivers/liblz4 \
libsnappy.so:archivers/snappy \

2
databases/memcached/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= memcached
PORTVERSION= 1.6.24
PORTVERSION= 1.6.25
CATEGORIES= databases
MASTER_SITES= http://www.memcached.org/files/ \
GENTOO

6
databases/memcached/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1709105874
SHA256 (memcached-1.6.24.tar.gz) = f905ec0b38432a8a80bccd04e90e74d5ecba98b8f647e5d61e4bb54085a7a422
SIZE (memcached-1.6.24.tar.gz) = 1168521
TIMESTAMP = 1710926520
SHA256 (memcached-1.6.25.tar.gz) = 23d90c5261f756ca3ccb7d92bdf8ebf4976dac5d8ec27c6c0d60e5ad5db6a15c
SIZE (memcached-1.6.25.tar.gz) = 1178044

4
databases/mongodb44/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
DISTVERSION= 4.4.28
DISTVERSION= 4.4.29
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/
@ -17,6 +17,8 @@ LICENSE_NAME_SSPLv1= Server Side Public License Version 1
LICENSE_FILE_SSPLv1= ${WRKSRC}/LICENSE-Community.txt
LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
DEPRECATED= EOL as of February 2024, https://www.mongodb.com/legal/support-policy/lifecycles
EXPIRATION_DATE=2024-07-31
ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le
ONLY_FOR_ARCHS_REASON= only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64

6
databases/mongodb44/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1705396383
SHA256 (mongodb-src-r4.4.28.tar.gz) = 6aae1d265d853933a14376f3563d0bff4084de86c4ee50b1d9e72318d602f17e
SIZE (mongodb-src-r4.4.28.tar.gz) = 51471609
TIMESTAMP = 1709336798
SHA256 (mongodb-src-r4.4.29.tar.gz) = 63792db1e58b0a3d41063b969251f6514fc0f0c899b8165282f1044d754ae8c0
SIZE (mongodb-src-r4.4.29.tar.gz) = 51483592

3
databases/mongodb50/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
DISTVERSION= 5.0.24
PORTREVISION= 1
DISTVERSION= 5.0.25
CATEGORIES= databases net
MASTER_SITES= https://fastdl.mongodb.org/src/ \
http://fastdl.mongodb.org/src/

6
databases/mongodb50/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1705396401
SHA256 (mongodb-src-r5.0.24.tar.gz) = e82550387377c854eae8ec9591931812320a7c56d067a3392806b793baafe067
SIZE (mongodb-src-r5.0.24.tar.gz) = 56957730
TIMESTAMP = 1709336809
SHA256 (mongodb-src-r5.0.25.tar.gz) = d05c06c6bb5ce4318c95da2a0e8c2422ab81fb7fdd398c73993b8456439567ba
SIZE (mongodb-src-r5.0.25.tar.gz) = 57070487

2
databases/mongodb60/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
DISTVERSION= 6.0.13
DISTVERSION= 6.0.14
CATEGORIES= databases net
PKGNAMESUFFIX= ${DISTVERSION:R:S/.//}

6
databases/mongodb60/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1705396435
SHA256 (mongodb-mongo-r6.0.13_GH0.tar.gz) = 9def706a5cb0cb571fa9a140bf2a648c2c5b7a925e0db7adcddd6805ff0eaea3
SIZE (mongodb-mongo-r6.0.13_GH0.tar.gz) = 91130887
TIMESTAMP = 1709336837
SHA256 (mongodb-mongo-r6.0.14_GH0.tar.gz) = c4625d19c38036df4dd8ea474bdddb852d5e60b4df0563248f813f3a97235be2
SIZE (mongodb-mongo-r6.0.14_GH0.tar.gz) = 91244689
SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0
SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901

2
databases/mongodb70/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= mongodb
DISTVERSIONPREFIX= r
DISTVERSION= 7.0.5
DISTVERSION= 7.0.6
CATEGORIES= databases net
PKGNAMESUFFIX= ${DISTVERSION:R:S/.//}

6
databases/mongodb70/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1703951525
SHA256 (mongodb-mongo-r7.0.5_GH0.tar.gz) = 8b3bd7d5dfb51d008b8e2b2303b84647002cccd9121fe828e5cebcf70873273f
SIZE (mongodb-mongo-r7.0.5_GH0.tar.gz) = 113552695
TIMESTAMP = 1709336876
SHA256 (mongodb-mongo-r7.0.6_GH0.tar.gz) = 8924aef66c8b6d29c28c46f594e4167c31672d17b5d8abfac7500764512268b6
SIZE (mongodb-mongo-r7.0.6_GH0.tar.gz) = 113654731
SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0
SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901

5
databases/p5-Mango/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= Mango
PORTVERSION= 1.30
PORTREVISION= 2
PORTREVISION= 4
CATEGORIES= databases perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:ODC
@ -14,8 +14,7 @@ LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= mongo:databases/mongodb44 \
p5-Mojolicious>=5.40:www/p5-Mojolicious
RUN_DEPENDS= p5-Mojolicious>=5.40:www/p5-Mojolicious
USES= perl5
USE_PERL5= configure

8
deskutils/sowon/Makefile
View File

@ -1,5 +1,6 @@
PORTNAME= sowon
DISTVERSION= g20201203
PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= nsonack@outlook.com
@ -18,6 +19,11 @@ GH_TAGNAME= 0d43de4af5a430052aee2c2691fafe21ad80a83d
USE_SDL= sdl2
PLIST_FILES= bin/sowon \
man/man6/sowon.6.gz
share/man/man6/sowon.6.gz
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sowon ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/docs/sowon.6.gz \
${STAGEDIR}${PREFIX}/share/man/man6
.include <bsd.port.mk>

1
devel/Makefile
View File

@ -898,7 +898,6 @@
SUBDIR += grcov
SUBDIR += grex
SUBDIR += grpc
SUBDIR += grpc142
SUBDIR += grv
SUBDIR += gsettings-desktop-schemas
SUBDIR += gsoap

10
devel/ald/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= ald
PORTVERSION= 0.1.7
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
@ -8,11 +8,13 @@ MAINTAINER= alken@colorado.edu
COMMENT= Debugger for assembly level programs
WWW= https://ald.sourceforge.net
GNU_CONFIGURE= yes
ONLY_FOR_ARCHS= i386
USES= readline
PLIST_FILES= bin/ald man/man8/ald.8.gz
ONLY_FOR_ARCHS= i386
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
PLIST_FILES= bin/ald share/man/man8/ald.8.gz
NOPRECIOUSMAKEVARS= yes
.include <bsd.port.mk>

3
devel/blueprint-compiler/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= blueprint-compiler
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.0
PORTREVISION= 1
DISTVERSION= 0.12.0
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org

6
devel/blueprint-compiler/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1689969978
SHA256 (blueprint-compiler-v0.10.0.tar.bz2) = 9c3c6eecef9eb54ad43b9ef786697a9f99b21e35240e9ddc8541a2cbd9ea79ba
SIZE (blueprint-compiler-v0.10.0.tar.bz2) = 81856
TIMESTAMP = 1711049847
SHA256 (blueprint-compiler-v0.12.0.tar.bz2) = 0f762e8a0dfef9aa46b4bddf8ed4bbc09b5d2fa2baff5dec109ccc513c6e9e00
SIZE (blueprint-compiler-v0.12.0.tar.bz2) = 90521

13
devel/blueprint-compiler/files/patch-blueprintcompiler_gir.py
View File

@ -1,13 +0,0 @@
--- blueprintcompiler/gir.py.orig 2023-09-26 21:07:04 UTC
+++ blueprintcompiler/gir.py
@@ -888,8 +888,8 @@ class Repository(GirNode):
return self.lookup_namespace(ns).get_type(dir_entry.DIR_ENTRY_NAME)
def _resolve_type_id(self, type_id: int) -> GirType:
- if type_id & 0xFFFFFF == 0:
- type_id = (type_id >> 27) & 0x1F
+ if type_id & (0xFFFFFF if sys.byteorder == "little" else 0xFFFFFF00) == 0:
+ type_id = ((type_id >> 27) if sys.byteorder == "little" else type_id) & 0x1F
# simple type
if type_id == typelib.TYPE_BOOLEAN:
return BoolType()

38
devel/blueprint-compiler/files/patch-blueprintcompiler_typelib.py
View File

@ -1,38 +0,0 @@
--- blueprintcompiler/typelib.py.orig 2023-07-21 20:06:18 UTC
+++ blueprintcompiler/typelib.py
@@ -61,7 +61,14 @@ class Field:
def __init__(self, offset: int, type: str, shift=0, mask=None):
self._offset = offset
self._type = type
- self._shift = shift
+ if not mask or sys.byteorder == "little":
+ self._shift = shift
+ elif self._type == "u8" or self._type == "i8":
+ self._shift = 8 - (shift + mask)
+ elif self._type == "u16" or self._type == "i16":
+ self._shift = 16 - (shift + mask)
+ else:
+ self._shift = 32 - (shift + mask)
self._mask = (1 << mask) - 1 if mask else None
self._name = f"{offset}__{type}__{shift}__{mask}"
@@ -170,7 +177,7 @@ class Typelib:
OBJ_FINAL = Field(0x02, "u16", 3, 1)
OBJ_GTYPE_NAME = Field(0x08, "string")
OBJ_PARENT = Field(0x10, "dir_entry")
- OBJ_GTYPE_STRUCT = Field(0x14, "string")
+ OBJ_GTYPE_STRUCT = Field(0x12, "string")
OBJ_N_INTERFACES = Field(0x14, "u16")
OBJ_N_FIELDS = Field(0x16, "u16")
OBJ_N_PROPERTIES = Field(0x18, "u16")
@@ -255,7 +262,9 @@ class Typelib:
def _int(self, size, signed) -> int:
return int.from_bytes(
- self._typelib_file[self._offset : self._offset + size], sys.byteorder
+ self._typelib_file[self._offset : self._offset + size],
+ sys.byteorder,
+ signed=signed,
)

4
devel/blueprint-compiler/pkg-plist
View File

@ -5,11 +5,12 @@ bin/blueprint-compiler
%%PYTHON_SITELIBDIR%%/blueprintcompiler/completions_utils.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/decompiler.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/errors.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/formatter.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/gir.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/interactive_port.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/__init__.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/adw_breakpoint.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/adw_message_dialog.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/adw_response_dialog.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/attributes.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/binding.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/common.py
@ -32,6 +33,7 @@ bin/blueprint-compiler
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/gtkbuilder_template.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/imports.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/response_id.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/translation_domain.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/types.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/ui.py
%%PYTHON_SITELIBDIR%%/blueprintcompiler/language/values.py

2
devel/electron27/Makefile.version
View File

@ -1,2 +1,2 @@
ELECTRON_VER= 27.3.6
ELECTRON_VER= 27.3.7
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}

10
devel/electron27/distinfo
View File

@ -1,14 +1,14 @@
TIMESTAMP = 1710403769
TIMESTAMP = 1711019707
SHA256 (electron/chromium-118.0.5993.159.tar.xz) = 47fdd7677470f4f4daf68e59dcacbafb99f5ed0c07501162b6af168f760b4359
SIZE (electron/chromium-118.0.5993.159.tar.xz) = 1602730244
SHA256 (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = f7f7f38661b107fc1d91b7918f36362d9180e87f34e3027562eb5db8735746fe
SIZE (electron/937cea04689b7b8dcf3cb9adbb12c79d1d6c38bb) = 8881070
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
SHA256 (electron/electron-yarn-cache-27.3.6.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75
SIZE (electron/electron-yarn-cache-27.3.6.tar.xz) = 29116528
SHA256 (electron/electron-electron-v27.3.6_GH0.tar.gz) = b6d2424f96c012f6dd49849de9466bea5553a72f7e33be769bcc2131ac95ff1a
SIZE (electron/electron-electron-v27.3.6_GH0.tar.gz) = 11431870
SHA256 (electron/electron-yarn-cache-27.3.7.tar.xz) = b1d33fa2bf412990a64b1720140fdd712b5945f41f781a4b2c154915061c6d75
SIZE (electron/electron-yarn-cache-27.3.7.tar.xz) = 29116528
SHA256 (electron/electron-electron-v27.3.7_GH0.tar.gz) = 03fe692b505a40ba7daf250cc603eab386b69ee645bdd02bfdcfaa00697355dc
SIZE (electron/electron-electron-v27.3.7_GH0.tar.gz) = 11432018
SHA256 (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 1cc1670bc183eaf9e0afe0258391695d1d6ae1be02ba4c26e0218cf5f19b96f7
SIZE (electron/nodejs-node-v18.17.1_GH0.tar.gz) = 112512847
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39

7
devel/golangci-lint/Makefile
View File

@ -1,7 +1,6 @@
PORTNAME= golangci-lint
DISTVERSIONPREFIX= v
DISTVERSION= 1.55.2
PORTREVISION= 2
DISTVERSION= 1.57.1
CATEGORIES= devel
MAINTAINER= lcook@FreeBSD.org
@ -11,10 +10,10 @@ WWW= https://github.com/golangci/golangci-lint
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= go:modules
USES= go:1.21,modules
_BUILD_VERSION= ${DISTVERSION}
_BUILD_COMMIT= e3c2265
_BUILD_COMMIT= cd890db
_BUILD_DATE= $$(date -u "+%Y-%m-%dT%H:%M:%SZ")
GO_MODULE= github.com/${PORTNAME:S/-lint//}/${PORTNAME}

10
devel/golangci-lint/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1700077323
SHA256 (go/devel_golangci-lint/golangci-lint-v1.55.2/v1.55.2.mod) = bda237cb526cca4f839da0dd2c1bf5c68c35085ab6480e383bf8530366d1b3bd
SIZE (go/devel_golangci-lint/golangci-lint-v1.55.2/v1.55.2.mod) = 8736
SHA256 (go/devel_golangci-lint/golangci-lint-v1.55.2/v1.55.2.zip) = 1a42d185d1de4cc7aa7732c4047f001e699104b20ebd799e80c0c8ee87b84874
SIZE (go/devel_golangci-lint/golangci-lint-v1.55.2/v1.55.2.zip) = 1784444
TIMESTAMP = 1710981787
SHA256 (go/devel_golangci-lint/golangci-lint-v1.57.1/v1.57.1.mod) = 60429de4c30efe01fcebc97ae4e3a3d002c1924aa479a39b0d2beebcfe4236bc
SIZE (go/devel_golangci-lint/golangci-lint-v1.57.1/v1.57.1.mod) = 8390
SHA256 (go/devel_golangci-lint/golangci-lint-v1.57.1/v1.57.1.zip) = 9e435a5e9c71d8b48512fbbd3dd3682acce3255ee831d17419789ace41d6f21c
SIZE (go/devel_golangci-lint/golangci-lint-v1.57.1/v1.57.1.zip) = 1932573

65
devel/grpc142/Makefile
View File

@ -1,65 +0,0 @@
PORTNAME= grpc
PORTVERSION= 1.42.0
DISTVERSIONPREFIX= v
PORTREVISION= 6
CATEGORIES= devel
PKGNAMESUFFIX= 142
MAINTAINER= mfechner@FreeBSD.org
COMMENT= HTTP/2-based RPC framework
WWW= https://grpc.io/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN= fails to build
DEPRECATED= Please use devel/grpc instead
EXPIRATION_DATE= 2024-03-20
LIB_DEPENDS= libabsl_base.so:devel/abseil \
libbenchmark.so:devel/benchmark \
libcares.so:dns/c-ares \
libgflags.so:devel/gflags \
libprotobuf.so:devel/protobuf \
libre2.so:devel/re2
USES= cmake compiler:c++17-lang cpe localbase:ldflags pkgconfig ssl
USE_GITHUB= yes
CMAKE_ARGS= -DCMAKE_CXX_STANDARD=17 \
-DgRPC_ABSL_PROVIDER=package \
-DgRPC_BENCHMARK_PROVIDER=package \
-DgRPC_CARES_PROVIDER=package \
-DgRPC_GFLAGS_PROVIDER=package \
-DgRPC_PROTOBUF_PROVIDER=package \
-DgRPC_RE2_PROVIDER=package \
-DgRPC_SSL_PROVIDER=package \
-DgRPC_ZLIB_PROVIDER=package
CMAKE_ON= BUILD_SHARED_LIBS
LDFLAGS+= -labsl_hash -labsl_raw_hash_set
USE_LDCONFIG= yes
PLIST_SUB= SHLIB_MAJOR=${PORTVERSION:R} \
SHLIB_MINOR=${PORTVERSION:E}
CONFLICTS_INSTALL= grpc130 grpc134 grpc
.include <bsd.port.pre.mk>
# Remove openssl from grpc.pc because we do not ship openssl.pc in base system
.if ${SSL_DEFAULT} == base
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-CMakeLists.txt
.endif
post-patch:
# Clean up bundled libraries
@${RM} -r ${WRKSRC}/third_party/abseil-cpp/
@${RM} -r ${WRKSRC}/third_party/benchmark/
@${RM} -r ${WRKSRC}/third_party/boringssl-with-bazel/
@${RM} -r ${WRKSRC}/third_party/cares/
@${RM} -r ${WRKSRC}/third_party/protobuf/
@${RM} -r ${WRKSRC}/third_party/re2/
@${RM} -r ${WRKSRC}/third_party/zlib/
.include <bsd.port.post.mk>

3
devel/grpc142/distinfo
View File

@ -1,3 +0,0 @@
TIMESTAMP = 1644045994
SHA256 (grpc-grpc-v1.42.0_GH0.tar.gz) = b2f2620c762427bfeeef96a68c1924319f384e877bc0e084487601e4cc6e434c
SIZE (grpc-grpc-v1.42.0_GH0.tar.gz) = 8460322

11
devel/grpc142/files/extra-patch-CMakeLists.txt
View File

@ -1,11 +0,0 @@
--- CMakeLists.txt.orig 2021-11-16 23:39:48 UTC
+++ CMakeLists.txt
@@ -17280,7 +17280,7 @@ generate_pkgconfig(
"gRPC"
"high performance general RPC framework"
"${gRPC_CORE_VERSION}"
- "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant"
+ "gpr absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_hash absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_utility absl_variant"
"-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz"
""
"grpc.pc")

Some files were not shown because too many files have changed in this diff Show More