[gentoo-commits] gentoo-x86 commit in sci-chemistry/avogadro/files: avogadro-0.9.7-shader-include.patch

[Marcus Hanwell (cryos)]

cryos       09/08/02 21:30:15

  Added:                avogadro-0.9.7-shader-include.patch
  Log:
  Small patch to remove the unnecessary config.h include in the shader plugin, bug 277251.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/avogadro/files/avogadro-0.9.7-shader-include.patch?rev=1.1&content-type=text/plain

Index: avogadro-0.9.7-shader-include.patch
===================================================================
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