Add upstream patch to fix build with boost-1.48, bug 406261

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 48 insertions, 17 deletions

diff --git a/media-gfx/freecad/ChangeLog b/media-gfx/freecad/ChangeLog
index 5b29188e6767..0dd3945b5da5 100644
--- a/media-gfx/freecad/ChangeLog
+++ b/media-gfx/freecad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/freecad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.8 2012/01/07 19:40:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/ChangeLog,v 1.9 2012/05/06 18:50:24 dilfridge Exp $
+
+  06 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  freecad-0.12.5284-r2.ebuild, +files/freecad-0.12.5284-boost148.patch:
+  Add upstream patch to fix build with boost-1.48, bug 406261
 
   07 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   -freecad-0.11.3729.ebuild, -files/freecad-0.11.3729-asneeded.patch:
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 8565ada8d4fd..41b8c1e49a18 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX freecad-0.12.5284-boost148.patch 849 RMD160 324d030c977a40dd5c4d7d825e5ab49d9c3837c1 SHA1 14f491d23e500d2615c11c90ddfe92903b9eb561 SHA256 e87fd55562a13af12d66ab6587cf036d01b3a0a63bddb55a66ff12973b459e55
 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
@@ -8,23 +9,23 @@ AUX freecad-0.12.5284-nopivy.patch 751 RMD160 0864c7aba43f669496ae75ee29405d0fde
 AUX freecad-0.12.5284-qt3support.patch 1819 RMD160 fa2aa6715cde302c6caab83fb2c32eb8927ff402 SHA1 5ed2e852e429138889d9ef24b327b7a55e7c766e SHA256 a04ffcbeefe04e52a771fbb93467e32392d2bdb41b59bda41d45c3018f6c0eef
 AUX freecad-0.12.5284-removeoldswig.patch 5165 RMD160 c157e9d72ede6ed96fc82b116b32dd2009ef10bf SHA1 48102dd88918f11b99b4e52df5ff72cde848833e SHA256 a5f44ac26071e1769c0686de30bbd2ca2a5fd03cb44222a1625f23c6f5ad6fc8
 DIST freecad-0.12.5284.tar.gz 48399004 RMD160 6f8175509091592b72c74584b3a3418391022317 SHA1 29f80b84c5405d5dc9ab988db2c2a41018b90b15 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d
