diff options
| author |   Marcus D. Hanwell <cryos@gentoo.org> | 2009-08-02 21:30:15 +0000 |
|---|---|---|
| committer | Marcus D. Hanwell <cryos@gentoo.org> | 2009-08-02 21:30:15 +0000 |
| commit | 7ba2eebcce6acadf8123ff5b388252efa9a1682e (patch) | |
| tree | 8defbd92da9f99afd1ef6fd219b09804ac4c3ed5 /sci-chemistry/avogadro | |
| parent | x11-base/xorg-server: drop old ebuilds (diff) | |
| download | historical-7ba2eebcce6acadf8123ff5b388252efa9a1682e.tar.gz historical-7ba2eebcce6acadf8123ff5b388252efa9a1682e.tar.bz2 historical-7ba2eebcce6acadf8123ff5b388252efa9a1682e.zip | |
Small patch to remove the unnecessary config.h include in the shader plugin, bug 277251.
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/avogadro')
| -rw-r--r-- | sci-chemistry/avogadro/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/avogadro-0.9.7.ebuild | 10 | ||||
| -rw-r--r-- | sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch | 24 |
3 files changed, 38 insertions, 3 deletions
diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog index 696df12ce34a..c7bc78998cd7 100644 --- a/sci-chemistry/avogadro/ChangeLog +++ b/sci-chemistry/avogadro/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-chemistry/avogadro # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.26 2009/07/25 10:43:34 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.27 2009/08/02 21:30:15 cryos Exp $ + + 02 Aug 2009; Marcus D. Hanwell <cryos@gentoo.org> avogadro-0.9.7.ebuild, + +files/avogadro-0.9.7-shader-include.patch: + Small patch to remove the unnecessary config.h include in the shader + plugin, bug 277251. 25 Jul 2009; Marcus D. Hanwell <cryos@gentoo.org> avogadro-0.9.7.ebuild: Tidied up boost dep, Avogadro will not compile with older boost versions. diff --git a/sci-chemistry/avogadro/avogadro-0.9.7.ebuild b/sci-chemistry/avogadro/avogadro-0.9.7.ebuild index 9f0313b1e9b5..419334b9f855 100644 --- a/sci-chemistry/avogadro/avogadro-0.9.7.ebuild +++ b/sci-chemistry/avogadro/avogadro-0.9.7.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.7.ebuild,v 1.2 2009/07/25 10:43:34 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.7.ebuild,v 1.3 2009/08/02 21:30:15 cryos Exp $ EAPI=2 -inherit cmake-utils +inherit cmake-utils eutils DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL" HOMEPAGE="http://avogadro.sourceforge.net/" @@ -30,6 +30,12 @@ DEPEND="${RDEPEND} dev-cpp/eigen:2 >=dev-util/cmake-2.6.2" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-shader-include.patch" +} + src_configure() { local mycmakeargs mycmakeargs="${mycmakeargs} diff --git a/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch b/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch new file mode 100644 index 000000000000..f8a3fab40316 --- /dev/null +++ b/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch @@ -0,0 +1,24 @@ +diff --git a/libavogadro/src/extensions/shaderextension.cpp b/libavogadro/src/extensions/shaderextension.cpp +index 117b0e7..1295cc1 100644 +--- a/libavogadro/src/extensions/shaderextension.cpp ++++ b/libavogadro/src/extensions/shaderextension.cpp +@@ -28,8 +28,6 @@ + #include <GL/glew.h> + #endif + +-#include "../config.h" +- + #include <avogadro/glwidget.h> + #include <avogadro/toolgroup.h> + #include <avogadro/engine.h> +@@ -384,8 +382,8 @@ namespace Avogadro + verts = QCoreApplication::applicationDirPath(); + verts.cd("shaders"); + #else +- QString systemShadersPath = QString(INSTALL_PREFIX) + '/' +- + "share/libavogadro/shaders"; ++ QString systemShadersPath = QCoreApplication::applicationDirPath() + ++ "/../share/libavogadro/shaders"; + verts.cd(systemShadersPath); + #endif + |