opencascade: bump version (#8295)

additionaly, cleanup the recipe
 * modernize cmake and make invocations
 * change "portVersionCompat" to libVersionCompat for consistency
This commit is contained in:
Joachim Mairböck
2023-04-07 08:12:27 +02:00
committed by GitHub
parent 2411ac0c0c
commit 6dbe7eef44
2 changed files with 154 additions and 170 deletions

View File

@@ -9,7 +9,7 @@ LICENSE="GNU LGPL v2.1
Open CASCADE exception v1.0"
REVISION="1"
SOURCE_URI="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V${portVersion//./_};sf=tgz"
CHECKSUM_SHA256="075ca1dddd9646fcf331a809904925055747a951a6afd07a463369b9b441b445"
CHECKSUM_SHA256="f413d30a8a06d6164e94860a652cbc96ea58fe262df36ce4eaa92a9e3561fd12"
SOURCE_DIR="occt-V${portVersion//./_}"
PATCHES="opencascade-$portVersion.patchset"
@@ -25,7 +25,8 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
relativeCommandBinDir=bin
fi
portVersionCompat="$portVersion compat >= ${portVersion%.*}"
libVersion="$portVersion"
libVersionCompat="$libVersion compat >= ${libVersion%.*}"
case "$targetArchitecture" in
*64*)
@@ -38,57 +39,57 @@ esac
PROVIDES="
opencascade$secondaryArchSuffix = $portVersion
lib:libTKBin$secondaryArchSuffix = $portVersionCompat
lib:libTKBinL$secondaryArchSuffix = $portVersionCompat
lib:libTKBinTObj$secondaryArchSuffix = $portVersionCompat
lib:libTKBinXCAF$secondaryArchSuffix = $portVersionCompat
lib:libTKBO$secondaryArchSuffix = $portVersionCompat
lib:libTKBool$secondaryArchSuffix = $portVersionCompat
lib:libTKBRep$secondaryArchSuffix = $portVersionCompat
lib:libTKCAF$secondaryArchSuffix = $portVersionCompat
lib:libTKCDF$secondaryArchSuffix = $portVersionCompat
lib:libTKernel$secondaryArchSuffix = $portVersionCompat
lib:libTKFeat$secondaryArchSuffix = $portVersionCompat
lib:libTKFillet$secondaryArchSuffix = $portVersionCompat
lib:libTKG2d$secondaryArchSuffix = $portVersionCompat
lib:libTKG3d$secondaryArchSuffix = $portVersionCompat
lib:libTKGeomAlgo$secondaryArchSuffix = $portVersionCompat
lib:libTKGeomBase$secondaryArchSuffix = $portVersionCompat
lib:libTKHLR$secondaryArchSuffix = $portVersionCompat
lib:libTKIGES$secondaryArchSuffix = $portVersionCompat
lib:libTKLCAF$secondaryArchSuffix = $portVersionCompat
lib:libTKMath$secondaryArchSuffix = $portVersionCompat
lib:libTKMesh$secondaryArchSuffix = $portVersionCompat
lib:libTKMeshVS$secondaryArchSuffix = $portVersionCompat
lib:libTKOffset$secondaryArchSuffix = $portVersionCompat
# lib:libTKOpenGl$secondaryArchSuffix = $portVersionCompat
lib:libTKPrim$secondaryArchSuffix = $portVersionCompat
lib:libTKRWMesh$secondaryArchSuffix = $portVersionCompat
lib:libTKService$secondaryArchSuffix = $portVersionCompat
lib:libTKShHealing$secondaryArchSuffix = $portVersionCompat
lib:libTKStd$secondaryArchSuffix = $portVersionCompat
lib:libTKStdL$secondaryArchSuffix = $portVersionCompat
lib:libTKSTEP$secondaryArchSuffix = $portVersionCompat
lib:libTKSTEP209$secondaryArchSuffix = $portVersionCompat
lib:libTKSTEPAttr$secondaryArchSuffix = $portVersionCompat
lib:libTKSTEPBase$secondaryArchSuffix = $portVersionCompat
lib:libTKSTL$secondaryArchSuffix = $portVersionCompat
lib:libTKTObj$secondaryArchSuffix = $portVersionCompat
lib:libTKTopAlgo$secondaryArchSuffix = $portVersionCompat
lib:libTKV3d$secondaryArchSuffix = $portVersionCompat
lib:libTKVCAF$secondaryArchSuffix = $portVersionCompat
lib:libTKVRML$secondaryArchSuffix = $portVersionCompat
lib:libTKXCAF$secondaryArchSuffix = $portVersionCompat
lib:libTKXDE$secondaryArchSuffix = $portVersionCompat
lib:libTKXDECascade$secondaryArchSuffix = $portVersionCompat
lib:libTKXDEIGES$secondaryArchSuffix = $portVersionCompat
lib:libTKXDESTEP$secondaryArchSuffix = $portVersionCompat
lib:libTKXMesh$secondaryArchSuffix = $portVersionCompat
lib:libTKXml$secondaryArchSuffix = $portVersionCompat
lib:libTKXmlL$secondaryArchSuffix = $portVersionCompat
lib:libTKXmlTObj$secondaryArchSuffix = $portVersionCompat
lib:libTKXmlXCAF$secondaryArchSuffix = $portVersionCompat
lib:libTKXSBase$secondaryArchSuffix = $portVersionCompat
lib:libTKBin$secondaryArchSuffix = $libVersionCompat
lib:libTKBinL$secondaryArchSuffix = $libVersionCompat
lib:libTKBinTObj$secondaryArchSuffix = $libVersionCompat
lib:libTKBinXCAF$secondaryArchSuffix = $libVersionCompat
lib:libTKBO$secondaryArchSuffix = $libVersionCompat
lib:libTKBool$secondaryArchSuffix = $libVersionCompat
lib:libTKBRep$secondaryArchSuffix = $libVersionCompat
lib:libTKCAF$secondaryArchSuffix = $libVersionCompat
lib:libTKCDF$secondaryArchSuffix = $libVersionCompat
lib:libTKernel$secondaryArchSuffix = $libVersionCompat
lib:libTKFeat$secondaryArchSuffix = $libVersionCompat
lib:libTKFillet$secondaryArchSuffix = $libVersionCompat
lib:libTKG2d$secondaryArchSuffix = $libVersionCompat
lib:libTKG3d$secondaryArchSuffix = $libVersionCompat
lib:libTKGeomAlgo$secondaryArchSuffix = $libVersionCompat
lib:libTKGeomBase$secondaryArchSuffix = $libVersionCompat
lib:libTKHLR$secondaryArchSuffix = $libVersionCompat
lib:libTKIGES$secondaryArchSuffix = $libVersionCompat
lib:libTKLCAF$secondaryArchSuffix = $libVersionCompat
lib:libTKMath$secondaryArchSuffix = $libVersionCompat
lib:libTKMesh$secondaryArchSuffix = $libVersionCompat
lib:libTKMeshVS$secondaryArchSuffix = $libVersionCompat
lib:libTKOffset$secondaryArchSuffix = $libVersionCompat
# lib:libTKOpenGl$secondaryArchSuffix = $libVersionCompat
lib:libTKPrim$secondaryArchSuffix = $libVersionCompat
lib:libTKRWMesh$secondaryArchSuffix = $libVersionCompat
lib:libTKService$secondaryArchSuffix = $libVersionCompat
lib:libTKShHealing$secondaryArchSuffix = $libVersionCompat
lib:libTKStd$secondaryArchSuffix = $libVersionCompat
lib:libTKStdL$secondaryArchSuffix = $libVersionCompat
lib:libTKSTEP$secondaryArchSuffix = $libVersionCompat
lib:libTKSTEP209$secondaryArchSuffix = $libVersionCompat
lib:libTKSTEPAttr$secondaryArchSuffix = $libVersionCompat
lib:libTKSTEPBase$secondaryArchSuffix = $libVersionCompat
lib:libTKSTL$secondaryArchSuffix = $libVersionCompat
lib:libTKTObj$secondaryArchSuffix = $libVersionCompat
lib:libTKTopAlgo$secondaryArchSuffix = $libVersionCompat
lib:libTKV3d$secondaryArchSuffix = $libVersionCompat
lib:libTKVCAF$secondaryArchSuffix = $libVersionCompat
lib:libTKVRML$secondaryArchSuffix = $libVersionCompat
lib:libTKXCAF$secondaryArchSuffix = $libVersionCompat
lib:libTKXDE$secondaryArchSuffix = $libVersionCompat
lib:libTKXDECascade$secondaryArchSuffix = $libVersionCompat
lib:libTKXDEIGES$secondaryArchSuffix = $libVersionCompat
lib:libTKXDESTEP$secondaryArchSuffix = $libVersionCompat
lib:libTKXMesh$secondaryArchSuffix = $libVersionCompat
lib:libTKXml$secondaryArchSuffix = $libVersionCompat
lib:libTKXmlL$secondaryArchSuffix = $libVersionCompat
lib:libTKXmlTObj$secondaryArchSuffix = $libVersionCompat
lib:libTKXmlXCAF$secondaryArchSuffix = $libVersionCompat
lib:libTKXSBase$secondaryArchSuffix = $libVersionCompat
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -108,77 +109,77 @@ REQUIRES="
PROVIDES_devel="
opencascade${secondaryArchSuffix}_devel = $portVersion
devel:libTKBin$secondaryArchSuffix = $portVersionCompat
devel:libTKBinL$secondaryArchSuffix = $portVersionCompat
devel:libTKBinTObj$secondaryArchSuffix = $portVersionCompat
devel:libTKBinXCAF$secondaryArchSuffix = $portVersionCompat
devel:libTKBO$secondaryArchSuffix = $portVersionCompat
devel:libTKBool$secondaryArchSuffix = $portVersionCompat
devel:libTKBRep$secondaryArchSuffix = $portVersionCompat
devel:libTKCAF$secondaryArchSuffix = $portVersionCompat
devel:libTKCDF$secondaryArchSuffix = $portVersionCompat
devel:libTKDCAF$secondaryArchSuffix = $portVersionCompat
devel:libTKDFBrowser$secondaryArchSuffix = $portVersionCompat
devel:libTKDraw$secondaryArchSuffix = $portVersionCompat
devel:libTKernel$secondaryArchSuffix = $portVersionCompat
devel:libTKExpress$secondaryArchSuffix = $portVersionCompat
devel:libTKFeat$secondaryArchSuffix = $portVersionCompat
devel:libTKFillet$secondaryArchSuffix = $portVersionCompat
devel:libTKG2d$secondaryArchSuffix = $portVersionCompat
devel:libTKG3d$secondaryArchSuffix = $portVersionCompat
devel:libTKGeomAlgo$secondaryArchSuffix = $portVersionCompat
devel:libTKGeomBase$secondaryArchSuffix = $portVersionCompat
devel:libTKHLR$secondaryArchSuffix = $portVersionCompat
devel:libTKIGES$secondaryArchSuffix = $portVersionCompat
devel:libTKLCAF$secondaryArchSuffix = $portVersionCompat
devel:libTKMath$secondaryArchSuffix = $portVersionCompat
devel:libTKMesh$secondaryArchSuffix = $portVersionCompat
devel:libTKMeshVS$secondaryArchSuffix = $portVersionCompat
devel:libTKMessageModel$secondaryArchSuffix = $portVersionCompat
devel:libTKMessageView$secondaryArchSuffix = $portVersionCompat
devel:libTKOffset$secondaryArchSuffix = $portVersionCompat
# devel:libTKOpenGl$secondaryArchSuffix = $portVersionCompat
# devel:libTKOpenGlTest$secondaryArchSuffix = $portVersionCompat
devel:libTKPrim$secondaryArchSuffix = $portVersionCompat
devel:libTKQADraw$secondaryArchSuffix = $portVersionCompat
devel:libTKRWMesh$secondaryArchSuffix = $portVersionCompat
devel:libTKService$secondaryArchSuffix = $portVersionCompat
devel:libTKShapeView$secondaryArchSuffix = $portVersionCompat
devel:libTKShHealing$secondaryArchSuffix = $portVersionCompat
devel:libTKStd$secondaryArchSuffix = $portVersionCompat
devel:libTKStdL$secondaryArchSuffix = $portVersionCompat
devel:libTKSTEP$secondaryArchSuffix = $portVersionCompat
devel:libTKSTEP209$secondaryArchSuffix = $portVersionCompat
devel:libTKSTEPAttr$secondaryArchSuffix = $portVersionCompat
devel:libTKSTEPBase$secondaryArchSuffix = $portVersionCompat
devel:libTKSTL$secondaryArchSuffix = $portVersionCompat
devel:libTKTInspector$secondaryArchSuffix = $portVersionCompat
devel:libTKTInspectorAPI$secondaryArchSuffix = $portVersionCompat
devel:libTKTObj$secondaryArchSuffix = $portVersionCompat
devel:libTKTObjDRAW$secondaryArchSuffix = $portVersionCompat
devel:libTKToolsDraw$secondaryArchSuffix = $portVersionCompat
devel:libTKTopAlgo$secondaryArchSuffix = $portVersionCompat
devel:libTKTopTest$secondaryArchSuffix = $portVersionCompat
devel:libTKTreeModel$secondaryArchSuffix = $portVersionCompat
devel:libTKV3d$secondaryArchSuffix = $portVersionCompat
devel:libTKVCAF$secondaryArchSuffix = $portVersionCompat
devel:libTKVInspector$secondaryArchSuffix = $portVersionCompat
devel:libTKVRML$secondaryArchSuffix = $portVersionCompat
devel:libTKView$secondaryArchSuffix = $portVersionCompat
devel:libTKViewerTest$secondaryArchSuffix = $portVersionCompat
devel:libTKXCAF$secondaryArchSuffix = $portVersionCompat
devel:libTKXDE$secondaryArchSuffix = $portVersionCompat
devel:libTKXDECascade$secondaryArchSuffix = $portVersionCompat
devel:libTKXDEDRAW$secondaryArchSuffix = $portVersionCompat
devel:libTKXDEIGES$secondaryArchSuffix = $portVersionCompat
devel:libTKXDESTEP$secondaryArchSuffix = $portVersionCompat
devel:libTKXMesh$secondaryArchSuffix = $portVersionCompat
devel:libTKXml$secondaryArchSuffix = $portVersionCompat
devel:libTKXmlL$secondaryArchSuffix = $portVersionCompat
devel:libTKXmlTObj$secondaryArchSuffix = $portVersionCompat
devel:libTKXmlXCAF$secondaryArchSuffix = $portVersionCompat
devel:libTKXSBase$secondaryArchSuffix = $portVersionCompat
devel:libTKXSDRAW$secondaryArchSuffix = $portVersionCompat
devel:libTKBin$secondaryArchSuffix = $libVersionCompat
devel:libTKBinL$secondaryArchSuffix = $libVersionCompat
devel:libTKBinTObj$secondaryArchSuffix = $libVersionCompat
devel:libTKBinXCAF$secondaryArchSuffix = $libVersionCompat
devel:libTKBO$secondaryArchSuffix = $libVersionCompat
devel:libTKBool$secondaryArchSuffix = $libVersionCompat
devel:libTKBRep$secondaryArchSuffix = $libVersionCompat
devel:libTKCAF$secondaryArchSuffix = $libVersionCompat
devel:libTKCDF$secondaryArchSuffix = $libVersionCompat
devel:libTKDCAF$secondaryArchSuffix = $libVersionCompat
devel:libTKDFBrowser$secondaryArchSuffix = $libVersionCompat
devel:libTKDraw$secondaryArchSuffix = $libVersionCompat
devel:libTKernel$secondaryArchSuffix = $libVersionCompat
devel:libTKExpress$secondaryArchSuffix = $libVersionCompat
devel:libTKFeat$secondaryArchSuffix = $libVersionCompat
devel:libTKFillet$secondaryArchSuffix = $libVersionCompat
devel:libTKG2d$secondaryArchSuffix = $libVersionCompat
devel:libTKG3d$secondaryArchSuffix = $libVersionCompat
devel:libTKGeomAlgo$secondaryArchSuffix = $libVersionCompat
devel:libTKGeomBase$secondaryArchSuffix = $libVersionCompat
devel:libTKHLR$secondaryArchSuffix = $libVersionCompat
devel:libTKIGES$secondaryArchSuffix = $libVersionCompat
devel:libTKLCAF$secondaryArchSuffix = $libVersionCompat
devel:libTKMath$secondaryArchSuffix = $libVersionCompat
devel:libTKMesh$secondaryArchSuffix = $libVersionCompat
devel:libTKMeshVS$secondaryArchSuffix = $libVersionCompat
devel:libTKMessageModel$secondaryArchSuffix = $libVersionCompat
devel:libTKMessageView$secondaryArchSuffix = $libVersionCompat
devel:libTKOffset$secondaryArchSuffix = $libVersionCompat
# devel:libTKOpenGl$secondaryArchSuffix = $libVersionCompat
# devel:libTKOpenGlTest$secondaryArchSuffix = $libVersionCompat
devel:libTKPrim$secondaryArchSuffix = $libVersionCompat
devel:libTKQADraw$secondaryArchSuffix = $libVersionCompat
devel:libTKRWMesh$secondaryArchSuffix = $libVersionCompat
devel:libTKService$secondaryArchSuffix = $libVersionCompat
devel:libTKShapeView$secondaryArchSuffix = $libVersionCompat
devel:libTKShHealing$secondaryArchSuffix = $libVersionCompat
devel:libTKStd$secondaryArchSuffix = $libVersionCompat
devel:libTKStdL$secondaryArchSuffix = $libVersionCompat
devel:libTKSTEP$secondaryArchSuffix = $libVersionCompat
devel:libTKSTEP209$secondaryArchSuffix = $libVersionCompat
devel:libTKSTEPAttr$secondaryArchSuffix = $libVersionCompat
devel:libTKSTEPBase$secondaryArchSuffix = $libVersionCompat
devel:libTKSTL$secondaryArchSuffix = $libVersionCompat
devel:libTKTInspector$secondaryArchSuffix = $libVersionCompat
devel:libTKTInspectorAPI$secondaryArchSuffix = $libVersionCompat
devel:libTKTObj$secondaryArchSuffix = $libVersionCompat
devel:libTKTObjDRAW$secondaryArchSuffix = $libVersionCompat
devel:libTKToolsDraw$secondaryArchSuffix = $libVersionCompat
devel:libTKTopAlgo$secondaryArchSuffix = $libVersionCompat
devel:libTKTopTest$secondaryArchSuffix = $libVersionCompat
devel:libTKTreeModel$secondaryArchSuffix = $libVersionCompat
devel:libTKV3d$secondaryArchSuffix = $libVersionCompat
devel:libTKVCAF$secondaryArchSuffix = $libVersionCompat
devel:libTKVInspector$secondaryArchSuffix = $libVersionCompat
devel:libTKVRML$secondaryArchSuffix = $libVersionCompat
devel:libTKView$secondaryArchSuffix = $libVersionCompat
devel:libTKViewerTest$secondaryArchSuffix = $libVersionCompat
devel:libTKXCAF$secondaryArchSuffix = $libVersionCompat
devel:libTKXDE$secondaryArchSuffix = $libVersionCompat
devel:libTKXDECascade$secondaryArchSuffix = $libVersionCompat
devel:libTKXDEDRAW$secondaryArchSuffix = $libVersionCompat
devel:libTKXDEIGES$secondaryArchSuffix = $libVersionCompat
devel:libTKXDESTEP$secondaryArchSuffix = $libVersionCompat
devel:libTKXMesh$secondaryArchSuffix = $libVersionCompat
devel:libTKXml$secondaryArchSuffix = $libVersionCompat
devel:libTKXmlL$secondaryArchSuffix = $libVersionCompat
devel:libTKXmlTObj$secondaryArchSuffix = $libVersionCompat
devel:libTKXmlXCAF$secondaryArchSuffix = $libVersionCompat
devel:libTKXSBase$secondaryArchSuffix = $libVersionCompat
devel:libTKXSDRAW$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_devel="
opencascade$secondaryArchSuffix == $portVersion base
@@ -243,26 +244,26 @@ PROVIDES_tools="
cmd:draw.sh
cmd:env.sh
cmd:inspector.sh
lib:libTKDCAF$secondaryArchSuffix = $portVersionCompat
lib:libTKDFBrowser$secondaryArchSuffix = $portVersionCompat
lib:libTKDraw$secondaryArchSuffix = $portVersionCompat
lib:libTKExpress$secondaryArchSuffix = $portVersionCompat
lib:libTKMessageModel$secondaryArchSuffix = $portVersionCompat
lib:libTKMessageView$secondaryArchSuffix = $portVersionCompat
# lib:libTKOpenGlTest$secondaryArchSuffix = $portVersionCompat
lib:libTKQADraw$secondaryArchSuffix = $portVersionCompat
lib:libTKShapeView$secondaryArchSuffix = $portVersionCompat
lib:libTKTInspector$secondaryArchSuffix = $portVersionCompat
lib:libTKTInspectorAPI$secondaryArchSuffix = $portVersionCompat
lib:libTKTObjDRAW$secondaryArchSuffix = $portVersionCompat
lib:libTKToolsDraw$secondaryArchSuffix = $portVersionCompat
lib:libTKTopTest$secondaryArchSuffix = $portVersionCompat
lib:libTKTreeModel$secondaryArchSuffix = $portVersionCompat
lib:libTKVInspector$secondaryArchSuffix = $portVersionCompat
lib:libTKView$secondaryArchSuffix = $portVersionCompat
lib:libTKViewerTest$secondaryArchSuffix = $portVersionCompat
lib:libTKXDEDRAW$secondaryArchSuffix = $portVersionCompat
lib:libTKXSDRAW$secondaryArchSuffix = $portVersionCompat
lib:libTKDCAF$secondaryArchSuffix = $libVersionCompat
lib:libTKDFBrowser$secondaryArchSuffix = $libVersionCompat
lib:libTKDraw$secondaryArchSuffix = $libVersionCompat
lib:libTKExpress$secondaryArchSuffix = $libVersionCompat
lib:libTKMessageModel$secondaryArchSuffix = $libVersionCompat
lib:libTKMessageView$secondaryArchSuffix = $libVersionCompat
# lib:libTKOpenGlTest$secondaryArchSuffix = $libVersionCompat
lib:libTKQADraw$secondaryArchSuffix = $libVersionCompat
lib:libTKShapeView$secondaryArchSuffix = $libVersionCompat
lib:libTKTInspector$secondaryArchSuffix = $libVersionCompat
lib:libTKTInspectorAPI$secondaryArchSuffix = $libVersionCompat
lib:libTKTObjDRAW$secondaryArchSuffix = $libVersionCompat
lib:libTKToolsDraw$secondaryArchSuffix = $libVersionCompat
lib:libTKTopTest$secondaryArchSuffix = $libVersionCompat
lib:libTKTreeModel$secondaryArchSuffix = $libVersionCompat
lib:libTKVInspector$secondaryArchSuffix = $libVersionCompat
lib:libTKView$secondaryArchSuffix = $libVersionCompat
lib:libTKViewerTest$secondaryArchSuffix = $libVersionCompat
lib:libTKXDEDRAW$secondaryArchSuffix = $libVersionCompat
lib:libTKXSDRAW$secondaryArchSuffix = $libVersionCompat
"
REQUIRES_tools="
opencascade$secondaryArchSuffix == $portVersion base
@@ -326,11 +327,7 @@ BUILD_PREREQUIRES="
BUILD()
{
mkdir -p build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=Release \
cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
-D3RDPARTY_QT_DIR=$portPackageLinksDir/devel~libqt5 \
-D3RDPARTY_SKIP_DOT_EXECUTABLE=OFF \
-DBUILD_Inspector=ON \
@@ -360,15 +357,14 @@ BUILD()
-DUSE_VTK=OFF \
-DUSE_XLIB=ON
# Draco, OpenVR and VTK are not available, TBB is too old, (SDL)Tk hangs on opening a
# window, OpenGL has no native implementation amd EGL is broken
# window, OpenGL has no native implementation and EGL is broken
make $jobArgs
make -C build $jobArgs
}
INSTALL()
{
cd build
make install
make -C build install
prepareInstalledDevelLibs libTKBin libTKBinL libTKBinTObj libTKBinXCAF libTKBO libTKBool \
libTKBRep libTKCAF libTKCDF libTKDCAF libTKDFBrowser libTKDraw libTKernel libTKExpress \

View File

@@ -1,4 +1,4 @@
From 88ed698031d776e27efcfa964e96d7e5309845d0 Mon Sep 17 00:00:00 2001
From f986751f670e135a476903a6829976677d049eb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 18 Dec 2022 20:25:23 +0100
Subject: Haiku support
@@ -253,18 +253,6 @@ index f73d6b6..a40a2f7 100755
#error System does not support xlocale. Import/export could be broken if C locale did not specified by application.
#endif
#define strtod_l(thePtr, theNextPtr, theLocale) strtod(thePtr, theNextPtr)
diff --git a/src/ViewerTest/ViewerTest_CmdParser.cxx b/src/ViewerTest/ViewerTest_CmdParser.cxx
index 04cb7d4..a8619da 100644
--- a/src/ViewerTest/ViewerTest_CmdParser.cxx
+++ b/src/ViewerTest/ViewerTest_CmdParser.cxx
@@ -21,6 +21,7 @@
#include <algorithm>
#include <iostream>
+#include <limits>
namespace
{
diff --git a/tests/perf/fclasses/bug24947 b/tests/perf/fclasses/bug24947
index 39bb04b..0707f0d 100644
--- a/tests/perf/fclasses/bug24947
@@ -281,7 +269,7 @@ index 39bb04b..0707f0d 100644
2.37.3
From e2ce92d6a65eff90850d33c449f18b11697ac976 Mon Sep 17 00:00:00 2001
From 5e0fca2d4c328191bda56db541a2e09ea765491f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 18 Dec 2022 20:26:18 +0100
Subject: allow building the OpenGl module on Haiku
@@ -324,7 +312,7 @@ index a1b5b2b..26c2d27 100644
2.37.3
From 6d76e7402a139f084860ec267fa71e87b3f1c2ff Mon Sep 17 00:00:00 2001
From b36417c4388fb9af881ee5be23d0fe7964ea4338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 4 Dec 2022 21:33:38 +0100
Subject: add a stub to allow building on Haiku when not using Xlib
@@ -349,7 +337,7 @@ index a9b7406..87c8069 100644
2.37.3
From 641785c5aba5cbf34cb256126cc6acdfd211272d Mon Sep 17 00:00:00 2001
From 83c7ca84fa3315a6bf4f2370828f8766d82cc00c Mon Sep 17 00:00:00 2001
From: Bernd Waibel <waebbl@gmail.com>
Date: Wed, 3 Feb 2021 23:31:23 +0100
Subject: allow default search path for Qt5
@@ -373,7 +361,7 @@ index 535e6a2..ca8fa9a 100644
2.37.3
From 9f478eb50f8a994577c37c71d787d48d73db36a7 Mon Sep 17 00:00:00 2001
From bdb2616cdb97d4b0fb20aa623c2d80c511d66422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 18 Dec 2022 20:16:41 +0100
Subject: allow building without OpenGL (stubbed)