diff options
| author |   Oliver Freyermuth <o.freyermuth@googlemail.com> | 2015-09-27 21:36:35 +0200 |
|---|---|---|
| committer | Oliver Freyermuth <o.freyermuth@googlemail.com> | 2015-09-27 21:36:35 +0200 |
| commit | bc44947211bd480f0d44e86a2a77761ee8b6ae83 (patch) | |
| tree | bfdc0bdcb20a15e0ce9ecd1756c268959aa2f34d /sci-physics | |
| parent | sci-physics/root: Drop desktop-patch (upstreamed), add http-useflag enabling ... (diff) | |
| download | sci-bc44947211bd480f0d44e86a2a77761ee8b6ae83.tar.gz sci-bc44947211bd480f0d44e86a2a77761ee8b6ae83.tar.bz2 sci-bc44947211bd480f0d44e86a2a77761ee8b6ae83.zip | |
sci-physics/root:
Remove geocad-patch, is now upstream.
Package-Manager: portage-2.2.22
Diffstat (limited to 'sci-physics')
| -rw-r--r-- | sci-physics/root/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-physics/root/files/root-6.00.01-geocad.patch | 15 | ||||
| -rw-r--r-- | sci-physics/root/root-9999.ebuild | 3 |
3 files changed, 5 insertions, 17 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index 77f4c1f49..accb1de2e 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 27 Sep 2015; Oliver Freyermuth <o.freyermuth@googlemail.com> + -files/root-6.00.01-geocad.patch, root-9999.ebuild: + sci-physics/root: Remove geocad-patch, is now upstream. + 27 Sep 2015; Oliver Freyermuth <o.freyermuth@googlemail.com> root-9999.ebuild: sci-physics/root: Drop desktop-patch (upstreamed), add http-useflag enabling THttpServer. diff --git a/sci-physics/root/files/root-6.00.01-geocad.patch b/sci-physics/root/files/root-6.00.01-geocad.patch deleted file mode 100644 index 2742a74bd..000000000 --- a/sci-physics/root/files/root-6.00.01-geocad.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/geom/geocad/inc/TGeoToOCC.h b/geom/geocad/inc/TGeoToOCC.h -index 892f225..86eb9e1 100644 ---- a/geom/geocad/inc/TGeoToOCC.h -+++ b/geom/geocad/inc/TGeoToOCC.h -@@ -13,8 +13,10 @@ - #define ROOT_TGeoToOCC - - //Cascade -+#define Printf Printf_opencascade - #include <TopoDS_Shape.hxx> - #include <TopoDS_Wire.hxx> -+#undef Printf - - //Root - #ifndef ROOT_TGeoXtru diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 3ff5618ef..1b3ed7294 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -197,8 +197,7 @@ src_prepare() { "${FILESDIR}"/${PN}-5.34.13-unuran.patch \ "${FILESDIR}"/${PN}-6.00.01-dotfont.patch \ "${FILESDIR}"/${PN}-6.00.01-nobyte-compile.patch \ - "${FILESDIR}"/${PN}-6.00.01-llvm.patch \ - "${FILESDIR}"/${PN}-6.00.01-geocad.patch + "${FILESDIR}"/${PN}-6.00.01-llvm.patch # make sure we use system libs and headers rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die |