[arch-commits] Commit in celestia/repos (30 files)
Eric Bélanger
eric at archlinux.org
Wed Dec 12 00:31:41 UTC 2012
Date: Tuesday, December 11, 2012 @ 19:31:40
Author: eric
Revision: 173170
db-move: moved celestia from [testing] to [extra] (i686, x86_64)
Added:
celestia/repos/extra-i686/PKGBUILD
(from rev 173168, celestia/repos/testing-i686/PKGBUILD)
celestia/repos/extra-i686/celestia-1.5.1-gcc44.patch
(from rev 173168, celestia/repos/testing-i686/celestia-1.5.1-gcc44.patch)
celestia/repos/extra-i686/celestia-1.6.1-gcc46.patch
(from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-gcc46.patch)
celestia/repos/extra-i686/celestia-1.6.1-gentoo.patch
(from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-gentoo.patch)
celestia/repos/extra-i686/celestia-1.6.1-libpng15.patch
(from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-libpng15.patch)
celestia/repos/extra-i686/celestia-1.6.1-linking.patch
(from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-linking.patch)
celestia/repos/extra-i686/gcc-4.7-fixes.diff
(from rev 173168, celestia/repos/testing-i686/gcc-4.7-fixes.diff)
celestia/repos/extra-x86_64/PKGBUILD
(from rev 173168, celestia/repos/testing-x86_64/PKGBUILD)
celestia/repos/extra-x86_64/celestia-1.5.1-gcc44.patch
(from rev 173168, celestia/repos/testing-x86_64/celestia-1.5.1-gcc44.patch)
celestia/repos/extra-x86_64/celestia-1.6.1-gcc46.patch
(from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-gcc46.patch)
celestia/repos/extra-x86_64/celestia-1.6.1-gentoo.patch
(from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-gentoo.patch)
celestia/repos/extra-x86_64/celestia-1.6.1-libpng15.patch
(from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-libpng15.patch)
celestia/repos/extra-x86_64/celestia-1.6.1-linking.patch
(from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-linking.patch)
celestia/repos/extra-x86_64/gcc-4.7-fixes.diff
(from rev 173168, celestia/repos/testing-x86_64/gcc-4.7-fixes.diff)
Deleted:
celestia/repos/extra-i686/PKGBUILD
celestia/repos/extra-i686/celestia-1.5.1-gcc44.patch
celestia/repos/extra-i686/celestia-1.6.1-gcc46.patch
celestia/repos/extra-i686/celestia-1.6.1-gentoo.patch
celestia/repos/extra-i686/celestia-1.6.1-libpng15.patch
celestia/repos/extra-i686/celestia-1.6.1-linking.patch
celestia/repos/extra-i686/gcc-4.7-fixes.diff
celestia/repos/extra-x86_64/PKGBUILD
celestia/repos/extra-x86_64/celestia-1.5.1-gcc44.patch
celestia/repos/extra-x86_64/celestia-1.6.1-gcc46.patch
celestia/repos/extra-x86_64/celestia-1.6.1-gentoo.patch
celestia/repos/extra-x86_64/celestia-1.6.1-libpng15.patch
celestia/repos/extra-x86_64/celestia-1.6.1-linking.patch
celestia/repos/extra-x86_64/gcc-4.7-fixes.diff
celestia/repos/testing-i686/
celestia/repos/testing-x86_64/
--------------------------------------------+
extra-i686/PKGBUILD | 106 +++++++++++++-------------
extra-i686/celestia-1.5.1-gcc44.patch | 40 +++++-----
extra-i686/celestia-1.6.1-gcc46.patch | 26 +++---
extra-i686/celestia-1.6.1-gentoo.patch | 46 +++++------
extra-i686/celestia-1.6.1-libpng15.patch | 28 +++----
extra-i686/celestia-1.6.1-linking.patch | 108 +++++++++++++--------------
extra-i686/gcc-4.7-fixes.diff | 20 ++---
extra-x86_64/PKGBUILD | 106 +++++++++++++-------------
extra-x86_64/celestia-1.5.1-gcc44.patch | 40 +++++-----
extra-x86_64/celestia-1.6.1-gcc46.patch | 26 +++---
extra-x86_64/celestia-1.6.1-gentoo.patch | 46 +++++------
extra-x86_64/celestia-1.6.1-libpng15.patch | 28 +++----
extra-x86_64/celestia-1.6.1-linking.patch | 108 +++++++++++++--------------
extra-x86_64/gcc-4.7-fixes.diff | 20 ++---
14 files changed, 374 insertions(+), 374 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-i686/PKGBUILD 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : Damir Perisa <damir.perisa at bluewin.ch>
-
-pkgname=celestia
-pkgver=1.6.1
-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' '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'
- 'gcc-4.7-fixes.diff')
-sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
- '7c08ca391603806d788cb8f3342acedafc924eef'
- '46ecc4e10b24191384bc848c206652498843adf0'
- '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
- '582f9eed93eca02a16350f02c29e2ea6f69aa869')
-
-build() {
- 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 -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"
-
- autoreconf
- ./configure --prefix=/usr \
- --with-lua=/usr \
- --datadir=/usr/share \
- --with-gtk \
- --disable-rpath \
- --with-lua
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
-
Copied: celestia/repos/extra-i686/PKGBUILD (from rev 173168, celestia/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=celestia
+pkgver=1.6.1
+pkgrel=4
+pkgdesc="Real-time space simulation"
+arch=('i686' 'x86_64')
+license=('GPL')
+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-libpng15.patch'
+ 'celestia-1.6.1-linking.patch'
+ 'gcc-4.7-fixes.diff')
+sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
+ '7c08ca391603806d788cb8f3342acedafc924eef'
+ '46ecc4e10b24191384bc848c206652498843adf0'
+ '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
+ '582f9eed93eca02a16350f02c29e2ea6f69aa869')
+
+build() {
+ 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 -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"
+
+ autoreconf
+ ./configure --prefix=/usr \
+ --with-lua=/usr \
+ --datadir=/usr/share \
+ --with-gtk \
+ --disable-rpath \
+ --with-lua
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+}
+
Deleted: extra-i686/celestia-1.5.1-gcc44.patch
===================================================================
--- extra-i686/celestia-1.5.1-gcc44.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-i686/celestia-1.5.1-gcc44.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,20 +0,0 @@
---- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400
-+++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400
-@@ -10,6 +10,7 @@
- #ifndef _OVERLAY_H_
- #define _OVERLAY_H_
-
-+#include <cstdio>
- #include <string>
- #include <iostream>
- #include <celtxf/texturefont.h>
---- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400
-+++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
-
- #include <celmath/mathlib.h>
-+#include <cstdio>
- #include <cstring>
- #include <cassert>
- #include "celestia.h"
Copied: celestia/repos/extra-i686/celestia-1.5.1-gcc44.patch (from rev 173168, celestia/repos/testing-i686/celestia-1.5.1-gcc44.patch)
===================================================================
--- extra-i686/celestia-1.5.1-gcc44.patch (rev 0)
+++ extra-i686/celestia-1.5.1-gcc44.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,20 @@
+--- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400
++++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400
+@@ -10,6 +10,7 @@
+ #ifndef _OVERLAY_H_
+ #define _OVERLAY_H_
+
++#include <cstdio>
+ #include <string>
+ #include <iostream>
+ #include <celtxf/texturefont.h>
+--- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400
++++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400
+@@ -8,6 +8,7 @@
+ // of the License, or (at your option) any later version.
+
+ #include <celmath/mathlib.h>
++#include <cstdio>
+ #include <cstring>
+ #include <cassert>
+ #include "celestia.h"
Deleted: extra-i686/celestia-1.6.1-gcc46.patch
===================================================================
--- extra-i686/celestia-1.6.1-gcc46.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-i686/celestia-1.6.1-gcc46.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=366073
-
-Patch written by Nils Larsson <ni1s at nerdshack.com>
---- src/celengine/frametree.h
-+++ src/celengine/frametree.h
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
-
- #include <vector>
-+#include <cstddef>
-
- class Star;
- class Body;
Copied: celestia/repos/extra-i686/celestia-1.6.1-gcc46.patch (from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-gcc46.patch)
===================================================================
--- extra-i686/celestia-1.6.1-gcc46.patch (rev 0)
+++ extra-i686/celestia-1.6.1-gcc46.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+
+Patch written by Nils Larsson <ni1s at nerdshack.com>
+--- src/celengine/frametree.h
++++ src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+
+ #include <vector>
++#include <cstddef>
+
+ class Star;
+ class Body;
Deleted: extra-i686/celestia-1.6.1-gentoo.patch
===================================================================
--- extra-i686/celestia-1.6.1-gentoo.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-i686/celestia-1.6.1-gentoo.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,23 +0,0 @@
---- 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;
Copied: celestia/repos/extra-i686/celestia-1.6.1-gentoo.patch (from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-gentoo.patch)
===================================================================
--- extra-i686/celestia-1.6.1-gentoo.patch (rev 0)
+++ extra-i686/celestia-1.6.1-gentoo.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -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: extra-i686/celestia-1.6.1-libpng15.patch
===================================================================
--- extra-i686/celestia-1.6.1-libpng15.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-i686/celestia-1.6.1-libpng15.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,14 +0,0 @@
-imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-
---- src/celestia/imagecapture.cpp
-+++ src/celestia/imagecapture.cpp
-@@ -31,6 +31,9 @@
- #include "png.h"
- #endif
-
-+// Z_BEST_COMPRESSION
-+#include <zlib.h>
-+
- // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
- #ifndef png_jmpbuf
- #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
Copied: celestia/repos/extra-i686/celestia-1.6.1-libpng15.patch (from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-libpng15.patch)
===================================================================
--- extra-i686/celestia-1.6.1-libpng15.patch (rev 0)
+++ extra-i686/celestia-1.6.1-libpng15.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+
++// Z_BEST_COMPRESSION
++#include <zlib.h>
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
Deleted: extra-i686/celestia-1.6.1-linking.patch
===================================================================
--- extra-i686/celestia-1.6.1-linking.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-i686/celestia-1.6.1-linking.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,54 +0,0 @@
-Fix linking issues:
- * underlinking GLUT (bug #372123, #387609)
- * as-needed (bug #281258)
-
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -7,14 +7,15 @@
-
- if ENABLE_KDE
- SUBDIRS += kde
--celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
-- $(LIBSOCKET) -lDCOP kde/libkdegui.a
-+celestiaKDELIBS = kde/libkdegui.a
- celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
- endif
-
- if ENABLE_GTK
- SUBDIRS += gtk
--celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+celestiaGTKLIBS = gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
-
- COMMONSOURCES = \
-@@ -62,6 +63,7 @@
-
- if ENABLE_GLUT
- GLUTSOURCES = glutmain.cpp
-+GLUTLIBS = -lGL
- endif
-
- if ENABLE_THEORA
-@@ -80,15 +82,16 @@
- celestia_LDADD = \
- $(celestiaKDELIBS) \
- $(celestiaGTKLIBS) \
-- $(DL_LIBS) \
-- $(LUA_LIBS) \
-- $(THEORA_LIBS) \
- ../celengine/libcelengine.a \
- ../celtxf/libceltxf.a \
- ../cel3ds/libcel3ds.a \
- ../celmath/libcelmath.a \
- ../celutil/libcelutil.a \
-- $(SPICE_LIBS)
-+ $(LUA_LIBS) \
-+ $(THEORA_LIBS) \
-+ $(GLUTLIBS) \
-+ $(SPICE_LIBS) \
-+ $(DL_LIBS)
-
- noinst_HEADERS = $(wildcard *.h)
- noinst_DATA = ../../celestia
Copied: celestia/repos/extra-i686/celestia-1.6.1-linking.patch (from rev 173168, celestia/repos/testing-i686/celestia-1.6.1-linking.patch)
===================================================================
--- extra-i686/celestia-1.6.1-linking.patch (rev 0)
+++ extra-i686/celestia-1.6.1-linking.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,54 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+
+--- a/src/celestia/Makefile.am
++++ b/src/celestia/Makefile.am
+@@ -7,14 +7,15 @@
+
+ if ENABLE_KDE
+ SUBDIRS += kde
+-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+- $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a
+ celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+ endif
+
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+
+ COMMONSOURCES = \
+@@ -62,6 +63,7 @@
+
+ if ENABLE_GLUT
+ GLUTSOURCES = glutmain.cpp
++GLUTLIBS = -lGL
+ endif
+
+ if ENABLE_THEORA
+@@ -80,15 +82,16 @@
+ celestia_LDADD = \
+ $(celestiaKDELIBS) \
+ $(celestiaGTKLIBS) \
+- $(DL_LIBS) \
+- $(LUA_LIBS) \
+- $(THEORA_LIBS) \
+ ../celengine/libcelengine.a \
+ ../celtxf/libceltxf.a \
+ ../cel3ds/libcel3ds.a \
+ ../celmath/libcelmath.a \
+ ../celutil/libcelutil.a \
+- $(SPICE_LIBS)
++ $(LUA_LIBS) \
++ $(THEORA_LIBS) \
++ $(GLUTLIBS) \
++ $(SPICE_LIBS) \
++ $(DL_LIBS)
+
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
Deleted: extra-i686/gcc-4.7-fixes.diff
===================================================================
--- extra-i686/gcc-4.7-fixes.diff 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-i686/gcc-4.7-fixes.diff 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,10 +0,0 @@
---- 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,
Copied: celestia/repos/extra-i686/gcc-4.7-fixes.diff (from rev 173168, celestia/repos/testing-i686/gcc-4.7-fixes.diff)
===================================================================
--- extra-i686/gcc-4.7-fixes.diff (rev 0)
+++ extra-i686/gcc-4.7-fixes.diff 2012-12-12 00:31:40 UTC (rev 173170)
@@ -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,
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-x86_64/PKGBUILD 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : Damir Perisa <damir.perisa at bluewin.ch>
-
-pkgname=celestia
-pkgver=1.6.1
-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' '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'
- 'gcc-4.7-fixes.diff')
-sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
- '7c08ca391603806d788cb8f3342acedafc924eef'
- '46ecc4e10b24191384bc848c206652498843adf0'
- '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
- '582f9eed93eca02a16350f02c29e2ea6f69aa869')
-
-build() {
- 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 -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"
-
- autoreconf
- ./configure --prefix=/usr \
- --with-lua=/usr \
- --datadir=/usr/share \
- --with-gtk \
- --disable-rpath \
- --with-lua
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
-
Copied: celestia/repos/extra-x86_64/PKGBUILD (from rev 173168, celestia/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor : Damir Perisa <damir.perisa at bluewin.ch>
+
+pkgname=celestia
+pkgver=1.6.1
+pkgrel=4
+pkgdesc="Real-time space simulation"
+arch=('i686' 'x86_64')
+license=('GPL')
+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-libpng15.patch'
+ 'celestia-1.6.1-linking.patch'
+ 'gcc-4.7-fixes.diff')
+sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
+ '7c08ca391603806d788cb8f3342acedafc924eef'
+ '46ecc4e10b24191384bc848c206652498843adf0'
+ '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
+ '582f9eed93eca02a16350f02c29e2ea6f69aa869')
+
+build() {
+ 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 -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"
+
+ autoreconf
+ ./configure --prefix=/usr \
+ --with-lua=/usr \
+ --datadir=/usr/share \
+ --with-gtk \
+ --disable-rpath \
+ --with-lua
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+}
+
Deleted: extra-x86_64/celestia-1.5.1-gcc44.patch
===================================================================
--- extra-x86_64/celestia-1.5.1-gcc44.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-x86_64/celestia-1.5.1-gcc44.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,20 +0,0 @@
---- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400
-+++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400
-@@ -10,6 +10,7 @@
- #ifndef _OVERLAY_H_
- #define _OVERLAY_H_
-
-+#include <cstdio>
- #include <string>
- #include <iostream>
- #include <celtxf/texturefont.h>
---- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400
-+++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
-
- #include <celmath/mathlib.h>
-+#include <cstdio>
- #include <cstring>
- #include <cassert>
- #include "celestia.h"
Copied: celestia/repos/extra-x86_64/celestia-1.5.1-gcc44.patch (from rev 173168, celestia/repos/testing-x86_64/celestia-1.5.1-gcc44.patch)
===================================================================
--- extra-x86_64/celestia-1.5.1-gcc44.patch (rev 0)
+++ extra-x86_64/celestia-1.5.1-gcc44.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,20 @@
+--- src/celengine/overlay.h.orig 2009-07-08 02:27:08.000000000 -0400
++++ src/celengine/overlay.h 2009-07-08 02:27:28.000000000 -0400
+@@ -10,6 +10,7 @@
+ #ifndef _OVERLAY_H_
+ #define _OVERLAY_H_
+
++#include <cstdio>
+ #include <string>
+ #include <iostream>
+ #include <celtxf/texturefont.h>
+--- src/celengine/star.cpp.orig 2009-07-08 02:40:52.000000000 -0400
++++ src/celengine/star.cpp 2009-07-08 02:41:08.000000000 -0400
+@@ -8,6 +8,7 @@
+ // of the License, or (at your option) any later version.
+
+ #include <celmath/mathlib.h>
++#include <cstdio>
+ #include <cstring>
+ #include <cassert>
+ #include "celestia.h"
Deleted: extra-x86_64/celestia-1.6.1-gcc46.patch
===================================================================
--- extra-x86_64/celestia-1.6.1-gcc46.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-x86_64/celestia-1.6.1-gcc46.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=366073
-
-Patch written by Nils Larsson <ni1s at nerdshack.com>
---- src/celengine/frametree.h
-+++ src/celengine/frametree.h
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
-
- #include <vector>
-+#include <cstddef>
-
- class Star;
- class Body;
Copied: celestia/repos/extra-x86_64/celestia-1.6.1-gcc46.patch (from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-gcc46.patch)
===================================================================
--- extra-x86_64/celestia-1.6.1-gcc46.patch (rev 0)
+++ extra-x86_64/celestia-1.6.1-gcc46.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+
+Patch written by Nils Larsson <ni1s at nerdshack.com>
+--- src/celengine/frametree.h
++++ src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+
+ #include <vector>
++#include <cstddef>
+
+ class Star;
+ class Body;
Deleted: extra-x86_64/celestia-1.6.1-gentoo.patch
===================================================================
--- extra-x86_64/celestia-1.6.1-gentoo.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-x86_64/celestia-1.6.1-gentoo.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,23 +0,0 @@
---- 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;
Copied: celestia/repos/extra-x86_64/celestia-1.6.1-gentoo.patch (from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-gentoo.patch)
===================================================================
--- extra-x86_64/celestia-1.6.1-gentoo.patch (rev 0)
+++ extra-x86_64/celestia-1.6.1-gentoo.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -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: extra-x86_64/celestia-1.6.1-libpng15.patch
===================================================================
--- extra-x86_64/celestia-1.6.1-libpng15.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-x86_64/celestia-1.6.1-libpng15.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,14 +0,0 @@
-imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-
---- src/celestia/imagecapture.cpp
-+++ src/celestia/imagecapture.cpp
-@@ -31,6 +31,9 @@
- #include "png.h"
- #endif
-
-+// Z_BEST_COMPRESSION
-+#include <zlib.h>
-+
- // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
- #ifndef png_jmpbuf
- #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
Copied: celestia/repos/extra-x86_64/celestia-1.6.1-libpng15.patch (from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-libpng15.patch)
===================================================================
--- extra-x86_64/celestia-1.6.1-libpng15.patch (rev 0)
+++ extra-x86_64/celestia-1.6.1-libpng15.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,14 @@
+imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
+
+--- src/celestia/imagecapture.cpp
++++ src/celestia/imagecapture.cpp
+@@ -31,6 +31,9 @@
+ #include "png.h"
+ #endif
+
++// Z_BEST_COMPRESSION
++#include <zlib.h>
++
+ // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
+ #ifndef png_jmpbuf
+ #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
Deleted: extra-x86_64/celestia-1.6.1-linking.patch
===================================================================
--- extra-x86_64/celestia-1.6.1-linking.patch 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-x86_64/celestia-1.6.1-linking.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,54 +0,0 @@
-Fix linking issues:
- * underlinking GLUT (bug #372123, #387609)
- * as-needed (bug #281258)
-
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -7,14 +7,15 @@
-
- if ENABLE_KDE
- SUBDIRS += kde
--celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
-- $(LIBSOCKET) -lDCOP kde/libkdegui.a
-+celestiaKDELIBS = kde/libkdegui.a
- celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
- endif
-
- if ENABLE_GTK
- SUBDIRS += gtk
--celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+celestiaGTKLIBS = gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
-
- COMMONSOURCES = \
-@@ -62,6 +63,7 @@
-
- if ENABLE_GLUT
- GLUTSOURCES = glutmain.cpp
-+GLUTLIBS = -lGL
- endif
-
- if ENABLE_THEORA
-@@ -80,15 +82,16 @@
- celestia_LDADD = \
- $(celestiaKDELIBS) \
- $(celestiaGTKLIBS) \
-- $(DL_LIBS) \
-- $(LUA_LIBS) \
-- $(THEORA_LIBS) \
- ../celengine/libcelengine.a \
- ../celtxf/libceltxf.a \
- ../cel3ds/libcel3ds.a \
- ../celmath/libcelmath.a \
- ../celutil/libcelutil.a \
-- $(SPICE_LIBS)
-+ $(LUA_LIBS) \
-+ $(THEORA_LIBS) \
-+ $(GLUTLIBS) \
-+ $(SPICE_LIBS) \
-+ $(DL_LIBS)
-
- noinst_HEADERS = $(wildcard *.h)
- noinst_DATA = ../../celestia
Copied: celestia/repos/extra-x86_64/celestia-1.6.1-linking.patch (from rev 173168, celestia/repos/testing-x86_64/celestia-1.6.1-linking.patch)
===================================================================
--- extra-x86_64/celestia-1.6.1-linking.patch (rev 0)
+++ extra-x86_64/celestia-1.6.1-linking.patch 2012-12-12 00:31:40 UTC (rev 173170)
@@ -0,0 +1,54 @@
+Fix linking issues:
+ * underlinking GLUT (bug #372123, #387609)
+ * as-needed (bug #281258)
+
+--- a/src/celestia/Makefile.am
++++ b/src/celestia/Makefile.am
+@@ -7,14 +7,15 @@
+
+ if ENABLE_KDE
+ SUBDIRS += kde
+-celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
+- $(LIBSOCKET) -lDCOP kde/libkdegui.a
++celestiaKDELIBS = kde/libkdegui.a
+ celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
++LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
+ endif
+
+ if ENABLE_GTK
+ SUBDIRS += gtk
+-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
++celestiaGTKLIBS = gtk/libgtkgui.a
++LIBS += $(GTK_LIBS)
+ endif
+
+ COMMONSOURCES = \
+@@ -62,6 +63,7 @@
+
+ if ENABLE_GLUT
+ GLUTSOURCES = glutmain.cpp
++GLUTLIBS = -lGL
+ endif
+
+ if ENABLE_THEORA
+@@ -80,15 +82,16 @@
+ celestia_LDADD = \
+ $(celestiaKDELIBS) \
+ $(celestiaGTKLIBS) \
+- $(DL_LIBS) \
+- $(LUA_LIBS) \
+- $(THEORA_LIBS) \
+ ../celengine/libcelengine.a \
+ ../celtxf/libceltxf.a \
+ ../cel3ds/libcel3ds.a \
+ ../celmath/libcelmath.a \
+ ../celutil/libcelutil.a \
+- $(SPICE_LIBS)
++ $(LUA_LIBS) \
++ $(THEORA_LIBS) \
++ $(GLUTLIBS) \
++ $(SPICE_LIBS) \
++ $(DL_LIBS)
+
+ noinst_HEADERS = $(wildcard *.h)
+ noinst_DATA = ../../celestia
Deleted: extra-x86_64/gcc-4.7-fixes.diff
===================================================================
--- extra-x86_64/gcc-4.7-fixes.diff 2012-12-12 00:31:37 UTC (rev 173169)
+++ extra-x86_64/gcc-4.7-fixes.diff 2012-12-12 00:31:40 UTC (rev 173170)
@@ -1,10 +0,0 @@
---- 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,
Copied: celestia/repos/extra-x86_64/gcc-4.7-fixes.diff (from rev 173168, celestia/repos/testing-x86_64/gcc-4.7-fixes.diff)
===================================================================
--- extra-x86_64/gcc-4.7-fixes.diff (rev 0)
+++ extra-x86_64/gcc-4.7-fixes.diff 2012-12-12 00:31:40 UTC (rev 173170)
@@ -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,
More information about the arch-commits
mailing list