rpms/celestia
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 1.6.4-1mamba;Tue Jun 25 2024]

Browse Source
This commit is contained in:
Automatic Build System 2024-06-25 09:58:12 +02:00
parent 745de5c039
commit a535c32438
7 changed files with 41 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
celestia-1.5.0-gcc44.patch
View File

@ -1,26 +0,0 @@
Fix build with GCC 4.4
Lubomir Rintel (Fedora Astronomy) <lkundrak@v3.sk>
diff -up celestia-1.5.0/src/celengine/overlay.h.gcc44 celestia-1.5.0/src/celengine/overlay.h
--- celestia-1.5.0/src/celengine/overlay.h.gcc44 2009-03-01 15:23:44.000000000 +0100
+++ celestia-1.5.0/src/celengine/overlay.h 2009-03-01 15:23:50.000000000 +0100
@@ -12,6 +12,7 @@
#include <string>
#include <iostream>
+#include <cstdio>
#include <celtxf/texturefont.h>
diff -up celestia-1.5.0/src/celengine/star.cpp.gcc44 celestia-1.5.0/src/celengine/star.cpp
--- celestia-1.5.0/src/celengine/star.cpp.gcc44 2009-03-01 15:26:57.000000000 +0100
+++ celestia-1.5.0/src/celengine/star.cpp 2009-03-01 15:27:22.000000000 +0100
@@ -9,6 +9,7 @@
#include <celmath/mathlib.h>
#include <cstring>
+#include <cstdio>
#include <cassert>
#include "celestia.h"
#include "astro.h"

11
celestia-1.5.1-gcc44.patch
View File

@ -1,11 +0,0 @@
diff -Nru celestia-1.5.1.orig/src/celestia/oggtheoracapture.cpp celestia-1.5.1/src/celestia/oggtheoracapture.cpp
--- celestia-1.5.1.orig/src/celestia/oggtheoracapture.cpp 2009-05-18 13:09:14.000000000 +0200
+++ celestia-1.5.1/src/celestia/oggtheoracapture.cpp 2009-05-18 13:09:33.000000000 +0200
@@ -62,6 +62,7 @@
#include <cstdlib>
#include <cstdio>
#include <cmath>
+#include <ctime>
#include <celutil/debug.h>
#include <celutil/util.h>
#include "../celengine/gl.h"

45
celestia-1.6.0-gcc45.patch
View File

@ -1,45 +0,0 @@
--- src/celengine/overlay.h 2010-04-16 17:43:35.000000000 +0200
+++ src/celengine/overlay.h 2010-04-16 17:43:55.000000000 +0200
@@ -12,6 +12,7 @@
#include <string>
#include <iostream>
+#include <cstdio>
#include <celtxf/texturefont.h>
--- src/celmath/mathlib.h 2010-04-16 18:16:09.000000000 +0200
+++ src/celmath/mathlib.h 2010-04-16 18:16:18.000000000 +0200
@@ -44,11 +44,6 @@ template<class T> T radToDeg(T r)
return r * 180 / static_cast<T>(PI);
}
-template<class T> T abs(T x)
-{
- return (x < 0) ? -x : x;
-}
-
template<class T> T square(T x)
{
return x * x;
--- src/celengine/star.cpp 2010-04-16 18:17:42.000000000 +0200
+++ src/celengine/star.cpp 2010-04-16 18:17:57.000000000 +0200
@@ -10,6 +10,7 @@
#include <celmath/mathlib.h>
#include <cstring>
#include <cassert>
+#include <cstdio>
#include "celestia.h"
#include "astro.h"
#include "orbit.h"
--- src/celestia/celx_object.cpp 2010-04-16 18:19:52.000000000 +0200
+++ src/celestia/celx_object.cpp 2010-04-16 18:22:37.000000000 +0200
@@ -773,7 +773,7 @@ static int object_mark(lua_State* l)
markAlpha = 1.0f;
Color markColorAlpha(0.0f, 1.0f, 0.0f, 0.9f);
- markColorAlpha = Color::Color(markColor, markAlpha);
+ markColorAlpha = Color(markColor, markAlpha);
const char* markLabel = celx.safeGetString(6, WrongType, "Fifth argument to object:mark must be a string");
if (markLabel == NULL)

22
celestia-1.6.0-png14.patch
View File

@ -1,22 +0,0 @@
$NetBSD: patch-ap,v 1.1 2010/06/13 22:44:58 wiz Exp $
--- src/celengine/image.cpp.orig 2005-07-19 20:30:54.000000000 +0000
+++ src/celengine/image.cpp
@@ -78,7 +78,7 @@ using namespace std;
// Define various expansion transformations for old versions of libpng
#if PNG_LIBPNG_VER < 10004
#define png_set_palette_to_rgb(p) png_set_expand(p)
-#define png_set_gray_1_2_4_to_8(p) png_set_expand(p)
+#define png_set_expand_gray_1_2_4_to_8(p) png_set_expand(p)
#define png_set_tRNS_to_alpha(p) png_set_expand(p)
#endif // PNG_LIBPNG_VER < 10004
@@ -720,7 +720,7 @@ Image* LoadPNGImage(const string& filena
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))