-EBUILD freecad-0.12.5284-r2.ebuild 2084 RMD160 ea0b56ae4d37ebc1488f5d99d5191c602f13f715 SHA1 c1461f8256511bbafb2caeaab209f3b94da8b649 SHA256 e53e16f35a92bd8c9fe54f9783e7e74e4822c7e633fb1551aaac333d368b96a4
-MISC ChangeLog 1806 RMD160 836ba12b731bc06509afbef5e03e5dc4186484e5 SHA1 677608fd4f5c07405910ae8b3eb2611b03bd3726 SHA256 0ebce56a9ac783eee9d83e8e5e06bbb0a811d5355e55662b1be63f76541fed0d
+EBUILD freecad-0.12.5284-r2.ebuild 2119 RMD160 4bfb77a22f95c44769f41c006a019fac2cf293bf SHA1 45c77f05ff4940b8effdebd54a8fb58f163b4ea4 SHA256 392027a17f62d5853454766ccc08768c25bc6df4d61777144b82d4a75c3afcac
+MISC ChangeLog 1998 RMD160 933f9210cafbdfa71b6c51723e588945fdda3c7e SHA1 68efc81842503b5791451046846d5eb4c85bcf19 SHA256 78711a95618c14b46b38c40cfc0aba6682e7cd2d04dc0831379ae7113c339750
 MISC metadata.xml 217 RMD160 aa960d9d3f7d900bcaf1a9413f17c3662adc0820 SHA1 a8a3016deab1f6aca4951ea86977cfe5d509b695 SHA256 756924c88548f738071c2d39fa7e18737b063e3b8f4376737eb88ac307571478
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPCJ/8AAoJENwGBM22xffeTR0P/3loWX+jxPeA33NOFahwmlkK
-MW3xJUhDeqUqegIugbmAAT6ExRbjhaG+Rj6LkaI43n5UnKkYT2/NTO1kN1f2g81G
-IsMWcL9aIRYtgQkuyspqTw/3Kx0+6bC5T0+1JYO+39t9XC9i3dQIoOvHPWZh51bK
-hy5k/x+ahwadVOkJvwlehhwxWfUU2g8xOR+648yCGtqRMH0ev634nkUrMSrlLgvM
-3AhNG5RlgO3X1ZwRZAPjZyVFo/wnqLjBR3adlDl7R1Zk06rOj8bLTYEPBZHvAJcr
-QTuhU+vFIKBgvwZOdwqoh6J9X6Up4nqNeHcvqPzDQwH3j38HvtSgBKDXEcd0fAjT
-zFjvn9x16gyf/IZSkytZZlWEKFyk5pwYJOSikxp80ujdbq+s3Bm1VLOj+qpEln2H
-96b/ChibVRyovl5+ofRSd7NA8FX0DBf3IkvD/cjg0ySXOaPq1YH3cMYs5iyF+Zhy
-6nlxBLoH7aE50nabeL8d0FVrHVYGGDwz4qp9MniWHcWNgBfqL7wWeDJPSSs4EhmX
-EQJEJfYtF+jTgrdQ1vIGj47BsqMiJCS3zfwFJch7A/GtyT1MpJ2BLiXkDB1bXA2p
-Q4Ym3Wl4qqc7MrG+/TEsSwLjzUAa/36LD0ADVslALCD6tKViPhJD6dpMz/CN7BLv
-BuP9d/AZ5K5VfZkpjShu
-=5hd9
+iQIcBAEBCgAGBQJPpsgVAAoJENwGBM22xffeIWsP/Ak5Y2dkx0pk2ed7zYSyztLo
+1LfUpaZB/CmBtKR/lyI8wL7wDu9oL9gAd5+alp6QP/t3wPeg3my5Ye1CRFGWmA2G
+QetKvCQF/SH8YVon1ZD6N2VdeM5QtgDRBfHS/xcVWj+KhggAdEl7/+EnRx4ODA3U
+yU+MSiYaFh+jE+uQFIg+fcz1ViDpgYQpmBVnRPcQ7t3KZ61E6iyDlvp6qcV9ki7d
+s/v03JJRxnx7iFNBUUs13Wljxz302EFQ2rOQ7pacn8oAvNEJoK2GEnPzH6fANj73
+QnVZCxKxRhtRj5qk3BlxxoGhYAhaN2s9lrdS+yn2iM+KdACfFEezg6Zwi4MTaLie
+lhgjudR66sMEyZt9M0dsqErc5N8aALrgzmakVJvY78wMDSV9dkkctwaQsfTagI1Y
+YsHxgSHG7989qaOtS8qiE5+S1zxU4GQtt4tLQdGpVv5RNBqcf9rMm7FHvikJXWm2
+WniG0mmeZ+vS4qtel74IIqVwX5TStSx4zA7RPu9SIRrD2L//G0VqCHW/Vwwedpm9
+HcYPuED8DQLKkx1S8lUAKdfdIklqiAfbgweJKpfP9UwEFG7Qt57nb0lMFWlrPXMB
+czEALYMCMOTyDsc63+plb3qGSKX+1uZNL123RAc0EhopGPBWj2tPHFgbdeue/vm0
+tmq/5IIRljCEQZCskK08
+=cHE8
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch b/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch
new file mode 100644
index 000000000000..4c9c735598d8
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch
@@ -0,0 +1,25 @@
+From d6061d30a053617b8127c96e8c6a65e47589a182 Mon Sep 17 00:00:00 2001
+From: Werner Mayer <werner@werner-VirtualBox.(none)>
+Date: Sat, 31 Mar 2012 19:22:11 +0200
+Subject: [PATCH] #0000585: bug with boost 1.48
+
+---
+ CMakeLists.txt |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 920aca7..9e3bbf5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -284,6 +284,8 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X)
+         # get include dirs
+         QT4_GET_MOC_FLAGS(moc_flags)
+         QT4_EXTRACT_OPTIONS(moc_files moc_options ${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)
+-- 
+1.7.9.2
+
diff --git a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
index d0aa75e67dd1..27c814f97281 100644
--- a/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.12.5284-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/01/07 16:23:50 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freecad/freecad-0.12.5284-r2.ebuild,v 1.3 2012/05/06 18:50:24 dilfridge Exp $
 
 EAPI=4
 PYTHON_DEPEND=2
@@ -56,6 +56,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-nodir.patch"
 	"${FILESDIR}/${P}-nopivy.patch"
 	"${FILESDIR}/${P}-qt3support.patch"
+	"${FILESDIR}/${P}-boost148.patch"
 )
 
 pkg_setup() {