Stuart Henderson <s...@spacehopper.org> wrote:
> On 2023/10/20 11:53, Ian Darwin wrote:
> > Thanks for picking this up and finishing it!
> > I'm OK with your being opencascade maintainer.
> >
> > I built the opencascade and prusaslicer 2.5.2p1 and that seems to work as
> > before. Didn't test kicad but it's a trivial change and you've tested it. So
> > those three are OK ian@.
> >
> > You probably need a 'quirks' entry and/or a conflict marker for anyone who
> > might have the older oce installed. Probably a conflict entry, and then
> > remove the old one in a few days?
>
> Yes, it needs a quirks entry in $stem_extensions, @conflict oce-* in PLIST,
> and unhook and remove cad/oce whenever this gets committed. The version
> number is higher than that of oce so that should be enough.
>
> : WANTLIB += ${COMPILER_LIBCXX} GL X11 c execinfo fontconfig freetype
> : WANTLIB += m tcl86 tk86
>
> should use ${MODTK_WANTLIB} instead of tcl86 tk86 (as already done in
> cad/oce).
>
> : .for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool \
> : TKCAF TKCDF TKDCAF TKDraw TKExpress TKFeat TKFillet TKG2d \
> : TKG3d TKGeomAlgo TKGeomBase TKHLR TKIGES TKLCAF TKMath \
> : TKMesh TKMeshVS TKOffset TKOpenGl TKOpenGlTest TKPrim \
> : TKQADraw TKRWMesh TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase \
> : TKSTL TKService TKShHealing TKStd TKStdL TKTObj TKTObjDRAW \
> : TKTopAlgo TKTopTest TKV3d TKVCAF TKVRML TKViewerTest TKXCAF \
> : TKXDE TKXDECascade TKXDEDRAW TKXDEIGES TKXDESTEP TKXMesh \
> : TKXSBase TKXSDRAW TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel
> : SHARED_LIBS += ${LIB} 0.0
> : .endfor
>
> These should use the same (if compatible ABI) or higher (if not or
> if unknown) library version number than oce, so it probably wants 2.0
>
> Otherwise reads OK to me but I've not tested.
Thanks ian@ and sthen@ for your feedback. I've updated the port
based on your feedback. Please find attached the updated port, a
patch for devel/quirks with the new entry in @stem_extensions and
the same patches for prusaslicer and kicad that I sent before.
@sthen: Regarding the version bump for the SHARED_LIBS, I just
followed the instructions here[1] and looked for differences between
the shared libraries in the two packages as follows:
# with cad/opencascade installed
# and cad/oce libs copied to /tmp/oce_shlibs
for i in /usr/local/lib/libTK*; do
name="${i##*/}"
oldlib="${name%0.0}1.0"
nm -g $i | cut -c10- | grep -e^T > /tmp/new
nm -g /tmp/oce_shlibs/$oldlib | cut -c10- | grep -e^T > /tmp/old
diff -up /tmp/old /tmp/new 2> /dev/null
done
Since the output was not empty, I bumped the version to 2.0. This
is the first time I do this, so please let me know if what I did
here is wrong or if there is a better way to do it.
Thanks!
Kind regards,
Johannes
[1] https://www.openbsd.org/faq/ports/specialtopics.html
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile 19 Sep 2023 15:16:35 -0000 1.64
+++ Makefile 19 Oct 2023 06:49:38 -0000
@@ -9,7 +9,7 @@ V = 6.0.11
COMMENT = schematic and PCB editing software
DISTNAME = kicad-${V}
EPOCH = 0
-REVISION = 1
+REVISION = 2
SHARED_LIBS += kicad_3dsg 1.0 # 2.0
@@ -60,7 +60,7 @@ RUN_DEPENDS = cad/kicad-share/footprint
x11/gtk+4,-guic
LIB_DEPENDS = cad/ngspice/libngspice \
- cad/oce \
+ cad/opencascade \
graphics/cairo \
net/curl \
x11/wxWidgets
Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/prusaslicer/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 19 Sep 2023 20:09:06 -0000 1.2
+++ Makefile 19 Oct 2023 07:38:47 -0000
@@ -1,7 +1,7 @@
COMMENT = g-code generator for 3D printers
V = 2.5.2
-REVISION = 0
+REVISION = 1
PKGNAME = prusaslicer-${V}
GH_ACCOUNT = prusa3d
@@ -21,15 +21,16 @@ WANTLIB += ${COMPILER_LIBCXX} CGAL GL GL
WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR TKLCAF TKMath
WANTLIB += TKMesh TKPrim TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase
WANTLIB += TKService TKShHealing TKTopAlgo TKV3d TKVCAF TKXCAF
-WANTLIB += TKXDESTEP TKXSBase TKernel atk-1.0 boost_atomic-mt
+WANTLIB += TKXDE TKXDESTEP TKXSBase TKernel X11 atk-1.0 boost_atomic-mt
WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c cairo
-WANTLIB += cairo-gobject curl dbus-1 expat gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 glib-2.0 gmp gobject-2.0 gtk-3 harfbuzz hidapi-libusb
-WANTLIB += intl jpeg m mpfr nlopt openvdb pango-1.0 pangocairo-1.0
-WANTLIB += png qhull_r tbb tiff wx_baseu-3.2 wx_gtk3u_core-3.2
-WANTLIB += wx_gtk3u_gl-3.2 wx_gtk3u_html-3.2 z
+WANTLIB += cairo-gobject curl dbus-1 execinfo expat fontconfig
+WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmp
+WANTLIB += gobject-2.0 gtk-3 harfbuzz hidapi-libusb intl jpeg
+WANTLIB += m mpfr nlopt openvdb pango-1.0 pangocairo-1.0 png qhull_r
+WANTLIB += tbb tiff wx_baseu-3.2 wx_gtk3u_core-3.2 wx_gtk3u_gl-3.2
+WANTLIB += wx_gtk3u_html-3.2 z
COMPILER = base-clang ports-gcc
@@ -45,8 +46,7 @@ BUILD_DEPENDS = devel/cereal \
devel/gmp,-cxx \
math/eigen3
-LIB_DEPENDS = archivers/blosc \
- cad/oce \
+LIB_DEPENDS = cad/opencascade \
comms/libhidapi \
devel/gmp \
devel/tbb \
Index: patches/patch-src_occt_wrapper_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/cad/prusaslicer/patches/patch-src_occt_wrapper_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_occt_wrapper_CMakeLists_txt
--- patches/patch-src_occt_wrapper_CMakeLists_txt 12 Sep 2023 00:46:55
-0000 1.1.1.1
+++ patches/patch-src_occt_wrapper_CMakeLists_txt 19 Oct 2023 07:38:47
-0000
@@ -1,7 +1,7 @@
Index: src/occt_wrapper/CMakeLists.txt
--- src/occt_wrapper/CMakeLists.txt.orig
+++ src/occt_wrapper/CMakeLists.txt
-@@ -19,9 +19,10 @@ include(GenerateExportHeader)
+@@ -19,9 +19,11 @@ include(GenerateExportHeader)
generate_export_header(OCCTWrapper)
@@ -10,10 +10,11 @@ Index: src/occt_wrapper/CMakeLists.txt
set(OCCT_LIBS
+ -L${CMAKE_INSTALL_PREFIX}/lib
++ -L/usr/X11R6/lib
TKXDESTEP
TKSTEP
TKSTEP209
-@@ -56,5 +57,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
+@@ -56,5 +58,5 @@ target_link_libraries(OCCTWrapper ${OCCT_LIBS})
include(GNUInstallDirs)
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1550
diff -u -p -r1.1550 Makefile
--- Makefile 18 Oct 2023 06:50:52 -0000 1.1550
+++ Makefile 21 Oct 2023 10:30:32 -0000
@@ -3,7 +3,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-6.166
+PKGNAME = quirks-6.167
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1562
diff -u -p -r1.1562 Quirks.pm
--- files/Quirks.pm 18 Oct 2023 06:50:52 -0000 1.1562
+++ files/Quirks.pm 21 Oct 2023 10:30:32 -0000
@@ -789,6 +789,7 @@ my $stem_extensions = {
# 7.5
'py-reportlab' => 'py3-reportlab',
'py-simplejson' => 'py3-simplejson',
+ 'oce' => 'opencascade',
};
my $obsolete_reason = {};
opencascade-7.7.2.tar.gz
Description: GNU Zip compressed data
