[packages/OpenCASCADE] - added X patch (adjust X11 vs other headers inclusion order to workaround Status macro/symbol confl
qboosh
qboosh at pld-linux.org
Wed Sep 6 21:19:19 CEST 2023
commit 40cbf0ef39ee5641e9ff433d078b0c824ae7da3b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 6 21:07:30 2023 +0200
- added X patch (adjust X11 vs other headers inclusion order to workaround Status macro/symbol conflict)
OpenCASCADE-X.patch | 20 ++++++++++++++++++++
OpenCASCADE.spec | 2 ++
2 files changed, 22 insertions(+)
---
diff --git a/OpenCASCADE.spec b/OpenCASCADE.spec
index c35daa2..585f8ff 100644
--- a/OpenCASCADE.spec
+++ b/OpenCASCADE.spec
@@ -36,6 +36,7 @@ Patch0: %{name}-cmake.patch
Patch1: %{name}-inspector-data.patch
Patch2: %{name}-draco.patch
Patch3: %{name}-openvr.patch
+Patch4: %{name}-X.patch
URL: https://www.opencascade.com/open-cascade-technology/
%{?with_freeimage:BuildRequires: FreeImage-devel}
BuildRequires: OpenGL-GLU-devel
@@ -222,6 +223,7 @@ Przykłady do OpenCASCADE.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%{__sed} -i -e '/set (CMAKE_CONFIGURATION_TYPES/ { s/INTERNAL/STRING/;s/ FORCE// }' CMakeLists.txt
%{__sed} -i -e 's/IMPORTED_LOCATION_RELEASE/IMPORTED_LOCATION_PLD/' adm/cmake/tbb.cmake
diff --git a/OpenCASCADE-X.patch b/OpenCASCADE-X.patch
new file mode 100644
index 0000000..f1ef47b
--- /dev/null
+++ b/OpenCASCADE-X.patch
@@ -0,0 +1,20 @@
+--- occt-cec1ecd/src/IVtkDraw/IVtkDraw_Interactor.cxx.orig 2023-07-21 17:36:51.000000000 +0200
++++ occt-cec1ecd/src/IVtkDraw/IVtkDraw_Interactor.cxx 2023-09-06 19:55:42.845602803 +0200
+@@ -19,6 +19,8 @@
+ #include <vtkWin32RenderWindowInteractor.h>
+ #include <vtkWin32OpenGLRenderWindow.h>
+ #else
++#include <vtkXRenderWindowInteractor.h>
++#include <vtkXOpenGLRenderWindow.h>
+ #include <GL/glx.h>
+
+ // Preventing naming collisions between
+@@ -36,8 +38,6 @@
+ #undef Success
+ #endif
+
+-#include <vtkXRenderWindowInteractor.h>
+-#include <vtkXOpenGLRenderWindow.h>
+ #endif
+ #include <vtkActor.h>
+ #include <vtkActorCollection.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/OpenCASCADE.git/commitdiff/40cbf0ef39ee5641e9ff433d078b0c824ae7da3b
More information about the pld-cvs-commit
mailing list