Tue May 7 00:36:35 PDT 2013

2 files changed, 45 insertions, 10 deletions

diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD
index 481743d78..0c9fa0549 100644
--- a/extra/celestia/PKGBUILD
+++ b/extra/celestia/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 173170 2012-12-12 00:31:40Z eric $
+# $Id: PKGBUILD 184365 2013-05-06 19:36:48Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=celestia
 pkgver=1.6.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Real-time space simulation"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,33 +12,43 @@ url="http://www.shatters.net/celestia/"
 depends=('gtk2' 'libtheora' 'lua51' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa')
 options=('!makeflags')
 source=("http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz"
-        'celestia-1.6.1-gcc46.patch' 
+        'celestia-1.6.1-gcc46.patch'
         'celestia-1.6.1-libpng15.patch'
+        'celestia-1.6.1-libpng16.patch'
         'celestia-1.6.1-linking.patch'
         'gcc-4.7-fixes.diff')
 sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
           '7c08ca391603806d788cb8f3342acedafc924eef'
           '46ecc4e10b24191384bc848c206652498843adf0'
+          '6f357bd319cdac0776206726e0743b90d4d8127b'
           '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
           '582f9eed93eca02a16350f02c29e2ea6f69aa869')
 
-build() {
+prepare() {
     cd ${srcdir}/${pkgname}-${pkgver}
 
     # build patch
     patch -Np0 -i "${srcdir}/celestia-1.6.1-gcc46.patch"
     patch -Np0 -i "${srcdir}/celestia-1.6.1-libpng15.patch"
+    patch -Np2 -i "${srcdir}/celestia-1.6.1-libpng16.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"
-    export CXXFLAGS="$CXXFLAGS -fsigned-char"
+    sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
+
+    autoreconf -vi
+}
+
+build() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+
+    # This version of Celestia has a bug in the font rendering and requires -fsigned-char
+    CFLAGS+=' -fsigned-char'
+    CXXFLAGS+=' -fsigned-char'
 
-    autoreconf
     ./configure --prefix=/usr \
                 --with-lua=/usr \
-		--datadir=/usr/share \
+                --datadir=/usr/share \
                 --with-gtk \
                 --disable-rpath \
                 --with-lua
@@ -48,6 +58,6 @@ build() {
 package() {
     cd ${srcdir}/${pkgname}-${pkgver}
 
-    make DESTDIR=${pkgdir} install
+    make DESTDIR=${pkgdir} MKDIR_P='mkdir -p' install
 }
 
diff --git a/extra/celestia/celestia-1.6.1-libpng16.patch b/extra/celestia/celestia-1.6.1-libpng16.patch
new file mode 100644
index 000000000..78911cb55
--- /dev/null
+++ b/extra/celestia/celestia-1.6.1-libpng16.patch
@@ -0,0 +1,25 @@
+image.cpp:530:61: error: ‘memcpy’ was not declared in this scope
+
+https://bugs.gentoo.org/show_bug.cgi?id=464764
+
+Patch written by Lars Wendler <polynomial-c@gentoo.org>
+--- a/celestia/src/celengine/image.cpp
++++ b/celestia/src/celengine/image.cpp
+@@ -42,6 +42,7 @@ extern "C" {
+ #include "jpeglib.h"
+ #else
+ #include <cstdio>
++#include <string.h>
+ #include <jpeglib.h>
+ #endif
+ }
+--- a/celestia/src/celengine/texture.cpp
++++ b/celestia/src/celengine/texture.cpp
+@@ -28,6 +28,7 @@
+ #include <cstdlib>
+ #include <cstdio>
+ #include <cassert>
++#include <string.h>
+ 
+ #ifndef _WIN32
+ #ifndef TARGET_OS_MAC