summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-12-05 17:06:55 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-12-05 17:06:55 +0000
commit9118419ff8fc70663c4d98d39f0c24de771e1a94 (patch)
treeda3049a6cf05ec2b4eff35cdd53b655064098b9a /sci-physics
parentEmacs and dependencies fixes, thanks to ulm, bug #249360. Removed -j1 since p... (diff)
downloadhistorical-9118419ff8fc70663c4d98d39f0c24de771e1a94.tar.gz
historical-9118419ff8fc70663c4d98d39f0c24de771e1a94.tar.bz2
historical-9118419ff8fc70663c4d98d39f0c24de771e1a94.zip
Fixed for older ftgl versions, bug #249885, thanks to Benjamin Bannier
Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/root/ChangeLog6
-rw-r--r--sci-physics/root/files/root-5.20.00-ftgl_header.patch26
-rw-r--r--sci-physics/root/root-5.20.00-r2.ebuild7
3 files changed, 37 insertions, 2 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 0ca5419f529c..e414e9312099 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-physics/root
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.35 2008/12/04 18:21:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.36 2008/12/05 17:06:55 bicatali Exp $
+
+ 05 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/root-5.20.00-ftgl_header.patch, root-5.20.00-r2.ebuild:
+ Fixed for older ftgl versions, bug #249885, thanks to Benjamin Bannier
*root-5.20.00-r2 (04 Dec 2008)
diff --git a/sci-physics/root/files/root-5.20.00-ftgl_header.patch b/sci-physics/root/files/root-5.20.00-ftgl_header.patch
new file mode 100644
index 000000000000..de4e18a8f40d
--- /dev/null
+++ b/sci-physics/root/files/root-5.20.00-ftgl_header.patch
@@ -0,0 +1,26 @@
+diff --git a/graf3d/gl/src/TGLFontManager.cxx b/graf3d/gl/src/TGLFontManager.cxx
+index 5334023..8f35ccc 100644
+--- a/graf3d/gl/src/TGLFontManager.cxx
++++ b/graf3d/gl/src/TGLFontManager.cxx
+@@ -6,7 +6,7 @@
+ #include "TObjString.h"
+ #include "TGLUtil.h"
+
+-#include <FTGL/ftgl.h>
++#include <FTGL/FTGL.h>
+ #include "FTGLExtrdFont.h"
+ #include "FTGLOutlineFont.h"
+ #include "FTGLPolygonFont.h"
+diff --git a/graf3d/gl/src/TGLText.cxx b/graf3d/gl/src/TGLText.cxx
+index a60c532..bb0dc7c 100644
+--- a/graf3d/gl/src/TGLText.cxx
++++ b/graf3d/gl/src/TGLText.cxx
+@@ -18,7 +18,7 @@
+ #include "TSystem.h"
+ #include "TEnv.h"
+
+-#include <FTGL/ftgl.h>
++#include <FTGL/FTGL.h>
+ #include "FTGLOutlineFont.h"
+ #include "FTGLPolygonFont.h"
+ #include "FTGLTextureFont.h"
diff --git a/sci-physics/root/root-5.20.00-r2.ebuild b/sci-physics/root/root-5.20.00-r2.ebuild
index c6e590e5e84c..510fd060a45f 100644
--- a/sci-physics/root/root-5.20.00-r2.ebuild
+++ b/sci-physics/root/root-5.20.00-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r2.ebuild,v 1.1 2008/12/04 18:21:21 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.20.00-r2.ebuild,v 1.2 2008/12/05 17:06:55 bicatali Exp $
EAPI=1
inherit versionator eutils toolchain-funcs qt4 fortran elisp-common
@@ -98,6 +98,11 @@ src_unpack() {
# various patches from upstream branch
epatch "${FILESDIR}"/${P}-upstream.patch
+ # adjust header names only for older ftgl versions
+ if has_version '<media-libs/ftgl-2.1.3_rc5'; then
+ epatch "${FILESDIR}"/${P}-ftgl_header.patch
+ fi
+
if use cern; then
mv montecarlo/eg/inc/cfortran.h{,.orig} || die
ln -s /usr/include/cfortran.h montecarlo/eg/inc/cfortran.h || die