Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5db193fbf2e9fda93230e8c798dea9b1fa7a129b

commit 5db193fbf2e9fda93230e8c798dea9b1fa7a129b
Author: Devil505 <devil505li...@gmail.com>
Date:   Sun Jul 10 11:04:03 2011 +0200

stellarium-0.11.0-1-i686
* version bump
* removed old patch
* updating icon file

diff --git a/source/xapps-extra/stellarium/FrugalBuild 
b/source/xapps-extra/stellarium/FrugalBuild
index 682e90c..da2681e 100644
--- a/source/xapps-extra/stellarium/FrugalBuild
+++ b/source/xapps-extra/stellarium/FrugalBuild
@@ -4,8 +4,8 @@
# Contributor: Mcklaren <mckla...@gmail.com>

pkgname=stellarium
-pkgver=0.10.6
-pkgrel=2
+pkgver=0.11.0
+pkgrel=1
pkgdesc="A free open source planetarium for your computer."
makedepends=('boost>=1.46.1')
_F_cmake_confopts="-DCMAKE_CXX_FLAGS=$CXXFLAGS -DCMAKE_C_FLAGS=$CFLAGS"
@@ -14,20 +14,19 @@ url="http://www.stellarium.org/";
depends=('sdl_mixer' 'libpng>=1.4.1' 'mesa' 'freetype2' 'libjpeg>=8b' 
'libqtopengl' 'curl>=7.19.0' 'qt4')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-sha1sums=('b28f74d145c89656d9f79b86abe00297a3559cef')
+source=($source $pkgname.png)
+sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' \
+          'b890d3b6c4dcfcfcc696514202af11b2a50c0fea')
options=('scriptlet')

+_F_desktop_name="Stellarium nightsky renderer"
+_F_desktop_desc="A real-time nightsky renderer"
+_F_desktop_icon="$pkgname"
+_F_desktop_categories="Education;Science;Astronomy"
+
build() {
-       Fcd
-       Fpatchall
-       mkdir -p builds/unix || Fdie
-       cd builds/unix || Fdie
-       cmake -DCMAKE_INSTALL_PREFIX=/usr ../.. || Fdie
-       make || Fdie
-       make DESTDIR=${Fdestdir} install || Fdie
-       Ficon $pkgname-$pkgver/data/$pkgname.png
-       Fsed 'env LD_LIBRARY_PATH=/opt/qt4-maemo5/lib /opt/stellarium' '/usr' 
$Fsrcdir/$pkgname-$pkgver/data/$pkgname.desktop
-       Fsed '4' '5' $Fsrcdir/$pkgname-$pkgver/data/$pkgname.desktop
-       Ffile $pkgname-$pkgver/data/$pkgname.desktop 
/usr/share/applications/$pkgname.desktop
+       CMake_build
+       Ficon $pkgname.png
+       Fdesktop2
}
# optimization OK
diff --git a/source/xapps-extra/stellarium/stellarium-gcc45.patch 
b/source/xapps-extra/stellarium/stellarium-gcc45.patch
deleted file mode 100644
index f5af542..0000000
--- a/source/xapps-extra/stellarium/stellarium-gcc45.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- 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/source/xapps-extra/stellarium/stellarium.png 
b/source/xapps-extra/stellarium/stellarium.png
index e603356..08bce12 100644
Binary files a/source/xapps-extra/stellarium/stellarium.png and 
b/source/xapps-extra/stellarium/stellarium.png differ
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to