pool/FreeCAD
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 720109 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/720109
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeCAD?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2019-09-07 09:46:26 +00:00 committed by Git OBS Bridge
commit 8f9c2b8ab1
10 changed files with 166 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
0001-Fix-build-with-pyside2-shiboken2-5.12.1.patch Normal file
View File

@ -0,0 +1,88 @@
From 7d362752633f0e47cebc44f52db8dffbc3b3c2e6 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 13 Jun 2019 14:15:07 +0200
Subject: [PATCH] Fix build with pyside2/shiboken2 >= 5.12.1
Starting with 5.12.2, pyside2 and shiboken2 now create CMake build targets.
The old variables were removed, leading to linker errors when building FreeCAD.
---
src/Gui/CMakeLists.txt | 54 ++++++++++++++++++++++++------------------
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index 3bd96e0..93babc5 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -137,38 +137,46 @@ IF(OCULUS_FOUND)
)
ENDIF(OCULUS_FOUND)
-if(SHIBOKEN_INCLUDE_DIR)
- if (BUILD_QT5)
+if(BUILD_QT5)
+ if(Shiboken2_FOUND)
add_definitions(-DHAVE_SHIBOKEN2)
- else()
+ if("${Shiboken2_VERSION}" VERSION_GREATER 5.12.1)
+ list(APPEND FreeCADGui_LIBS Shiboken2::libshiboken)
+ else()
+ include_directories(${SHIBOKEN_INCLUDE_DIR})
+ list(APPEND FreeCADGui_LIBS ${SHIBOKEN_LIBRARY})
+ endif()
+ endif()
+ if(PySide2_FOUND)
+ add_definitions(-DHAVE_PYSIDE2)
+ if("${PySide2_VERSION}" VERSION_GREATER 5.12.1)
+ list(APPEND FreeCADGui_LIBS PySide2::pyside2)
+ # Needed to '#include pyside2_<module_name>_python.h'
+ get_target_property(PYSIDE_INCLUDE_DIR PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES)
+ else()
+ list(APPEND FreeCADGui_LIBS ${PYSIDE_LIBRARY})
+ endif()
+ include_directories(${PYSIDE_INCLUDE_DIR}/QtWidgets)
+ endif()
+else()
+ if(SHIBOKEN_INCLUDE_DIR)
add_definitions(-DHAVE_SHIBOKEN)
+ include_directories(${SHIBOKEN_INCLUDE_DIR})
+ list(APPEND FreeCADGui_LIBS ${SHIBOKEN_LIBRARY})
endif()
- include_directories(
- ${SHIBOKEN_INCLUDE_DIR}
- )
- list(APPEND FreeCADGui_LIBS
- ${SHIBOKEN_LIBRARY}
- )
-endif(SHIBOKEN_INCLUDE_DIR)
+ if(PYSIDE_INCLUDE_DIR)
+ add_definitions(-DHAVE_PYSIDE)
+ list(APPEND FreeCADGui_LIBS ${PYSIDE_LIBRARY})
+ endif()
+endif()
-if(PYSIDE_INCLUDE_DIR)
+if(DEFINED PYSIDE_INCLUDE_DIR)
include_directories(
${PYSIDE_INCLUDE_DIR}
${PYSIDE_INCLUDE_DIR}/QtCore
${PYSIDE_INCLUDE_DIR}/QtGui
)
- list(APPEND FreeCADGui_LIBS
- ${PYSIDE_LIBRARY}
- )
- if (BUILD_QT5)
- include_directories(
- ${PYSIDE_INCLUDE_DIR}/QtWidgets
- )
- add_definitions(-DHAVE_PYSIDE2)
- else()
- add_definitions(-DHAVE_PYSIDE)
- endif()
-endif(PYSIDE_INCLUDE_DIR)
+endif()
generate_from_xml(DocumentPy)
generate_from_xml(PythonWorkbenchPy)
--
2.22.0

