Builds now

(Portage version: 2.1.10.44/git/Linux x86_64, signed Manifest commit with key 7887F787)

5 files changed, 34 insertions, 27 deletions

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 2854723..d3ca84f 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  freecad-0.12.5284.ebuild, +files/freecad-0.12.5284-glu.patch,
+  -files/archive/FreeCAD-swig-2.0.4.patch:
+  Builds now
+
 *freecad-0.12.5284 (05 Jan 2012)
 
   05 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index efbaa8b..d2217b6 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX archive/FreeCAD-swig-2.0.4.patch 479 RMD160 58ffbca7fa5aa2baf17b43f22d99f3acac011903 SHA1 78c0d46412b6c48267199d937b3a436eb58e7366 SHA256 7fd4a3f0471a35c5738c2dd4da6b8a680aaf95ac7691c90373c4f0a7c9220701
 AUX freecad-0.10.3205-asneeded.patch 588 RMD160 27fadb74f9f123fd0cc0092b57ae55369867a75b SHA1 9a1477d66b69448ae2cc3e81b2004f5f318a9e77 SHA256 43a1cd392bd05010cfe216f0afd688c8150ca2bc168fd0f776b3dc1e797e6876
 AUX freecad-0.11.3729-asneeded.patch 588 RMD160 27fadb74f9f123fd0cc0092b57ae55369867a75b SHA1 9a1477d66b69448ae2cc3e81b2004f5f318a9e77 SHA256 43a1cd392bd05010cfe216f0afd688c8150ca2bc168fd0f776b3dc1e797e6876
 AUX freecad-0.11.4422-gcc46.patch 424 RMD160 1c88a1b7dccd92d9d906d7a01edf3a2bac3b34e3 SHA1 0df7252bd5d53946694bdb983e18067d5aa9a04e SHA256 ce452c6ab373f41f0a88c3f40966ba3f942aae097134ee18273b6ff22ed6f44b
 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-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.11.4422.tar.gz 36392506 RMD160 3543b68b121ff8f3535604f0b6fde13411614d2f SHA1 2a36b0a18f7de5e6d67442f060727b7d033c55d9 SHA256 ab6bdc2d9e2628a7862f6ad013e8982dec7e8c87f77d1f26d1403e87a50caefa
 DIST freecad-0.12.5284.tar.gz 48399004 RMD160 6f8175509091592b72c74584b3a3418391022317 SHA1 29f80b84c5405d5dc9ab988db2c2a41018b90b15 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d
 EBUILD freecad-0.11.3729.ebuild 2286 RMD160 29e5b96afd25efc3819d6d57c2bef70b26de0978 SHA1 1cb2c13e9b67d497d49020c7f3ac538b1ab7ade4 SHA256 f369c5b0b7fe515d1c37a9adac2c714586e14f4e0c369cdfb98953e14f100812
 EBUILD freecad-0.11.4422.ebuild 2133 RMD160 3a7f3dd7f1299e4b73234a383673255a27762d55 SHA1 d27054a8114dac8c33fb395fbe054eed632c67de SHA256 aed0689815f2ea8013a581c01c412c1082a20bea4699421556f4259802a35898
-EBUILD freecad-0.12.5284.ebuild 2205 RMD160 433badc38fca417174f2f550537daea6605ec3f9 SHA1 13fd60916d60163f694f7bfcda2416a177667b6f SHA256 eb60d779f95280b37a478500b09d5ba04bdd22210c19973f82a27b2a68d9fda5
-MISC ChangeLog 2056 RMD160 9aace549d6379833f91d8cf1446ea3c2297704cb SHA1 934dde0e5d8263544dba113fe535116f7f3611b1 SHA256 60ed1b45fbc592adb9899d90fafb0948394ea04665218a596e8738a7c723eb5d
+EBUILD freecad-0.12.5284.ebuild 2235 RMD160 91ebd8523d3d3ac4fe341f56b148b90916619a97 SHA1 431e327abd0f4e49e43cad723d28a7bcc683de0a SHA256 bec8da044eed9e9baccf08661a9eb608f1d1bf23ddfda5d2040804db9d2ea25a
+MISC ChangeLog 2234 RMD160 801eb571e8bfc90f1563f0b20707e2fcba3f3aa4 SHA1 25b222e9e49299d118dd7fd0f83bf09ca844052f SHA256 457a79989ac93c166bc609b0ddf6ab1814a73439e6b17c5c451fa54f82bd5c14
 MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPBhnwAAoJEEb+UGWnxTyHGNoQAJgZbWRDFxk7YjKfphhBJTCc
