From 7c64c5039335c73eaa1a402c417235e8ca9a5109 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Mon, 13 Jun 2011 19:04:06 +0000
Subject: Mon Jun 13 19:04:06 UTC 2011

---
 extra/celestia/PKGBUILD                    | 28 ++++++++++++++++------------
 extra/celestia/celestia-1.6.1-gentoo.patch | 23 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 extra/celestia/celestia-1.6.1-gentoo.patch

(limited to 'extra/celestia')

diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD
index 87c4af8a6..702e3e05f 100644
--- a/extra/celestia/PKGBUILD
+++ b/extra/celestia/PKGBUILD
@@ -1,34 +1,38 @@
-# $Id: PKGBUILD 63841 2010-01-18 21:47:42Z ibiru $
+# $Id: PKGBUILD 127269 2011-06-12 08:43:30Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=celestia
-pkgver=1.6.0
-pkgrel=2
+pkgver=1.6.1
+pkgrel=1
 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>=8')
+depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg')
 options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz
-	celestia-1.5.1-gcc44.patch libpng14.patch)
-md5sums=('9b96a8e7666ab5a26f032b9d605e023d'
-         '0c606dbd3a641afb1b0725428db854c8'
-         '829c0860659272a9f55aedf096ee4216')
+	celestia-1.5.1-gcc44.patch celestia-1.6.1-gentoo.patch)
+sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
+          '5ab2769e239a89468bb8ffb5740cbeec6018143c'
+          'aebf894630fdba4c4d429622f5e2b8da56d8b61e')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
 
     # build patch
-    patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch || return 1
-    patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+    patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch
+    patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.patch
 
     ./configure --prefix=/usr \
                 --with-lua=/usr \
 		--datadir=/usr/share \
                 --with-gtk
-    make || return 1
-    make DESTDIR=${pkgdir} install || return 1
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}-${pkgver}
+    make DESTDIR=${pkgdir} install
 }
 
diff --git a/extra/celestia/celestia-1.6.1-gentoo.patch b/extra/celestia/celestia-1.6.1-gentoo.patch
new file mode 100644
index 000000000..57fffe159
--- /dev/null
+++ b/extra/celestia/celestia-1.6.1-gentoo.patch
@@ -0,0 +1,23 @@
+--- src/celestia/Makefile.am	2011-06-07 19:15:51.502000147 +0200
++++ src/celestia/Makefile.am.new	2011-06-07 19:15:47.208000302 +0200
+@@ -15,6 +15,7 @@
+ if ENABLE_GTK
+ SUBDIRS += gtk
+ celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+ 
+ COMMONSOURCES = \
+
+Index: src/celengine/frametree.h
+===================================================================
+--- src/celengine/frametree.h	(revision 5163)
++++ src/celengine/frametree.h	(arbetskopia)
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+ 
+ #include <vector>
++#include <cstddef>
+ 
+ class Star;
+ class Body;
-- 
cgit v1.2.3-54-g00ecf