[arch-commits] Commit in avogadro/trunk (PKGBUILD fix-opengl-headers.patch)

[Andrea Scarpino]

    Date: Monday, February 27, 2012 @ 13:54:44
  Author: andrea
Revision: 151589

upgpkg: avogadro 1.0.3-5

boost rebuild

Added:
  avogadro/trunk/fix-opengl-headers.patch
Modified:
  avogadro/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    9 +++++--
 fix-opengl-headers.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-27 18:52:15 UTC (rev 151588)
+++ PKGBUILD	2012-02-27 18:54:44 UTC (rev 151589)
@@ -5,7 +5,7 @@
 
 pkgname=avogadro
 pkgver=1.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
@@ -15,15 +15,18 @@
 install=avogadro.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch')
+        'fix-boost.patch'
+        'fix-opengl-headers.patch')
 md5sums=('92c2702c1980f70fb6d87a1a58147911'
          'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec')
+         '46282e4709429447e44a0a54d51ad2ec'
+         'f420bfd22e3d5d8fcddc625cf5e711f6')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
   patch -p1 -i "${srcdir}"/fix-boost.patch
+  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
 
   cd "${srcdir}"
   mkdir build

Added: fix-opengl-headers.patch
===================================================================
--- fix-opengl-headers.patch	                        (rev 0)
+++ fix-opengl-headers.patch	2012-02-27 18:54:44 UTC (rev 151589)
@@ -0,0 +1,53 @@
+--- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
++++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
+@@ -25,6 +25,8 @@
+ #include "camera.h"
+ #include "glwidget.h"
+ #include <avogadro/molecule.h>
++#include <Eigen/LU>
++#include <GL/glu.h>
+ 
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
++++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
+@@ -42,6 +42,7 @@
+ #include <QColor>
+ #include <QVarLengthArray>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
++++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
+@@ -70,6 +70,8 @@
+ 
+ #include <openbabel/mol.h>
+ 
++#include <GL/glu.h>
++
+ using namespace OpenBabel;
+ using namespace Eigen;
+ 
+--- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
++++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
+@@ -36,6 +36,7 @@
+ #include <QFile>
+ #include <QDebug>
+ #include <Eigen/Geometry>
++#include <GL/glu.h>
+ 
+ namespace Avogadro
+ {
+--- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
++++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
+@@ -44,6 +44,8 @@
+ #include <QComboBox>
+ #include <QDebug>
+ 
++#include <GL/glu.h>
++
+ using namespace std;
+ using namespace OpenBabel;
+ using namespace Eigen;