commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2020-09-22 21:08:49
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.4249 (New)
Package is "FreeCAD"
Tue Sep 22 21:08:49 2020 rev:26 rq:835691 version:0.18.4
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2020-07-27
17:48:26.331458875 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.4249/FreeCAD.changes
2020-09-22 21:10:55.235915683 +0200
@@ -1,0 +2,7 @@
+Sat Sep 19 01:37:12 UTC 2020 - Stefan Brüns
+
+- Fix build with boost 1.73 and later, add
+ 0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch
+- Cleanup some build dependencies.
+
+---
Old:
_service
New:
0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch
FreeCAD-0.18.4.tar.xz
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.j2slgR/_old 2020-09-22 21:10:58.791918794 +0200
+++ /var/tmp/diff_new_pack.j2slgR/_new 2020-09-22 21:10:58.795918797 +0200
@@ -25,6 +25,8 @@
%else
%bcond_withboost_signals2
%endif
+# Bundled SALOME-MESH (smesh) fails to build with VTK 9.0
+%bcond_with smesh
Name: FreeCAD
Version:0.18.4
@@ -46,6 +48,8 @@
Patch6: fix_unittestgui_tkinter_py3.patch
# PATCH-FIX-UPSTREAM https://github.com/FreeCAD/FreeCAD/pull/3558
Patch7: fix_qt_5.15_build.patch
+# PATCH-FIX-UPSTREAM -- Rebased
https://github.com/FreeCAD/FreeCAD/commit/4ec45b545ebf
+Patch8: 0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch
# Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch:%ix86 %arm ppc s390 s390x
@@ -71,12 +75,10 @@
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-fortran
-BuildRequires: git
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
@@ -205,11 +207,13 @@
-DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \
-DBUILD_QT5=ON \
-DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \
- -DBUILD_MESH_PART:BOOL=OFF \
-DBUILD_OPENSCAD:BOOL=ON \
- -DBUILD_FEM:BOOL=OFF \
-DBUILD_FEM_NETGEN:BOOL=OFF \
-DFREECAD_USE_EXTERNAL_SMESH=OFF \
+ -DBUILD_SMESH:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \
+ -DBUILD_MESH_PART:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \
+ -DBUILD_FEM:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \
+ -Wno-dev \
..
%cmake_build
++ 0001-boost-1.73.0-The-practice-of-declaring-the-Bind-plac.patch ++
5663 lines (skipped)
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2020-07-27 17:46:03
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.3592 (New)
Package is "FreeCAD"
Mon Jul 27 17:46:03 2020 rev:25 rq:822931 version:0.18.4
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2020-06-09
00:04:00.417150763 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.3592/FreeCAD.changes
2020-07-27 17:48:26.331458875 +0200
@@ -1,0 +2,5 @@
+Thu Jul 23 11:43:21 UTC 2020 - Adrian Schröter
+
+- temporary disable FEM module until VTK 9 support arrives
+
+---
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.Nb7nM0/_old 2020-07-27 17:48:28.979461793 +0200
+++ /var/tmp/diff_new_pack.Nb7nM0/_new 2020-07-27 17:48:28.983461797 +0200
@@ -188,6 +188,7 @@
rm src/3rdparty/Pivy-0.5 -fr
%build
+# disabled until vtk 9 support arrives: -DBUILD_MESH_PART:BOOL=ON
-DBUILD_FEM:BOOL=ON
%cmake \
-DCMAKE_INSTALL_PREFIX=%{x_prefix} \
-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
@@ -204,9 +205,9 @@
-DPYSIDE_INCLUDE_DIR=/usr/include/PySide2/ \
-DBUILD_QT5=ON \
-DFREECAD_USE_EXTERNAL_PIVY:BOOL=TRUE \
- -DBUILD_MESH_PART:BOOL=ON \
+ -DBUILD_MESH_PART:BOOL=OFF \
-DBUILD_OPENSCAD:BOOL=ON \
- -DBUILD_FEM:BOOL=ON \
+ -DBUILD_FEM:BOOL=OFF \
-DBUILD_FEM_NETGEN:BOOL=OFF \
-DFREECAD_USE_EXTERNAL_SMESH=OFF \
..
commit FreeCAD for openSUSE:Factory
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
+
+- 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 @@
- 4
+ 14
5
++ fix_qt_5.15_build.patch ++
>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__)
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2020-05-07 14:51:29
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.2738 (New)
Package is "FreeCAD"
Thu May 7 14:51:29 2020 rev:23 rq:800703 version:0.18.4
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-test.changes 2019-09-07
11:48:17.974317733 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.2738/FreeCAD-test.changes
2020-05-07 14:51:36.906093126 +0200
@@ -1,0 +2,6 @@
+Wed May 6 07:02:41 UTC 2020 - Wolfgang Bauer
+
+- Only enable gmsh BuildRequires on Tumbleweed, it's not available
+ in Leap 15
+
+---
Other differences:
--
++ FreeCAD-test.spec ++
--- /var/tmp/diff_new_pack.TL23n6/_old 2020-05-07 14:51:41.582102506 +0200
+++ /var/tmp/diff_new_pack.TL23n6/_new 2020-05-07 14:51:41.582102506 +0200
@@ -24,7 +24,9 @@
Group: Productivity/Graphics/CAD
URL:http://www.freecadweb.org/
BuildRequires: FreeCAD
+%if 0%{?suse_version} > 1500
BuildRequires: gmsh
+%endif
# Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch:%ix86 %arm ppc s390 s390x
commit FreeCAD for openSUSE:Factory
Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2020-03-27 21:58:44 Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.3160 (New) Package is "FreeCAD" Fri Mar 27 21:58:44 2020 rev:22 rq:788942 version:0.18.4 Changes: --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2020-03-26 23:35:33.502824528 +0100 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.3160/FreeCAD.changes 2020-03-27 22:00:26.386902423 +0100 @@ -1,0 +2,5 @@ +Wed Mar 18 09:34:33 UTC 2020 - Yunhe Guo + +- Allow install with lowercase package name: zypper install freecad + +--- Other differences: -- ++ FreeCAD.spec ++ --- /var/tmp/diff_new_pack.wpB4sP/_old 2020-03-27 22:00:34.350907055 +0100 +++ /var/tmp/diff_new_pack.wpB4sP/_new 2020-03-27 22:00:34.358907060 +0100 @@ -143,6 +143,8 @@ Recommends: ccx +Provides: freecad + %description FreeCAD is a parametric 3D modeler made primarily to design real-life objects of any size. Parametric modeling allows modifying designs by
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2020-03-26 23:35:12
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.3160 (New)
Package is "FreeCAD"
Thu Mar 26 23:35:12 2020 rev:21 rq:788586 version:0.18.4
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2020-03-16
10:21:44.491670407 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.3160/FreeCAD.changes
2020-03-26 23:35:33.502824528 +0100
@@ -1,0 +2,6 @@
+Mon Mar 16 22:24:32 UTC 2020 - Stefan Brüns
+
+- More spec file cleanup, removed duplicate files
+- Use upstream provided desktop files, mimeinfo, etc
+
+---
Old:
FreeCAD.sh
FreeCADCmd.sh
FreeCAD_shared_mimeinfo
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.TNQZny/_old 2020-03-26 23:35:40.910827203 +0100
+++ /var/tmp/diff_new_pack.TNQZny/_new 2020-03-26 23:35:40.910827203 +0100
@@ -36,9 +36,6 @@
%if %{build_tar_ball}
Source0:%{name}-%version.tar.xz
%endif
-Source1:FreeCAD.sh
-Source2:FreeCADCmd.sh
-Source3:FreeCAD_shared_mimeinfo
# 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
@@ -186,20 +183,16 @@
rm src/3rdparty/Pivy-0.5 -fr
%build
-mkdir build && cd build
-# cmake macro would set standard libdir
-# it needs an older specific zipios version -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE
-
-printenv
-cmake \
- -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
+%cmake \
+ -DCMAKE_INSTALL_PREFIX=%{x_prefix} \
-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
+ -DCMAKE_INSTALL_LIBDIR=%{x_prefix}/lib \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \
+ -DCMAKE_SKIP_RPATH:BOOL=OFF \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
-DOCC_INCLUDE_DIR=%{_includedir}/opencascade \
-DRESOURCEDIR=%{_datadir}/%{name} \
- -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-DSHIBOKEN_INCLUDE_DIR=/usr/include/shiboken2/ \
@@ -213,57 +206,30 @@
-DFREECAD_USE_EXTERNAL_SMESH=OFF \
..
-make VERBOSE=1 %{?_smp_mflags} all || make VERBOSE=1 all
-
-# # Build documentation last, somehow
-# # this triggers a rebuild
-# mkdir build_doc
-# pushd build_doc
-# cmake \
-# -DCMAKE_INSTALL_PREFIX=%%{_prefix} \
-# -DLIB_SUFFIX=%%{_lib} \
-# -DCMAKE_INSTALL_DATADIR=%%{_datadir}/%%{name} \
-# -DCMAKE_INSTALL_DOCDIR=%%{_docdir}/%%{name} \
-# -DCMAKE_INSTALL_INCLUDEDIR=%%{_includedir}/%%{name} \
-# -DCMAKE_BUILD_TYPE=Release \
-# -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE \
-# -DFREECAD_USE_EXTERNAL_PIVY=TRUE \
-# ../
-# # Needs an updated opencascade
-# #-DOCE_DIR=/opt/OpenCASCADE/%%{_lib}
-#
-# nice make VERBOSE=1 DevDoc
-# popd
+%cmake_build
%install
-pushd build
-nice %make_install VERBOSE=1 %{?_smp_mflags}
-popd
-
-# pushd build_doc
-# nice make VERBOSE=1 %%{?_smp_mflags} install DESTDIR=%%{buildroot}
-# popd
+%cmake_install
# Fix "non-executable-script" rpmlint warning
chmod 755 %{buildroot}%{x_prefix}/Mod/Robot/MovieTool.py \
%{buildroot}%{x_prefix}/Mod/Test/testmakeWireString.py \
%{buildroot}%{x_prefix}/Mod/Test/unittestgui.py
-# Move desktop icon in the correct location
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable
+# Move icons, mimeinfo, metainfo to the correct location
+mv %{buildroot}%{x_prefix}/share/* %{buildroot}%{_datadir}/
for size in 64 48 32 16; do
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps
mv %{buildroot}%{_datadir}/%{name}/freecad-icon-${size}.png \
- %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/freecad.png
+
%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/org.freecadweb.FreeCAD.png
done
-mv %{buildroot}%{_datadir}/%{name}/freecad.svg
%{buildroot}%{_datadir}/icons/hicolor/scalable
-mv %{buildroot}%{_datadir}/%{name}/freecad-doc.png
%{buildroot}%{_datadir}/icons/hicolor/64x64/
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/
+# Install under the correct name according to FDO shared-mime-info-spec
+mv %{buildroot}%{_datadir}/%{name}/freecad-doc.png
%{buildroot}%{_datadir}/icons/hicolor/64x64/mimetypes/application-x-extension-fcstd.png
rm %{buildroot}%{_datadir}/%{name}/freecad.xpm
+rm %{buildroot}%{_datadir}/%{name}/freecad.svg
-%suse_update_desktop_file -c %{name} "%{name}" "3D CAD
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2020-03-16 10:20:10
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.3160 (New)
Package is "FreeCAD"
Mon Mar 16 10:20:10 2020 rev:20 rq:785389 version:0.18.4
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2020-01-27
00:22:29.057498312 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.3160/FreeCAD.changes
2020-03-16 10:21:44.491670407 +0100
@@ -1,0 +2,27 @@
+Sun Mar 15 18:13:15 UTC 2020 - Stefan Brüns
+
+- Fix runtime errors with Python 3.8:
+ * 0001-fem-use-time.process_time-instead-of-removed-time.cl.patch
+- Fix last python2 she-bang remainders, fix imports:
+ * fix_unittestgui_tkinter_py3.patch
+- Remove unnecessary opencv build dependency
+- update to current 0.18 branch:
+ * Fem: fix segmentation fault when opening contraint transform
+panel. Fix Python code
+ * Part: the number of domains returned by TopoShape::getDomains
+must match with number of faces
+ * apply fixes from master when building with occt 7.4
++ Drop 0002-fix-compile.patch
+
+---
+Sat Mar 14 15:12:29 UTC 2020 - Stefan Brüns
+
+- Fix build with Python 3.8:
+ Add update-swigpyrunin-for-python-3.8.patch
+- Spec file cleanup
+ * Drop xpm FreeCAD icon
+ * Install PNGs/SVG icons in correct paths
+ * Remove obsolete update_mime_database calls in %post
+ * Remove obsolete conditionals for Leap 42.x
+
+---
@@ -11,3 +38,6 @@
- * fixes #0004182: Segfault when clicking constraints from a different
viewport [skip ci]
- * See discussion https://forum.freecadweb.org/viewtopic.php?f=3=41879
- * fixes #0004233: Access violation and file corruption on undo duplicate
sketch
+ * fixes #0004182: Segfault when clicking constraints from a
+different viewport [skip ci]
+ * [Draft] ImportDXF 0.18 Bug upgrading from 0.16. See discussion
+https://forum.freecadweb.org/viewtopic.php?f=3=41879
+ * fixes #0004233: Access violation and file corruption on undo
+duplicate sketch
@@ -17,3 +47,5 @@
- * [AddonManager] 0.18 Improve Non GitPython Error..
- * ...Handling. Previous output when clicking Macros tab caused errors in
Report View with no Macros loaded at all.
- * fix encoding problem when clicking a link on StartPage if application is
installed into a directory with non-ASCII characters
+ * [AddonManager] 0.18 Improve Non GitPython Error Handling.
+Previous output when clicking Macros tab caused errors in
+Report View with no Macros loaded at all.
+ * fix encoding problem when clicking a link on StartPage if
+application is installed into a directory with non-ASCII characters
@@ -21 +52,0 @@
-
Old:
0002-fix-compile.patch
New:
0001-fem-use-time.process_time-instead-of-removed-time.cl.patch
fix_unittestgui_tkinter_py3.patch
update-swigpyrunin-for-python-3.8.patch
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.W7wcAd/_old 2020-03-16 10:21:51.567673289 +0100
+++ /var/tmp/diff_new_pack.W7wcAd/_new 2020-03-16 10:21:51.567673289 +0100
@@ -41,16 +41,19 @@
Source3:FreeCAD_shared_mimeinfo
# 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-UPSTREAM 0002-fix-compile.patch
-Patch2: 0002-fix-compile.patch
# PATCH-FIX-OPENSUSE qt-5.14.patch
Patch3: 0003-qt-5.14.patch
+# PATCH-FIX-UPSTREAM
https://github.com/FreeCAD/FreeCAD/commit/6eacb17b3e03d200.patch
+Patch4: update-swigpyrunin-for-python-3.8.patch
+# PATCH-FIX-UPSTREAM https://github.com/FreeCAD/FreeCAD/pull/2899
+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
# Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch:%ix86 %arm ppc s390 s390x
BuildRequires: Coin-devel
-%if 0%{?suse_version} >= 1330
BuildRequires: libboost_filesystem-devel >= 1.55
BuildRequires: libboost_graph-devel >= 1.55
BuildRequires: libboost_program_options-devel >= 1.55
@@ -61,9 +64,6 @@
%endif
BuildRequires: libboost_system-devel >= 1.55
BuildRequires: libboost_thread-devel >= 1.55
-%else
-BuildRequires: boost-devel >= 1.55
-%endif
BuildRequires: cmake
BuildRequires: dos2unix
@@ -78,6 +78,7 @@
BuildRequires: glew-devel
BuildRequires: graphviz
BuildRequires: hdf5-devel
+BuildRequires: hicolor-icon-theme
#
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2020-01-27 00:21:54
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.26092 (New)
Package is "FreeCAD"
Mon Jan 27 00:21:54 2020 rev:19 rq:767343 version:0.18.4
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-10-31
22:20:17.891915979 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.26092/FreeCAD.changes
2020-01-27 00:22:29.057498312 +0100
@@ -1,0 +2,28 @@
+Sat Jan 25 11:03:06 UTC 2020 - Hans-Peter Jansen
+
+- make 0003-qt-5.14.patch do what it is advertising
+ * fix conditional in order to locate rcc/uic properly
+
+---
+Fri Jan 24 09:02:08 UTC 2020 - Adrian Schröter
+
+- update to current 0.18 branch:
+ * fixes #0004182: Segfault when clicking constraints from a different
viewport [skip ci]
+ * See discussion https://forum.freecadweb.org/viewtopic.php?f=3=41879
+ * fixes #0004233: Access violation and file corruption on undo duplicate
sketch
+ * FEM: py3 fix in selection widget
+ * FEM: selection widgets, add some error prints
+ * FEM: equations, fix reset edit mode
+ * [AddonManager] 0.18 Improve Non GitPython Error..
+ * ...Handling. Previous output when clicking Macros tab caused errors in
Report View with no Macros loaded at all.
+ * fix encoding problem when clicking a link on StartPage if application is
installed into a directory with non-ASCII characters
+ * [Arch] ArchMaterial 0.18 Fix Crash
+
+
+---
+Thu Jan 23 16:41:29 UTC 2020 - Adrian Schröter
+
+- fix build with new gcc and Qt 5.14
+ (0002-fix-compile.patch 0003-qt-5.14.patch)
+
+---
New:
0002-fix-compile.patch
0003-qt-5.14.patch
Other differences:
--
++ FreeCAD-test.spec ++
--- /var/tmp/diff_new_pack.i5o8RG/_old 2020-01-27 00:22:39.917503429 +0100
+++ /var/tmp/diff_new_pack.i5o8RG/_new 2020-01-27 00:22:39.921503431 +0100
@@ -1,7 +1,7 @@
#
# spec file for package FreeCAD-test
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@
Summary:Meta source package that runs the FreeCAD testsuite when built
License:LGPL-2.0-or-later AND GPL-2.0-or-later
Group: Productivity/Graphics/CAD
-Url:http://www.freecadweb.org/
+URL:http://www.freecadweb.org/
BuildRequires: FreeCAD
BuildRequires: gmsh
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.i5o8RG/_old 2020-01-27 00:22:39.933503436 +0100
+++ /var/tmp/diff_new_pack.i5o8RG/_new 2020-01-27 00:22:39.937503438 +0100
@@ -1,7 +1,7 @@
#
# spec file for package FreeCAD
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -32,7 +32,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/
+URL:https://www.freecadweb.org/
%if %{build_tar_ball}
Source0:%{name}-%version.tar.xz
%endif
@@ -41,6 +41,10 @@
Source3:FreeCAD_shared_mimeinfo
# 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-UPSTREAM 0002-fix-compile.patch
+Patch2: 0002-fix-compile.patch
+# PATCH-FIX-OPENSUSE qt-5.14.patch
+Patch3: 0003-qt-5.14.patch
# Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch:%ix86 %arm ppc s390 s390x
++ 0002-fix-compile.patch ++
diff --git a/src/3rdParty/salomesmesh/inc/Rn.h
b/src/3rdParty/salomesmesh/inc/Rn.h
index 6ec871d93..e92d2275a 100644
--- a/src/3rdParty/salomesmesh/inc/Rn.h
+++ b/src/3rdParty/salomesmesh/inc/Rn.h
@@ -180,12 +180,12 @@ class R4: public R3
{
friend std::ostream& operator <<(std::ostream& f, const R4 & P )
{ f << P.x << ' ' << P.y << ' ' << P.z << ' ' << P.omega; return f; }
- friend istream& operator >>(istream& f, R4 & P)
+ friend std::istream& operator >>(std::istream& f, R4 & P)
{ f >> P.x >> P.y >> P.z >> P.omega ; return f; }
friend std::ostream& operator <<(std::ostream& f, const R4 *
commit FreeCAD for openSUSE:Factory
Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2019-10-31 22:19:16 Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.2990 (New) Package is "FreeCAD" Thu Oct 31 22:19:16 2019 rev:18 rq:744271 version:0.18.4 Changes: --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-10-28 16:59:38.313705386 +0100 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.2990/FreeCAD.changes 2019-10-31 22:20:17.891915979 +0100 @@ -1,0 +2,6 @@ +Wed Oct 30 16:06:43 UTC 2019 - Adrian Schröter + +- Update to final 0.18.4 + * pre-select name filter in import/export file dialog + +--- Old: FreeCAD-0.18.3.obscpio New: FreeCAD-0.18.4.obscpio Other differences: -- ++ FreeCAD-test.spec ++ --- /var/tmp/diff_new_pack.aB9FP2/_old 2019-10-31 22:20:55.883967156 +0100 +++ /var/tmp/diff_new_pack.aB9FP2/_new 2019-10-31 22:20:55.895967172 +0100 @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version:0.18.3 +Version:0.18.4 Release:0 Summary:Meta source package that runs the FreeCAD testsuite when built License:LGPL-2.0-or-later AND GPL-2.0-or-later ++ FreeCAD.spec ++ --- /var/tmp/diff_new_pack.aB9FP2/_old 2019-10-31 22:20:55.67312 +0100 +++ /var/tmp/diff_new_pack.aB9FP2/_new 2019-10-31 22:20:56.027967350 +0100 @@ -27,7 +27,7 @@ %endif Name: FreeCAD -Version:0.18.3 +Version:0.18.4 Release:0 Summary:General Purpose 3D CAD Modeler License:LGPL-2.0-or-later AND GPL-2.0-or-later ++ FreeCAD-0.18.3.obscpio -> FreeCAD-0.18.4.obscpio ++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.18.3.obscpio /work/SRC/openSUSE:Factory/.FreeCAD.new.2990/FreeCAD-0.18.4.obscpio differ: char 50, line 1 ++ FreeCAD.obsinfo ++ --- /var/tmp/diff_new_pack.aB9FP2/_old 2019-10-31 22:20:56.339967771 +0100 +++ /var/tmp/diff_new_pack.aB9FP2/_new 2019-10-31 22:20:56.351967786 +0100 @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.18.3 -mtime: 1571183031 -commit: f972b010bb86b39e38e7f59526596bea8b06d954 +version: 0.18.4 +mtime: 1571763215 +commit: 980bf9060e28555fecd9e3462f68ca74007b70f8 ++ _service ++ --- /var/tmp/diff_new_pack.aB9FP2/_old 2019-10-31 22:20:56.539968040 +0100 +++ /var/tmp/diff_new_pack.aB9FP2/_new 2019-10-31 22:20:56.555968061 +0100 @@ -2,8 +2,8 @@ https://github.com/FreeCAD/FreeCAD.git git -releases/FreeCAD-0-18 -0.18.3 +0.18.4 +0.18.4
commit FreeCAD for openSUSE:Factory
Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2019-10-28 16:55:57 Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.2990 (New) Package is "FreeCAD" Mon Oct 28 16:55:57 2019 rev:17 rq:741676 version:0.18.3 Changes: --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-09-07 11:48:19.594317503 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.2990/FreeCAD.changes 2019-10-28 16:59:38.313705386 +0100 @@ -1,0 +2,16 @@ +Tue Oct 22 06:46:22 UTC 2019 - Adrian Schröter + +- update to current 0.18 branch, esp for Qt >= 5.9 fixes + * [TD]Fix slow GC of QGIPrimPath + * [Spreadsheet] Excel File Import fix Py3 bug + * [Path] Fix xrange bug with Py3 + * fix print preview function for >= Qt 5.9 + * Backport: startwb files restored in 0.18.3 to display thumbs correctly + * 0.18.x displays the example files within in the Start WB without their + respective thumbs. This PR restores that functionality + * Fixed problems with 'pythonopen' + * Correction of drill speed calculation + * Material: py2 fix in depreciated mat file parser (back port from 0.19) + * [TD]Fix #4017 Crash on bad hatch scale + +--- Other differences: -- FreeCAD.spec: same change ++ FreeCAD-0.18.3.obscpio ++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.18.3.obscpio /work/SRC/openSUSE:Factory/.FreeCAD.new.2990/FreeCAD-0.18.3.obscpio differ: char 49, line 1 ++ FreeCAD.obsinfo ++ --- /var/tmp/diff_new_pack.XaCTDh/_old 2019-10-28 16:59:48.457717576 +0100 +++ /var/tmp/diff_new_pack.XaCTDh/_new 2019-10-28 16:59:48.457717576 +0100 @@ -1,5 +1,5 @@ name: FreeCAD version: 0.18.3 -mtime: 1562965688 -commit: 3129ae4296e40ed20e7b3d460b86e6969acbe1c3 +mtime: 1571183031 +commit: f972b010bb86b39e38e7f59526596bea8b06d954 ++ _service ++ --- /var/tmp/diff_new_pack.XaCTDh/_old 2019-10-28 16:59:48.513717644 +0100 +++ /var/tmp/diff_new_pack.XaCTDh/_new 2019-10-28 16:59:48.513717644 +0100 @@ -2,7 +2,7 @@ https://github.com/FreeCAD/FreeCAD.git git -0.18.3 +releases/FreeCAD-0-18 0.18.3
commit FreeCAD for openSUSE:Factory
Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2019-09-07 11:46:26 Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.7948 (New) Package is "FreeCAD" Sat Sep 7 11:46:26 2019 rev:16 rq:720109 version:0.18.3 Changes: --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-test.changes 2019-02-28 21:41:39.801569685 +0100 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.7948/FreeCAD-test.changes 2019-09-07 11:48:17.974317733 +0200 @@ -1,0 +2,6 @@ +Sat Jul 27 03:34:10 UTC 2019 - Stefan Brüns + +- Fix inverted logic when evaluating test suite exit code +- Add gmsh mesher to BuildRequires, increase FEM test coverage + +--- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-04-08 10:39:19.355278021 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.7948/FreeCAD.changes 2019-09-07 11:48:19.594317503 +0200 @@ -1,0 +2,48 @@ +Thu Jul 18 11:01:30 UTC 2019 - Adrian Schröter + +- Update to 0.18.3 + * AddonManager: Skip non-github addons + * Sketcher: Fix Carbon copy leads to unsolvable sketch + * Sketcher: Fix carbon copy construction points + * fixes #0003993: Memory leak with Python3 + * code simplification in PythonWrapper + * issue #0003984: Creating a Path Job object fails with 'PySide2.QtWidgets.QDialog' object has no attribute 'templateGroup' + * Fixes bug #4008: removes phantom path cause + * Fix crash in case encoding of Python paths fails + * [Material] Respect unicode filenames Fixes #4027 + * BrowserView: fix QWebEngine crash + * Py3: no __builtin__ module available + * fixes 0004010: Box Selection + Part -> MakeCompound will crash FreeCAD + * FEM: solver elmer tasks, Py3 decode fix + * make OpenSCAD utilities working again with Py2 + +--- +Fri Jul 12 22:23:09 UTC 2019 - Stefan Brüns + +- Remove MPI dependencies, as these are not used for the built package, + but adversely affect build times and rebuilds. + Proper MPI integration needs more work and has to ensure the base version + of FreeCAD can be used without prior manual setup of an MPI environment. + Remove 0001-find-openmpi2-include-files.patch, mpicc/mpicxx would + pick up the correct include path by themselfs. +- Sort BuildRequires: again + +--- +Thu Jun 13 12:25:02 UTC 2019 - Christophe Giboudeaux + +- Add 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch to fix + build with recent shiboken2/pyside2 releases. + +--- +Sun May 12 07:21:14 UTC 2019 - Adrian Schröter + +- Update to 0.18.2 + * replace insecure use of eval() with proper use of units + * py3/py2: use exec as function + * Arch: Fixed error in roof - Fixes #3864 + * Draft: Fixed 0.18.1 bug in DXF importer + * Py3 fix: correctly convert a Python str to const char* + * Py3 fix reading/writing from/to OBJ file + * fixes 0003913: libspnav crash on linux wayland during startup + +--- Old: 0001-find-openmpi2-include-files.patch FreeCAD-0.18.1.obscpio New: 0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch FreeCAD-0.18.3.obscpio Other differences: -- ++ FreeCAD-test.spec ++ --- /var/tmp/diff_new_pack.lsNj4o/_old 2019-09-07 11:48:30.906315901 +0200 +++ /var/tmp/diff_new_pack.lsNj4o/_new 2019-09-07 11:48:30.906315901 +0200 @@ -17,13 +17,14 @@ Name: FreeCAD-test -Version:0.18.1 +Version:0.18.3 Release:0 Summary:Meta source package that runs the FreeCAD testsuite when built License:LGPL-2.0-or-later AND GPL-2.0-or-later Group: Productivity/Graphics/CAD Url:http://www.freecadweb.org/ BuildRequires: FreeCAD +BuildRequires: gmsh # Test suite fails on 32bit and I don't want to debug that anymore ExcludeArch:%ix86 %arm ppc s390 s390x @@ -33,7 +34,10 @@ %build export LC_ALL="C.utf-8" -#FreeCAD --console --write-log --log-file=/tmp/FreeCAD.log --run-test 0 || exit 1 -FreeCAD --console --run-test 0 || exit 1 +file=`mktemp` +if ! FreeCAD --console --write-log --log-file="$file" --run-test 0; then + cat "$file" + exit 1 +fi %changelog ++ FreeCAD.spec ++ --- /var/tmp/diff_new_pack.lsNj4o/_old 2019-09-07 11:48:30.922315899 +0200 +++ /var/tmp/diff_new_pack.lsNj4o/_new 2019-09-07 11:48:30.922315899 +0200 @@ -27,7 +27,7 @@ %endif Name: FreeCAD -Version:0.18.1 +Version:0.18.3 Release:0 Summary:General Purpose 3D CAD
commit FreeCAD for openSUSE:Factory
Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2019-04-08 10:36:33 Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.3908 (New) Package is "FreeCAD" Mon Apr 8 10:36:33 2019 rev:15 rq:691894 version:0.18.1 Changes: --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-04-05 12:00:38.646497451 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.3908/FreeCAD.changes 2019-04-08 10:39:19.355278021 +0200 @@ -1,0 +2,8 @@ +Fri Apr 5 11:56:11 UTC 2019 - Adrian Schröter + +- Update to 0.18.1 + * FEM module fixes + * crash fixes + * Qt5 bugs with external display + +--- Old: FreeCAD-0.18.obscpio New: FreeCAD-0.18.1.obscpio Other differences: -- ++ FreeCAD-test.spec ++ --- /var/tmp/diff_new_pack.HQZKPT/_old 2019-04-08 10:39:33.059282465 +0200 +++ /var/tmp/diff_new_pack.HQZKPT/_new 2019-04-08 10:39:33.071282469 +0200 @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version:0.18 +Version:0.18.1 Release:0 Summary:Meta source package that runs the FreeCAD testsuite when built License:LGPL-2.0-or-later AND GPL-2.0-or-later ++ FreeCAD.spec ++ --- /var/tmp/diff_new_pack.HQZKPT/_old 2019-04-08 10:39:33.107282481 +0200 +++ /var/tmp/diff_new_pack.HQZKPT/_new 2019-04-08 10:39:33.119282485 +0200 @@ -27,7 +27,7 @@ %endif Name: FreeCAD -Version:0.18 +Version:0.18.1 Release:0 Summary:General Purpose 3D CAD Modeler License:LGPL-2.0-or-later AND GPL-2.0-or-later ++ FreeCAD-0.18.obscpio -> FreeCAD-0.18.1.obscpio ++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.18.obscpio /work/SRC/openSUSE:Factory/.FreeCAD.new.3908/FreeCAD-0.18.1.obscpio differ: char 49, line 1 ++ FreeCAD.obsinfo ++ --- /var/tmp/diff_new_pack.HQZKPT/_old 2019-04-08 10:39:33.219282517 +0200 +++ /var/tmp/diff_new_pack.HQZKPT/_new 2019-04-08 10:39:33.219282517 +0200 @@ -1,5 +1,5 @@ name: FreeCAD -version: 0.18 -mtime: 1552397887 -commit: 690774c0effe4fd7b8d2b5e2fb2b8c8d145e21ce +version: 0.18.1 +mtime: 1554385363 +commit: f7dccfaa909e5b9da26bf50c4a22ccca9bb10c40 ++ _service ++ --- /var/tmp/diff_new_pack.HQZKPT/_old 2019-04-08 10:39:33.367282566 +0200 +++ /var/tmp/diff_new_pack.HQZKPT/_new 2019-04-08 10:39:33.367282566 +0200 @@ -2,8 +2,8 @@ https://github.com/FreeCAD/FreeCAD.git git -releases/FreeCAD-0-18 -0.18 +0.18.1 +0.18.1
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2019-04-05 11:57:22
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.3908 (New)
Package is "FreeCAD"
Fri Apr 5 11:57:22 2019 rev:14 rq:688190 version:0.18
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-03-18
10:39:24.955444282 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.3908/FreeCAD.changes
2019-04-05 12:00:38.646497451 +0200
@@ -1,0 +2,24 @@
+Mon Mar 25 08:01:35 UTC 2019 - Adrian Schröter
+
+- add missing requires to six and vtk python modules (found via test suite)
+
+---
+Mon Mar 18 12:34:53 UTC 2019 - Adrian Schröter
+
+- Update to release 0.18
+ * NetGen FEM enabled
+ * 0001-find-openmpi2-include-files.patch added for openmpi2 support
+- Obsolete patches:
+ * 0001-Convert-deprecated-boost-signal-to-signals2.patch
+ * 0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch
+ * 0002-move-from-deprecated-boost.signals-to-boost.signals2.patch
+ * 0003-fix-blocking-of-SelectionObserver.patch
+ * fix-build-with-Qt5_11.diff
+ * fix-build.diff
+ * fix-draft-module-with-python3.patch
+ * fix-gcc8-build-failure.patch
+ *
get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch
+ *
get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch
+
+
+---
Old:
0001-Convert-deprecated-boost-signal-to-signals2.patch
0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch
0002-move-from-deprecated-boost.signals-to-boost.signals2.patch
0003-fix-blocking-of-SelectionObserver.patch
FreeCAD-0.17.1545162057.e1db7bff8.obscpio
fix-build-with-Qt5_11.diff
fix-build.diff
fix-draft-module-with-python3.patch
fix-gcc8-build-failure.patch
get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch
get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch
New:
0001-find-openmpi2-include-files.patch
FreeCAD-0.18.obscpio
Other differences:
--
++ FreeCAD-test.spec ++
--- /var/tmp/diff_new_pack.RfT8Fq/_old 2019-04-05 12:00:44.414501220 +0200
+++ /var/tmp/diff_new_pack.RfT8Fq/_new 2019-04-05 12:00:44.418501223 +0200
@@ -17,7 +17,7 @@
Name: FreeCAD-test
-Version:0.17.1545162057.e1db7bff8
+Version:0.18
Release:0
Summary:Meta source package that runs the FreeCAD testsuite when built
License:LGPL-2.0-or-later AND GPL-2.0-or-later
@@ -33,6 +33,7 @@
%build
export LC_ALL="C.utf-8"
+#FreeCAD --console --write-log --log-file=/tmp/FreeCAD.log --run-test 0 ||
exit 1
FreeCAD --console --run-test 0 || exit 1
%changelog
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.RfT8Fq/_old 2019-04-05 12:00:44.446501241 +0200
+++ /var/tmp/diff_new_pack.RfT8Fq/_new 2019-04-05 12:00:44.454501246 +0200
@@ -16,6 +16,8 @@
#
+%define build_tar_ball 1
+
%define x_prefix %{_libdir}/%{name}
%if 0%{?suse_version} > 1500
@@ -25,45 +27,23 @@
%endif
Name: FreeCAD
-Version:0.17.1545162057.e1db7bff8
+Version:0.18
Release:0
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
Source1:FreeCAD.sh
Source2:FreeCADCmd.sh
Source3:FreeCAD_shared_mimeinfo
-# python3 and generic compile fixes
-Patch1: fix-build.diff
-# 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
-# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/8c08635d3
-Patch5:
get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch
-# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/b79e1bfee
-Patch6:
get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch
-# PATCH-FIX-OPENSUSE - fix building on ARM with GLES Qt5
-Patch7: 0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch
-# PATCH-FIX-UPSTREAM --
https://github.com/FreeCAD/FreeCAD/commit/5ff383b46.patch
-Patch8: fix-gcc8-build-failure.patch
-%if %{with boost_signals2}
-# PATCH-FIX-UPSTREAM --
https://github.com/FreeCAD/FreeCAD/commit/26d7d747257f.patch
-Patch9: 0001-Convert-deprecated-boost-signal-to-signals2.patch
-#
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2019-03-18 10:39:22
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.28833 (New)
Package is "FreeCAD"
Mon Mar 18 10:39:22 2019 rev:13 rq:685413 version:0.17.1545162057.e1db7bff8
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-03-11
11:17:39.185291030 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.28833/FreeCAD.changes
2019-03-18 10:39:24.955444282 +0100
@@ -1,0 +2,10 @@
+Thu Mar 14 03:36:03 UTC 2019 - Stefan Brüns
+
+- Add support for Boost::Signals2, Boost::Signals has been deprecated
+ since Boost 1.54 and removed in 1.69:
+ * 0001-Convert-deprecated-boost-signal-to-signals2.patch
+ * 0002-move-from-deprecated-boost.signals-to-boost.signals2.patch
+ * 0003-fix-blocking-of-SelectionObserver.patch
+- Add explicit double-conversion-devel BuildRequires
+
+---
New:
0001-Convert-deprecated-boost-signal-to-signals2.patch
0002-move-from-deprecated-boost.signals-to-boost.signals2.patch
0003-fix-blocking-of-SelectionObserver.patch
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.TkOjqC/_old 2019-03-18 10:39:31.067439059 +0100
+++ /var/tmp/diff_new_pack.TkOjqC/_new 2019-03-18 10:39:31.071439056 +0100
@@ -18,6 +18,12 @@
%define x_prefix %{_libdir}/%{name}
+%if 0%{?suse_version} > 1500
+%bcond_without boost_signals2
+%else
+%bcond_withboost_signals2
+%endif
+
Name: FreeCAD
Version:0.17.1545162057.e1db7bff8
Release:0
@@ -43,6 +49,14 @@
Patch7: 0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch
# PATCH-FIX-UPSTREAM --
https://github.com/FreeCAD/FreeCAD/commit/5ff383b46.patch
Patch8: fix-gcc8-build-failure.patch
+%if %{with boost_signals2}
+# PATCH-FIX-UPSTREAM --
https://github.com/FreeCAD/FreeCAD/commit/26d7d747257f.patch
+Patch9: 0001-Convert-deprecated-boost-signal-to-signals2.patch
+# PATCH-FIX-UPSTREAM --
https://github.com/FreeCAD/FreeCAD/commit/f898eafd64f8.patch
+Patch10:0002-move-from-deprecated-boost.signals-to-boost.signals2.patch
+# PATCH-FIX-UPSTREAM --
https://github.com/FreeCAD/FreeCAD/commit/c3014fc65f86.patch
+Patch11:0003-fix-blocking-of-SelectionObserver.patch
+%endif
# Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch:%ix86 %arm ppc s390 s390x
@@ -56,7 +70,9 @@
BuildRequires: libboost_program_options-devel >= 1.55
BuildRequires: libboost_python3-devel >= 1.55
BuildRequires: libboost_regex-devel >= 1.55
+%if %{without boost_signals2}
BuildRequires: libboost_signals-devel >= 1.55
+%endif
BuildRequires: libboost_system-devel >= 1.55
BuildRequires: libboost_thread-devel >= 1.55
%else
@@ -65,6 +81,7 @@
BuildRequires: cmake
BuildRequires: dos2unix
+BuildRequires: double-conversion-devel
BuildRequires: doxygen
BuildRequires: eigen3-devel
BuildRequires: f2c
@@ -135,6 +152,8 @@
BuildRequires: zlib-devel
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
+# we need to ensure to have the minimum version from build env
+Requires: libopencascade7 >= %(/bin/bash -c 'rpm -q --qf "%%{version}"
libopencascade7')
Recommends: ccx
@@ -246,7 +265,7 @@
mv %{buildroot}%{_datadir}/%{name}/freecad.xpm
%{buildroot}%{_datadir}/pixmaps/freecad.xpm
# Install additional documentation files
-#install -pm 0644 ChangeLog.txt copying.lib %{buildroot}%{_docdir}/%{name}/
+#install -pm 0644 ChangeLog.txt copying.lib %%{buildroot}%%{_docdir}/%%{name}/
%suse_update_desktop_file -c %{name} "%{name}" "3D CAD Modeler" %{name}
"freecad" Education Engineering
++ 0001-Convert-deprecated-boost-signal-to-signals2.patch ++
>From ca29d09d51f20d147c5377e66207a1c959698afd Mon Sep 17 00:00:00 2001
From: wandererfan
Date: Thu, 10 May 2018 12:00:13 -0400
Subject: [PATCH 1/3] Convert deprecated boost::signal to signals2
---
src/Mod/TechDraw/App/DrawPage.h | 4 ++--
src/Mod/TechDraw/App/DrawView.h | 4 ++--
src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp | 3 ++-
src/Mod/TechDraw/Gui/ViewProviderDrawingView.h | 4 +++-
src/Mod/TechDraw/Gui/ViewProviderPage.cpp| 3 ++-
src/Mod/TechDraw/Gui/ViewProviderPage.h | 4 +++-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h
index 60df838b8..cfde590d0 100644
--- a/src/Mod/TechDraw/App/DrawPage.h
+++ b/src/Mod/TechDraw/App/DrawPage.h
@@ -24,7 +24,7 @@
#ifndef _DrawPage_h_
#define _DrawPage_h_
-#include
+#include
#include
#include
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2019-03-11 11:16:18
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.28833 (New)
Package is "FreeCAD"
Mon Mar 11 11:16:18 2019 rev:12 rq:683694 version:0.17.1545162057.e1db7bff8
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-02-28
21:41:39.821569677 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.28833/FreeCAD.changes
2019-03-11 11:17:39.185291030 +0100
@@ -1,0 +2,12 @@
+Sat Mar 9 15:10:24 UTC 2019 - Stefan Brüns
+
+- Update URL: to use https://
+- Reorder BuildRequires alphabetically, remove duplicates
+
+---
+Fri Feb 15 09:48:24 UTC 2019 - Jan Engelhardt
+
+- Generalize description, and strip info that is already in
+ the metadata.
+
+---
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.XXivM2/_old 2019-03-11 11:17:46.417288428 +0100
+++ /var/tmp/diff_new_pack.XXivM2/_new 2019-03-11 11:17:46.417288428 +0100
@@ -24,7 +24,7 @@
Summary:General Purpose 3D CAD Modeler
License:LGPL-2.0-or-later AND GPL-2.0-or-later
Group: Productivity/Graphics/CAD
-Url:http://www.freecadweb.org/
+Url:https://www.freecadweb.org/
Source0:%{name}-%version.tar.xz
Source1:FreeCAD.sh
Source2:FreeCADCmd.sh
@@ -49,12 +49,6 @@
BuildRequires: Coin-devel
#BuildRequires: SoQt-devel
-BuildRequires: hdf5-devel
-BuildRequires: libmed-devel
-# we use upstream OpenCASCADE instead of oce atm
-BuildRequires: occt-devel
-BuildRequires: vtk-devel
-#BuildRequires: smesh-devel
%if 0%{?suse_version} >= 1330
BuildRequires: libboost_filesystem-devel >= 1.55
@@ -72,12 +66,21 @@
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: doxygen
+BuildRequires: eigen3-devel
BuildRequires: f2c
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-fortran
BuildRequires: git
+BuildRequires: hdf5-devel
+#BuildRequires: smesh-devel
BuildRequires: libXerces-c-devel
+BuildRequires: libmed-devel
+BuildRequires: libspnav-devel
+BuildRequires: make
+# we use upstream OpenCASCADE instead of oce atm
+BuildRequires: occt-devel
+BuildRequires: opencv-devel
BuildRequires: pkg-config
%if 0%{?suse_version} >= 1330
@@ -122,21 +125,13 @@
%endif
%endif
%if 0%{?fedora} > 18
-BuildRequires: eigen3-devel
BuildRequires: qt5-qtbase-devel
%endif
-BuildRequires: libspnav-devel
-BuildRequires: opencv-devel
BuildRequires: swig
-%if 0%{?suse_version}
-BuildRequires: libeigen3-devel
-BuildRequires: update-desktop-files
-%endif
-BuildRequires: dos2unix
-BuildRequires: make
BuildRequires: unzip
BuildRequires: update-desktop-files
+BuildRequires: vtk-devel
BuildRequires: zlib-devel
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
@@ -145,10 +140,9 @@
%description
FreeCAD is a parametric 3D modeler made primarily to design real-life objects
-of any size. Parametric modeling allows you to easily modify your design by
-going back into your model history and changing its parameters. FreeCAD is
-open-source and highly customizable, scriptable and extensible.
-
+of any size. Parametric modeling allows modifying designs by
+going back into the model history and changing its parameters. FreeCAD is
+customizable and scriptable.
%package devel
Summary:Development Files for %{name}
@@ -235,7 +229,7 @@
%install
pushd build
-nice make VERBOSE=1 %{?_smp_mflags} install DESTDIR=%{buildroot}
+nice %make_install VERBOSE=1 %{?_smp_mflags}
popd
# pushd build_doc
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2019-02-28 21:39:36
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.28833 (New)
Package is "FreeCAD"
Thu Feb 28 21:39:36 2019 rev:11 rq:676501 version:0.17.1545162057.e1db7bff8
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-test.changes 2018-09-07
15:41:01.386431988 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.28833/FreeCAD-test.changes
2019-02-28 21:41:39.801569685 +0100
@@ -1,0 +2,6 @@
+Tue Feb 12 21:10:12 UTC 2019 - Adrian Schröter
+
+- disable builds for 32bit and s390x, test suite fails and it makes no
+ sense to use FreeCAD on small systems or mainframes...
+
+---
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2019-02-08
12:10:31.965533833 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.28833/FreeCAD.changes
2019-02-28 21:41:39.821569677 +0100
@@ -1,0 +2,17 @@
+Thu Feb 14 23:21:01 UTC 2019 - Stefan Brüns
+
+- Fix build with GCC 8, add fix-gcc8-build-failure.patch
+- Add 0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch, fix building
+ on AArch64.
+- Remove openmpi build dependencies, erroneously required for VTK
+ previously.
+ Drop 0001-find-openmpi2-include-files.patch
+
+---
+Tue Feb 12 21:10:12 UTC 2019 - Adrian Schröter
+
+- enable FEM module
+- disable builds for 32bit and s390x, test suite fails and it makes no
+ sense to use FreeCAD on small systems or mainframes...
+
+---
Old:
0001-find-openmpi2-include-files.patch
New:
0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch
fix-gcc8-build-failure.patch
Other differences:
--
++ FreeCAD-test.spec ++
--- /var/tmp/diff_new_pack.H82L7X/_old 2019-02-28 21:41:47.625566343 +0100
+++ /var/tmp/diff_new_pack.H82L7X/_new 2019-02-28 21:41:47.637566339 +0100
@@ -25,6 +25,9 @@
Url:http://www.freecadweb.org/
BuildRequires: FreeCAD
+# Test suite fails on 32bit and I don't want to debug that anymore
+ExcludeArch:%ix86 %arm ppc s390 s390x
+
%description
This is just executing the test suite at build time.
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.H82L7X/_old 2019-02-28 21:41:47.973566196 +0100
+++ /var/tmp/diff_new_pack.H82L7X/_new 2019-02-28 21:41:48.013566178 +0100
@@ -31,8 +31,6 @@
Source3:FreeCAD_shared_mimeinfo
# python3 and generic compile fixes
Patch1: fix-build.diff
-# support for openmpi2 suse package
-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
@@ -41,16 +39,21 @@
Patch5:
get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch
# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/b79e1bfee
Patch6:
get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch
+# PATCH-FIX-OPENSUSE - fix building on ARM with GLES Qt5
+Patch7: 0001-Use-GL_RGB32F-instead-of-GL_RGB32F_ARB.patch
+# PATCH-FIX-UPSTREAM --
https://github.com/FreeCAD/FreeCAD/commit/5ff383b46.patch
+Patch8: fix-gcc8-build-failure.patch
+
+# Test suite fails on 32bit and I don't want to debug that anymore
+ExcludeArch:%ix86 %arm ppc s390 s390x
+
BuildRequires: Coin-devel
#BuildRequires: SoQt-devel
-#BuildRequires: libmed-devel # needed for FEM module, but requires older hdf5
lib
+BuildRequires: hdf5-devel
+BuildRequires: libmed-devel
# we use upstream OpenCASCADE instead of oce atm
-#BuildRequires: hdf5-1_8-devel
-#BuildRequires: hdf5-1_8-openmpi-devel
BuildRequires: occt-devel
BuildRequires: vtk-devel
-BuildRequires: vtk-java
-BuildRequires: vtk-tcl
#BuildRequires: smesh-devel
%if 0%{?suse_version} >= 1330
@@ -79,7 +82,6 @@
%if 0%{?suse_version} >= 1330
# Qt5 & python3
-BuildRequires: openmpi2-devel
BuildRequires: python3-devel
BuildRequires: python3-matplotlib
BuildRequires: python3-pyside2-devel
@@ -142,7 +144,10 @@
Recommends: ccx
%description
-FreeCAD is a parametric 3D modeler made primarily to design real-life objects
of any size. Parametric modeling allows you to easily modify your design by
going back into your model history and changing its parameters. FreeCAD is
open-source and highly customizable, scriptable and extensible.
+FreeCAD is a parametric 3D modeler made primarily to design real-life objects
+of any size. Parametric modeling allows you to easily modify your
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2019-02-08 12:09:46
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new.28833 (New)
Package is "FreeCAD"
Fri Feb 8 12:09:46 2019 rev:10 rq:671003 version:0.17.1545162057.e1db7bff8
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2018-09-07
15:41:01.898431440 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new.28833/FreeCAD.changes
2019-02-08 12:10:31.965533833 +0100
@@ -1,0 +2,13 @@
+Mon Feb 4 08:28:22 UTC 2019 - Adrian Schröter
+
+- update to current branch:
+ - Spreadsheet: Fixed issue #3361.
+
+---
+Fri Feb 1 09:42:55 UTC 2019 - wba...@tmo.at
+
+- Add upstream patches to fix build with python 3.7:
+ *
get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch
+ *
get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch
+
+---
Old:
FreeCAD-0.17.1534399137.9948ee4f1.obscpio
New:
FreeCAD-0.17.1545162057.e1db7bff8.obscpio
get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch
get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch
Other differences:
--
++ FreeCAD-test.spec ++
--- /var/tmp/diff_new_pack.LmawmC/_old 2019-02-08 12:10:46.725528297 +0100
+++ /var/tmp/diff_new_pack.LmawmC/_new 2019-02-08 12:10:46.733528294 +0100
@@ -1,7 +1,7 @@
#
# spec file for package FreeCAD-test
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: FreeCAD-test
-Version:0.17.1534399137.9948ee4f1
+Version:0.17.1545162057.e1db7bff8
Release:0
Summary:Meta source package that runs the FreeCAD testsuite when built
License:LGPL-2.0-or-later AND GPL-2.0-or-later
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.LmawmC/_old 2019-02-08 12:10:46.757528285 +0100
+++ /var/tmp/diff_new_pack.LmawmC/_new 2019-02-08 12:10:46.761528283 +0100
@@ -1,7 +1,7 @@
#
# spec file for package FreeCAD
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define x_prefix %{_libdir}/%{name}
Name: FreeCAD
-Version:0.17.1534399137.9948ee4f1
+Version:0.17.1545162057.e1db7bff8
Release:0
Summary:General Purpose 3D CAD Modeler
License:LGPL-2.0-or-later AND GPL-2.0-or-later
@@ -37,6 +37,10 @@
Patch3: fix-draft-module-with-python3.patch
# PATCH-FIX-UPSTREAM -- fix-build-with-Qt5_11.diff
Patch4: fix-build-with-Qt5_11.diff
+# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/8c08635d3
+Patch5:
get-rid-of-private-function-_PyImport_FixupBuiltin-for-__FreeCADBase__-module.patch
+# PATCH-FIX-UPSTREAM -- https://github.com/FreeCAD/FreeCAD/commit/b79e1bfee
+Patch6:
get-rid-of-private-function-_PyImport_FixupBuiltin-for-FreeCAD-and-FreeCADGui-modules.patch
BuildRequires: Coin-devel
#BuildRequires: SoQt-devel
#BuildRequires: libmed-devel # needed for FEM module, but requires older hdf5
lib
++ FreeCAD-0.17.1534399137.9948ee4f1.obscpio ->
FreeCAD-0.17.1545162057.e1db7bff8.obscpio ++
/work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.17.1534399137.9948ee4f1.obscpio
/work/SRC/openSUSE:Factory/.FreeCAD.new.28833/FreeCAD-0.17.1545162057.e1db7bff8.obscpio
differ: char 8, line 1
++ FreeCAD.obsinfo ++
--- /var/tmp/diff_new_pack.LmawmC/_old 2019-02-08 12:10:46.833528256 +0100
+++ /var/tmp/diff_new_pack.LmawmC/_new 2019-02-08 12:10:46.837528255 +0100
@@ -1,5 +1,5 @@
name: FreeCAD
-version:
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2018-09-07 15:40:29
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new (New)
Package is "FreeCAD"
Fri Sep 7 15:40:29 2018 rev:9 rq:633536 version:0.17.1534399137.9948ee4f1
Changes:
New Changes file:
--- /dev/null 2018-09-06 11:34:12.900627678 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD-test.changes
2018-09-07 15:41:01.386431988 +0200
@@ -0,0 +1,11 @@
+---
+Wed Sep 5 14:50:23 UTC 2018 - Jan Engelhardt
+
+- Use noun phrase in summary.
+
+---
+Tue Aug 28 17:10:43 UTC 2018 - Adrian Schröter
+
+- initial package of test package. Just for running the test suite
+ of installed FreeCAD rpm, so no binary rpm gets build on purpose.
+
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2018-06-22
13:32:35.916826588 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2018-09-07
15:41:01.898431440 +0200
@@ -1,0 +2,22 @@
+Wed Sep 5 14:50:23 UTC 2018 - Jan Engelhardt
+
+- Use noun phrase in summary.
+
+---
+Tue Aug 28 11:56:17 UTC 2018 - Adrian Schröter
+
+- fix missing dependency to numpy, found via the..
+- added testsuite run via extra spec file
+
+---
+Sat Aug 11 12:29:12 UTC 2018 - adr...@suse.de
+
+- update branch again
+- fix dependencies of Qt4 build (Leap 42.3)
+
+---
+Thu Jul 26 07:42:15 UTC 2018 - adr...@suse.de
+
+- update to current branch, obsoletes branch_update.patch
+
+---
Old:
FreeCAD-0.17.obscpio
branch_update.patch
New:
FreeCAD-0.17.1534399137.9948ee4f1.obscpio
FreeCAD-test.changes
FreeCAD-test.spec
Other differences:
--
++ FreeCAD-test.spec ++
#
# spec file for package FreeCAD-test
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: FreeCAD-test
Version:0.17.1534399137.9948ee4f1
Release:0
Summary:Meta source package that runs the FreeCAD testsuite when built
License:LGPL-2.0-or-later AND GPL-2.0-or-later
Group: Productivity/Graphics/CAD
Url:http://www.freecadweb.org/
BuildRequires: FreeCAD
%description
This is just executing the test suite at build time.
%build
export LC_ALL="C.utf-8"
FreeCAD --console --run-test 0 || exit 1
%changelog
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.c5gFfX/_old 2018-09-07 15:41:09.542423252 +0200
+++ /var/tmp/diff_new_pack.c5gFfX/_new 2018-09-07 15:41:09.542423252 +0200
@@ -19,7 +19,7 @@
%define x_prefix %{_libdir}/%{name}
Name: FreeCAD
-Version:0.17
+Version:0.17.1534399137.9948ee4f1
Release:0
Summary:General Purpose 3D CAD Modeler
License:LGPL-2.0-or-later AND GPL-2.0-or-later
@@ -29,7 +29,6 @@
Source1:FreeCAD.sh
Source2:FreeCADCmd.sh
Source3:FreeCAD_shared_mimeinfo
-Patch0: branch_update.patch
# python3 and generic compile fixes
Patch1: fix-build.diff
# support for openmpi2 suse package
@@ -42,6 +41,8 @@
#BuildRequires: SoQt-devel
#BuildRequires: libmed-devel # needed for FEM module, but requires older hdf5
lib
# we use upstream OpenCASCADE instead of oce atm
+#BuildRequires: hdf5-1_8-devel
+#BuildRequires: hdf5-1_8-openmpi-devel
BuildRequires: occt-devel
BuildRequires: vtk-devel
BuildRequires: vtk-java
@@ -72,10 +73,6 @@
BuildRequires: libXerces-c-devel
BuildRequires: pkg-config
-# reported to break FreeCAD here
-# https://forum.freecadweb.org/viewtopic.php?t=24610
-Conflicts: python-pivy
-
%if 0%{?suse_version} >= 1330
# Qt5 & python3
BuildRequires: openmpi2-devel
@@ -92,12 +89,16 @@
BuildRequires: pkgconfig(Qt5UiTools)
BuildRequires: pkgconfig(Qt5WebKit)
commit FreeCAD for openSUSE:Factory
Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2018-06-22 13:32:31 Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new (New) Package is "FreeCAD" Fri Jun 22 13:32:31 2018 rev:8 rq:617706 version:0.17 Changes: --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2018-05-25 21:39:12.743846146 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2018-06-22 13:32:35.916826588 +0200 @@ -1,0 +2,7 @@ +Mon Jun 18 19:36:22 UTC 2018 - stefan.bru...@rwth-aachen.de + +- Fix BuildRequires, TW no longer has libboost_python-devel but + libboost_python3-devel, and for Leap 15.0 this linked libpython3.6m + and libboost_python-py2_7 into the same binary. + +--- Other differences: -- ++ FreeCAD.spec ++ --- /var/tmp/diff_new_pack.qsOyus/_old 2018-06-22 13:32:42.808571842 +0200 +++ /var/tmp/diff_new_pack.qsOyus/_new 2018-06-22 13:32:42.808571842 +0200 @@ -52,7 +52,7 @@ BuildRequires: libboost_filesystem-devel >= 1.55 BuildRequires: libboost_graph-devel >= 1.55 BuildRequires: libboost_program_options-devel >= 1.55 -BuildRequires: libboost_python-devel >= 1.55 +BuildRequires: libboost_python3-devel >= 1.55 BuildRequires: libboost_regex-devel >= 1.55 BuildRequires: libboost_signals-devel >= 1.55 BuildRequires: libboost_system-devel >= 1.55
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2018-05-25 21:39:11
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new (New)
Package is "FreeCAD"
Fri May 25 21:39:11 2018 rev:7 rq:611499 version:0.17
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2018-05-08
13:40:41.498294327 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2018-05-25
21:39:12.743846146 +0200
@@ -1,0 +2,7 @@
+Sun May 20 08:12:30 UTC 2018 - christo...@krop.fr
+
+- Add fix-build-with-Qt5_11.diff. Fixes build with the upcoming
+ Qt 5.11.
+- Switch to %autosetup
+
+---
New:
fix-build-with-Qt5_11.diff
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.G5BNTA/_old 2018-05-25 21:39:18.367642535 +0200
+++ /var/tmp/diff_new_pack.G5BNTA/_new 2018-05-25 21:39:18.371642391 +0200
@@ -36,6 +36,8 @@
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 @@
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}' \
++ fix-build-with-Qt5_11.diff ++
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
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2018-05-08 13:39:22
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new (New)
Package is "FreeCAD"
Tue May 8 13:39:22 2018 rev:6 rq:605255 version:0.17
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2018-01-06
18:49:37.538008244 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2018-05-08
13:40:41.498294327 +0200
@@ -1,0 +2,35 @@
+Tue May 8 06:33:56 UTC 2018 - adr...@suse.de
+
+- temporary disable FEM module
+ * it works fine, but requires hdf5 version 1.8 via med-tools,
+which currently conflicts in openSUSE distro.
+- Fix draft module crash
+ (got merged upstream for 0.18 fix-draft-module-with-python3.patch)
+
+---
+Fri Apr 27 12:55:30 UTC 2018 - adr...@suse.de
+
+- apply current 0.17 branch (branch_update.patch)
+ In first place for occt 7.2 fixes
+
+---
+Tue Apr 17 06:46:23 UTC 2018 - adr...@suse.de
+
+- fix crash in Draft module with python 3
+
+---
+Mon Apr 16 06:51:06 UTC 2018 - adr...@suse.de
+
+- cleanup python qt deps (pyside2 only now)
+
+---
+Tue Apr 10 11:33:35 UTC 2018 - adr...@suse.de
+
+- update to version 0.17
+ 2 years of work: https://www.freecadweb.org/wiki/Release_notes_0.17
+- switching to Qt5
+ (fix-build.diff 0001-find-openmpi2-include-files.patch)
+ (the old 0.16 fork had obsolete temporary patches remove-qtwebkit.patch and
+ remove-webgui.patch)
+
+---
Old:
FreeCAD-0.16.6712.obscpio
remove-qtwebkit.patch
remove-webgui.patch
New:
0001-find-openmpi2-include-files.patch
FreeCAD-0.17.obscpio
FreeCAD.sh
FreeCADCmd.sh
branch_update.patch
fix-build.diff
fix-draft-module-with-python3.patch
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.22TrFy/_old 2018-05-08 13:40:50.669963239 +0200
+++ /var/tmp/diff_new_pack.22TrFy/_new 2018-05-08 13:40:50.681962806 +0200
@@ -1,7 +1,7 @@
#
# spec file for package FreeCAD
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,20 +19,33 @@
%define x_prefix %{_libdir}/%{name}
Name: FreeCAD
-Version:0.16.6712
+Version:0.17
Release:0
Summary:General Purpose 3D CAD Modeler
-License:LGPL-2.0+ and GPL-2.0+
+License:LGPL-2.0-or-later AND GPL-2.0-or-later
Group: Productivity/Graphics/CAD
Url:http://www.freecadweb.org/
-Source0:%{name}-%{version}.tar.xz
-Source2:FreeCAD_shared_mimeinfo
-# PATCH-FIX-OPENSUSE remove-qtwebkit.patch -- fix build without QtWebKit
-Patch0: remove-qtwebkit.patch
-# PATCH-FIX-OPENSUSE remove-webgui.patch -- remove browser view that would
need QtWebKit
-Patch1: remove-webgui.patch
+Source0:%{name}-%version.tar.xz
+Source1:FreeCAD.sh
+Source2:FreeCADCmd.sh
+Source3:FreeCAD_shared_mimeinfo
+Patch0: branch_update.patch
+# python3 and generic compile fixes
+Patch1: fix-build.diff
+# support for openmpi2 suse package
+Patch2: 0001-find-openmpi2-include-files.patch
+# runtime fix, submitted upstream
+Patch3: fix-draft-module-with-python3.patch
BuildRequires: Coin-devel
-BuildRequires: SoQt-devel
+#BuildRequires: SoQt-devel
+#BuildRequires: libmed-devel # needed for FEM module, but requires older hdf5
lib
+# we use upstream OpenCASCADE instead of oce atm
+BuildRequires: occt-devel
+BuildRequires: vtk-devel
+BuildRequires: vtk-java
+BuildRequires: vtk-tcl
+#BuildRequires: smesh-devel
+
%if 0%{?suse_version} >= 1330
BuildRequires: libboost_filesystem-devel >= 1.55
BuildRequires: libboost_graph-devel >= 1.55
@@ -45,6 +58,7 @@
%else
BuildRequires: boost-devel >= 1.55
%endif
+
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: doxygen
@@ -53,46 +67,74 @@
BuildRequires: freeglut-devel
BuildRequires: gcc-fortran
BuildRequires: git
-BuildRequires: hdf5-devel
BuildRequires: libXerces-c-devel
-BuildRequires: libeigen3-devel
-BuildRequires: libqt4-devel
+BuildRequires: pkg-config
+
+# reported to break FreeCAD here
+# https://forum.freecadweb.org/viewtopic.php?t=24610
+Conflicts:
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2018-01-06 18:49:33
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new (New)
Package is "FreeCAD"
Sat Jan 6 18:49:33 2018 rev:5 rq:561795 version:0.16.6712
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2017-12-18
08:59:03.120119475 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2018-01-06
18:49:37.538008244 +0100
@@ -1,0 +2,8 @@
+Thu Jan 4 15:36:57 UTC 2018 - wba...@tmo.at
+
+- Add remove-qtwebkit.patch and remove-webgui.patch (taken from
+ Arch Linux) to fix build without QtWebKit
+- Build without QtWebKit on Tumbleweed and SLE/Leap 15 as
+ libQtWebKit4 is about to be dropped (boo#1070901)
+
+---
New:
remove-qtwebkit.patch
remove-webgui.patch
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.WH5UZg/_old 2018-01-06 18:49:45.725625675 +0100
+++ /var/tmp/diff_new_pack.WH5UZg/_new 2018-01-06 18:49:45.725625675 +0100
@@ -27,6 +27,10 @@
Url:http://www.freecadweb.org/
Source0:%{name}-%{version}.tar.xz
Source2:FreeCAD_shared_mimeinfo
+# PATCH-FIX-OPENSUSE remove-qtwebkit.patch -- fix build without QtWebKit
+Patch0: remove-qtwebkit.patch
+# PATCH-FIX-OPENSUSE remove-webgui.patch -- remove browser view that would
need QtWebKit
+Patch1: remove-webgui.patch
BuildRequires: Coin-devel
BuildRequires: SoQt-devel
%if 0%{?suse_version} >= 1330
@@ -69,7 +73,9 @@
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
+%if 0%{?suse_version} < 1500
BuildRequires: pkgconfig(QtWebKit)
+%endif
Requires: python-CXX
Requires: python-pyside
%if 0%{?suse_version} <= 1320
@@ -99,6 +105,11 @@
%prep
%setup -q
+%if 0%{?suse_version} >= 1500
+%patch0 -p1
+%patch1 -p1
+%endif
+
# Fix "wrong-file-end-of-line-encoding" rpmlint warning
sed -i 's/\r$//' ChangeLog.txt
sed -i 's/\r$//' copying.lib
@@ -134,6 +145,10 @@
%else
-DBUILD_FEM_NETGEN=OFF \
%endif
+%if 0%{?suse_version} >= 1500
+ -DBUILD_START=OFF \
+ -DBUILD_WEB=OFF \
+%endif
../
make VERBOSE=1 %{?_smp_mflags} all
++ remove-qtwebkit.patch ++
diff -Naur FreeCAD-0.16.orig/src/Gui/DownloadManager.cpp
FreeCAD-0.16/src/Gui/DownloadManager.cpp
--- FreeCAD-0.16.orig/src/Gui/DownloadManager.cpp 2016-04-07
03:39:34.0 +0200
+++ FreeCAD-0.16/src/Gui/DownloadManager.cpp2017-02-07 17:05:51.753657498
+0100
@@ -33,7 +33,6 @@
#include
#include
#include
-#include
#include "DownloadItem.h"
#include "DownloadManager.h"
@@ -224,11 +223,6 @@
ui->downloadsView->setRowHeight(row, item->minimumSizeHint().height());
bool remove = false;
-QWebSettings *globalSettings = QWebSettings::globalSettings();
-if (!item->downloading()
-&& globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
-remove = true;
-
if (item->downloadedSuccessfully()
&& removePolicy() == DownloadManager::SuccessFullDownload) {
remove = true;
++ remove-webgui.patch ++
diff -Naur FreeCAD-0.16.orig/src/Mod/Arch/ArchServer.py
FreeCAD-0.16/src/Mod/Arch/ArchServer.py
--- FreeCAD-0.16.orig/src/Mod/Arch/ArchServer.py2016-04-07
03:39:34.0 +0200
+++ FreeCAD-0.16/src/Mod/Arch/ArchServer.py 2017-02-07 18:55:34.918643280
+0100
@@ -36,20 +36,6 @@
__url__ = "http://www.freecadweb.org;
-class _CommandBimserver:
-"the Arch Bimserver command definition"
-def GetResources(self):
-return {'Pixmap' : 'Arch_Bimserver',
-'MenuText': QtCore.QT_TRANSLATE_NOOP("Arch_Bimserver","BIM
server"),
-'ToolTip': QtCore.QT_TRANSLATE_NOOP("Arch_Bimserver","Opens a
browser window and connects to a BIM server instance")}
-
-def Activated(self):
-p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Arch")
-url = p.GetString("BimServerUrl","http://localhost:8082;)
-FreeCADGui.addModule("WebGui")
-FreeCADGui.doCommand("WebGui.openBrowser(\""+url+"\")")
-
-
class _CommandGit:
"the Arch Git Commit command definition"
def GetResources(self):
@@ -161,5 +147,4 @@
if FreeCAD.GuiUp:
-FreeCADGui.addCommand('Arch_Bimserver',_CommandBimserver())
FreeCADGui.addCommand('Arch_Git',_CommandGit())
diff -Naur FreeCAD-0.16.orig/src/Mod/Arch/InitGui.py
FreeCAD-0.16/src/Mod/Arch/InitGui.py
--- FreeCAD-0.16.orig/src/Mod/Arch/InitGui.py 2016-04-07 03:39:34.0
+0200
+++ FreeCAD-0.16/src/Mod/Arch/InitGui.py2017-02-07 18:54:19.949158114
+0100
@@ -44,7
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2017-12-18 08:58:41
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new (New)
Package is "FreeCAD"
Mon Dec 18 08:58:41 2017 rev:4 rq:557258 version:0.16.6712
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2017-11-09
16:28:14.738313815 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2017-12-18
08:59:03.120119475 +0100
@@ -1,0 +2,5 @@
+Fri Dec 15 07:13:05 UTC 2017 - adr...@suse.de
+
+- fix build for factory (boost dependencies)
+
+---
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.vOPDip/_old 2017-12-18 08:59:11.263726349 +0100
+++ /var/tmp/diff_new_pack.vOPDip/_new 2017-12-18 08:59:11.267726155 +0100
@@ -29,9 +29,15 @@
Source2:FreeCAD_shared_mimeinfo
BuildRequires: Coin-devel
BuildRequires: SoQt-devel
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1
-# Leap has its own special boost-devel
-BuildRequires: boost_1_58_0-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires: libboost_filesystem-devel >= 1.55
+BuildRequires: libboost_graph-devel >= 1.55
+BuildRequires: libboost_program_options-devel >= 1.55
+BuildRequires: libboost_python-devel >= 1.55
+BuildRequires: libboost_regex-devel >= 1.55
+BuildRequires: libboost_signals-devel >= 1.55
+BuildRequires: libboost_system-devel >= 1.55
+BuildRequires: libboost_thread-devel >= 1.55
%else
BuildRequires: boost-devel >= 1.55
%endif
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2017-11-09 16:27:38
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new (New)
Package is "FreeCAD"
Thu Nov 9 16:27:38 2017 rev:3 rq:540131 version:0.16.6712
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2017-10-18
10:50:43.200203450 +0200
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2017-11-09
16:28:14.738313815 +0100
@@ -1,0 +2,6 @@
+Wed Nov 8 08:09:39 UTC 2017 - aloi...@gmx.com
+
+- Update to 0.16.6712 (contains backports from trunk)
+- Some cleanup
+
+---
Old:
FreeCAD-0.16.tar.xz
New:
FreeCAD-0.16.6712.obscpio
FreeCAD.obsinfo
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.kXbLXd/_old 2017-11-09 16:28:29.333779557 +0100
+++ /var/tmp/diff_new_pack.kXbLXd/_new 2017-11-09 16:28:29.337779411 +0100
@@ -19,65 +19,58 @@
%define x_prefix %{_libdir}/%{name}
Name: FreeCAD
-Version:0.16
+Version:0.16.6712
Release:0
Summary:General Purpose 3D CAD Modeler
License:LGPL-2.0+ and GPL-2.0+
Group: Productivity/Graphics/CAD
Url:http://www.freecadweb.org/
-Source0:%{name}-%version.tar.xz
+Source0:%{name}-%{version}.tar.xz
Source2:FreeCAD_shared_mimeinfo
BuildRequires: Coin-devel
BuildRequires: SoQt-devel
-BuildRequires: oce-devel
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1
-# Leap has it's own special boost-devel
+# Leap has its own special boost-devel
BuildRequires: boost_1_58_0-devel
%else
BuildRequires: boost-devel >= 1.55
%endif
BuildRequires: cmake
+BuildRequires: dos2unix
BuildRequires: doxygen
BuildRequires: f2c
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-fortran
+BuildRequires: git
+BuildRequires: hdf5-devel
BuildRequires: libXerces-c-devel
-BuildRequires: pkg-config
-BuildRequires: pkgconfig(QtWebKit)
-%if 0%{?suse_version} > 0
BuildRequires: libeigen3-devel
-BuildRequires: python-xml
-%endif
-%if 0%{?fedora} > 18
-BuildRequires: eigen3-devel
-%endif
BuildRequires: libqt4-devel
+BuildRequires: libshiboken-devel
BuildRequires: libspnav-devel
+BuildRequires: oce-devel
BuildRequires: opencv-devel
+BuildRequires: pkgconfig
BuildRequires: python-CXX-devel
BuildRequires: python-devel
BuildRequires: python-matplotlib
-BuildRequires: swig
-%if 0%{?suse_version}
-BuildRequires: update-desktop-files
-%endif
-BuildRequires: dos2unix
-BuildRequires: git
-BuildRequires: hdf5-devel
-BuildRequires: libshiboken-devel
-BuildRequires: make
BuildRequires: python-pyside
BuildRequires: python-pyside-devel
BuildRequires: python-pyside-tools
+BuildRequires: python-xml
+BuildRequires: swig
BuildRequires: unzip
+BuildRequires: update-desktop-files
BuildRequires: zlib-devel
+BuildRequires: pkgconfig(QtWebKit)
Requires: python-CXX
Requires: python-pyside
+%if 0%{?suse_version} <= 1320
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
+%endif
Recommends: python-pivy
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Note: This package contains the current development version and thus might
@@ -112,6 +105,11 @@
rm src/3rdparty/Pivy -fr
rm src/3rdparty/Pivy-0.5 -fr
+# fix env-script-interpreter
+sed -i '1c#!%{__python2}' \
+src/Mod/Test/testmakeWireString.py \
+src/Mod/Test/unittestgui.py
+
%build
mkdir build && cd build
# cmake macro would set standard libdir
@@ -139,17 +137,17 @@
# mkdir build_doc
# pushd build_doc
# cmake \
-# -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-# -DLIB_SUFFIX=%{_lib} \
-# -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
-# -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
-# -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/%{name} \
+# -DCMAKE_INSTALL_PREFIX=%%{_prefix} \
+# -DLIB_SUFFIX=%%{_lib} \
+# -DCMAKE_INSTALL_DATADIR=%%{_datadir}/%%{name} \
+# -DCMAKE_INSTALL_DOCDIR=%%{_docdir}/%%{name} \
+# -DCMAKE_INSTALL_INCLUDEDIR=%%{_includedir}/%%{name} \
# -DCMAKE_BUILD_TYPE=Release \
# -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE \
# -DFREECAD_USE_EXTERNAL_PIVY=TRUE \
# ../
# # Needs an updated opencascade
-# #-DOCE_DIR=/opt/OpenCASCADE/%{_lib}
+# #-DOCE_DIR=/opt/OpenCASCADE/%%{_lib}
#
# nice make VERBOSE=1 DevDoc
# popd
@@ -160,38 +158,38 @@
popd
# pushd build_doc
-# nice make VERBOSE=1 %{?_smp_mflags} install DESTDIR=%{buildroot}
+# nice make VERBOSE=1 %%{?_smp_mflags} install DESTDIR=%%{buildroot}
# popd
# Install the Qt plugin
-#install -Dpm 0755
commit FreeCAD for openSUSE:Factory
Hello community,
here is the log from the commit of package FreeCAD for openSUSE:Factory checked
in at 2017-10-18 10:50:42
Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old)
and /work/SRC/openSUSE:Factory/.FreeCAD.new (New)
Package is "FreeCAD"
Wed Oct 18 10:50:42 2017 rev:2 rq:533180 version:0.16
Changes:
--- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2017-01-22
00:11:49.802151659 +0100
+++ /work/SRC/openSUSE:Factory/.FreeCAD.new/FreeCAD.changes 2017-10-18
10:50:43.200203450 +0200
@@ -1,0 +2,6 @@
+Sun Sep 10 08:23:34 UTC 2017 - rbr...@suse.com
+
+- Correct python-CXX requires
+- add python-pyside requires, needed for welcome splash
+
+---
Other differences:
--
++ FreeCAD.spec ++
--- /var/tmp/diff_new_pack.Ynhp9B/_old 2017-10-18 10:50:46.792034939 +0200
+++ /var/tmp/diff_new_pack.Ynhp9B/_new 2017-10-18 10:50:46.796034752 +0200
@@ -1,7 +1,7 @@
#
# spec file for package FreeCAD
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%define x_prefix %{_libdir}/%{name}
Name: FreeCAD
Version:0.16
Release:0
-License:LGPL-2.0+ and GPL-2.0+
Summary:General Purpose 3D CAD Modeler
-Url:http://www.freecadweb.org/
+License:LGPL-2.0+ and GPL-2.0+
Group: Productivity/Graphics/CAD
+Url:http://www.freecadweb.org/
Source0:%{name}-%version.tar.xz
Source2:FreeCAD_shared_mimeinfo
BuildRequires: Coin-devel
-BuildRequires: oce-devel
BuildRequires: SoQt-devel
+BuildRequires: oce-devel
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1
# Leap has it's own special boost-devel
BuildRequires: boost_1_58_0-devel
@@ -41,9 +42,9 @@
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-fortran
+BuildRequires: libXerces-c-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(QtWebKit)
-BuildRequires: libXerces-c-devel
%if 0%{?suse_version} > 0
BuildRequires: libeigen3-devel
BuildRequires: python-xml
@@ -61,19 +62,18 @@
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
-BuildRequires: zlib-devel
-# Used because of "no-return-in-nonvoid-function" and "stringcompare" rpm post
build check errors
-#BuildRequires:-post-build-checks
-BuildRequires: unzip
+BuildRequires: dos2unix
+BuildRequires: git
+BuildRequires: hdf5-devel
BuildRequires: libshiboken-devel
+BuildRequires: make
BuildRequires: python-pyside
BuildRequires: python-pyside-devel
BuildRequires: python-pyside-tools
-BuildRequires: git
-BuildRequires: make
-BuildRequires: dos2unix
-BuildRequires: hdf5-devel
-Requires: python-cxx
+BuildRequires: unzip
+BuildRequires: zlib-devel
+Requires: python-CXX
+Requires: python-pyside
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
Recommends: python-pivy
