From 3316926b96aa033dc1aa23c567a1e7498a3bc5b7e33f1d45a6c185e9f67b932e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 7 May 2020 05:49:11 +0000 Subject: [PATCH 1/9] need to increase disk size need after failures OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=113 --- _constraints | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_constraints b/_constraints index 31a91c5..780cde6 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 4 + 14 5 From 27b33982ca02bb74a64772f02428e914d25f17aa2824e7e029d1774bb52c02f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 31 May 2020 11:39:00 +0000 Subject: [PATCH 2/9] fix OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=115 --- FreeCAD.changes | 5 +++++ FreeCAD.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/FreeCAD.changes b/FreeCAD.changes index 1bf9876..5d2f421 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 31 11:38:38 UTC 2020 - Adrian Schröter + +- solve choice error by selecting vtk-qt + ------------------------------------------------------------------- Wed Mar 18 09:34:33 UTC 2020 - Yunhe Guo diff --git a/FreeCAD.spec b/FreeCAD.spec index b1055a1..b565f29 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -35,6 +35,8 @@ Group: Productivity/Graphics/CAD URL: https://www.freecadweb.org/ %if %{build_tar_ball} Source0: %{name}-%version.tar.xz +%else +Source0: _service %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 @@ -95,6 +97,7 @@ BuildRequires: python3-matplotlib BuildRequires: python3-pyside2-devel BuildRequires: python3-vtk BuildRequires: python3-xml +BuildRequires: vtk-qt BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) From ed1482b89b5846f53776a3d2995345f09385e3c8a7459db7ba8808099b77e2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 31 May 2020 11:41:54 +0000 Subject: [PATCH 3/9] also at runtime OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=116 --- FreeCAD.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/FreeCAD.spec b/FreeCAD.spec index b565f29..4d99a57 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -110,6 +110,7 @@ BuildRequires: pkgconfig(Qt5X11Extras) Requires: python3-numpy Requires: python3-pyside2 Requires: python3-vtk +Requires: vtk-qt # For Arch & Draft workbench Requires: python3-pivy # For FEM workbench From 95892f7296e134fed96dc2b49f392766637ac947b2daf30aa5299a6ad194d1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 31 May 2020 12:04:45 +0000 Subject: [PATCH 4/9] go OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=117 --- FreeCAD.changes | 1 + FreeCAD.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/FreeCAD.changes b/FreeCAD.changes index 5d2f421..a00c238 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -2,6 +2,7 @@ Sun May 31 11:38:38 UTC 2020 - Adrian Schröter - solve choice error by selecting vtk-qt +- add pugixml-devel buildrequires ------------------------------------------------------------------- Wed Mar 18 09:34:33 UTC 2020 - Yunhe Guo diff --git a/FreeCAD.spec b/FreeCAD.spec index 4d99a57..33a0134 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -89,6 +89,7 @@ BuildRequires: netgen-devel # we use upstream OpenCASCADE instead of oce-devel atm BuildRequires: occt-devel BuildRequires: pkg-config +BuildRequires: pugixml-devel %if 0%{?suse_version} # Qt5 & python3 From bc66ca878f6ddcea965d15f56c464aff3165446d227ab8697ba3612e1195acbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 2 Jun 2020 07:00:54 +0000 Subject: [PATCH 5/9] solve OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=118 --- FreeCAD.changes | 2 +- FreeCAD.spec | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/FreeCAD.changes b/FreeCAD.changes index a00c238..408fe0c 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -2,7 +2,7 @@ Sun May 31 11:38:38 UTC 2020 - Adrian Schröter - solve choice error by selecting vtk-qt -- add pugixml-devel buildrequires +- add pugixml-devel, vtk-java, proj-devel buildrequires ------------------------------------------------------------------- Wed Mar 18 09:34:33 UTC 2020 - Yunhe Guo diff --git a/FreeCAD.spec b/FreeCAD.spec index 33a0134..68e5cc5 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -90,6 +90,10 @@ BuildRequires: netgen-devel BuildRequires: occt-devel BuildRequires: pkg-config BuildRequires: pugixml-devel +BuildRequires: sqlite3-devel +%if 0%{?suse_version} >= 1550 +BuildRequires: proj-devel +%endif %if 0%{?suse_version} # Qt5 & python3 @@ -98,6 +102,7 @@ BuildRequires: python3-matplotlib BuildRequires: python3-pyside2-devel BuildRequires: python3-vtk BuildRequires: python3-xml +BuildRequires: vtk-java BuildRequires: vtk-qt BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5OpenGL) @@ -111,6 +116,7 @@ BuildRequires: pkgconfig(Qt5X11Extras) Requires: python3-numpy Requires: python3-pyside2 Requires: python3-vtk +Requires: vtk-java Requires: vtk-qt # For Arch & Draft workbench Requires: python3-pivy From a9689d341444d34749011df321d96f86b2de7fa94825b5c1c55c78c49cde2d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sun, 7 Jun 2020 17:26:41 +0000 Subject: [PATCH 6/9] Accepting request 812266 from home:StefanBruens:branches:science - Fix build with Qt 5.15, add fix_qt_5.15_build.patch OBS-URL: https://build.opensuse.org/request/show/812266 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=120 --- FreeCAD.changes | 5 +++++ FreeCAD.spec | 7 ++++--- fix_qt_5.15_build.patch | 21 +++++++++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 fix_qt_5.15_build.patch diff --git a/FreeCAD.changes b/FreeCAD.changes index 408fe0c..e735c29 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 + ------------------------------------------------------------------- Sun May 31 11:38:38 UTC 2020 - Adrian Schröter diff --git a/FreeCAD.spec b/FreeCAD.spec index 68e5cc5..829e920 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -48,6 +48,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 @@ -78,6 +80,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 @@ -89,11 +92,9 @@ BuildRequires: netgen-devel # we use upstream OpenCASCADE instead of oce-devel atm BuildRequires: occt-devel BuildRequires: pkg-config +BuildRequires: proj-devel BuildRequires: pugixml-devel BuildRequires: sqlite3-devel -%if 0%{?suse_version} >= 1550 -BuildRequires: proj-devel -%endif %if 0%{?suse_version} # Qt5 & python3 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__) From a20e90e4cda2e587b6647b4edf67cbc6627076c602267936a517c985555eb077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sun, 7 Jun 2020 17:34:56 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=121 --- FreeCAD.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/FreeCAD.spec b/FreeCAD.spec index 829e920..c24cb58 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -93,7 +93,6 @@ BuildRequires: netgen-devel BuildRequires: occt-devel BuildRequires: pkg-config BuildRequires: proj-devel -BuildRequires: pugixml-devel BuildRequires: sqlite3-devel %if 0%{?suse_version} @@ -103,8 +102,6 @@ BuildRequires: python3-matplotlib BuildRequires: python3-pyside2-devel BuildRequires: python3-vtk BuildRequires: python3-xml -BuildRequires: vtk-java -BuildRequires: vtk-qt BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) @@ -117,8 +114,6 @@ BuildRequires: pkgconfig(Qt5X11Extras) Requires: python3-numpy Requires: python3-pyside2 Requires: python3-vtk -Requires: vtk-java -Requires: vtk-qt # For Arch & Draft workbench Requires: python3-pivy # For FEM workbench From 2d6aeb5879804e4b47f43d5c29482ee3841011a4199c2a465aeaceee0a1cdc3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sun, 7 Jun 2020 17:36:34 +0000 Subject: [PATCH 8/9] OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=122 --- FreeCAD.changes | 6 ------ 1 file changed, 6 deletions(-) diff --git a/FreeCAD.changes b/FreeCAD.changes index e735c29..2143a6a 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -3,12 +3,6 @@ Sun Jun 7 15:48:17 UTC 2020 - Stefan Brüns - Fix build with Qt 5.15, add fix_qt_5.15_build.patch -------------------------------------------------------------------- -Sun May 31 11:38:38 UTC 2020 - Adrian Schröter - -- solve choice error by selecting vtk-qt -- add pugixml-devel, vtk-java, proj-devel buildrequires - ------------------------------------------------------------------- Wed Mar 18 09:34:33 UTC 2020 - Yunhe Guo From e4aea40a67f3a95aa0d1c9cc0e7d3c4067d444578ad7f12be02f15e4d1364359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sun, 7 Jun 2020 18:54:55 +0000 Subject: [PATCH 9/9] OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=123 --- FreeCAD.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/FreeCAD.spec b/FreeCAD.spec index c24cb58..58fde0a 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -33,11 +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 -%else -Source0: _service -%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