From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 696E51382C5 for ; Thu, 17 May 2018 16:02:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71A2AE0A87; Thu, 17 May 2018 16:02:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A7ADE0A87 for ; Thu, 17 May 2018 16:02:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 06562335C73 for ; Thu, 17 May 2018 16:02:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD80743 for ; Thu, 17 May 2018 16:02:05 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1526572921.2767cf258e45ec4e9e50add416f18a4495f77475.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/celestia/, sci-astronomy/celestia/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/celestia/celestia-9999.ebuild sci-astronomy/celestia/files/celestia-1.6.99-glew_linking.patch sci-astronomy/celestia/files/celestia-1.6.99-gtk_libs.patch X-VCS-Directories: sci-astronomy/celestia/files/ sci-astronomy/celestia/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2767cf258e45ec4e9e50add416f18a4495f77475 X-VCS-Branch: master Date: Thu, 17 May 2018 16:02:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa5da99c-50a8-4234-a705-443eb013511f X-Archives-Hash: 2e70cbf78ec2433758875b44498d8c40 commit: 2767cf258e45ec4e9e50add416f18a4495f77475 Author: Lars Wendler gentoo org> AuthorDate: Thu May 17 16:00:34 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu May 17 16:02:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2767cf25 sci-astronomy/celestia: Removed patches which got merged by upstream. Package-Manager: Portage-2.3.37, Repoman-2.3.9 sci-astronomy/celestia/celestia-9999.ebuild | 4 ---- .../files/celestia-1.6.99-glew_linking.patch | 22 ------------------ .../celestia/files/celestia-1.6.99-gtk_libs.patch | 26 ---------------------- 3 files changed, 52 deletions(-) diff --git a/sci-astronomy/celestia/celestia-9999.ebuild b/sci-astronomy/celestia/celestia-9999.ebuild index 23ad6bc99f7..4e61192de39 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 4c8657f34ce..00000000000 --- 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 2f175d96707..00000000000 --- 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 -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 -