[arch-commits] Commit in celestia/trunk (3 files)

[Ronald van Haren]

    Date: Sunday, June 12, 2011 @ 04:43:30
  Author: ronald
Revision: 127269

upgpkg: celestia 1.6.1-1
bump to 1.6.1; add build patches from gentoo

Added:
  celestia/trunk/celestia-1.6.1-gentoo.patch
Modified:
  celestia/trunk/PKGBUILD
Deleted:
  celestia/trunk/libpng14.patch

-----------------------------+
 PKGBUILD                    |   26 +++++++++++++++-----------
 celestia-1.6.1-gentoo.patch |   23 +++++++++++++++++++++++
 libpng14.patch              |   12 ------------
 3 files changed, 38 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-12 08:14:20 UTC (rev 127268)
+++ PKGBUILD	2011-06-12 08:43:30 UTC (rev 127269)
@@ -3,32 +3,36 @@
 # Contributor : Damir Perisa <damir.perisa at 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
+}
+

Added: celestia-1.6.1-gentoo.patch
===================================================================
--- celestia-1.6.1-gentoo.patch	                        (rev 0)
+++ celestia-1.6.1-gentoo.patch	2011-06-12 08:43:30 UTC (rev 127269)
@@ -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;

Deleted: libpng14.patch
===================================================================
--- libpng14.patch	2011-06-12 08:14:20 UTC (rev 127268)
+++ libpng14.patch	2011-06-12 08:43:30 UTC (rev 127269)
@@ -1,12 +0,0 @@
-diff -Nur celestia-1.6.0.orig/src/celengine/image.cpp celestia-1.6.0/src/celengine/image.cpp
---- celestia-1.6.0.orig/src/celengine/image.cpp	2009-06-22 18:44:08.000000000 +0300
-+++ celestia-1.6.0/src/celengine/image.cpp	2010-01-18 23:27:55.000000000 +0200
-@@ -737,7 +737,7 @@
- 
-     if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-     {
--        png_set_gray_1_2_4_to_8(png_ptr);
-+        png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))