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

Antonio Rojas arojas at archlinux.org
Sat Nov 28 18:06:13 UTC 2020


    Date: Saturday, November 28, 2020 @ 18:06:12
  Author: arojas
Revision: 402374

Update to 1.6.2

Modified:
  celestia/trunk/PKGBUILD
Deleted:
  celestia/trunk/celestia-1.5.1-gcc44.patch
  celestia/trunk/celestia-1.6.1-gcc46.patch
  celestia/trunk/celestia-1.6.1-gentoo.patch
  celestia/trunk/celestia-1.6.1-libpng15.patch
  celestia/trunk/celestia-1.6.1-libpng16.patch
  celestia/trunk/celestia-1.6.1-linking.patch
  celestia/trunk/gcc-4.7-fixes.diff

-------------------------------+
 PKGBUILD                      |   44 ++++++--------------------------
 celestia-1.5.1-gcc44.patch    |   20 --------------
 celestia-1.6.1-gcc46.patch    |   13 ---------
 celestia-1.6.1-gentoo.patch   |   23 -----------------
 celestia-1.6.1-libpng15.patch |   14 ----------
 celestia-1.6.1-libpng16.patch |   25 ------------------
 celestia-1.6.1-linking.patch  |   54 ----------------------------------------
 gcc-4.7-fixes.diff            |   10 -------
 8 files changed, 9 insertions(+), 194 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-28 17:39:50 UTC (rev 402373)
+++ PKGBUILD	2020-11-28 18:06:12 UTC (rev 402374)
@@ -2,50 +2,24 @@
 # Contributor : Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=celestia
-pkgver=1.6.1
-pkgrel=8
+pkgver=1.6.2
+pkgrel=1
 pkgdesc="Real-time space simulation"
 arch=('x86_64')
 license=('GPL')
 url="https://celestia.space/"
-depends=('gtk2' 'libtheora' 'lua51' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa')
+depends=('gtk2' 'libtheora' 'lua53' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa')
 options=('!makeflags')
-source=("https://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-libpng16.patch'
-        'celestia-1.6.1-linking.patch'
-        'gcc-4.7-fixes.diff')
-sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
-          '7c08ca391603806d788cb8f3342acedafc924eef'
-          '46ecc4e10b24191384bc848c206652498843adf0'
-          '6f357bd319cdac0776206726e0743b90d4d8127b'
-          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
-          '582f9eed93eca02a16350f02c29e2ea6f69aa869')
+source=("https://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('c94562902e3fcfa72203f96d5f711edb868dfc7e')
 
 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"
-
-    sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
-    sed -e 's|lua5.1|lua51|g' -i configure.in
-
+    cd Celestia-${pkgver}
     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'
-
+    cd Celestia-${pkgver}
     ./configure --prefix=/usr \
                 --with-lua=/usr \
                 --datadir=/usr/share \
@@ -56,8 +30,8 @@
 }
 
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd Celestia-${pkgver}
 
-    make DESTDIR=${pkgdir} MKDIR_P='mkdir -p' install
+    make DESTDIR="${pkgdir}" MKDIR_P='mkdir -p' install
 }
 

Deleted: celestia-1.5.1-gcc44.patch
===================================================================
--- celestia-1.5.1-gcc44.patch	2020-11-28 17:39:50 UTC (rev 402373)
+++ celestia-1.5.1-gcc44.patch	2020-11-28 18:06:12 UTC (rev 402374)
@@ -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"

Deleted: celestia-1.6.1-gcc46.patch
===================================================================
--- celestia-1.6.1-gcc46.patch	2020-11-28 17:39:50 UTC (rev 402373)
+++ celestia-1.6.1-gcc46.patch	2020-11-28 18:06:12 UTC (rev 402374)
@@ -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;

Deleted: celestia-1.6.1-gentoo.patch
===================================================================
--- celestia-1.6.1-gentoo.patch	2020-11-28 17:39:50 UTC (rev 402373)
+++ celestia-1.6.1-gentoo.patch	2020-11-28 18:06:12 UTC (rev 402374)
@@ -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;

Deleted: celestia-1.6.1-libpng15.patch
===================================================================
--- celestia-1.6.1-libpng15.patch	2020-11-28 17:39:50 UTC (rev 402373)
+++ celestia-1.6.1-libpng15.patch	2020-11-28 18:06:12 UTC (rev 402374)
@@ -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

Deleted: celestia-1.6.1-libpng16.patch
===================================================================
--- celestia-1.6.1-libpng16.patch	2020-11-28 17:39:50 UTC (rev 402373)
+++ celestia-1.6.1-libpng16.patch	2020-11-28 18:06:12 UTC (rev 402374)
@@ -1,25 +0,0 @@
-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 at 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

Deleted: celestia-1.6.1-linking.patch
===================================================================
--- celestia-1.6.1-linking.patch	2020-11-28 17:39:50 UTC (rev 402373)
+++ celestia-1.6.1-linking.patch	2020-11-28 18:06:12 UTC (rev 402374)
@@ -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

Deleted: gcc-4.7-fixes.diff
===================================================================
--- gcc-4.7-fixes.diff	2020-11-28 17:39:50 UTC (rev 402373)
+++ gcc-4.7-fixes.diff	2020-11-28 18:06:12 UTC (rev 402374)
@@ -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,


More information about the arch-commits mailing list