Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2020-06-09 00:00:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Tue Jun 9 00:00:05 2020 rev:24 rq:812289 version:0.18.4 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2020-03-27 22:00:26.386902423 +0100 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.3606/FreeCAD.changes 2020-06-09 00:04:00.417150763 +0200 @@ -1,0 +2,5 @@ +Sun Jun 7 15:48:17 UTC 2020 - Stefan Brüns <[email protected]> + +- Fix build with Qt 5.15, add fix_qt_5.15_build.patch + +------------------------------------------------------------------- New: ---- fix_qt_5.15_build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD.spec ++++++ --- /var/tmp/diff_new_pack.OQmKYT/_old 2020-06-09 00:04:04.917166728 +0200 +++ /var/tmp/diff_new_pack.OQmKYT/_new 2020-06-09 00:04:04.917166728 +0200 @@ -33,9 +33,7 @@ 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 @@ 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: 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 @@ # 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 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.OQmKYT/_old 2020-06-09 00:04:04.977166941 +0200 +++ /var/tmp/diff_new_pack.OQmKYT/_new 2020-06-09 00:04:04.977166941 +0200 @@ -2,7 +2,7 @@ <constraints> <hardware> <disk> - <size unit="G">4</size> + <size unit="G">14</size> </disk> <memory> <size unit="G">5</size> ++++++ fix_qt_5.15_build.patch ++++++ >From b2882c699b1444efadd9faee36855a965ac6a215 Mon Sep 17 00:00:00 2001 From: bartoszek <[email protected]> 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 <QSurfaceFormat> # include <QMessageBox> # include <QPainter> +# include <QPainterPath> #endif #if defined(__MINGW32__)
