# ChangeLog for media-gfx/freecad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.5 2011/11/13 20:13:27 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.6 2012/01/07 16:09:21 dilfridge Exp $
+
+*freecad-0.12.5284-r2 (07 Jan 2012)
+
+ 07 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ +freecad-0.12.5284-r2.ebuild, +files/freecad-0.12.5284-gcc46.patch,
+ +files/freecad-0.12.5284-glu.patch, +files/freecad-0.12.5284-nodir.patch,
+ +files/freecad-0.12.5284-nopivy.patch,
+ +files/freecad-0.12.5284-removeoldswig.patch:
+ Version bump. Thanks to Maciej Szmigiero for patches.
13 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
freecad-0.11.3729.ebuild:
Hash: SHA512
AUX freecad-0.11.3729-asneeded.patch 588 RMD160 27fadb74f9f123fd0cc0092b57ae55369867a75b SHA1 9a1477d66b69448ae2cc3e81b2004f5f318a9e77 SHA256 43a1cd392bd05010cfe216f0afd688c8150ca2bc168fd0f776b3dc1e797e6876
+AUX freecad-0.12.5284-gcc46.patch 424 RMD160 1c88a1b7dccd92d9d906d7a01edf3a2bac3b34e3 SHA1 0df7252bd5d53946694bdb983e18067d5aa9a04e SHA256 ce452c6ab373f41f0a88c3f40966ba3f942aae097134ee18273b6ff22ed6f44b
+AUX freecad-0.12.5284-glu.patch 441 RMD160 b72b8bb579b6d08c62abbc65d6ca727244241804 SHA1 f57286bc450f7267c6bc76e3e9b791e1394456e6 SHA256 7375de7bd4880070afd6c45ea7c9f5c2214b4f76f028ad89c1cd013883c802e0
+AUX freecad-0.12.5284-nodir.patch 776 RMD160 49cc0092e4cacefc9cd12c07239ba55bb1a47ec3 SHA1 6cb199641e299b455221dd9942735fc3edbff2f9 SHA256 9ce3f5897311c4b26678d432a9f725d5469eaff855de59d97cb1fd12e320bb3b
+AUX freecad-0.12.5284-nopivy.patch 751 RMD160 0864c7aba43f669496ae75ee29405d0fde33d58d SHA1 994dfc400fefbe4aae127bc001400a46a882e7bf SHA256 3424f2630cd739ecb5ddcd7824469c44d6e89c2fe97a9e123090d7b8d04dfcfd
+AUX freecad-0.12.5284-removeoldswig.patch 5165 RMD160 c157e9d72ede6ed96fc82b116b32dd2009ef10bf SHA1 48102dd88918f11b99b4e52df5ff72cde848833e SHA256 a5f44ac26071e1769c0686de30bbd2ca2a5fd03cb44222a1625f23c6f5ad6fc8
DIST freecad-0.11.3729.tar.gz 16229615 RMD160 ac056ace72758d83dddfd075205bfeb81020df70 SHA1 fb683989e1a53a9292cc12940c98c41505124512 SHA256 94dcf25e6ae2934d7d23555e22a558643225a9809d443c898f096b39a1853261
+DIST freecad-0.12.5284.tar.gz 48399004 RMD160 6f8175509091592b72c74584b3a3418391022317 SHA1 29f80b84c5405d5dc9ab988db2c2a41018b90b15 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d
EBUILD freecad-0.11.3729.ebuild 2306 RMD160 aa15612a86fedda3c63c26814fe7ebfe84c35c17 SHA1 5c90687979675f4dab1b7e972f977a37fbc9c6ab SHA256 826c345120f23701ad6aa69da12e0d0b88adcbb56987eb0cf2ceb0b3ca05e9c1
-MISC ChangeLog 1059 RMD160 2808a8d57b12b6bbb82b7d3d1872a8851c8daef6 SHA1 374e6f988fdfa3c325ee9678564134bd03067de6 SHA256 a73b1ac58aed5072fc3d0cce6d27f423956f592e75d5f4bebf2c20b8c6102199
+EBUILD freecad-0.12.5284-r2.ebuild 2047 RMD160 ce0697e24d0e8c0cc761d0972a064c89b923ed9e SHA1 f6b00d4ca788156b4ca527268e2ace9088f9565f SHA256 59d20cf61c3db567eec471719969ce690211ef6fc59ada61ee30ec741a36049b
+MISC ChangeLog 1445 RMD160 c4fe8a2c799dc4e94dad0e0d6c1669601949d349 SHA1 98fb4332663dfbde910a95bd7c5527fff3d75f57 SHA256 14ffbe874029c3d90d2e840f6209b1c55ccfc9d6d2496dd02cfd4ce6f58a1a35
MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOwDM5AAoJENwGBM22xffeeJQP/0VnP679QzovnUSaqhGBdyTL
-bIuW56Df+hPGbWlPJa6INdSK3UGjSWFoIpjVCKTqDjieTEAwxbaiVhRMh9M8kD2I
-b7I5OK9wixKfGiHknxDpAuX/ir1hirVpu63wvoxms7tQdYwNC9Std8THip/TI4mr
-BgmJms7C9jXqRbs7Z9OAtXamxSGGWwz/TIA8wHQm6RGHG7p2lcXm109eT0XZxglc
-jV0ZrUgRz3Ev6gWS3S19OZUlKhqopUkfZCvCkgwA3K01O27TsFA0QqIZ+5DO/6aw
-NO2Np6j5OZvzR8V+dDM2CFCvFaK1SSlfv/MR/yOYniKi8mswRteYcd8dZB2/Auf9
-hInb07cJpOARF4E/l7nI8xF4tqBi9uCbUuw+BVVdt35bypI9NNzQeYaB8weduHxW
-HFd1LCFYcUuvmD8B1S9Bw4wUwaW8qfI3SO7haCclfUnD3rl+U24IzN8FMi9/P2Me
-LOpjNa/7b4L4gdI1OAiYdaY8gMdUK3nzhL2bpH2UM4W5uj1Lrw3TJdYeoI6hKcqq
-7yWo5G2T+NXasKBS8WQZoKOCUploH8oXMj5vubZNoJZw6mfDOjj2k9CKg3C7ITnX
-J3cU4A6SqSeixR8Gbb3URX/qkkSC3tDCnBX0SuSauHg3EvRugcn99kW2jUnpor15
-tsWxyblfe/TpYaXIAphS
-=ItgV
+iQIcBAEBCgAGBQJPCG5HAAoJEEb+UGWnxTyH3jIQAJhVpavQqlKAYd1B0KBxmn3r
+qYDjk9hk9ai2mx8cpIa0y+8Csfk685jWf3kcBYdMXhw3Wo0BYLD1Ct6Z6Q1vkQlP
+tQM2AAnapnXHNcqKXkE87ChOqFANCAGdxkrXVgtdKo9uh4TAc9t46LMj8w5voXRN
+b1L1hdIv7VV6AHjmIgsamhgCUzXJpsn2rW/Mms56lBdQAKZNTultAWKLWFwHX25d
+V2Pt7GG8T8Ag+6mhm3H1o8N5Lzcbj15huGDIdYfToznsuTjH5TDzxzIbOrw/s0ym
+8UvFBxLCmidD2H/8nKEpbeOrvysp2DWaphxsJMyNls4L9uyniXMs+1dCZDeWWENR
+EQEeb4hFm1CZRkZfShB8yCNuyxEDjB5iOGoa2LNKAo8Id1quQyJesFwS0e7PW0TF
+Ky4Mu8XP94glAAtvE/0VHpP3aK8TOoVJk1NYC8hgjoKC6H3BjtHoIaGqRE8Kmz2r
+zUVGVjYA3y8qv1uHsxj9s2acb/nl09WQbSxgv1OwhJGXeG1BA7k2dKjcT3emE2A4
+f1j7Liio1DA298O9WobqZB68euTOvSUugHhHjAN31pE9TOK3IqmTTqU9+yaF1rJJ
+WSFhCe6p2L1HU9Qo7+pwrP0HqBsFvTkhLD2kMSjh4I/NcrMZQr+2VRnx3JGBY+dR
+IwUoI1ebuwEO4VWRaxAr
+=czEe
-----END PGP SIGNATURE-----
--- /dev/null
+diff -ruN FreeCAD-0.11.4422.orig/src/zipios++/directory.h FreeCAD-0.11.4422/src/zipios++/directory.h
+--- FreeCAD-0.11.4422.orig/src/zipios++/directory.h 2011-02-11 01:48:21.000000000 +0100
++++ FreeCAD-0.11.4422/src/zipios++/directory.h 2011-11-13 22:11:27.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include <string>\r
+ #include <ctime>\r
+ #include <stdexcept>\r
++#include <cstddef>\r
+ \r
+ // #include <boost.h> Contents of boost.h\r
+ \r
--- /dev/null
+diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp
+--- FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-03 13:24:30.000000000 +0100
++++ FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-06 10:26:38.000000000 +0100
+@@ -27,6 +27,8 @@
+ # include <GL/glext.h>\r
+ #endif\r
+ \r
++#include <GL/glu.h>\r
++\r
+ #include "GLImageBox.h"\r
+ \r
+ using namespace ImageGui;\r
--- /dev/null
+diff -ruN FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt FreeCAD-0.12.5284/src/Mod/CMakeLists.txt
+--- FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt 2012-01-03 13:26:12.000000000 +0100
++++ FreeCAD-0.12.5284/src/Mod/CMakeLists.txt 2012-01-06 12:19:06.000000000 +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)
+@@ -32,7 +32,7 @@
+
+ add_subdirectory(Arch)
+
+-add_subdirectory(Assembly)
++# add_subdirectory(Assembly)
+
+ if(FREECAD_BUILD_CAM)
+ add_subdirectory(Cam)
--- /dev/null
+diff -ruN FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt
+--- FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt 2012-01-03 13:30:19.000000000 +0100
++++ FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt 2012-01-07 15:57:52.000000000 +0100
+@@ -19,13 +19,6 @@
+ # add_subdirectory(Pivy)
+ #endif(MINGW)
+ # applies for Unix, MinGW and Windows with custom LibPack
+-elseif(FREECAD_BUILD_GUI)
+- find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR})
+- if (COIN_VERSION3)
+- add_subdirectory(Pivy-0.5)
+- else (COIN_VERSION3)
+- add_subdirectory(Pivy)
+- endif(COIN_VERSION3)
+ endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X)
+
+ # For Windows we have all stuff in the LibPack
--- /dev/null
+--- src/Base/Interpreter.cpp.old 2010-08-27 16:24:16.000000000 +0200
++++ src/Base/Interpreter.cpp 2011-12-24 00:13:52.356641021 +0100
+@@ -503,11 +503,6 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))\r
+ namespace Swig_python { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }\r
+ #endif\r
+-namespace Swig_1_3_25 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }\r
+-namespace Swig_1_3_33 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }\r
+-namespace Swig_1_3_36 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }\r
+-namespace Swig_1_3_38 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }\r
+-namespace Swig_1_3_40 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }\r
+ \r
+ PyObject* InterpreterSingleton::createSWIGPointerObj(const char* Module, const char* TypeName, void* Pointer, int own)\r
+ {\r
+@@ -517,21 +512,6 @@
+ int version = getSWIGVersionFromModule(Module);\r
+ switch (version&0xff)\r
+ {\r
+- case 25:\r
+- result = Swig_1_3_25::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);\r
+- break;\r
+- case 33:\r
+- result = Swig_1_3_33::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);\r
+- break;\r
+- case 36:\r
+- result = Swig_1_3_36::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);\r
+- break;\r
+- case 38:\r
+- result = Swig_1_3_38::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);\r
+- break;\r
+- case 40:\r
+- result = Swig_1_3_40::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);\r
+- break;\r
+ default:\r
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))\r
+ result = Swig_python::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);\r
+@@ -550,11 +530,6 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))\r
+ namespace Swig_python { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }\r
+ #endif\r
+-namespace Swig_1_3_25 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }\r
+-namespace Swig_1_3_33 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }\r
+-namespace Swig_1_3_36 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }\r
+-namespace Swig_1_3_38 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }\r
+-namespace Swig_1_3_40 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }\r
+ \r
+ bool InterpreterSingleton::convertSWIGPointerObj(const char* Module, const char* TypeName, PyObject* obj, void** ptr, int flags)\r
+ {\r
+@@ -563,21 +538,6 @@
+ int version = getSWIGVersionFromModule(Module);\r
+ switch (version&0xff)\r
+ {\r
+- case 25:\r
+- result = Swig_1_3_25::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);\r
+- break;\r
+- case 33:\r
+- result = Swig_1_3_33::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);\r
+- break;\r
+- case 36:\r
+- result = Swig_1_3_36::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);\r
+- break;\r
+- case 38:\r
+- result = Swig_1_3_38::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);\r
+- break;\r
+- case 40:\r
+- result = Swig_1_3_40::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);\r
+- break;\r
+ default:\r
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))\r
+ result = Swig_python::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);\r
+@@ -596,11 +556,6 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))\r
+ namespace Swig_python { extern void cleanupSWIG_T(const char* TypeName); }\r
+ #endif\r
+-namespace Swig_1_3_25 { extern void cleanupSWIG_T(const char* TypeName); }\r
+-namespace Swig_1_3_33 { extern void cleanupSWIG_T(const char* TypeName); }\r
+-namespace Swig_1_3_36 { extern void cleanupSWIG_T(const char* TypeName); }\r
+-namespace Swig_1_3_38 { extern void cleanupSWIG_T(const char* TypeName); }\r
+-namespace Swig_1_3_40 { extern void cleanupSWIG_T(const char* TypeName); }\r
+ \r
+ void InterpreterSingleton::cleanupSWIG(const char* TypeName)\r
+ {\r
+@@ -608,9 +563,4 @@
+ #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))\r
+ Swig_python::cleanupSWIG_T(TypeName);\r
+ #endif\r
+- Swig_1_3_25::cleanupSWIG_T(TypeName);\r
+- Swig_1_3_33::cleanupSWIG_T(TypeName);\r
+- Swig_1_3_36::cleanupSWIG_T(TypeName);\r
+- Swig_1_3_38::cleanupSWIG_T(TypeName);\r
+- Swig_1_3_40::cleanupSWIG_T(TypeName);\r
+ }\r
+--- src/Base/Makefile.am.old 2011-12-24 00:14:25.625540687 +0100
++++ src/Base/Makefile.am 2010-10-27 12:29:37.000000000 +0200
+@@ -65,16 +65,6 @@
+ Swap.cpp \
+ swigpyrun.inl \
+ swigpyrun.cpp \
+- swigpyrun_1.3.25.cpp \
+- swigpyrun_1.3.25.h \
+- swigpyrun_1.3.33.cpp \
+- swigpyrun_1.3.33.h \
+- swigpyrun_1.3.36.cpp \
+- swigpyrun_1.3.36.h \
+- swigpyrun_1.3.38.cpp \
+- swigpyrun_1.3.38.h \
+- swigpyrun_1.3.40.cpp \
+- swigpyrun_1.3.40.h \
+ TimeInfo.cpp \
+ Type.cpp \
+ Tools.cpp \
--- /dev/null
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r2.ebuild,v 1.1 2012/01/07 16:09:21 dilfridge Exp $
+
+EAPI=4
+PYTHON_DEPEND=2
+
+inherit base multilib fortran-2 flag-o-matic python cmake-utils
+
+MY_P="freecad-${PV}"
+MY_PD="FreeCAD-${PV}"
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="http://sourceforge.net/apps/mediawiki/free-cad/"
+SRC_URI="mirror://sourceforge/free-cad/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-games/ode
+ dev-libs/boost
+ dev-libs/libf2c
+ dev-libs/xerces-c
+ dev-python/pivy
+ dev-python/PyQt4[svg]
+ media-libs/coin
+ media-libs/SoQt
+ >=sci-libs/opencascade-6.3-r3
+ sci-libs/gts
+ sys-libs/zlib
+ virtual/fortran
+ x11-libs/qt-gui:4
+ x11-libs/qt-opengl:4
+ x11-libs/qt-svg:4
+ x11-libs/qt-webkit:4
+ x11-libs/qt-xmlpatterns:4
+"
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2.0.4-r1
+"
+
+RESTRICT="bindist mirror"
+# http://bugs.gentoo.org/show_bug.cgi?id=352435
+# http://www.gentoo.org/foundation/en/minutes/2011/20110220_trustees.meeting_log.txt
+
+S="${WORKDIR}/${MY_PD}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc46.patch"
+ "${FILESDIR}/${P}-removeoldswig.patch"
+ "${FILESDIR}/${P}-glu.patch"
+ "${FILESDIR}/${P}-nodir.patch"
+ "${FILESDIR}/${P}-nopivy.patch"
+)
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ python_set_active_version 2
+}
+
+src_prepare() {
+ base_src_prepare
+ append-cxxflags -fpermissive
+}
+
+src_configure() {
+ 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=/usr/include/coin
+ -DCOIN3D_LIBRARY=/usr/$(get_libdir)/libCoin.so
+ -DSOQT_LIBRARY=/usr/$(get_libdir)/libSoQt.so
+ -DSOQT_INCLUDE_PATH=/usr/include/coin
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ find "${D}" -name "*.la" -exec rm {} +
+
+ dodoc README.Linux ChangeLog.txt
+}
projects / gentoo.git / commitdiff