diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-06 18:50:24 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-05-06 18:50:24 +0000 |
| commit | 5a095c7ce2cbb2321c061c2125c937461d1e75f4 (patch) | |
| tree | 6c131c6d9745c8736642ec1b8bd79d7b4a7cf865 /media-gfx | |
| parent | fixed linguas patch, failed on install if LINGUAS value is en (diff) | |
| download | gentoo-2-5a095c7ce2cbb2321c061c2125c937461d1e75f4.tar.gz gentoo-2-5a095c7ce2cbb2321c061c2125c937461d1e75f4.tar.bz2 gentoo-2-5a095c7ce2cbb2321c061c2125c937461d1e75f4.zip | |
Add upstream patch to fix build with boost-1.48, bug 406261
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/freecad/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/freecad/files/freecad-0.12.5284-boost148.patch | 25 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-0.12.5284-r2.ebuild | 3 |
3 files changed, 32 insertions, 2 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/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() { |