Add gcc45 patch submitted by Philipp via bug #317465

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/sci-astronomy/stellarium/ChangeLog b/sci-astronomy/stellarium/ChangeLog
index 2a8d87d830b968b1daef70117b397622df7e5c81..bb946f94bbc3663f5baf30e6cb432672950d11d8 100644 (file)
--- a/sci-astronomy/stellarium/ChangeLog
+++ b/sci-astronomy/stellarium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/stellarium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.60 2010/04/18 17:15:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/ChangeLog,v 1.61 2010/04/29 00:20:36 mr_bones_ Exp $
+
+  29 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  stellarium-0.10.4.ebuild, +files/stellarium-0.10.4-gcc45.patch:
+  Add gcc45 patch submitted by Philipp via bug #317465
 
   18 Apr 2010; <nixnut@gentoo.org> stellarium-0.10.4.ebuild:
   ppc stable #311921

diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index a8d598f1e1eeeca629201e8d7c4c5608a1632adf..85ddef9717c11cf872029bc95004da79c95cde61 100644 (file)
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -1,3 +1,4 @@
+AUX stellarium-0.10.4-gcc45.patch 4074 RMD160 6d30335dce1b1d5f94689626fa182695b83da779 SHA1 c3aa1cd7fd938844e0bb7d2ccd76a93180d35492 SHA256 4709cf7601c26f8f5ca866837785d6ccdca1f8a70e26152aa3fde5174fe28f66
 DIST stars_4_1v0_0.cat 17275482 RMD160 27287e8970c99ee51baeb81de30574a96a1ff21d SHA1 3098174bec4797af54d98d48f60d6bc2ecabaf49 SHA256 e0373d869d08ffac2ba78e7fbe29add6511073cd74a52b9918d8b77fb05827e7
 DIST stars_5_2v0_0.cat 46096018 RMD160 b6a74ea80946ac40521dbf0752c018cd1cc3397f SHA1 358e2f62539d21d775a07ded0dcb70bdc8368265 SHA256 d093e25e8cb8350ef74706d7bf05455d224acb076da87bf1b784b5cf0e0d9931
 DIST stars_6_2v0_0.cat 160019110 RMD160 adef51e800a9c95fc991b7cbc321d324e38597dc SHA1 babcc1d3d12a334e4b3e5d38270460a3e3645d2b SHA256 40a8674dead3178d9f36178f62e128047bb53784fa3ff408e473a5969a4ee379
@@ -8,6 +9,6 @@ DIST stellarium-0.10.3.tar.gz 36128838 RMD160 d1dde6d57e77130854621618f7f8035424
 DIST stellarium-0.10.4.tar.gz 36129866 RMD160 ed2ea67c905adb211266df29dca2f8ed1626ad8e SHA1 8a9f22da5a0049ea10b19b24d28490dc15dea1a8 SHA256 afdd9376f2e36e9e56575516e2a8203b8091588e7236d9e595b4fc9c4ae668df
 EBUILD stellarium-0.10.2.ebuild 1197 RMD160 1e3cf8c2491d186021accb04db0f3ffcc08c24e8 SHA1 12315abeb005f309a063feeabcb2da735a38d244 SHA256 af9dbbc6cb3d91ec3e1ce9962e17707aca113c855f8f2df79cfddfc9fe944472
 EBUILD stellarium-0.10.3.ebuild 1697 RMD160 d4f059841005d7c77785782e5e43837cef42639a SHA1 ed43acdd69648beccd0a71f25b697eafd7469fb5 SHA256 0584eac254f8a3aa735de80ec2c11749f0fa260182090bdda48309e80413563a
-EBUILD stellarium-0.10.4.ebuild 1953 RMD160 fbc3cbe5d0de082841d0482f520bc17b2011b5b3 SHA1 b56ec00227e36c13d1a7f2d9c2fa48f46da5d174 SHA256 52c0dffa0240c7fb339e09ccac4425594f25eea47ba9fddacdf63618720d38ef
-MISC ChangeLog 9806 RMD160 6dfdc6bc958e453e844cc5c3fa84db1c322c3f0f SHA1 962648e76c1145f471d6f1659a662cb4c4f6fb3e SHA256 33c161d989f1fc5c7faa5185a988179bc73fe264be08fb1005978904398147f3
+EBUILD stellarium-0.10.4.ebuild 2029 RMD160 e699a172bf46877eae9395ad5592c46309e83855 SHA1 b450fd8023dc5717df07af19abc608273d4224cc SHA256 20bddaf0dccbcf204c179770179ff502e9b228a1bd90cbc4ca254862aab94de1
+MISC ChangeLog 9986 RMD160 69c11c32775b81cee0bc2fde0e59328fe68a0343 SHA1 af6b5d335efd5d84a7ea36f86101d29efedec4c5 SHA256 560d3ab4df8922859d76e979f6eb3d0bba34a9b18abe8ffb0f2deb63cbbeba67
 MISC metadata.xml 304 RMD160 0e98a636ce6a98f33c2a840019018e682bc7b54b SHA1 ea2018bcef7df901b77ee4ee803e7743077587a5 SHA256 a2c1ffe593b0dbec47b82b9029c18e46549ee5b7f2397b973bd837090a8db6aa