-HFt+9c6lU63mbFLtjsj806xlhCCkoQO9AMRmIOuDKGQc5eaFf8DxD66mzWzm/+gz
-8jZi8bP3p7jnwfHqvFJw58PvodNCHn64KMF9PqkvEvwPrmg5f+WPBJeEl+Hch2Dc
-Uv90BeIw/3UB3V31xpUg2wJrC6/z3FvPRLvtl2ZPZpYm6Gryf+rMc1AnyUNsz22C
-eNOqsuxbPgqTJGcUV0DEQug2c4tSrFHGWJbwb/yzpQu0iBizG3f/FfYlowwCTCCv
-WIIy+OmSQtUBxbUocfSqOjiddGCNN07Bv1AgpvXwoPK7/2UsbtcaWRc4h5KXo8BO
-731fiHeqYZ4Fp3mTm8fYNlmN7NNqSW41NpBud7hgQH0foRXrCfiHWBq1CPZth4hZ
-3q3dMULHiPcJOUjVDZldvL19LFBfTTObuTQzHBqlmtSGub6KZhgZ27IX4Go0mEpL
-DZusjuyQc+I9Hno2S6PuPNrc/dMyNSRX3GAvJBNbBb/jgIet/VPjzcNwFpX7m/eG
-ArMEvdnMcX34OP4je/jfkf9ZP9eTu7CHR2Rs8Hw2RUSYqx1Zn2ihQokcx4sbHMem
-sBE7jnz2HlMs2igtI6BnmGAeJAsC4cK8jqQQG0HmDz68f5iProrAwarpZrXQUaUL
-Vnh58hkj0ivEMz3YvMu5
-=8Cxo
+iQIcBAEBCgAGBQJPBsT2AAoJEEb+UGWnxTyHyisP/0jF0GQX+/M+vwL551ZOGs/J
+O/OKTe5+cPnAQLsaMyvrVyfSaN/RJWGmmo+3/K5+gH+n2nU9CtPNIHEsXTbQQRWX
+WkM4kKMSDlqP63nFuFIt153kdZ0ZfOeLk614OTix9y7Jiyz5wN/nR+pcsB+VJOYV
+hgjjuzIKhQyCtKWEYPEjz7ta0AMj7z6f6CiaWrabS69kOFDLDmVygXd4uewsjzos
+bECePsbCNIuFYWkmJxtN0yfQkIb+8xRB9bgLv9Poo0qp1zPkngtwv7+l753AYF1U
+aXBlooMJ7mbLXaO/5PPJmPqR0LpN3J9A5rPLwJ1GLNa/7NUDZ0ReFcpcQUC9gY7L
+sZwdElJSh/ac/paYKaP4nSHZSXls/PNXOe3V07pV71VxDLgf5j6ilc/tBsD2hWjY
+xuePrHsJwsAEbj2dg/jqZdJA+PVjyCa/lY2Ur3rkKVT/DWHzIay9Rd4fvHh1ND3c
+r0c2swveq+AwNig9ypSBJAOu1uEP+VoQ58XZaDx1N4c/RApPIteaVB4iaFD0kZLE
++05afX48v7nUpHnE3BRZxW5GqfEhyY+1ULRUfVIsB3YSrFlEHbhoGrLkOE0e1LwB
+Quns6HznNlc0Aue7HZDmXE8XOlqsMj2xx15BX8eVd4a+mURhqLO3eADr2FVALpl5
+QQsdq63dpHJoDZJeqg/g
+=BccP
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freecad/files/archive/FreeCAD-swig-2.0.4.patch b/media-gfx/freecad/files/archive/FreeCAD-swig-2.0.4.patch
deleted file mode 100644
index 7bd2e5d..0000000
--- a/media-gfx/freecad/files/archive/FreeCAD-swig-2.0.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Base/swigpyrun.inl.old	2010-08-27 16:24:16.000000000 +0200
-+++ src/Base/swigpyrun.inl	2011-12-24 00:19:25.175628049 +0100
-@@ -32,7 +32,7 @@
-     if (!swig_type)

-         throw Base::Exception("Cannot find type information for requested type");

-     

--    *ptr = SWIG_Python_NewPointerObj(obj,swig_type,own);

-+    *ptr = SWIG_Python_NewPointerObj(NULL,obj,swig_type,own);

-     if (*ptr == 0)

-         throw Base::Exception("Cannot convert into requested type");

- 

diff --git a/media-gfx/freecad/files/freecad-0.12.5284-glu.patch b/media-gfx/freecad/files/freecad-0.12.5284-glu.patch
new file mode 100644
index 0000000..9567215
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.12.5284-glu.patch
@@ -0,0 +1,12 @@
+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>

+ #endif

+ 

++#include <GL/glu.h>

++

+ #include "GLImageBox.h"

+ 

+ using namespace ImageGui;

diff --git a/media-gfx/freecad/freecad-0.12.5284.ebuild b/media-gfx/freecad/freecad-0.12.5284.ebuild
index c8354ff..9bf0065 100644
--- a/media-gfx/freecad/freecad-0.12.5284.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284.ebuild
@@ -52,6 +52,7 @@ S="${WORKDIR}/${MY_PD}"
 PATCHES=(
 	"${FILESDIR}/${P}-gcc46.patch"
 	"${FILESDIR}/${P}-removeoldswig.patch"
+	"${FILESDIR}/${P}-glu.patch"
 )
 
 pkg_setup() {