13
0001-find-openmpi2-include-files.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ecfe23a6..1db9bf33e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -717,7 +717,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_compile_options(${OPENMPI_CFLAGS})
link_directories(${OPENMPI_LIBRARY_DIRS})
link_libraries(${OPENMPI_LIBRARIES})
- find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS} NO_DEFAULT_PATH)
+ find_file(MpidotH mpi.h PATHS ${OPENMPI_INCLUDE_DIRS} /usr/lib64/mpi/gcc/openmpi2/include NO_DEFAULT_PATH)
if(NOT MpidotH)
message( WARNING "mpi.h was not found. Check for error above.")
endif()

3
FreeCAD-0.18.1.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddbbce2dc1f06a7239e343e1478ab44d6c45d49d47cff7587457e66f69c84ec2
size 427612686

3
FreeCAD-0.18.3.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62ef89cca228b718f48e380d29b10f807724f649da169c45151a1df8fecde672
size 427664910

6
FreeCAD-test.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jul 27 03:34:10 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix inverted logic when evaluating test suite exit code
- Add gmsh mesher to BuildRequires, increase FEM test coverage
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 12 21:10:12 UTC 2019 - Adrian Schröter <adrian@suse.de> Tue Feb 12 21:10:12 UTC 2019 - Adrian Schröter <adrian@suse.de>

10
FreeCAD-test.spec
View File

@ -17,13 +17,14 @@
Name: FreeCAD-test Name: FreeCAD-test
Version: 0.18.1 Version: 0.18.3
Release: 0 Release: 0
Summary: Meta source package that runs the FreeCAD testsuite when built Summary: Meta source package that runs the FreeCAD testsuite when built
License: LGPL-2.0-or-later AND GPL-2.0-or-later License: LGPL-2.0-or-later AND GPL-2.0-or-later
Group: Productivity/Graphics/CAD Group: Productivity/Graphics/CAD
Url: http://www.freecadweb.org/ Url: http://www.freecadweb.org/
BuildRequires: FreeCAD BuildRequires: FreeCAD
BuildRequires: gmsh
# Test suite fails on 32bit and I don't want to debug that anymore # Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch: %ix86 %arm ppc s390 s390x ExcludeArch: %ix86 %arm ppc s390 s390x
@ -33,7 +34,10 @@ This is just executing the test suite at build time.
%build %build
export LC_ALL="C.utf-8" export LC_ALL="C.utf-8"
#FreeCAD --console --write-log --log-file=/tmp/FreeCAD.log --run-test 0 || exit 1 file=`mktemp`
FreeCAD --console --run-test 0 || exit 1 if ! FreeCAD --console --write-log --log-file="$file" --run-test 0; then
cat "$file"
exit 1
fi
%changelog %changelog

48
FreeCAD.changes
View File

@ -1,3 +1,51 @@
-------------------------------------------------------------------
Thu Jul 18 11:01:30 UTC 2019 - Adrian Schröter <adrian@suse.de>
- 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 <stefan.bruens@rwth-aachen.de>
- 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 <christophe@krop.fr>
- 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 <adrian@suse.de>
- 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
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 5 11:56:11 UTC 2019 - Adrian Schröter <adrian@suse.de> Fri Apr 5 11:56:11 UTC 2019 - Adrian Schröter <adrian@suse.de>

6
FreeCAD.obsinfo
View File

@ -1,5 +1,5 @@
name: FreeCAD name: FreeCAD
version: 0.18.1 version: 0.18.3
mtime: 1554385363 mtime: 1562965688
commit: f7dccfaa909e5b9da26bf50c4a22ccca9bb10c40 commit: 3129ae4296e40ed20e7b3d460b86e6969acbe1c3

18
FreeCAD.spec
View File

