gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

sci-astronomy/celestia: Removed patches which got merged by upstream.

Browse Source 
Package-Manager: Portage-2.3.37, Repoman-2.3.9
This commit is contained in:
Lars Wendler
2018-05-17 18:00:34 +02:00
parent a68586160f
commit 2767cf258e
3 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sci-astronomy/celestia/celestia-9999.ebuild
View File

@@ -41,10 +41,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.0-desktop.patch
# add a ~/.celestia for extra directories
"${FILESDIR}"/${PN}-1.6.99-cfg.patch
# https://github.com/CelestiaProject/Celestia/pull/48
"${FILESDIR}"/${PN}-1.6.99-gtk_libs.patch
"${FILESDIR}"/${PN}-1.6.99-glew_linking.patch
)
pkg_setup() {

22
sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch
View File

@@ -1,22 +0,0 @@
diff --git a/src/celengine/Makefile.am b/src/celengine/Makefile.am
index 77d909b7..dd0b0a66 100644
--- a/src/celengine/Makefile.am
+++ b/src/celengine/Makefile.am
@@ -1,7 +1,10 @@
noinst_LIBRARIES = libcelengine.a
noinst_HEADERS = $(wildcard *.h)
-AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/thirdparty/Eigen -I$(top_srcdir)/thirdparty/curveplot/include
+AM_CPPFLAGS = -I$(top_srcdir)/src \
+ -I$(top_srcdir)/thirdparty/Eigen \
+ -I$(top_srcdir)/thirdparty/curveplot/include \
+ -I$(top_srcdir)/thirdparty/glew/include
libcelengine_a_CXXFLAGS = $(LUA_CFLAGS) $(SPICE_CFLAGS) $(GLEW_CFLAGS)
@@ -75,4 +78,5 @@ libcelengine_a_SOURCES = \
vertexprog.cpp \
virtualtex.cpp \
visibleregion.cpp \
+ ../../thirdparty/glew/src/glew.c \
../../thirdparty/curveplot/src/curveplot.cpp

26
sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch
View File

@@ -1,26 +0,0 @@
From 80bd68c7ff75f3e87574a4557ccf149fc70752b3 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 15 May 2018 11:28:08 +0200
Subject: [PATCH 1/2] Fix gtk related undefined references
---
src/celestia/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/celestia/Makefile.am b/src/celestia/Makefile.am
index 60609fd3..a08fb0c7 100644
--- a/src/celestia/Makefile.am
+++ b/src/celestia/Makefile.am
@@ -14,7 +14,8 @@ endif
if ENABLE_GTK
SUBDIRS += gtk
-celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
+celestiaGTKLIBS = gtk/libgtkgui.a
+LIBS += $(GTK_LIBS)
endif
if ENABLE_QT
--
2.17.0