From 579c8c91aacde7b3568ac77cbb757ac5e4174f15 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Fri, 21 Oct 2022 02:50:45 +0200 Subject: [PATCH] celestia-gtk: remove package * gtk2, conflicts with celestia-glut, master has a gtk3 version, but it's not in a release yet --- .../patches/NULL_notdecleared.patch | 10 ------- .../patches/Z_BEST_COMPRESSION.patch | 12 --------- .../patches/fix-stdint_redefine.patch | 12 --------- .../patches/memcpy_notdecleared.patch | 21 --------------- .../patches/missing_mathlib.patch | 11 -------- srcpkgs/celestia-gtk/template | 26 ------------------- srcpkgs/celestia-gtk/update | 2 -- srcpkgs/removed-packages/template | 1 + 8 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch delete mode 100644 srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch delete mode 100644 srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch delete mode 100644 srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch delete mode 100644 srcpkgs/celestia-gtk/patches/missing_mathlib.patch delete mode 100644 srcpkgs/celestia-gtk/template delete mode 100644 srcpkgs/celestia-gtk/update diff --git a/srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch b/srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch deleted file mode 100644 index baf2e4a2157f..000000000000 --- a/srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/celengine/frametree.h 2014-04-26 16:08:47.217900392 +0200 -+++ b/src/celengine/frametree.h 2014-04-26 16:09:09.601899991 +0200 -@@ -13,6 +13,7 @@ - #ifndef _CELENGINE_FRAMETREE_H_ - #define _CELENGINE_FRAMETREE_H_ - -+#include - #include - - class Star; diff --git a/srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch b/srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch deleted file mode 100644 index c46c5034177b..000000000000 --- a/srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/celestia/imagecapture.cpp 2014-04-26 16:15:37.185893050 +0200 -+++ b/src/celestia/imagecapture.cpp 2014-04-26 16:16:56.697891627 +0200 -@@ -31,6 +31,9 @@ - #include "png.h" - #endif - -+// Z_BEST_COMPRESSION -+#include -+ - // 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 diff --git a/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch b/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch deleted file mode 100644 index d8e3ccdbc6c2..000000000000 --- a/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/celutil/basictypes.h 2011-06-05 18:11:15.000000000 +0200 -+++ b/src/celutil/basictypes.h 2016-09-02 17:41:33.335187908 +0200 -@@ -31,7 +31,9 @@ - #include - typedef int64_t int64; - typedef uint64_t uint64; -+#ifndef INT64_MAX - #define INT64_MAX 9223372036854775807LL -+#endif - #ifndef UINT64_MAX - #define UINT64_MAX 0xffffffffffffffffULL - #endif diff --git a/srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch b/srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch deleted file mode 100644 index c7a67d94a2ca..000000000000 --- a/srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/celengine/image.cpp 2014-04-26 14:41:56.359993709 +0200 -+++ b/src/celengine/image.cpp 2014-04-26 14:42:16.886993341 +0200 -@@ -42,6 +42,7 @@ - #include "jpeglib.h" - #else - #include -+#include - #include - #endif - } - ---- a/src/celengine/texture.cpp 2014-04-26 15:54:19.937915924 +0200 -+++ b/src/celengine/texture.cpp 2014-04-26 15:54:46.992915439 +0200 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #ifndef _WIN32 - #ifndef TARGET_OS_MAC diff --git a/srcpkgs/celestia-gtk/patches/missing_mathlib.patch b/srcpkgs/celestia-gtk/patches/missing_mathlib.patch deleted file mode 100644 index c8b637dcc0fa..000000000000 --- a/srcpkgs/celestia-gtk/patches/missing_mathlib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/celmath/intersect.h 2014-04-26 15:57:58.793912004 +0200 -+++ b/src/celmath/intersect.h 2014-04-26 16:00:49.024908956 +0200 -@@ -15,7 +15,7 @@ - #include "ray.h" - #include "sphere.h" - #include "ellipsoid.h" -- -+#include "mathlib.h" - - template bool testIntersection(const Ray3& ray, - const Sphere& sphere, diff --git a/srcpkgs/celestia-gtk/template b/srcpkgs/celestia-gtk/template deleted file mode 100644 index 85e1c6ee1ed8..000000000000 --- a/srcpkgs/celestia-gtk/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'celestia-gtk' -pkgname=celestia-gtk -version=1.6.1 -revision=5 -wrksrc="celestia-${version}" -build_style=gnu-configure -configure_args="--with-gtk --with-lua --enable-theora --disable-static" -hostmakedepends="pkg-config" -makedepends="gtkglext-devel zlib-devel lua51-devel glu-devel gtk+-devel - libjpeg-turbo-devel libpng-devel libtheora-devel" -short_desc="Free space simulation using GTK" -maintainer="Martin Riese " -license="GPL-2.0-only" -homepage="https://celestia.space" -distfiles="${SOURCEFORGE_SITE}/celestia/celestia-${version}.tar.gz" -checksum="d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4" - -provides="celestia-${version}_${revision}" -replaces="celestia>=0" - -do_configure() { - local _gtk_libs=$(pkg-config --libs gtkglext-x11-1.0) - CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - LIBS="-lpng -ljpeg -llua5.1 ${_gtk_libs} -logg -ltheora -lz -ldl" \ - ./configure ${configure_args} -} diff --git a/srcpkgs/celestia-gtk/update b/srcpkgs/celestia-gtk/update deleted file mode 100644 index c812b6e17ba2..000000000000 --- a/srcpkgs/celestia-gtk/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname="celestia" -ignore="103 104 107" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 1b8e3bb7a7d2..067d20560563 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -47,6 +47,7 @@ replaces=" cegui07-devel<=0.7.9_8 cegui07-doc<=0.7.9_8 cegui07<=0.7.9_8 + celestia-gtk<=1.6.1_5 cgminer<=4.11.1_1 clamz<=0.5_4 couchdb<=1.7.1_2