@ -27,7 +27,7 @@
%endif %endif
Name: FreeCAD Name: FreeCAD
Version: 0.18.1 Version: 0.18.3
Release: 0 Release: 0
Summary: General Purpose 3D CAD Modeler Summary: General Purpose 3D CAD Modeler
License: LGPL-2.0-or-later AND GPL-2.0-or-later License: LGPL-2.0-or-later AND GPL-2.0-or-later
@ -39,11 +39,13 @@ Source0: %{name}-%version.tar.xz
Source1: FreeCAD.sh Source1: FreeCAD.sh
Source2: FreeCADCmd.sh Source2: FreeCADCmd.sh
Source3: FreeCAD_shared_mimeinfo Source3: FreeCAD_shared_mimeinfo
Patch2: 0001-find-openmpi2-include-files.patch # 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
# Test suite fails on 32bit and I don't want to debug that anymore # Test suite fails on 32bit and I don't want to debug that anymore
ExcludeArch: %ix86 %arm ppc s390 s390x ExcludeArch: %ix86 %arm ppc s390 s390x
BuildRequires: Coin-devel
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
BuildRequires: libboost_filesystem-devel >= 1.55 BuildRequires: libboost_filesystem-devel >= 1.55
BuildRequires: libboost_graph-devel >= 1.55 BuildRequires: libboost_graph-devel >= 1.55
@ -70,25 +72,23 @@ BuildRequires: freeglut-devel
BuildRequires: gcc-fortran BuildRequires: gcc-fortran
BuildRequires: git BuildRequires: git
BuildRequires: glew-devel BuildRequires: glew-devel
BuildRequires: hdf5-openmpi-devel BuildRequires: graphviz
BuildRequires: hdf5-devel
# We use the internal smesh version with fixes atm # We use the internal smesh version with fixes atm
#BuildRequires: smesh-devel #BuildRequires: smesh-devel
BuildRequires: libXerces-c-devel BuildRequires: libXerces-c-devel
BuildRequires: libXi-devel
BuildRequires: libmed-devel BuildRequires: libmed-devel
BuildRequires: netgen-devel
BuildRequires: libspnav-devel BuildRequires: libspnav-devel
BuildRequires: make BuildRequires: make
BuildRequires: netgen-devel
# we use upstream OpenCASCADE instead of oce-devel atm # we use upstream OpenCASCADE instead of oce-devel atm
BuildRequires: Coin-devel
BuildRequires: libXi-devel
BuildRequires: occt-devel BuildRequires: occt-devel
BuildRequires: opencv-devel BuildRequires: opencv-devel
BuildRequires: pkg-config BuildRequires: pkg-config
%if 0%{?suse_version} >= 1330 %if 0%{?suse_version} >= 1330
# Qt5 & python3 # Qt5 & python3
BuildRequires: openmpi2-devel
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-matplotlib BuildRequires: python3-matplotlib
BuildRequires: python3-pyside2-devel BuildRequires: python3-pyside2-devel
@ -169,7 +169,7 @@ This package contains the files needed for development with FreeCAD.
mv %_sourcedir/%name-%version %_builddir/%name-%version mv %_sourcedir/%name-%version %_builddir/%name-%version
%setup -q -D -T 0 %setup -q -D -T 0
%endif %endif
%patch2 -p1 %autopatch -p1
# fix env-script-interpreter # fix env-script-interpreter
sed -i '1c#!%{__python2}' \ sed -i '1c#!%{__python2}' \

4
_service
View File

@ -2,8 +2,8 @@
<service name="obs_scm" mode="disabled"> <service name="obs_scm" mode="disabled">
<param name="url">https://github.com/FreeCAD/FreeCAD.git</param> <param name="url">https://github.com/FreeCAD/FreeCAD.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="revision">0.18.1</param> <param name="revision">0.18.3</param>
<param name="version">0.18.1</param> <param name="version">0.18.3</param>
</service> </service>
<service name="set_version" mode="disabled"/> <service name="set_version" mode="disabled"/>