From 70bb526ac0dd158fa6fb3107221e69e4307f4742ce025514c588d87765de2ed2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 23 May 2018 08:29:11 +0000 Subject: [PATCH] Accepting request 610724 from home:cgiboudeaux:branches:science Fix build with Qt 5.11 OBS-URL: https://build.opensuse.org/request/show/610724 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=41 --- FreeCAD.changes | 7 + FreeCAD.spec | 8 +- fix-build-with-Qt5_11.diff | 286 +++++++++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 5 deletions(-) create mode 100644 fix-build-with-Qt5_11.diff diff --git a/FreeCAD.changes b/FreeCAD.changes index 3abbc23..7b8725b 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun May 20 08:12:30 UTC 2018 - christophe@krop.fr + +- Add fix-build-with-Qt5_11.diff. Fixes build with the upcoming + Qt 5.11. +- Switch to %autosetup + ------------------------------------------------------------------- Tue May 8 06:33:56 UTC 2018 - adrian@suse.de diff --git a/FreeCAD.spec b/FreeCAD.spec index 579d57f..4bd2a20 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -36,6 +36,8 @@ Patch1: fix-build.diff Patch2: 0001-find-openmpi2-include-files.patch # runtime fix, submitted upstream Patch3: fix-draft-module-with-python3.patch +# PATCH-FIX-UPSTREAM -- fix-build-with-Qt5_11.diff +Patch4: fix-build-with-Qt5_11.diff BuildRequires: Coin-devel #BuildRequires: SoQt-devel #BuildRequires: libmed-devel # needed for FEM module, but requires older hdf5 lib @@ -145,11 +147,7 @@ Requires: %{name} = %{version} This package contains the files needed for development with FreeCAD. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 # fix env-script-interpreter sed -i '1c#!%{__python2}' \ diff --git a/fix-build-with-Qt5_11.diff b/fix-build-with-Qt5_11.diff new file mode 100644 index 0000000..5eab715 --- /dev/null +++ b/fix-build-with-Qt5_11.diff @@ -0,0 +1,286 @@ +commit 018b41032a5af616fb861538695f8be14ad120ce +Author: sL1pKn07 +Date: Sat Apr 7 02:17:49 2018 +0200 + + [For v018] Fix build with Qt5 beta + + Seems need add some headers for build with incoming Qt 5.11 (Tested with 5.11.0beta2) + +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp +index c3992f9d8..cd9b64a94 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintBearing.cpp +@@ -28,6 +28,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp +index c445ca1c8..6fe9898e1 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintContact.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp +index 0a83e737b..cfb16d9d8 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintDisplacement.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp +index 0d864e47e..183719432 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintFixed.cpp +@@ -29,6 +29,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +index c9964403b..8aaacdcf4 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +@@ -29,6 +29,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp +index 33deb1b00..94fa4209a 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintForce.cpp +@@ -28,6 +28,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +index 344b8d32b..20a636215 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintHeatflux.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp +index b4c3cb03b..29d90c334 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintPlaneRotation.cpp +@@ -30,6 +30,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp +index 2da2b11cb..a85289183 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintPressure.cpp +@@ -30,6 +30,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp +index 42c0d8f2e..88e9029fd 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintTemperature.cpp +@@ -32,6 +32,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +index 35a1fcf5b..e3afeb785 100644 +--- a/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp ++++ b/src/Mod/Fem/Gui/TaskFemConstraintTransform.cpp +@@ -33,6 +33,7 @@ + # include + # include + # include ++# include + # include + # include + # include +diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp +index e392d470b..7636ad2fb 100644 +--- a/src/Mod/MeshPart/Gui/Tessellation.cpp ++++ b/src/Mod/MeshPart/Gui/Tessellation.cpp +@@ -25,6 +25,7 @@ + #ifndef _PreComp_ + # include + # include ++# include + #endif + + #include "Tessellation.h" +diff --git a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp +index d0cf0f94e..b44eac6ff 100644 +--- a/src/Mod/Part/Gui/DlgSettingsGeneral.cpp ++++ b/src/Mod/Part/Gui/DlgSettingsGeneral.cpp +@@ -22,6 +22,9 @@ + + + #include "PreCompiled.h" ++#ifndef _PreComp_ ++# include ++#endif + + #include + +diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +index 785705448..7e3280065 100644 +--- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskBooleanParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +index 330d58535..4600cc25b 100644 +--- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h" + + #ifndef _PreComp_ ++# include + #endif + + #include "ui_TaskChamferParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +index 556fc92ae..020148001 100644 +--- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskDraftParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +index 3c4025574..5e0c31ec6 100644 +--- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h" + + #ifndef _PreComp_ ++# include + #endif + + #include "ui_TaskFilletParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +index 532936310..1970db7ef 100644 +--- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + # include + #endif + +diff --git a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +index 084ab353c..f8e96fd6c 100644 +--- a/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskMirroredParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include +diff --git a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +index 1fe452a59..d5a5317ae 100644 +--- a/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskMultiTransformParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskMultiTransformParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +index 874273f63..79c564d09 100644 +--- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + # include + #endif + +diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +index 593664c9b..acaacce6e 100644 +--- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +@@ -25,6 +25,7 @@ + + #ifndef _PreComp_ + # include ++# include + #endif + + #include "ui_TaskScaledParameters.h" +diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +index b3f17f299..5b907304f 100644 +--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp ++++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +@@ -24,6 +24,7 @@ + #include "PreCompiled.h" + + #ifndef _PreComp_ ++# include + #endif + + #include "ui_TaskThicknessParameters.h"