diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-05-17 18:00:34 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-05-17 18:02:01 +0200 |
| commit | 2767cf258e45ec4e9e50add416f18a4495f77475 (patch) | |
| tree | 185a7f04c50d6f18fdd364ad1193c49a46a528f3 /sci-astronomy | |
| parent | www-apps/moodle: version bump to 3.1.12 3.2.9 3.3.6 3.4.2 3.4.3 and 3.5 (diff) | |
| download | gentoo-2767cf258e45ec4e9e50add416f18a4495f77475.tar.gz gentoo-2767cf258e45ec4e9e50add416f18a4495f77475.tar.bz2 gentoo-2767cf258e45ec4e9e50add416f18a4495f77475.zip | |
sci-astronomy/celestia: Removed patches which got merged by upstream.
Package-Manager: Portage-2.3.37, Repoman-2.3.9
Diffstat (limited to 'sci-astronomy')
3 files changed, 0 insertions, 52 deletions
diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild index 23ad6bc99f7c..4e61192de39e 100644 --- a/sci-astronomy/celestia/celestia-9999.ebuild +++ b/sci-astronomy/celestia/celestia-9999.ebuild @@ -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() { diff --git a/sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch b/sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch deleted file mode 100644 index 4c8657f34ced..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch +++ /dev/null @@ -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 diff --git a/sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch b/sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch deleted file mode 100644 index 2f175d967079..000000000000 --- a/sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch +++ /dev/null @@ -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 - |