diff options
author | Michael Weber <xmw@gentoo.org> | 2014-04-24 04:48:13 +0000 |
---|---|---|
committer | Michael Weber <xmw@gentoo.org> | 2014-04-24 04:48:13 +0000 |
commit | 87bf31fdf9a8345a89bf07896a34a21ec34ed605 (patch) | |
tree | d95f24741db3fa01023785554edb000b84298c06 /media-gfx | |
parent | Add missed Changelog entry (diff) | |
download | historical-87bf31fdf9a8345a89bf07896a34a21ec34ed605.tar.gz historical-87bf31fdf9a8345a89bf07896a34a21ec34ed605.tar.bz2 historical-87bf31fdf9a8345a89bf07896a34a21ec34ed605.zip |
Revbump with ebuild by Fabio Rossi (bug 457830).
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/freecad/ChangeLog | 13 | ||||
-rw-r--r-- | media-gfx/freecad/Manifest | 15 | ||||
-rw-r--r-- | media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch | 21 | ||||
-rw-r--r-- | media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch | 11 | ||||
-rw-r--r-- | media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch | 294 | ||||
-rw-r--r-- | media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch | 11 | ||||
-rw-r--r-- | media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch | 63 | ||||
-rw-r--r-- | media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch | 97 | ||||
-rw-r--r-- | media-gfx/freecad/freecad-0.13.1830-r1.ebuild | 149 |
9 files changed, 669 insertions, 5 deletions
diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog index 07761ba371ca..59332a6f9427 100644 --- a/media-gfx/freecad/ChangeLog +++ b/media-gfx/freecad/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for media-gfx/freecad # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.17 2014/04/23 22:49:07 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.18 2014/04/24 04:48:12 xmw Exp $ + +*freecad-0.13.1830-r1 (24 Apr 2014) + + 24 Apr 2014; Michael Weber <xmw@gentoo.org> + +files/freecad-0.13.1830-CMakefile.patch, + +files/freecad-0.13.1830-avoid-include-salome.patch, + +files/freecad-0.13.1830-cmake-2.8.12.patch, + +files/freecad-0.13.1830-no-machdist.patch, + +files/freecad-0.13.1830-occ-6.7.patch, + +files/freecad-0.13.1830-startpage-links.patch, +freecad-0.13.1830-r1.ebuild: + Revbump with ebuild by Fabio Rossi (bug 457830). *freecad-0.12.5284-r4 (23 Apr 2014) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 9ecaedb1399f..41c46571447a 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -14,19 +14,26 @@ AUX freecad-0.12.5284-occ-6.6.patch 2846 SHA256 f5e3b4162aeda258a55877ecd3886eea AUX freecad-0.12.5284-qt3support.patch 1819 SHA256 a04ffcbeefe04e52a771fbb93467e32392d2bdb41b59bda41d45c3018f6c0eef SHA512 5f0436ee705f924c0beef0fe7dfcd104c7e8f220dbfb59965ec340c01e7e30bb2e459c2fbc787b4f67a60913d86ae771029e8239597766da71f14d51286844a6 WHIRLPOOL c55ed752206aa9605007c54a34250cb17bc3c5818d6cf80eac36ef7f33dcc90a66ef5d501e5d07b4bdb9ce0819357bba73b0053c02c6a4bc7547e073aa27c1f5 AUX freecad-0.12.5284-removeoldswig.patch 5165 SHA256 a5f44ac26071e1769c0686de30bbd2ca2a5fd03cb44222a1625f23c6f5ad6fc8 SHA512 732f0fc6b15b237df0014d30763e5b6bd46ebb0afe6d83eba5f2d325a5462367ab4d8890ac2426fb5fc3092465fc076f8cc4170a7d46f4eba9e4e0fa5703307b WHIRLPOOL ba101dbb802ed1a5762b2340ccf7c38a496b0f72d1deb38ea0558942f64b84c54131f7e5ce936a4405f5c025b3bc0a08d522f6d3fd2226804f7a43f21382b436 AUX freecad-0.12.5284-salomesmesh-occ-6.5.5.patch 8617 SHA256 2ebcf2a5a81a2613d598f2eae56c87b0474b0bcac9d1b17038b71ff33c699d27 SHA512 ab1964d9a470f1edf0ce01ac67626b920a1be3f85f404e95c21122f5b69302d7b4faa41f10a648919793245cbd4ccbc804b723c59915ebe0c8011fc7fe4a9406 WHIRLPOOL dc7072b3edca746ae24b0c539753cd6f0c463ad803c222bc83f88cc3d02c9f97caa6074e95d7ff0da287a2f334633a1201cc993720c231e1e31f69d9fd240987 +AUX freecad-0.13.1830-CMakefile.patch 1028 SHA256 57e5d5ac39a8ff9cfdbaaeb723a6bd8eff4556575bc3ff1384e79fe136b7274b SHA512 8bb0effd1094a860aa527a04fd88d104a380faa178e3aaf07b722feb0378a01e09864f9f2b6d0706bbb19c8217c80b37de46a5e5094ca19924c10d2418944dec WHIRLPOOL 28de8725f048dfe182a2df2346b19a64cd4d4dc061c1d07710076d4e9f277dcb9b46a1e38b000e5184040d615c7c7350d9815702023c5ca75e8905ca3b39d68e +AUX freecad-0.13.1830-avoid-include-salome.patch 436 SHA256 e2d27c87c21eee356f3db07fb60b177a07901e3d32153267535830c7726183dc SHA512 d8e663ee7274cf5358592b6bc07284693b72212a43d1d4d87222af9638c61913934f74ebd288c27b9aac7ebd42fbac655755958e8e0ca267a8d3a5ee1077acf3 WHIRLPOOL 0acb4b1836d19c3eb188dbd52256fdfd02f854a14afcda053f02f30f2600ccbd9df017ab0ddd8dda8b1e801910d1f6ca25ed03fbd1bb4b1beb2d87953f5931db +AUX freecad-0.13.1830-cmake-2.8.12.patch 10945 SHA256 d0670c1087d0e665cf06c06a0af317556bebe4545ec250ed54cca2ba336e7ab5 SHA512 5f4b6c266be5ad41751c84498c75789f7c966e25af8be2e6ff38b8fa4f064d31f45c6cfcb9359dcdf67f6e2314d3d389634a4f0ac5f0a7195d81c994d8aa353c WHIRLPOOL 172c38e8a5c80f232be84dfa42791c4babc3f8c67a781c3d68bf597f0fd8baa664b4763631f570ed0d784c21a6448861b60bb11a25de04a304b7b4c246f9fd11 +AUX freecad-0.13.1830-no-machdist.patch 485 SHA256 342a8e337b9506851afab664644ef2043aa42611b23832234e1653f2de126358 SHA512 082a9af89fee5ce6d1012cbcf22bec2b13e7a79b3c7b1a13d65f56b846d5ddb6e835d4093c436173902cbaeb6975648a0c136ed3bddc0e1bd35937bedee94dad WHIRLPOOL 0b08c958e619e1f66b9e8c6778e44a8d81e9fce5a8553631c599e1be8507e0ff6d78f2afa1d2e7dbed81a9c2fa9744584c4df6fb1b600e9e8a413708f3e38102 +AUX freecad-0.13.1830-occ-6.7.patch 2354 SHA256 3c5ce4fdb5af8c39309ccb50ee4f8244c388907b90d92b9cad873992cf3d8bad SHA512 b3cbcdfec41a1504801b64aeffb9f3b95a0ced141fab0e8a72aba038209b956ab6204ee63d815a8d4361ef98e10d5c86cb01538f9489eabe5fe4615ed24bfcb3 WHIRLPOOL 2836fc785dd3a08572bb318cb254360b07e6246b32f72434e159ca3f130886677c07cc283812ac86040362efbed3e0996e5d627d5b0a5d02d7c950197584a902 AUX freecad-0.13.1830-remove-qt3-support.patch 1165 SHA256 dab93f53d16aa2b22a4c97203efb3dbe87562c7afeb6d3a3bef3f26492344f59 SHA512 479d2b5f1e5e8a1d0ffac6eb0ae3ef913530a700cabbee160471c131b1a898063be9feebb38e8870691da9d81e66924784e157a524339103713a2691ce3e6ae5 WHIRLPOOL 28c78c61de550964d6e12033bcf53876eeff2e474af67f6274f6eb0734ede7d00adb4bcd7e0a16556a1a90660c1a15d9ebf1e1b245da5bb377ccb7824d26224b +AUX freecad-0.13.1830-startpage-links.patch 5549 SHA256 14913231fd7f0314bc4c4c7be0c3b9ee689aea98ded2269a40b8e855c15da225 SHA512 1365d2099121a4aa186f6efbb9ff2345d8cec698226ea04ca81ee5b4da6759fb9944382eccafadc622969910c410f3afc07e8387287ad765518c49130fc75f9e WHIRLPOOL f26f73b76ce1734b5cc973f726a723dd23f0e6968b7a246b3ae3fbadcaf6e08d087c45aa99e472597bb5b9e8a297b36dcfc8e0ff6e33a56408b467216bdacffe DIST freecad-0.12.5284.tar.gz 48399004 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d SHA512 f1fee73ae7b43e7b3a136847f0dbb0b3f3e8f62ad3a9063f759efd8b9ed5a0dfff54961870465f37c0563161c4c5e2821f1f3379ead72dbdeddae36702e2ec0a WHIRLPOOL 7a46119d86a5d43ae8eaec6b5532e4739d54b0443769381630e644aa16c3f4185b63b513e4350c7562beacd86d56a7edbb3b506d10cb54190cbeaab48a504d5f DIST freecad-0.13.1830.tar.gz 70168706 SHA256 550ed16225e4cd67a463ae9b826f3a64edf7d2819cc8d235b15a89e10be72f13 SHA512 3e8d4eed8cace38da9615965f79a2b0da21d31a6df793ceaf3f732e0abd5666e9715ec9eb162e6ff998718e8d609a7dff2d0993b28f493200b734318a2322160 WHIRLPOOL 6d41565423edf8a0c67901a8559600ff1088f645c3ecb4aad8d7597490522f80d6475af3e7f5a623fc30b4d1571187bf6e6a132e6c480825798b957bea90bb83 EBUILD freecad-0.12.5284-r2.ebuild 2097 SHA256 419b512d16428711c64a8c46f8b3d0ddde058d6cf95de09d5be2af793426df70 SHA512 0d6fee89ff0430d5dac2ed4222cc40f4c1777e1658fea642d04423f096b5c032137428508c308ad3f7fa4155240e9ed8752f07d5947514b7386afe777b37a15d WHIRLPOOL 6a5717f4e476c53586e85b6515bb91927568a379d15a218e3197c7b6e0fae5770ddf2c302cf575337f3d29effdbad8782f543577b578b0a1103490943657d2e4 EBUILD freecad-0.12.5284-r3.ebuild 3608 SHA256 bbc6fd370e9380669946cbb34d4719e89c3473ee0ddcd3c04b38a6810b7301b6 SHA512 d3f37013ae47e8fb5a8d376ba328b56dc56c76756531e22cffa0e31753a3ba44779b3df92b61e8ecdb19066ca99d21f9b84e2b9ccde2f389032b7f5ffe059ddd WHIRLPOOL d8c68f0b1b99f4bad9b3dd0aa0a9657f72e7af7bcd371a511c6c2d27cc8c5933266cfef11fe5530a8e7796f7b1611bd93ff8181aad1c3d8f7df8e72c91eec341 EBUILD freecad-0.12.5284-r4.ebuild 3713 SHA256 37dc7913965f3a0b686b70c1f66b47f248a188b3294ac5b892b8f13d98d91c71 SHA512 91efeaedc89df00c3d1495720915a46c63eb856ff343871a5dbe179d5e96e5d6f1326e4b101fb12d2386f93cbafa456ccc7157bd849822c7b8aead53c9ccc3b7 WHIRLPOOL 7722d4698937a98f75516352790bbd9efade325325152a0f74712d414fa8d38f6f5dba6670a12538185a81aa9b5fbc793fb7efa44531cec204aa597b9952bc0d +EBUILD freecad-0.13.1830-r1.ebuild 4591 SHA256 f5a3a8896fc53a5f76cd903865951b1d08761bb9f79a74d1fc29fe05f0762421 SHA512 f13e2ef3ab9e09d37717920a6e2cb66c7ecc90ec254174acb9d629345639174b385e3f5b04778ad289ebdb9917fc63993b400f11714e6723e9512ebde3bc55c2 WHIRLPOOL add039a109515ca4b8660af9ab35c7e8af4cf605f38fabb22aef077a1f0cb6874479e14ff2ad49007da2928d34802a09ed5a28583044d6f5b6bd234f54d3b806 EBUILD freecad-0.13.1830.ebuild 2209 SHA256 856b8f575926dbc9f8da985e4e97d622dc5e464a3e86871e48efb7a704a2c796 SHA512 aa8c174b800911b3db2ec5d05c5df3bd4b6edce65fc0253ccc7cd9cc3aee47d96b1e58ad94ed9097b716817d3d0460873b5a66ab072c062d1d5ff505c64921f2 WHIRLPOOL 3cb896e16c8ee161ec1b0f63853d2d69c04bcbfaa734b007bdf069dff01601d0b49971d582b044102a06aaa3a43a2a4ba94ee4c20eaaa8222fb15aba857426ff -MISC ChangeLog 3800 SHA256 ec2d10396e2b6ff74fccc40ab8af7936cf3ef7b6dca7bcc7c1bd13ef9af7c2fa SHA512 31f456a1161a00b69ea6db1bf782a41ed2319b4abf006ad22a00e028a42a5cfdea9886de30acf15614570e6f1f3f7762daacf6a62d05326a7a2dcd8be76278c2 WHIRLPOOL 025fb15031f90253b03a87996cd1fcb0b6bcee81c963dbd84722ceda1f9cfce73caa8d996b2b8b5d7332e258f875af82266aada358c683431bce6c89f1f83b20 +MISC ChangeLog 4249 SHA256 937513af8d0e9616bfcb1c8d07a4b47e7876359e873efcd1b596de02f5c4dfb7 SHA512 8183f6d3ffff2fbdfb8899b36df7684359d83457e2122b5a6183942780e7858aacecf5045307128fa8bbd3131f21d3bbdedb1592d246d86879ac3db928a5576b WHIRLPOOL 23790accc48c623eca940992bffe7a50dd1331cc09a6e268a8bd080d9cee483aca05ff7e0e7f90bcf26f0eb0aa67c6e5d0d0ad5ce3fe3beffb4ed144aa8684c3 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iF4EAREIAAYFAlNYQ2QACgkQknrdDGLu8JBQXQD/TJI4RvsS0Q+xsvb5XhwxrqUB -22i3dLBrQg1IZn49tVgA/Ag1zolqWt5Wka6/SswTI7MQGBP3/PT2iUFzFF/LrK+H -=bcAt +iF0EAREIAAYFAlNYl40ACgkQknrdDGLu8JCeIQD3YarNjquK1jNdbxxO8aATITHj +8d6/eZReXJ5SlHBVngEAj6hossZF8KeX1RAklhu2c3c08Ns7hkcwsE1H3eAt518= +=UmZF -----END PGP SIGNATURE----- diff --git a/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch b/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch new file mode 100644 index 000000000000..58e99587f992 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch @@ -0,0 +1,21 @@ +--- CMakeLists.txt 2014-01-06 13:46:44.516313646 +0100 ++++ CMakeLists.txt.new 2014-01-06 13:58:16.035280554 +0100 +@@ -69,9 +69,15 @@ + SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") + endif(WIN32) + +-SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") +-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") ++endif(NOT CMAKE_INSTALL_DATADIR) ++if(NOT CMAKE_INSTALL_INCLUDEDIR) ++ 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") ++endif(NOT CMAKE_INSTALL_DOCDIR) + + # used as compiler defines + SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}") diff --git a/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch b/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch new file mode 100644 index 000000000000..0db660948579 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch @@ -0,0 +1,11 @@ +--- src/3rdParty/salomesmesh/CMakeLists.txt 2014-01-06 14:06:05.495258088 +0100 ++++ src/3rdParty/salomesmesh/CMakeLists.txt.new 2014-01-06 15:05:53.316086394 +0100 +@@ -206,8 +206,4 @@ + DESTINATION lib + ) + # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 +- INSTALL(DIRECTORY inc/ +- DESTINATION include +- FILES_MATCHING PATTERN "*.h*" +- ) + ENDIF(UNIX) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch b/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch new file mode 100644 index 000000000000..e0e0e9fc02a7 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch @@ -0,0 +1,294 @@ +commit f061b6f7ea667e1d6944590d67b9b5b6659e4ba0 +Author: wmayer <wmayer@users.sourceforge.net> +Date: Tue Oct 22 10:33:18 2013 +0200 + + 0001278: No build possible with current CMake version 2.8.12 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 862cd7b..11c9b43 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -270,14 +270,14 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X) + macro(fc_wrap_cpp outfiles ) + # get include dirs + QT4_GET_MOC_FLAGS(moc_flags) +- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) ++ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) + # fixes bug 0000585: bug with boost 1.48 + SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) + + foreach(it ${moc_files}) + get_filename_component(it ${it} ABSOLUTE) + QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) +- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") ++ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}") + set(${outfiles} ${${outfiles}} ${outfile}) + add_file_dependencies(${it} ${outfile}) + endforeach(it) +diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake +index 5fa7680..78bc0b8 100644 +--- a/cMake/FreeCadMacros.cmake ++++ b/cMake/FreeCadMacros.cmake +@@ -168,69 +168,6 @@ endmacro(generate_from_py) + #endmacro(qt4_wrap_ui)
+
+
+-# This is a special version of the built in macro qt4_add_resources that generates .cpp files
+-#
+-#macro(fc_add_resources outfiles )
+-# #QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
+-# set(ARGN )
+-# foreach (it ${rcc_files})
+-# get_filename_component(outfilename ${it} NAME_WE)
+-# get_filename_component(infile ${it} ABSOLUTE)
+-# get_filename_component(rc_path ${infile} PATH)
+-# set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
+-# # parse file for dependencies
+-# # all files are absolute paths or relative to the location of the qrc file
+-# file(READ "${infile}" _RC_FILE_CONTENTS)
+-# string(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
+-# set(_RC_DEPENDS)
+-# foreach(_RC_FILE ${_RC_FILES})
+-# string(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
+-# string(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
+-# if(NOT _ABS_PATH_INDICATOR)
+-# set(_RC_FILE "${rc_path}/${_RC_FILE}")
+-# endif(NOT _ABS_PATH_INDICATOR)
+-# set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
+-# endforeach(_RC_FILE)
+-# add_custom_command(OUTPUT ${outfile}
+-# COMMAND ${QT_RCC_EXECUTABLE}
+-# ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
+-# MAIN_DEPENDENCY ${infile}
+-# DEPENDS ${_RC_DEPENDS})
+-# set(${outfiles} ${${outfiles}} ${outfile})
+-# endforeach (it)
+-#endmacro(fc_add_resources)
+-
+-MACRO (fc_add_resources outfiles )
+- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
+-
+- FOREACH (it ${rcc_files})
+- GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
+- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
+- GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
+- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
+- # parse file for dependencies
+- # all files are absolute paths or relative to the location of the qrc file
+- FILE(READ "${infile}" _RC_FILE_CONTENTS)
+- STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
+- SET(_RC_DEPENDS)
+- FOREACH(_RC_FILE ${_RC_FILES})
+- STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
+- STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
+- IF(NOT _ABS_PATH_INDICATOR)
+- SET(_RC_FILE "${rc_path}/${_RC_FILE}")
+- ENDIF(NOT _ABS_PATH_INDICATOR)
+- SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
+- ENDFOREACH(_RC_FILE)
+- ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+- COMMAND ${QT_RCC_EXECUTABLE}
+- ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile}
+- MAIN_DEPENDENCY ${infile}
+- DEPENDS ${_RC_DEPENDS})
+- SET(${outfiles} ${${outfiles}} ${outfile})
+- ENDFOREACH (it)
+-
+-ENDMACRO (fc_add_resources)
+-
+ MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar)
+ IF(MSVC)
+ GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE)
+diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt +index b9f1939..124c4f8 100644 +--- a/src/Gui/CMakeLists.txt ++++ b/src/Gui/CMakeLists.txt +@@ -608,7 +608,7 @@ SOURCE_GROUP("Widget\\iisTaskPanel\\Mocs" FILES ${iis_MOC_SRCS}) + #SET(Resource_RCS + # Icons/resource.qrc + # Language/translation.qrc) +-#fc_add_resources(Resource_SRCS ${Resource_RCS}) ++#qt4_add_resources(Resource_SRCS ${Resource_RCS}) + #SET(Resource_SRCS + # ${Resource_SRCS} + # Icons/resource.qrc +diff --git a/src/Mod/Image/Gui/AppImageGui.cpp b/src/Mod/Image/Gui/AppImageGui.cpp +index c26129e..c817860 100644 +--- a/src/Mod/Image/Gui/AppImageGui.cpp ++++ b/src/Mod/Image/Gui/AppImageGui.cpp +@@ -20,7 +20,6 @@ + #include <Gui/Language/Translator.h>
+ #include "Workbench.h"
+ #include "ViewProviderImagePlane.h"
+-#include "qrc_Image.cpp"
+
+ // use a different name to CreateCommand()
+ void CreateImageCommands(void);
+diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt +index cc967ee..4edb462 100644 +--- a/src/Mod/Image/Gui/CMakeLists.txt ++++ b/src/Mod/Image/Gui/CMakeLists.txt +@@ -30,8 +30,7 @@ SET(ImageGui_RES_SRCS + Resources/Image.qrc + ) + +-fc_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) +-#QT4_ADD_RESOURCES(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) ++qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) + + set(ImageGui_UIC_SRCS + ImageOrientationDialog.ui +@@ -40,7 +39,7 @@ qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS}) + + SET(ImageGui_SRCS + # ${ImageGui_MOC_SRCS} +-# ${ImageGui_QRC_SRCS} ++ ${ImageGui_QRC_SRCS} + AppImageGui.cpp + AppImageGuiPy.cpp + Command.cpp +diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp +index 624d569..8fb68cf 100644 +--- a/src/Mod/Mesh/Gui/AppMeshGui.cpp ++++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp +@@ -50,7 +50,6 @@ + #include "ViewProviderDefects.h"
+ #include "ViewProviderPython.h"
+ #include "Workbench.h"
+-#include "qrc_Mesh.cpp"
+
+
+ // use a different name to CreateCommand()
+diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt +index cafca6c..9ef1dae 100644 +--- a/src/Mod/Mesh/Gui/CMakeLists.txt ++++ b/src/Mod/Mesh/Gui/CMakeLists.txt +@@ -75,9 +75,9 @@ SET(Inventor_SRCS + ) + SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS}) + +-fc_add_resources(resource_SRCS Resources/Mesh.qrc) ++qt4_add_resources(resource_SRCS Resources/Mesh.qrc) + SET(resource_SRCS +-# ${resource_SRCS} ++ ${resource_SRCS} + Resources/Mesh.qrc + ) + SOURCE_GROUP("resource" FILES ${resource_SRCS}) +diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp +index 9c3ebb3..ae84470 100644 +--- a/src/Mod/Part/Gui/AppPartGui.cpp ++++ b/src/Mod/Part/Gui/AppPartGui.cpp +@@ -57,7 +57,6 @@ + #include "Workbench.h"
+
+ #include <Gui/Language/Translator.h>
+-#include "qrc_Part.cpp"
+
+ #include "Resources/icons/PartFeature.xpm"
+ #include "Resources/icons/PartFeatureImport.xpm"
+diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt +index 375f6e4..87c4c28 100644 +--- a/src/Mod/Part/Gui/CMakeLists.txt ++++ b/src/Mod/Part/Gui/CMakeLists.txt +@@ -50,7 +50,7 @@ set(PartGui_MOC_HDRS + fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS}) + SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS}) + +-fc_add_resources(PartGui_QRC_SRCS Resources/Part.qrc) ++qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc) + + set(PartGui_UIC_SRCS + CrossSections.ui +@@ -77,7 +77,7 @@ set(PartGui_UIC_SRCS + qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS}) + + SET(PartGui_SRCS +-# ${PartGui_QRC_SRCS} ++ ${PartGui_QRC_SRCS} + ${PartGui_UIC_HDRS} + AppPartGui.cpp + Command.cpp +diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp +index 9acd98e..953d3e2 100644 +--- a/src/Mod/Points/Gui/AppPointsGui.cpp ++++ b/src/Mod/Points/Gui/AppPointsGui.cpp +@@ -33,7 +33,6 @@ +
+ #include "ViewProvider.h"
+ #include "Workbench.h"
+-#include "qrc_Points.cpp"
+
+ // use a different name to CreateCommand()
+ void CreatePointsCommands(void);
+diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt +index fab12ff..7e30f0d 100644 +--- a/src/Mod/Points/Gui/CMakeLists.txt ++++ b/src/Mod/Points/Gui/CMakeLists.txt +@@ -32,9 +32,9 @@ SET(Dialogs_SRCS + ) + SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS}) + +-fc_add_resources(Resource_SRCS Resources/Points.qrc) ++qt4_add_resources(Resource_SRCS Resources/Points.qrc) + SET(Resource_SRCS +-# ${Resource_SRCS} ++ ${Resource_SRCS} + Resources/Points.qrc + ) + SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) +diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp +index 156bd90..c59369a 100644 +--- a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp ++++ b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp +@@ -32,7 +32,6 @@ + #include "DlgSettingsRayImp.h"
+ #include "ViewProvider.h"
+ #include "Workbench.h"
+-#include "qrc_Raytracing.cpp"
+
+
+ using namespace RaytracingGui;
+diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt +index 38aa739..1da30c9 100644 +--- a/src/Mod/Raytracing/Gui/CMakeLists.txt ++++ b/src/Mod/Raytracing/Gui/CMakeLists.txt +@@ -43,8 +43,9 @@ set(RaytracingGui_MOC_HDRS + fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS}) + SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS}) + +-fc_add_resources(Resource_SRCS Resources/Raytracing.qrc) ++qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc) + SET(Resource_SRCS ++ ${Resource_SRCS} + Resources/Raytracing.qrc + ) + SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) +diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp +index a027d9d..7c2ef21 100644 +--- a/src/Mod/Test/Gui/AppTestGui.cpp ++++ b/src/Mod/Test/Gui/AppTestGui.cpp +@@ -28,7 +28,6 @@ +
+ #include "UnitTestPy.h"
+ #include "UnitTestImp.h"
+-#include "qrc_Test.cpp"
+
+ #include <Gui/Language/Translator.h>
+ #include <Base/Console.h>
+diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt +index 9b8b672..eaa0dcd 100644 +--- a/src/Mod/Test/Gui/CMakeLists.txt ++++ b/src/Mod/Test/Gui/CMakeLists.txt +@@ -30,9 +30,9 @@ SET(Dialogs_SRCS + ) + SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS}) + +-fc_add_resources(Resource_SRCS Resources/Test.qrc) ++qt4_add_resources(Resource_SRCS Resources/Test.qrc) + SET(Resource_SRCS +-# ${Resource_SRCS} ++ ${Resource_SRCS} + Resources/Test.qrc + ) + SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch b/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch new file mode 100644 index 000000000000..9e02f1b8b37d --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch @@ -0,0 +1,11 @@ +--- src/Mod/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 ++++ src/Mod/CMakeLists.txt.new 2014-01-19 18:00:27.215825143 +0100 +@@ -18,7 +18,7 @@ + MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built") + MESSAGE("Due to the missing Eigen3 library the Robot module won't be built") + ENDIF(EIGEN3_FOUND) +-add_subdirectory(Machining_Distortion) ++#add_subdirectory(Machining_Distortion) + + add_subdirectory(ReverseEngineering) + add_subdirectory(MeshPart) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch b/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch new file mode 100644 index 000000000000..410929bec851 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch @@ -0,0 +1,63 @@ +commit c1d14eab3c3f9f1141dc0b7fca7cc4441431b50b +Author: wmayer <wmayer@users.sourceforge.net> +Date: Sat Dec 28 12:22:31 2013 +0100 + + + Fix OCC 6.7 build failure + +diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp +index 578f5be..bdc91c3 100644 +--- a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp ++++ b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp +@@ -29,6 +29,7 @@ + # include <TopoDS.hxx> + # include <TopoDS_Wire.hxx> + # include <BRepOffsetAPI_MakePipeShell.hxx> ++# include <Standard_Version.hxx> + # include <TopTools_ListIteratorOfListOfShape.hxx> + #endif + +@@ -111,6 +112,36 @@ PyObject* BRepOffsetAPI_MakePipeShellPy::setSpineSupport(PyObject *args) + + PyObject* BRepOffsetAPI_MakePipeShellPy::setAuxiliarySpine(PyObject *args) + { ++#if OCC_VERSION_HEX >= 0x060700 ++ PyObject *spine, *curv, *keep; ++ if (!PyArg_ParseTuple(args, "O!O!O!",&Part::TopoShapePy::Type,&spine ++ ,&PyBool_Type,&curv ++ ,&PyInt_Type,&keep)) ++ return 0; ++ const TopoDS_Shape& s = static_cast<Part::TopoShapePy*>(spine)->getTopoShapePtr()->_Shape; ++ if (s.IsNull() || s.ShapeType() != TopAbs_WIRE) { ++ PyErr_SetString(PyExc_TypeError, "spine is not a wire"); ++ return 0; ++ } ++ ++ BRepFill_TypeOfContact typeOfCantact; ++ switch (PyLong_AsLong(keep)) { ++ case 1: ++ typeOfCantact = BRepFill_Contact; ++ break; ++ case 2: ++ typeOfCantact = BRepFill_ContactOnBorder; ++ break; ++ default: ++ typeOfCantact = BRepFill_NoContact; ++ break; ++ } ++ this->getBRepOffsetAPI_MakePipeShellPtr()->SetMode( ++ TopoDS::Wire(s), ++ PyObject_IsTrue(curv) ? Standard_True : Standard_False, ++ typeOfCantact); ++ Py_Return; ++#else + PyObject *spine, *curv, *keep; + if (!PyArg_ParseTuple(args, "O!O!O!",&Part::TopoShapePy::Type,&spine + ,&PyBool_Type,&curv +@@ -127,6 +158,7 @@ PyObject* BRepOffsetAPI_MakePipeShellPy::setAuxiliarySpine(PyObject *args) + PyObject_IsTrue(curv) ? Standard_True : Standard_False, + PyObject_IsTrue(keep) ? Standard_True : Standard_False); + Py_Return; ++#endif + } + + PyObject* BRepOffsetAPI_MakePipeShellPy::add(PyObject *args) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch b/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch new file mode 100644 index 000000000000..f8af21c2b3e3 --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch @@ -0,0 +1,97 @@ +commit dbdff257966c65feed6dd9360bc3d50549d9c4c9 +Author: Yorik van Havre <yorik@uncreated.net> +Date: Thu Sep 12 00:30:59 2013 -0300 + + Startpage: Fixed links + +diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py +index 478bf40..43985f3 100644 +--- a/src/Mod/Start/StartPage/StartPage.py ++++ b/src/Mod/Start/StartPage/StartPage.py +@@ -84,7 +84,7 @@ text34 = translate("StartPage","creation time:") + text35 = translate("StartPage","last modified:")
+ text36 = translate("StartPage","location:")
+ text37 = translate("StartPage","User manual")
+-text38 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Online_Help_Toc")
++text38 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc")
+ text39 = translate("StartPage","Tutorials")
+ text40 = translate("StartPage","Python resources")
+ text41 = translate("StartPage","File not found")
+@@ -97,7 +97,7 @@ text47 = translate("StartPage","The section of the FreeCAd website dedicate dto + text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community")
+ text49 = translate("StartPage","Getting started")
+ text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.")
+-text51 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Workbench_Concept")
++text51 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Workbench_Concept")
+ text52 = translate("StartPage","Ship Design")
+ text53 = translate("StartPage","Designing and calculating ships")
+ text54 = translate("StartPage","The <b>Ship Design</b> module offers several tools to help ship designers to view, model and calculate profiles and other specific properties of ship hulls.")
+@@ -159,7 +159,7 @@ page = """ + ddiv.innerHTML = "Done fetching";
+ ddiv = document.getElementById("news");
+ ddiv.innerHTML = "Fetching data from the web...";
+- var tobj=new JSONscriptRequest('http://twitter.com/status/user_timeline/FreeCADNews.json?count=10&callback=showTweets');
++ var tobj=new JSONscriptRequest('http://pipes.yahoo.com/pipes/pipe.run?_id=da8b612e97a6bb4588b1ce27db30efd9&_render=json&_callback=showTweets');
+ tobj.buildScriptTag(); // Build the script tag
+ tobj.addScriptTag(); // Execute (add) the script tag
+ ddiv.innerHTML = "Done fetching";
+@@ -182,19 +182,13 @@ page = """ + ddiv = document.getElementById('news');
+ ddiv.innerHTML = "Received";
+ var html = ['<ul>'];
+- for (var i = 0; i < Math.min(5,data.length); i++) {
+- tf = placeLinks(data[i].text);
+- html.push('<li>',tf,'</li>');
++ for (var i = 0; i < 8; i++) {
++ html.push('<li><a href="', data.value.items[i].link, '">', data.value.items[i].title, '</a></li>');
+ }
+ html.push('</ul>');
+ ddiv.innerHTML = html.join('');
+ }
+
+- function placeLinks(text) {
+- result=text.replace(/(https?:\/\/([-\w\.]+)+(:\d+)?(\/([\w\/_\.]*(\?\S+)?)?)?)/g,'<a href="$1">$1</a>');
+- return result;
+- }
+-
+ </script>
+
+ <style type="text/css">
+@@ -286,12 +280,12 @@ page = """ + </div>
+
+ <div class="block">
+- <h2>""" + text04 + """ <span class="from">""" + text44 + """</span></h2>
++ <h2>""" + text04 + """</h2>
+ <div id="youtube">youtube videos</div>
+ </div>
+
+ <div class="block">
+- <h2>""" + text05 + """ <span class="from">""" + text42 + """</span></h2>
++ <h2>""" + text05 + """</h2>
+ <div id="news">news feed</div>
+ </div>
+
+@@ -354,7 +348,7 @@ def getLinks(): + <li><img src="web.png">
+ <a onMouseover="show('<p>""" + text07 + """</p>')"
+ onMouseout="show('')"
+- href="http://free-cad.sf.net/">""" + text08 + """</a></li>
++ href="http://www.freecadweb.org/">""" + text08 + """</a></li>
+ <li><img src="web.png">
+ <a onMouseover="show('<p>""" + text45 + """</p>')"
+ onMouseout="show('')"
+@@ -362,11 +356,11 @@ def getLinks(): + <li><img src="web.png">
+ <a onMouseover="show('<p>""" + text46 + """</p>')"
+ onMouseout="show('')"
+- href="http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Tutorials">""" + text39 + """</a></li>
++ href="http://www.freecadweb.org/wiki/index.php?title=Tutorials">""" + text39 + """</a></li>
+ <li><img src="web.png">
+ <a onMouseover="show('<p>""" + text47 + """</p>')"
+ onMouseout="show('')"
+- href="http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Power_users_hub">""" + text40 + """</a></li>
++ href="http://www.freecadweb.org/wiki/index.php?title=Power_users_hub">""" + text40 + """</a></li>
+ <li><img src="web.png">
+ <a onMouseover="show('<p>""" + text48 + """</p>')"
+ onMouseout="show('')"
diff --git a/media-gfx/freecad/freecad-0.13.1830-r1.ebuild b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild new file mode 100644 index 000000000000..3e648613f660 --- /dev/null +++ b/media-gfx/freecad/freecad-0.13.1830-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.13.1830-r1.ebuild,v 1.1 2014/04/24 04:48:11 xmw Exp $ + +EAPI=5 + +PYTHON_COMPAT=( python2_{6,7} ) + +inherit cmake-utils eutils fortran-2 multilib python-single-r1 + +DESCRIPTION="QT based Computer Aided Design application" +HOMEPAGE="http://www.freecadweb.org/" +SRC_URI="mirror://sourceforge/free-cad/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="" + +COMMON_DEPEND="dev-cpp/eigen:3 + dev-games/ode + dev-libs/boost + dev-libs/libf2c + dev-libs/libspnav[X] + dev-libs/xerces-c[icu] + dev-python/matplotlib + dev-qt/qtgui:4 + dev-qt/qtopengl:4 + dev-qt/qtsvg:4 + dev-qt/qtwebkit:4 + dev-qt/qtxmlpatterns:4 + media-libs/SoQt + media-libs/coin[doc] + sci-libs/gts + sci-libs/opencascade + sys-libs/zlib + virtual/glu + ${PYTHON_DEPS}" +RDEPEND="${COMMON_DEPEND} + dev-qt/assistant:4 + dev-python/pycollada + dev-python/pivy + dev-python/PyQt4[svg] + dev-python/pyopencl + dev-python/numpy" +DEPEND="${COMMON_DEPEND} + >=dev-lang/swig-2.0.4-r1:0" + +# http://bugs.gentoo.org/show_bug.cgi?id=352435 +# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt +RESTRICT="bindist mirror" + +# TODO: +# DEPEND and RDEPEND: +# salome-smesh - science overlay +# zipio++ - not in portage yet + +pkg_setup() { + fortran-2_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + einfo remove bundled libs + rm -rf src/3rdParty/{boost,Pivy*} + + epatch "${FILESDIR}"/${P}-remove-qt3-support.patch + epatch "${FILESDIR}"/${P}-cmake-2.8.12.patch + epatch "${FILESDIR}"/${P}-CMakefile.patch + epatch "${FILESDIR}"/${P}-avoid-include-salome.patch + epatch "${FILESDIR}"/${P}-startpage-links.patch + #epatch "${FILESDIR}"/startpage.patch + + # disable Machining Distortion workbench because FEM will be disabled in src_configure() + # and also because the same module has been removed upstream (commit c0e2c9) + epatch "${FILESDIR}"/${P}-no-machdist.patch + + local my_cas_version=$(eselect opencascade show 2>/dev/null || echo 6.5) + if [ "${my_cas_version}" \> "6.5.0" ] ; then + epatch "${FILESDIR}"/${PN}-0.12.5284-occ-6.6.patch + epatch "${FILESDIR}"/${P}-occ-6.7.patch + fi + + einfo "Patching cMake/FindCoin3DDoc.cmake ..." + local my_coin_version=$(best_version media-libs/coin) + local my_coin_path="${EROOT}"usr/share/doc/${my_coin_version##*/}/html + sed -e "s:/usr/share/doc/libcoin60-doc/html:${my_coin_path}:" \ + -i cMake/FindCoin3DDoc.cmake || die +} + +src_configure() { + local my_occ_env=${EROOT}etc/env.d/50opencascade + if [ -e "${EROOT}etc//env.d/51opencascade" ] ; then + my_occ_env=${EROOT}etc/env.d/51opencascade + fi + export CASROOT=$(sed -ne '/^CASROOT=/{s:.*=:: ; p}' $my_occ_env) + + local mycmakeargs=( + -DOCC_INCLUDE_DIR="${CASROOT}"/inc + -DOCC_INCLUDE_PATH="${CASROOT}"/inc + -DOCC_LIBRARY="${CASROOT}"/lib/libTKernel.so + -DOCC_LIBRARY_DIR="${CASROOT}"/lib + -DOCC_LIB_PATH="${CASROOT}"/lib + -DCOIN3D_INCLUDE_DIR="${EROOT}"usr/include/coin + -DCOIN3D_LIBRARY="${EROOT}"usr/$(get_libdir)/libCoin.so + -DSOQT_LIBRARY="${EROOT}"usr/$(get_libdir)/libSoQt.so + -DSOQT_INCLUDE_PATH="${EROOT}"usr/include/coin + -DCMAKE_INSTALL_PREFIX="${EROOT}"usr/$(get_libdir)/${P} + -DCMAKE_INSTALL_DATADIR="${EROOT}"usr/share/${P}/ + -DCMAKE_INSTALL_DOCDIR="${EROOT}"usr/share/doc/${P}/ + -DCMAKE_INSTALL_INCLUDEDIR="${EROOT}"usr/include/${P}/ + -DFREECAD_USE_EXTERNAL_PIVY="ON" + -DFREECAD_BUILD_FEM="OFF" + ) + + # TODO to remove embedded dependencies: + # + # -DFREECAD_USE_EXTERNAL_ZIPIOS="ON" -- this option needs zipios++ but it's not yet in portage so the embedded zipios++ + # (under src/zipios++) will be used + # salomesmesh is in 3rdparty but upstream's find_package function is not complete yet to compile against external version + # (external salomesmesh is available in "science" overlay) + + cmake-utils_src_configure + ewarn "${P} will be built against opencascade version ${CASROOT}" +} + +src_install() { + cmake-utils_src_install + + prune_libtool_files + + make_wrapper FreeCAD \ + "${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCAD \ + "" "${EROOT}"usr/$(get_libdir)/${P}/lib + make_wrapper FreeCADCmd \ + "${EROOT}"usr/$(get_libdir)/${P}/bin/FreeCADCmd \ + "" "${EROOT}"usr/$(get_libdir)/${P}/lib + + newicon src/Main/icon.ico ${PN}.ico + make_desktop_entry FreeCAD + + dodoc README.Linux ChangeLog.txt + + # disable compression of QT assistant help files + >> "${ED}"usr/share/doc/${P}/freecad.qhc.ecompress.skip + >> "${ED}"usr/share/doc/${P}/freecad.qch.ecompress.skip + + python_optimize "${ED}"usr/{$(get_libdir),share}/${P}/Mod/ +} |