diff --git a/FreeCAD.changes b/FreeCAD.changes index 1bf9876..2143a6a 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jun 7 15:48:17 UTC 2020 - Stefan BrĂ¼ns + +- Fix build with Qt 5.15, add fix_qt_5.15_build.patch + ------------------------------------------------------------------- Wed Mar 18 09:34:33 UTC 2020 - Yunhe Guo diff --git a/FreeCAD.spec b/FreeCAD.spec index b1055a1..58fde0a 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -33,9 +33,7 @@ Summary: General Purpose 3D CAD Modeler License: LGPL-2.0-or-later AND GPL-2.0-or-later Group: Productivity/Graphics/CAD URL: https://www.freecadweb.org/ -%if %{build_tar_ball} Source0: %{name}-%version.tar.xz -%endif # PATCH-FIX-UPSTREAM 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch -- Fix build with shiboken2/pyside2 >= 5.12.1 Patch1: 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch # PATCH-FIX-OPENSUSE qt-5.14.patch @@ -46,6 +44,8 @@ Patch4: update-swigpyrunin-for-python-3.8.patch Patch5: 0001-fem-use-time.process_time-instead-of-removed-time.cl.patch # PATCH-FIX-OPENSUSE Use correct import for Python 3 tkinter Patch6: fix_unittestgui_tkinter_py3.patch +# PATCH-FIX-UPSTREAM https://github.com/FreeCAD/FreeCAD/pull/3558 +Patch7: fix_qt_5.15_build.patch # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch: %ix86 %arm ppc s390 s390x @@ -76,6 +76,7 @@ BuildRequires: glew-devel BuildRequires: graphviz BuildRequires: hdf5-devel BuildRequires: hicolor-icon-theme +BuildRequires: java-devel # We use the internal smesh version with fixes atm #BuildRequires: smesh-devel BuildRequires: libXerces-c-devel @@ -87,6 +88,8 @@ BuildRequires: netgen-devel # we use upstream OpenCASCADE instead of oce-devel atm BuildRequires: occt-devel BuildRequires: pkg-config +BuildRequires: proj-devel +BuildRequires: sqlite3-devel %if 0%{?suse_version} # Qt5 & python3 diff --git a/_constraints b/_constraints index 31a91c5..780cde6 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 4 + 14 5 diff --git a/fix_qt_5.15_build.patch b/fix_qt_5.15_build.patch new file mode 100644 index 0000000..5bbf75e --- /dev/null +++ b/fix_qt_5.15_build.patch @@ -0,0 +1,21 @@ +From b2882c699b1444efadd9faee36855a965ac6a215 Mon Sep 17 00:00:00 2001 +From: bartoszek +Date: Thu, 4 Jun 2020 14:10:08 +0200 +Subject: [PATCH] Fix qt5:5.15.0 build. + +--- + src/Mod/Image/Gui/OpenGLImageBox.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Mod/Image/Gui/OpenGLImageBox.cpp b/src/Mod/Image/Gui/OpenGLImageBox.cpp +index 404a1a19f1b..bb22ae0f836 100644 +--- a/src/Mod/Image/Gui/OpenGLImageBox.cpp ++++ b/src/Mod/Image/Gui/OpenGLImageBox.cpp +@@ -26,6 +26,7 @@ + # include + # include + # include ++# include + #endif + + #if defined(__MINGW32__)