diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
| commit | 38b5b952ddc3b86560fc02e98105bf5826d25354 (patch) | |
| tree | 0e689740cb7cc4cf171a6c962e623dbe7e53fc64 /staging/avogadro/fix-opengl-headers.patch | |
| parent | 1146fc0894bfda25180d63716029aabfa7ce017a (diff) | |
| parent | 0615a909b089a81d068ae10517ceff31dabfece1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/performous/PKGBUILD
community-testing/oss/PKGBUILD
community-testing/picard/PKGBUILD
community/deadbeef/PKGBUILD
community/gnash/PKGBUILD
community/mplayer2/PKGBUILD
community/radvd/PKGBUILD
community/tinc/PKGBUILD
core/glibc/PKGBUILD
core/lvm2/PKGBUILD
core/util-linux/PKGBUILD
extra/avidemux/PKGBUILD
extra/boost/PKGBUILD
extra/cppunit/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kradio/PKGBUILD
extra/opal/PKGBUILD
extra/pidgin/PKGBUILD
extra/postfix/PKGBUILD
extra/ptlib/PKGBUILD
extra/xine-lib/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kdm.service
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
libre/virtualbox-libre/PKGBUILD
libre/virtualbox-modules-lts/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-libjpeg-turbo/PKGBUILD
multilib/lib32-pixman/PKGBUILD
staging/ekiga/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/glibc/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kdm.service
testing/nilfs-utils/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'staging/avogadro/fix-opengl-headers.patch')
| -rw-r--r-- | staging/avogadro/fix-opengl-headers.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch new file mode 100644 index 000000000..e6e8bc3b5 --- /dev/null +++ b/staging/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; |