| 1 |
dilfridge 12/01/07 16:09:21 |
| 2 |
|
| 3 |
Added: freecad-0.12.5284-gcc46.patch |
| 4 |
freecad-0.12.5284-glu.patch |
| 5 |
freecad-0.12.5284-nopivy.patch |
| 6 |
freecad-0.12.5284-removeoldswig.patch |
| 7 |
freecad-0.12.5284-nodir.patch |
| 8 |
Log: |
| 9 |
Version bump. Thanks to Maciej Szmigiero for patches. |
| 10 |
|
| 11 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.1 media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch?rev=1.1&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch?rev=1.1&content-type=text/plain |
| 18 |
|
| 19 |
Index: freecad-0.12.5284-gcc46.patch |
| 20 |
=================================================================== |
| 21 |
diff -ruN FreeCAD-0.11.4422.orig/src/zipios++/directory.h FreeCAD-0.11.4422/src/zipios++/directory.h |
| 22 |
--- FreeCAD-0.11.4422.orig/src/zipios++/directory.h 2011-02-11 01:48:21.000000000 +0100 |
| 23 |
+++ FreeCAD-0.11.4422/src/zipios++/directory.h 2011-11-13 22:11:27.000000000 +0100 |
| 24 |
@@ -31,6 +31,7 @@ |
| 25 |
#include <string> |
| 26 |
#include <ctime> |
| 27 |
#include <stdexcept> |
| 28 |
+#include <cstddef> |
| 29 |
|
| 30 |
// #include <boost.h> Contents of boost.h |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
|
| 35 |
1.1 media-gfx/freecad/files/freecad-0.12.5284-glu.patch |
| 36 |
|
| 37 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-glu.patch?rev=1.1&view=markup |
| 38 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-glu.patch?rev=1.1&content-type=text/plain |
| 39 |
|
| 40 |
Index: freecad-0.12.5284-glu.patch |
| 41 |
=================================================================== |
| 42 |
diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp |
| 43 |
--- FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-03 13:24:30.000000000 +0100 |
| 44 |
+++ FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-06 10:26:38.000000000 +0100 |
| 45 |
@@ -27,6 +27,8 @@ |
| 46 |
# include <GL/glext.h> |
| 47 |
#endif |
| 48 |
|
| 49 |
+#include <GL/glu.h> |
| 50 |
+ |
| 51 |
#include "GLImageBox.h" |
| 52 |
|
| 53 |
using namespace ImageGui; |
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.1 media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch?rev=1.1&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch?rev=1.1&content-type=text/plain |
| 61 |
|
| 62 |
Index: freecad-0.12.5284-nopivy.patch |
| 63 |
=================================================================== |
| 64 |
diff -ruN FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt |
| 65 |
--- FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt 2012-01-03 13:30:19.000000000 +0100 |
| 66 |
+++ FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt 2012-01-07 15:57:52.000000000 +0100 |
| 67 |
@@ -19,13 +19,6 @@ |
| 68 |
# add_subdirectory(Pivy) |
| 69 |
#endif(MINGW) |
| 70 |
# applies for Unix, MinGW and Windows with custom LibPack |
| 71 |
-elseif(FREECAD_BUILD_GUI) |
| 72 |
- find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR}) |
| 73 |
- if (COIN_VERSION3) |
| 74 |
- add_subdirectory(Pivy-0.5) |
| 75 |
- else (COIN_VERSION3) |
| 76 |
- add_subdirectory(Pivy) |
| 77 |
- endif(COIN_VERSION3) |
| 78 |
endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X) |
| 79 |
|
| 80 |
# For Windows we have all stuff in the LibPack |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
1.1 media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch |
| 85 |
|
| 86 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch?rev=1.1&view=markup |
| 87 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch?rev=1.1&content-type=text/plain |
| 88 |
|
| 89 |
Index: freecad-0.12.5284-removeoldswig.patch |
| 90 |
=================================================================== |
| 91 |
--- src/Base/Interpreter.cpp.old 2010-08-27 16:24:16.000000000 +0200 |
| 92 |
+++ src/Base/Interpreter.cpp 2011-12-24 00:13:52.356641021 +0100 |
| 93 |
@@ -503,11 +503,6 @@ |
| 94 |
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) |
| 95 |
namespace Swig_python { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } |
| 96 |
#endif |
| 97 |
-namespace Swig_1_3_25 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } |
| 98 |
-namespace Swig_1_3_33 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } |
| 99 |
-namespace Swig_1_3_36 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } |
| 100 |
-namespace Swig_1_3_38 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } |
| 101 |
-namespace Swig_1_3_40 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } |
| 102 |
|
| 103 |
PyObject* InterpreterSingleton::createSWIGPointerObj(const char* Module, const char* TypeName, void* Pointer, int own) |
| 104 |
{ |
| 105 |
@@ -517,21 +512,6 @@ |
| 106 |
int version = getSWIGVersionFromModule(Module); |
| 107 |
switch (version&0xff) |
| 108 |
{ |
| 109 |
- case 25: |
| 110 |
- result = Swig_1_3_25::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); |
| 111 |
- break; |
| 112 |
- case 33: |
| 113 |
- result = Swig_1_3_33::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); |
| 114 |
- break; |
| 115 |
- case 36: |
| 116 |
- result = Swig_1_3_36::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); |
| 117 |
- break; |
| 118 |
- case 38: |
| 119 |
- result = Swig_1_3_38::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); |
| 120 |
- break; |
| 121 |
- case 40: |
| 122 |
- result = Swig_1_3_40::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); |
| 123 |
- break; |
| 124 |
default: |
| 125 |
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) |
| 126 |
result = Swig_python::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); |
| 127 |
@@ -550,11 +530,6 @@ |
| 128 |
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) |
| 129 |
namespace Swig_python { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } |
| 130 |
#endif |
| 131 |
-namespace Swig_1_3_25 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } |
| 132 |
-namespace Swig_1_3_33 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } |
| 133 |
-namespace Swig_1_3_36 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } |
| 134 |
-namespace Swig_1_3_38 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } |
| 135 |
-namespace Swig_1_3_40 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } |
| 136 |
|
| 137 |
bool InterpreterSingleton::convertSWIGPointerObj(const char* Module, const char* TypeName, PyObject* obj, void** ptr, int flags) |
| 138 |
{ |
| 139 |
@@ -563,21 +538,6 @@ |
| 140 |
int version = getSWIGVersionFromModule(Module); |
| 141 |
switch (version&0xff) |
| 142 |
{ |
| 143 |
- case 25: |
| 144 |
- result = Swig_1_3_25::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); |
| 145 |
- break; |
| 146 |
- case 33: |
| 147 |
- result = Swig_1_3_33::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); |
| 148 |
- break; |
| 149 |
- case 36: |
| 150 |
- result = Swig_1_3_36::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); |
| 151 |
- break; |
| 152 |
- case 38: |
| 153 |
- result = Swig_1_3_38::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); |
| 154 |
- break; |
| 155 |
- case 40: |
| 156 |
- result = Swig_1_3_40::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); |
| 157 |
- break; |
| 158 |
default: |
| 159 |
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) |
| 160 |
result = Swig_python::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); |
| 161 |
@@ -596,11 +556,6 @@ |
| 162 |
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) |
| 163 |
namespace Swig_python { extern void cleanupSWIG_T(const char* TypeName); } |
| 164 |
#endif |
| 165 |
-namespace Swig_1_3_25 { extern void cleanupSWIG_T(const char* TypeName); } |
| 166 |
-namespace Swig_1_3_33 { extern void cleanupSWIG_T(const char* TypeName); } |
| 167 |
-namespace Swig_1_3_36 { extern void cleanupSWIG_T(const char* TypeName); } |
| 168 |
-namespace Swig_1_3_38 { extern void cleanupSWIG_T(const char* TypeName); } |
| 169 |
-namespace Swig_1_3_40 { extern void cleanupSWIG_T(const char* TypeName); } |
| 170 |
|
| 171 |
void InterpreterSingleton::cleanupSWIG(const char* TypeName) |
| 172 |
{ |
| 173 |
@@ -608,9 +563,4 @@ |
| 174 |
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) |
| 175 |
Swig_python::cleanupSWIG_T(TypeName); |
| 176 |
#endif |
| 177 |
- Swig_1_3_25::cleanupSWIG_T(TypeName); |
| 178 |
- Swig_1_3_33::cleanupSWIG_T(TypeName); |
| 179 |
- Swig_1_3_36::cleanupSWIG_T(TypeName); |
| 180 |
- Swig_1_3_38::cleanupSWIG_T(TypeName); |
| 181 |
- Swig_1_3_40::cleanupSWIG_T(TypeName); |
| 182 |
} |
| 183 |
--- src/Base/Makefile.am.old 2011-12-24 00:14:25.625540687 +0100 |
| 184 |
+++ src/Base/Makefile.am 2010-10-27 12:29:37.000000000 +0200 |
| 185 |
@@ -65,16 +65,6 @@ |
| 186 |
Swap.cpp \ |
| 187 |
swigpyrun.inl \ |
| 188 |
swigpyrun.cpp \ |
| 189 |
- swigpyrun_1.3.25.cpp \ |
| 190 |
- swigpyrun_1.3.25.h \ |
| 191 |
- swigpyrun_1.3.33.cpp \ |
| 192 |
- swigpyrun_1.3.33.h \ |
| 193 |
- swigpyrun_1.3.36.cpp \ |
| 194 |
- swigpyrun_1.3.36.h \ |
| 195 |
- swigpyrun_1.3.38.cpp \ |
| 196 |
- swigpyrun_1.3.38.h \ |
| 197 |
- swigpyrun_1.3.40.cpp \ |
| 198 |
- swigpyrun_1.3.40.h \ |
| 199 |
TimeInfo.cpp \ |
| 200 |
Type.cpp \ |
| 201 |
Tools.cpp \ |
| 202 |
|
| 203 |
|
| 204 |
|
| 205 |
1.1 media-gfx/freecad/files/freecad-0.12.5284-nodir.patch |
| 206 |
|
| 207 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-nodir.patch?rev=1.1&view=markup |
| 208 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/freecad/files/freecad-0.12.5284-nodir.patch?rev=1.1&content-type=text/plain |
| 209 |
|
| 210 |
Index: freecad-0.12.5284-nodir.patch |
| 211 |
=================================================================== |
| 212 |
diff -ruN FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt FreeCAD-0.12.5284/src/Mod/CMakeLists.txt |
| 213 |
--- FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt 2012-01-03 13:26:12.000000000 +0100 |
| 214 |
+++ FreeCAD-0.12.5284/src/Mod/CMakeLists.txt 2012-01-06 12:19:06.000000000 +0100 |
| 215 |
@@ -18,7 +18,7 @@ |
| 216 |
MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built") |
| 217 |
MESSAGE("Due to the missing Eigen3 library the Robot module won't be built") |
| 218 |
ENDIF(EIGEN3_FOUND) |
| 219 |
-add_subdirectory(Machining_Distortion) |
| 220 |
+# add_subdirectory(Machining_Distortion) |
| 221 |
|
| 222 |
add_subdirectory(ReverseEngineering) |
| 223 |
add_subdirectory(MeshPart) |
| 224 |
@@ -32,7 +32,7 @@ |
| 225 |
|
| 226 |
add_subdirectory(Arch) |
| 227 |
|
| 228 |
-add_subdirectory(Assembly) |
| 229 |
+# add_subdirectory(Assembly) |
| 230 |
|
| 231 |
if(FREECAD_BUILD_CAM) |
| 232 |
add_subdirectory(Cam) |
Archives