From e4a3e8518e75e30f8415c59dc058022469eff0e8 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Oct 31 2019 22:20:01 +0000 Subject: Update to 0.18.4. --- diff --git a/.gitignore b/.gitignore index ea0e574..d84076f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /FreeCAD-0.18.tar.gz /FreeCAD-0.18.2.tar.gz /FreeCAD-0.18.3.tar.gz +/FreeCAD-0.18.4.tar.gz diff --git a/freecad-0.15-zipios.patch b/freecad-0.15-zipios.patch index 260d9eb..269f4ec 100644 --- a/freecad-0.15-zipios.patch +++ b/freecad-0.15-zipios.patch @@ -1,6 +1,6 @@ --- a/src/Base/CMakeLists.txt +++ b/src/Base/CMakeLists.txt -@@ -351,9 +351,11 @@ ENDIF(MSVC) +@@ -365,9 +365,11 @@ ENDIF(MSVC) # Use external zipios++ if specified. if(FREECAD_USE_EXTERNAL_ZIPIOS) find_library(ZIPIOS_LIBRARY zipios) diff --git a/freecad.spec b/freecad.spec index ac11086..8f3b934 100644 --- a/freecad.spec +++ b/freecad.spec @@ -10,8 +10,6 @@ %global plugins Complete DraftUtils Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part PartDesign Path Points QtUnit Raytracing ReverseEngineering Robot Sketcher Spreadsheet Start Web PartDesignGui _PartDesign Spreadsheet SpreadsheetGui area # Some configuration options for other environments -# rpmbuild --with=occ: Compile using OpenCASCADE instead of OCE -%global occ %{?_with_occ: 1} %{?!_with_occ: 0} # rpmbuild --with=bundled_zipios: use bundled version of zipios++ %global bundled_zipios %{?_with_bundled_zipios: 1} %{?!_with_bundled_zipios: 0} # rpmbuild --without=bundled_pycxx: don't use bundled version of pycxx @@ -22,8 +20,8 @@ Name: freecad Epoch: 1 -Version: 0.18.3 -Release: 6%{?dist} +Version: 0.18.4 +Release: 1%{?dist} Summary: A general purpose 3D CAD modeler License: GPLv2+ @@ -34,6 +32,8 @@ Source102: freecad.1 Patch0: freecad-0.15-zipios.patch Patch1: freecad-0.14-Version_h.patch Patch2: freecad-0.18-py38.patch +Patch3: freecad-iostream_scope.patch +#Patch4: freecad-cmake.patch # Utilities @@ -50,11 +50,7 @@ BuildRequires: libXmu-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: libglvnd-devel -%if %{occ} -BuildRequires: OpenCASCADE-devel -%else -BuildRequires: OCE-devel -%endif +BuildRequires: opencascade-devel BuildRequires: Coin4-devel BuildRequires: python3-devel BuildRequires: python3-matplotlib @@ -71,7 +67,8 @@ BuildRequires: python3-pyside2-devel pyside2-tools %if ! %{bundled_smesh} BuildRequires: smesh-devel %endif -BuildRequires: netgen-mesher-devel +# Does not build with current versions of OCCT. +#BuildRequires: netgen-mesher-devel %if ! %{bundled_zipios} BuildRequires: zipios++-devel %endif @@ -97,7 +94,7 @@ Provides: bundled(python-pycxx) Requires: python3-pivy Requires: python3-matplotlib Requires: python3-collada -Requires: python3-pyside +Requires: python3-pyside2 Requires: qt5-assistant @@ -137,13 +134,6 @@ dos2unix -k src/Mod/Test/unittestgui.py \ ChangeLog.txt \ data/License.txt -# Removed bundled libraries -#rm -rf src/3rdParty - -# At some point CMake changed from returning OPENGL_gl_LIBRARY to -# OPENGL_opengl_LIBRARY -sed -i "s|OPENGL_gl_LIBRARY|OPENGL_opengl_LIBRARY|g" src/Gui/CMakeLists.txt - %build mkdir build && pushd build @@ -167,13 +157,11 @@ LDFLAGS='%{build_ldflags} -Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS -DSHIBOKEN_INCLUDE_DIR=%{_includedir}/shiboken2 \ -DSHIBOKEN_LIBRARY=%{_libdir}/libshiboken2.%{py_suffix}.so \ -DBUILD_QT5=ON \ - -DOpenGL_GL_PREFERENCE=GLVND \ + -DOpenGL_GL_PREFERENCE=LEGACY \ -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin4 \ -DCOIN3D_DOC_PATH=%{_datadir}/Coin4/Coin \ -DFREECAD_USE_EXTERNAL_PIVY=TRUE \ -%if %{occ} -DUSE_OCC=TRUE \ -%endif %if ! %{bundled_smesh} -DFREECAD_USE_EXTERNAL_SMESH=TRUE \ -DSMESH_INCLUDE_DIR=%{_includedir}/smesh \ @@ -200,10 +188,6 @@ popd mkdir -p %{buildroot}%{_bindir} ln -rs %{buildroot}%{_libdir}/freecad/bin/FreeCAD %{buildroot}%{_bindir} ln -rs %{buildroot}%{_libdir}/freecad/bin/FreeCADCmd %{buildroot}%{_bindir} -#popd - -# Fix problems with unittestgui.py -#chmod +x %{buildroot}%{_libdir}/%{name}/Mod/Test/unittestgui.py # Move mis-installed files to the right location # Need to figure out if FreeCAD can install correctly at some point. @@ -211,12 +195,6 @@ mkdir -p %{buildroot}%{_datadir} mv %{buildroot}%{_libdir}/%{name}/share/* \ %{buildroot}%{_datadir} -#sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop - -# Install desktop icon -#install -pD -m 0644 src/Gui/Icons/%{name}.svg \ -# %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg - # Install man page install -pD -m 0644 %{SOURCE102} \ %{buildroot}%{_mandir}/man1/%{name}.1 @@ -230,10 +208,6 @@ popd # Remove obsolete Start_Page.html rm -f %{buildroot}%{_docdir}/%{name}/Start_Page.html -# Install appdata file -#mkdir -p %{buildroot}%{_datadir}/appdata -#install -pm 0644 %{SOURCE103} %{buildroot}%{_datadir}/appdata/ - # Belongs in %%license not %%doc rm -f %{buildroot}%{_docdir}/freecad/ThirdPartyLibraries.html @@ -278,6 +252,9 @@ desktop-file-validate \ %changelog +* Tue Oct 29 2019 Richard Shaw - 1:0.18.4-1 +- Update to 0.18.4. + * Mon Oct 28 2019 Richard Shaw - 1:0.18.3-6 - Rebuild for downgraded PySide2 so the version matches with Qt5. diff --git a/sources b/sources index 7540185..bd1d282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FreeCAD-0.18.3.tar.gz) = 4be8abd7e87ea1311c270b61a128a24ff9b3efc73330503e975fae6367373bd899969c1f2938b4ea537f6d36c18c2bad3eb22e8df11f0596859ca53843af39c3 +SHA512 (FreeCAD-0.18.4.tar.gz) = 06788ae00f8cd2334b2e5bf1642bcaedb5af4af3fdf1e0fd092c36adb761acfd8d0e8ad0cd2ff938fc2b63f50bdf760b078b06f7a4b851c705070101027cccf9