diff --git a/sci-astronomy/stellarium/files/stellarium-0.10.4-gcc45.patch b/sci-astronomy/stellarium/files/stellarium-0.10.4-gcc45.patch
new file mode 100644 (file)
index 0000000..f5af542
--- /dev/null
+++ b/sci-astronomy/stellarium/files/stellarium-0.10.4-gcc45.patch
@@ -0,0 +1,86 @@
+--- plugins/Oculars/src/Oculars.cpp.old        2010-04-16 18:32:41.000000000 +0200
++++ plugins/Oculars/src/Oculars.cpp    2010-04-16 18:34:15.000000000 +0200
+@@ -227,8 +227,8 @@ double Oculars::getCallOrder(StelModuleA
+ 
+ void Oculars::handleMouseClicks(class QMouseEvent* event)
+ {
+-      StelCore::StelCore *core = StelApp::getInstance().getCore();
+-      StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr();
++      StelCore *core = StelApp::getInstance().getCore();
++      StelMovementMgr *movementManager = core->getMovementMgr();
+       if (StelApp::getInstance().getStelObjectMgr().getWasSelected()){
+               LabelMgr *labelManager = GETSTELMODULE(LabelMgr);
+ 
+@@ -384,7 +384,7 @@ void Oculars::enableOcular(bool b)
+               loadDatabaseObjects();
+       }
+ 
+-      StelCore::StelCore *core = StelApp::getInstance().getCore();
++      StelCore *core = StelApp::getInstance().getCore();
+       LabelMgr* labelManager = GETSTELMODULE(LabelMgr);
+       // Toggle the plugin on & off.  To toggle on, we want to ensure there is a selected object.
+       if (!flagShowOculars && !StelApp::getInstance().getStelObjectMgr().getWasSelected()) {
+@@ -466,7 +466,7 @@ void Oculars::toggleCrosshair()
+ void Oculars::drawCrosshairs()
+ {
+       const StelProjectorP projector = StelApp::getInstance().getCore()->getProjection(StelCore::FrameEquinoxEqu);
+-      StelCore::StelCore *core = StelApp::getInstance().getCore();
++      StelCore *core = StelApp::getInstance().getCore();
+       StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
+       // Center of screen
+       Vec2i centerScreen(projector->getViewportPosX()+projector->getViewportWidth()/2,
+@@ -588,8 +588,8 @@ void Oculars::interceptMovementKey(QKeyE
+       // We onle care about the arrow keys.  This flag tracks that.
+       bool consumeEvent = false;
+ 
+-      StelCore::StelCore *core = StelApp::getInstance().getCore();
+-      StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr();
++      StelCore *core = StelApp::getInstance().getCore();
++      StelMovementMgr *movementManager = core->getMovementMgr();
+ 
+       if (event->type() == QEvent::KeyPress)
+       {
+@@ -693,7 +693,7 @@ void Oculars::loadDatabaseObjects()
+ 
+ void Oculars::paintMask()
+ {
+-      StelCore::StelCore *core = StelApp::getInstance().getCore();
++      StelCore *core = StelApp::getInstance().getCore();
+       StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
+ 
+       glDisable(GL_BLEND);
+@@ -774,9 +774,9 @@ void Oculars::validateIniFile()
+ 
+ void Oculars::unzoomOcular()
+ {
+-      StelCore::StelCore *core = StelApp::getInstance().getCore();
+-      StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr();
+-      GridLinesMgr::GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr");
++      StelCore *core = StelApp::getInstance().getCore();
++      StelMovementMgr *movementManager = core->getMovementMgr();
++      GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr");
+ 
+       gridManager->setFlagAzimuthalGrid(flagAzimuthalGrid);
+       gridManager->setFlagEquatorGrid(flagEquatorGrid);
+@@ -801,7 +801,7 @@ void Oculars::zoom(bool rezoom)
+ 
+       if (flagShowOculars)  {
+               if (!rezoom)  {
+-                      GridLinesMgr::GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr");
++                      GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr");
+                       // Current state
+                       flagAzimuthalGrid = gridManager->getFlagAzimuthalGrid();
+                       flagEquatorGrid = gridManager->getFlagEquatorGrid();
+@@ -821,9 +821,9 @@ void Oculars::zoom(bool rezoom)
+ 
+ void Oculars::zoomOcular()
+ {
+-      StelCore::StelCore *core = StelApp::getInstance().getCore();
+-      StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr();
+-      GridLinesMgr::GridLinesMgr *gridManager =
++      StelCore *core = StelApp::getInstance().getCore();
++      StelMovementMgr *movementManager = core->getMovementMgr();
++      GridLinesMgr *gridManager =
+               (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr");
+ 
+       gridManager->setFlagAzimuthalGrid(false);

diff --git a/sci-astronomy/stellarium/stellarium-0.10.4.ebuild b/sci-astronomy/stellarium/stellarium-0.10.4.ebuild
index 77e48cd3d6799f240856180990a51ac9aaee6cef..a0e8c1214dbd2f6697edd301459b2e953b92da39 100644 (file)
--- a/sci-astronomy/stellarium/stellarium-0.10.4.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.10.4.ebuild,v 1.3 2010/04/18 17:15:55 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/stellarium/stellarium-0.10.4.ebuild,v 1.4 2010/04/29 00:20:36 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
        nls? ( sys-devel/gettext )
        x11-libs/libXt"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-gcc45.patch  # bug #317465
+}
+
 src_configure() {
        mycmakeargs="$mycmakeargs $(cmake-utils_use_enable nls NLS)"
        CMAKE_IN_SOURCE_BUILD=1 cmake-utils_src_configure