From 5a680f7689b01b4b7a0bfade1a6c1f659f8cbed4 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 7 Mar 2012 00:01:25 +0000
Subject: Wed Mar  7 00:01:25 UTC 2012

---
 extra/avogadro/PKGBUILD                 | 11 ++++---
 extra/avogadro/fix-opengl-headers.patch | 53 +++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 extra/avogadro/fix-opengl-headers.patch

(limited to 'extra/avogadro')

diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index e73bdd8f0..5471577cb 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 144043 2011-12-02 20:54:10Z ibiru $
+# $Id: PKGBUILD 152200 2012-03-05 08:55:44Z ibiru $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 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 @@ makedepends=('cmake' 'boost')
 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
diff --git a/extra/avogadro/fix-opengl-headers.patch b/extra/avogadro/fix-opengl-headers.patch
new file mode 100644
index 000000000..e6e8bc3b5
--- /dev/null
+++ b/extra/avogadro/fix-opengl-headers.patch
@@ -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;
-- 
cgit v1.2.3-54-g00ecf