[arch-commits] Commit in celestia/trunk (PKGBUILD gcc-4.7-fixes.diff)

[andyrtr at archlinux.org]

    Date: Friday, October 12, 2012 @ 12:52:59
  Author: andyrtr
Revision: 168481

upgpkg: celestia 1.6.1-3

mesa -> glu rebuild; add a gcc4.7 build fix

Added:
  celestia/trunk/gcc-4.7-fixes.diff
Modified:
  celestia/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   11 +++++++----
 gcc-4.7-fixes.diff |   10 ++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-12 13:08:15 UTC (rev 168480)
+++ PKGBUILD	2012-10-12 16:52:59 UTC (rev 168481)
@@ -4,21 +4,23 @@
 
 pkgname=celestia
 pkgver=1.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Real-time space simulation"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
+depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg')
 options=('!makeflags')
 source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
         'celestia-1.6.1-gcc46.patch' 
         'celestia-1.6.1-libpng15.patch'
-        'celestia-1.6.1-linking.patch')
+        'celestia-1.6.1-linking.patch'
+        'gcc-4.7-fixes.diff')
 sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
           '7c08ca391603806d788cb8f3342acedafc924eef'
           '46ecc4e10b24191384bc848c206652498843adf0'
-          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1')
+          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
+          '582f9eed93eca02a16350f02c29e2ea6f69aa869')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
@@ -27,6 +29,7 @@
     patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
     patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
     patch -Np1 -i "${srcdir}/celestia-1.6.1-linking.patch"
+    patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff"
 
     # This version of Celestia has a bug in the font rendering and requires -fsigned-char 
     export CFLAGS="$CFLAGS -fsigned-char"

Added: gcc-4.7-fixes.diff
===================================================================
--- gcc-4.7-fixes.diff	                        (rev 0)
+++ gcc-4.7-fixes.diff	2012-10-12 16:52:59 UTC (rev 168481)
@@ -0,0 +1,10 @@
+--- a/src/celmath/intersect.h
++++ b/src/celmath/intersect.h
+@@ -15,6 +15,7 @@
+ #include "ray.h"
+ #include "sphere.h"
+ #include "ellipsoid.h"
++#include "mathlib.h"
+ 
+ 
+ template<class T> bool testIntersection(const Ray3<T>& ray,