summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2018-08-24 10:26:21 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2018-08-24 10:26:21 +0200
commit5dbf2dded489e8cb81a2e75a188036be72110e5c (patch)
tree6e7e83ff3f2fa7bc83fe3a4410c6885a7cc33d4d
parentmedia-libs/coin: fixed dependency on x11-base/xorg-proto (diff)
downloadfordfrog-5dbf2dded489e8cb81a2e75a188036be72110e5c.tar.gz
fordfrog-5dbf2dded489e8cb81a2e75a188036be72110e5c.tar.bz2
fordfrog-5dbf2dded489e8cb81a2e75a188036be72110e5c.zip
media-gfx/freecad: updated paths patch + added patch from bug #660994
Package-Manager: Portage-2.3.48, Repoman-2.3.10
-rw-r--r--media-gfx/freecad/Manifest6
-rw-r--r--media-gfx/freecad/files/freecad-9999-disable-shiboken2-missing-header-files.patch39
-rw-r--r--media-gfx/freecad/files/freecad-9999-install-paths.patch (renamed from media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch)16
-rw-r--r--media-gfx/freecad/files/freecad-9999-libboost-python-fix.patch26
-rw-r--r--media-gfx/freecad/freecad-9999.ebuild7
5 files changed, 40 insertions, 54 deletions
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 036a0c19c..7a2586f92 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,5 +1,5 @@
-AUX freecad-0.14.3702-install-paths.patch 1143 BLAKE2B bbf14f29381fa7d808af53c51ce439ac21acb269648df647ddf3abc5ee6f01de44ffbc62bd1274aec1a167cf3f449c8498768af2af50fc0b9e3a5963f1857a46 SHA512 12181e4b48e4fb6284b574cb9872af713323d8f229a6c1746424968b0d22300bd6ada6437854a730dd4c5310eb36ebb06a35375ab012d36e9d3af4fb4271d884
-AUX freecad-9999-disable-shiboken2-missing-header-files.patch 1244 BLAKE2B 04388b46cbfd60ff587f576d77cc4c3ed24896842f81ba3efa015c5d6eed072dee98ec675c5e1a315d2ea93c687e3f256f20af34d1f5c0bb59690c8d22ad470b SHA512 2f8e3f2fd058885f92df38516b894561ca29151a7ab71dd4bba17cd6216fa8a9ac4ed3375e673c89c72544a8e847281925b40ef53fdf051e10a140b96d1887da
+AUX freecad-9999-install-paths.patch 1195 BLAKE2B 45b0ac0dbc943101a9ad2dc64d03b973fcabade513f08d64d59388eee12447c1170c21c96b203e52a20108ed1690191e011fe61ff9029ece6827f8e46b4c572e SHA512 2f9886f579c5f0f144585d1546545492ae1bd80576ea9ffe6139807aaaabd7eb1ca94c569fee98fc4fe57550180cca9fd4f7a60257658e01d7a5866abbc2a944
+AUX freecad-9999-libboost-python-fix.patch 1458 BLAKE2B aefb2b781074d3f01226dd51a6ce3cfd2760aa5a9b9180c6362d71b519971737e1cbe72b8f5f37cb4b5d28c468e0fe24d9750268f5e8784a85dc0f07c3def8b4 SHA512 10deaff2777b698819f4859cf6d8d3aaa7fe0d4c8c50a96846a3b2421500b9f0b2b90e7600168134468f5e093e494248ce156148a88a2e6042c7baf2d036e7a2
AUX freecad.sharedmimeinfo 312 BLAKE2B 731f28f904bebac03c8a64778d5e36f9b26fa33c347fa0b67113752aea12568f5a19968e730a53da89a7c7d08db6f8d80f11ab30d011e6b4db973c8549f710bd SHA512 bb55cad8387032af0e06ce7f1b4cab4354a34a915b9f550de25e05bf24d4161d9ea152d5692d65df4b362622f76a11d78894deaf7fee60c7a3fc0bfec38fa10c
-EBUILD freecad-9999.ebuild 6335 BLAKE2B 2da518fd13520cff22fc58e8afe4571855e818e6fdc9a04e427a5484e2fe36a3bdddffb567f71571f7cb1484215a805c962e7f6dae02e67e105b3624e7332cc4 SHA512 8dfe0c709f8f86e579f1423f915e20dfcc25943cbf2d5060379751320c728bb11f4c34ed443ed0d51297def9eb2e67120ba27268ef1c4a0bf37b4e1f4d864ced
+EBUILD freecad-9999.ebuild 6104 BLAKE2B 5e0302405256e65643bb781907556ff34de653bc5a8c2fba3c715f1c257b135e0d9815d3bff7311b23f9f223b455614aa4a75369575f7abfcb38807679404381 SHA512 7d8cebcb42f0129e94131c88cafb060a1d231667df4bfe123a108365df251b774511f0a5f6f2c035a883541a9078007579ded5ccee1cc501479afaea55d8e193
MISC metadata.xml 3495 BLAKE2B 6d041650eaf96c51e60f720a8dfc97dd1d3867577f11e83300f9eb4340a46a43c6fbf165310e6522b0552487ebe41e504caeb27c381418ae17d1ec77613980aa SHA512 160d602c5640328e4d648ccbf8628873d1ed7abe86bddaf7d6b44bc17b22ffe6e67f7ab7491c89ff47ea4fa6181537c433eac4b59fcf157625c7e4368a27f3a3
diff --git a/media-gfx/freecad/files/freecad-9999-disable-shiboken2-missing-header-files.patch b/media-gfx/freecad/files/freecad-9999-disable-shiboken2-missing-header-files.patch
deleted file mode 100644
index f8b56710d..000000000
--- a/media-gfx/freecad/files/freecad-9999-disable-shiboken2-missing-header-files.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/Gui/WidgetFactory.cpp b/src/Gui/WidgetFactory.cpp
-index e9182de6d..7d67dd24d 100644
---- a/src/Gui/WidgetFactory.cpp
-+++ b/src/Gui/WidgetFactory.cpp
-@@ -77,7 +77,6 @@ PyTypeObject** SbkPySide_QtGuiTypes=NULL;
- # include <basewrapper.h>
- # include <sbkconverter.h>
- # include <sbkmodule.h>
--# include <typeresolver.h>
- # include <shiboken.h>
- # ifdef HAVE_PYSIDE2
- # define HAVE_PYSIDE
-@@ -113,7 +112,7 @@ PyTypeObject** SbkPySide2_QtWidgetsTypes=NULL;
-
- using namespace Gui;
-
--#if defined (HAVE_SHIBOKEN)
-+#if 0 // defined (HAVE_SHIBOKEN)
- namespace Shiboken {
- template<> struct Converter<Base::Quantity>
- {
-@@ -206,7 +205,7 @@ void registerTypes()
-
- PythonWrapper::PythonWrapper()
- {
--#if defined (HAVE_SHIBOKEN)
-+#if 0 // defined (HAVE_SHIBOKEN)
- static bool init = false;
- if (!init) {
- init = true;
-@@ -296,7 +295,7 @@ QObject* PythonWrapper::toQObject(const Py::Object& pyobject)
-
- Py::Object PythonWrapper::fromQIcon(const QIcon* icon)
- {
--#if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
-+#if 0 // defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE)
- PyObject* pyobj = Shiboken::createWrapper<QIcon>(icon, true);
- if (pyobj)
- return Py::asObject(pyobj);
diff --git a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch b/media-gfx/freecad/files/freecad-9999-install-paths.patch
index d042695e8..1959ca66e 100644
--- a/media-gfx/freecad/files/freecad-0.14.3702-install-paths.patch
+++ b/media-gfx/freecad/files/freecad-9999-install-paths.patch
@@ -1,6 +1,8 @@
---- freecad-0.14.3702/CMakeLists.txt
-+++ freecad-0.14.3702/CMakeLists.txt
-@@ -69,9 +69,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ff4d3fb49..b80d5085a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -138,9 +138,15 @@ else(WIN32)
SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory")
endif(WIN32)
@@ -8,14 +10,14 @@
-SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
-SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
+if(NOT CMAKE_INSTALL_DATADIR)
-+ SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
++ SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
+endif(NOT CMAKE_INSTALL_DATADIR)
+if(NOT CMAKE_INSTALL_INCLUDEDIR)
-+ SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
++ SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
+endif(NOT CMAKE_INSTALL_INCLUDEDIR)
+if(NOT CMAKE_INSTALL_DOCDIR)
-+ SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
++ SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
+endif(NOT CMAKE_INSTALL_DOCDIR)
- # Don't set it without manual adaption of LibDir variable in src/App/FreeCADInit.py
+ # Don't set it without manual adoption of LibDir variable in src/App/FreeCADInit.py
SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")
diff --git a/media-gfx/freecad/files/freecad-9999-libboost-python-fix.patch b/media-gfx/freecad/files/freecad-9999-libboost-python-fix.patch
new file mode 100644
index 000000000..393221552
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-9999-libboost-python-fix.patch
@@ -0,0 +1,26 @@
+Index: freecad-9999/src/Mod/MeshPart/App/CMakeLists.txt
+===================================================================
+--- freecad-9999.orig/src/Mod/MeshPart/App/CMakeLists.txt
++++ freecad-9999/src/Mod/MeshPart/App/CMakeLists.txt
+@@ -96,7 +96,7 @@ if (BUILD_FLAT_MESH)
+ else()
+ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
+ # boost-python >= 1.67 on some platforms has suffix
+- set(BOOST_PY_SUFFIX ${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++ set(BOOST_PY_SUFFIX -${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+
+ find_package( Boost COMPONENTS python${BOOST_PY_SUFFIX} )
+ if (NOT Boost_PYTHON${BOOST_PY_SUFFIX}_FOUND)
+Index: freecad-9999/src/Mod/Path/libarea/CMakeLists.txt
+===================================================================
+--- freecad-9999.orig/src/Mod/Path/libarea/CMakeLists.txt
++++ freecad-9999/src/Mod/Path/libarea/CMakeLists.txt
+@@ -15,7 +15,7 @@ include_directories(${CMAKE_CURRENT_SOUR
+ if(NOT FREECAD_USE_PYBIND11)
+ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
+ # boost-python >= 1.67 on some platforms has suffix
+- set(BOOST_PY_SUFFIX ${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++ set(BOOST_PY_SUFFIX -${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+
+ find_package( Boost COMPONENTS python${BOOST_PY_SUFFIX} )
+ if (NOT Boost_PYTHON${BOOST_PY_SUFFIX}_FOUND)
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index ae418304a..2472e8452 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -115,13 +115,10 @@ DEPEND="${COMMON_DEPEND}
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# freecad-9999-disable-shiboken2-missing-header-files.patch: it is a temporary workaround
-# till the issue is solved by upstream.
-# see https://forum.freecadweb.org/viewtopic.php?f=4&t=25308&p=203127
PATCHES=(
- "${FILESDIR}"/${PN}-0.14.3702-install-paths.patch
+ "${FILESDIR}"/${P}-install-paths.patch
+ "${FILESDIR}"/${P}-libboost-python-fix.patch
)
-# "${FILESDIR}"/${P}-disable-shiboken2-missing-header-files.patch
DOCS=( README.md ChangeLog.txt )