14
celestia-1.6.0-png15.patch
View File

@ -1,14 +0,0 @@
$NetBSD$
Fix build with png-1.5.
--- src/celestia/imagecapture.cpp.orig 2004-11-16 07:14:20.000000000 +0000
+++ src/celestia/imagecapture.cpp
@@ -30,6 +30,7 @@ extern "C" {
#else
#include "png.h"
#endif
+#include <zlib.h>
// Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
#ifndef png_jmpbuf

30
celestia-1.6.4-pr-m4.patch Normal file
View File

@ -0,0 +1,30 @@
From e1022216d9477309fc3ec51637ff1f59eb298530 Mon Sep 17 00:00:00 2001
From: Adam Fontenot <adam.m.fontenot@gmail.com>
Date: Fri, 12 Apr 2024 01:16:06 -0400
Subject: [PATCH] Fix build issues arising from syntax error in acinclude.m4
The acinclude.m4 file places the closing `fi` in the wrong location,
resulting in builds on some systems failing, e.g. Arch Linux:
https://aur.archlinux.org/packages/celestia
The `fi` belongs where it is placed by this commit because there is
no `if` inside the `AC_CACHE_VAL`. Rather, the statement is intended
to close the conditional `if test -n "$LIBJPEG"`.
---
acinclude.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 49a086f893..1fe80ef680 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2630,8 +2630,8 @@ AC_TRY_LINK(
LIBS="$ac_save_LIBS"
CXXFLAGS="$ac_save_CXXFLAGS"
AC_LANG_RESTORE
-fi
])
+fi
if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
AC_MSG_RESULT(yes)

35
celestia.spec
View File

@ -1,46 +1,32 @@
Name: celestia
Version: 1.6.2.2
Version: 1.6.4
Release: 1mamba
Summary: the free space simulation that lets you explore our universe in three dimensions
Group: Graphical Desktop/Applications/Educational
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://celestia.space/
URL: http://ww25.celestia.space/?subid1=20240625-1009-091b-8cd8-13b1fd672112
Source0: https://github.com/CelestiaProject/Celestia.git/%{version}/Celestia-%{version}.tar.bz2
#Source0: http://downloads.sourceforge.net/sourceforge/celestia/celestia-%{version}.tar.gz
Source1: %{name}.desktop
Patch2: %{name}-1.5.0-gcc44.patch
Patch3: %{name}-1.5.1-gcc44.patch
Patch4: %{name}-1.6.0-png14.patch
Patch5: %{name}-1.6.0-png15.patch
Patch6: %{name}-1.6.0-gcc45.patch
Patch0: celestia-1.6.4-pr-m4.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXau-devel
BuildRequires: libXdmcp-devel
BuildRequires: libXext-devel
BuildRequires: libXmu-devel
BuildRequires: libXt-devel
BuildRequires: libatk-devel
BuildRequires: libbrotli-devel
BuildRequires: libbsd-devel
BuildRequires: libbzip2-devel
BuildRequires: libat-spi2-core-devel
BuildRequires: libcairo-devel
BuildRequires: libexpat-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel
BuildRequires: libgcc
BuildRequires: libgdk-pixbuf-devel
BuildRequires: libglib-devel
BuildRequires: libgraphite2-devel
BuildRequires: libglu-devel
BuildRequires: libglvnd-devel
BuildRequires: libgtk2-devel
BuildRequires: libgtkglext-devel
BuildRequires: libharfbuzz-devel
@ -48,16 +34,12 @@ BuildRequires: libjpeg-devel
BuildRequires: liblua-devel
BuildRequires: libogg-devel
BuildRequires: libpango-devel
BuildRequires: libpcre-devel
BuildRequires: libpng-devel
BuildRequires: libreadline-devel
BuildRequires: libstdc++6-devel
BuildRequires: libtheora-devel
BuildRequires: libuuid-devel
BuildRequires: libxcb-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
The free space simulation that lets you explore our universe in three dimensions.
@ -66,6 +48,8 @@ The free space simulation that lets you explore our universe in three dimensions
%prep
%setup -q -n Celestia-%{version}
%patch 0 -p1 -b .pr-m4
autoupdate
autoreconf -f -i || true
@ -136,6 +120,9 @@ autoreconf -f -i || true
#ChangeLog INSTALL README
%changelog
* Tue Jun 25 2024 Automatic Build System <autodist@openmamba.org> 1.6.4-1mamba
- automatic version update by autodist
* Fri Jan 15 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.2.2-1mamba
- update to 1.6.2.2