Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26371
Modified Files:
stellarium.info stellarium.patch
Log Message:
New upstream version, switch to qt 4.6.2 and boost1.41.
Index: stellarium.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/stellarium.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- stellarium.patch 14 Jun 2009 19:37:44 -0000 1.3
+++ stellarium.patch 25 Feb 2010 00:55:39 -0000 1.4
@@ -1,42 +1,42 @@
-diff -ru stellarium-0.10.2.orig/CMakeLists.txt stellarium-0.10.2/CMakeLists.txt
---- stellarium-0.10.2.orig/CMakeLists.txt 2009-03-09 07:28:34.000000000
-0400
-+++ stellarium-0.10.2/CMakeLists.txt 2009-06-14 14:22:25.000000000 -0400
-@@ -32,9 +32,11 @@
+diff -ru stellarium-0.10.4.orig/CMakeLists.txt stellarium-0.10.4/CMakeLists.txt
+--- stellarium-0.10.4.orig/CMakeLists.txt 2010-02-22 06:22:31.000000000
-0500
++++ stellarium-0.10.4/CMakeLists.txt 2010-02-24 18:24:50.000000000 -0500
+@@ -52,13 +52,12 @@
# best way to get to APPLE?
IF(APPLE)
-- SET(CMAKE_INCLUDE_PATH
"/usr/X11/include:/usr/X11/include/freetype2:/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include:/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include/freetype2:/sw/include:${CMAKE_INCLUDE_PATH}")
-- SET(CMAKE_LIBRARY_PATH
"/Developer/SDKs/MacOSX10.5.sdk/usr/X11/lib:/sw/lib:${CMAKE_LIBRARY_PATH}")
-- SET(CMAKE_C_FLAGS "-fno-common -Wall -Wextra -Wno-unused-parameter -DMACOSX
-I/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include
-I/Developer/SDKs/MacOSX10.5.sdk/usr/X11/include/freetype2")
+- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra
-Wno-unused-parameter")
+- SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.4")
+- SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
+- SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/")
+- # Universal binary
+- #SET(CMAKE_OSX_ARCHITECTURES "i386;ppc")
+- SET(CMAKE_OSX_ARCHITECTURES "i386")
+ IF(APPLE_APP)
-+ SET(CMAKE_C_FLAGS "-fno-common -Wall -Wextra -Wno-unused-parameter -DMACOSX
-DMACOSX_APP")
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra
-Wno-unused-parameter -DMACOSX_APP")
+ ELSE(APPLE_APP)
-+ SET(CMAKE_C_FLAGS "-fno-common -Wall -Wextra -Wno-unused-parameter
-DMACOSX")
++ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra
-Wno-unused-parameter")
+ ENDIF(APPLE_APP)
- SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
- SET(CMAKE_EXE_LINKER_FLAGS "-dylib_file
/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
++SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
ENDIF()
-@@ -110,14 +112,13 @@
+
+ ########### Check headers ###########
+@@ -213,9 +212,10 @@
########### Set some global variables ###########
IF(UNIX AND NOT WIN32)
-IF(APPLE)
-- SET(CMAKE_INSTALL_PREFIX "/Users/Shared/stellarium/Stellarium.app/Contents")
-- SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources/data")
+- SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
+-ELSE(APPLE)
+IF(APPLE_APP)
+ SET(INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/Resources")
- SET(INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
--ELSE(APPLE)
++ SET(INSTALL_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/Resources/locale")
+ELSE(APPLE_APP)
SET(INSTALL_DATADIR ${CMAKE_INSTALL_PREFIX}/share/stellarium)
SET(INSTALL_LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
--ENDIF(APPLE)
-+ENDIF(APPLE_APP)
- ELSE()
- SET(INSTALL_DATADIR .)
- SET(INSTALL_LOCALEDIR ./locale)
-@@ -203,7 +204,7 @@
ENDIF()
+@@ -277,7 +277,7 @@
+
########### Macosx Bundling ###############
-IF(APPLE)
@@ -44,92 +44,110 @@
ADD_CUSTOM_TARGET(macosx_bundle bash util/macosx_bundle.sh
${CMAKE_INSTALL_PREFIX} ${PROJECT_SOURCE_DIR} DEPENDS install WORKING_DIRECTORY
${PROJECT_SOURCE_DIR} COMMENT "making the macosx bundle." VERBATIM)
ENDIF()
-diff -ru stellarium-0.10.2.orig/src/core/StelFileMgr.cpp
stellarium-0.10.2/src/core/StelFileMgr.cpp
---- stellarium-0.10.2.orig/src/core/StelFileMgr.cpp 2009-03-09
07:28:33.000000000 -0400
-+++ stellarium-0.10.2/src/core/StelFileMgr.cpp 2009-06-14 14:24:15.000000000
-0400
-@@ -16,7 +16,7 @@
- # endif
+diff -ru stellarium-0.10.4.orig/src/core/StelFileMgr.cpp
stellarium-0.10.4/src/core/StelFileMgr.cpp
+--- stellarium-0.10.4.orig/src/core/StelFileMgr.cpp 2010-02-22
06:22:31.000000000 -0500
++++ stellarium-0.10.4/src/core/StelFileMgr.cpp 2010-02-24 17:17:29.000000000
-0500
+@@ -17,7 +17,7 @@
+ # endif
#endif
--#ifdef MACOSX
+-#ifdef Q_OS_MAC
+#ifdef MACOSX_APP
#include "StelMacosxDirs.hpp"
#endif
-@@ -354,7 +354,7 @@
- if (QFileInfo(CHECK_FILE).exists())
+@@ -37,7 +37,7 @@
+ {
+ userDir = winApiPath + "\\Stellarium";
+ }
+-#elif defined(Q_OS_MAC)
++#elif defined(MACOSX_APP)
+ userDir = QDir::homePath() + "/Library/Application Support/Stellarium";
+ #else
+ userDir = QDir::homePath() + "/.stellarium";
+@@ -70,13 +70,13 @@
+ qWarning() << "WARNING: could not locate installation
directory";
+ }
+
+-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
++#if defined(Q_OS_WIN) || defined(MACOSX_APP)
+ screenshotDir = getDesktopDir();
+ #else
+ screenshotDir = QDir::homePath();
+ #endif
+
+-#ifdef Q_OS_MAC
++#ifdef MACOSX_APP
+ StelMacosxDirs::addApplicationPluginDirectory();
+ #endif
+ }
+@@ -334,7 +334,7 @@
return ".";
+ }
--#if defined(MACOSX)
-+#if defined(MACOSX_APP)
- QFileInfo MacOSdir(QCoreApplication::applicationDirPath());
+-#ifdef Q_OS_MAC
++#ifdef MACOSX_APP
+ QFileInfo MacOSdir(QCoreApplication::applicationDirPath() +
"/../Resources");
QDir ResourcesDir = MacOSdir.dir();
ResourcesDir.cd(QString("Resources"));
-@@ -405,7 +405,7 @@
- QString StelFileMgr::getLocaleDir(void)
+@@ -383,7 +383,7 @@
+ QString StelFileMgr::getLocaleDir()
{
QFileInfo localePath;
--#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__) ||
defined(MINGW32) || defined(MACOSX)
-+#if defined(WIN32) || defined(CYGWIN) || defined(__MINGW32__) ||
defined(MINGW32) || defined(MACOSX_APP)
+-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
++#if defined(Q_OS_WIN) || defined(MACOSX_APP)
// Windows and MacOS X have the locale dir in the installation folder
- // TODO: check if this works with OSX
localePath = QFileInfo(getInstallationDir() + "/locale");
-diff -ru stellarium-0.10.2.orig/src/core/StelIniParser.hpp
stellarium-0.10.2/src/core/StelIniParser.hpp
---- stellarium-0.10.2.orig/src/core/StelIniParser.hpp 2009-03-09
07:28:33.000000000 -0400
-+++ stellarium-0.10.2/src/core/StelIniParser.hpp 2009-06-14
14:25:03.000000000 -0400
-@@ -27,8 +27,6 @@
- // ourselves.
- #if defined(WIN32)
- static const QString stelEndl="\r\n";
--#elif defined(MACOSX)
-- static const QString stelEndl="\r";
- #else
- static const QString stelEndl="\n";
- #endif
-diff -ru stellarium-0.10.2.orig/src/core/StelTranslator.cpp
stellarium-0.10.2/src/core/StelTranslator.cpp
---- stellarium-0.10.2.orig/src/core/StelTranslator.cpp 2009-03-09
07:28:33.000000000 -0400
-+++ stellarium-0.10.2/src/core/StelTranslator.cpp 2009-06-14
14:26:22.000000000 -0400
+ // or MacosxDirs::getApplicationResourcesDirectory().append( "/locale"
);
+diff -ru stellarium-0.10.4.orig/src/external/glues_stel/source/glues.h
stellarium-0.10.4/src/external/glues_stel/source/glues.h
+--- stellarium-0.10.4.orig/src/external/glues_stel/source/glues.h
2010-02-22 06:22:31.000000000 -0500
++++ stellarium-0.10.4/src/external/glues_stel/source/glues.h 2010-02-24
17:27:23.000000000 -0500
@@ -39,7 +39,7 @@
- QString StelTranslator::systemLangName;
- // Use system locale language by default
--#if defined(MACOSX)
-+#if defined(MACOSX_APP)
- #include "StelMacosxDirs.hpp"
- StelTranslator StelTranslator::globalTranslator =
StelTranslator(PACKAGE_NAME,
StelMacosxDirs::getApplicationResourcesDirectory().append( "/locale" ),
"system");
- #else
-diff -ru stellarium-0.10.2.orig/src/main.cpp stellarium-0.10.2/src/main.cpp
---- stellarium-0.10.2.orig/src/main.cpp 2009-03-09 07:28:33.000000000
-0400
-+++ stellarium-0.10.2/src/main.cpp 2009-06-14 14:27:21.000000000 -0400
-@@ -26,7 +26,7 @@
- #include <QDebug>
- #include <QGLFormat>
- #include <QPlastiqueStyle>
--#ifdef MACOSX
-+#ifdef MACOSX_APP
- #include "StelMacosxDirs.hpp"
- #endif
+ #ifdef USE_OPENGL_ES2
+ # include <GLES2/gl2.h>
+-#elif defined(Q_OS_MAC) || defined(__APPLE__) || defined(__APPLE_CC__)
++#elif defined(MACOSX_APP)
+ # include <OpenGL/gl.h>
+ #elif defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
+ # include <GLES/gl.h>
+diff -ru stellarium-0.10.4.orig/src/external/glues_stel/source/glues_error.c
stellarium-0.10.4/src/external/glues_stel/source/glues_error.c
+--- stellarium-0.10.4.orig/src/external/glues_stel/source/glues_error.c
2010-02-22 06:22:31.000000000 -0500
++++ stellarium-0.10.4/src/external/glues_stel/source/glues_error.c
2010-02-24 17:27:36.000000000 -0500
+@@ -33,7 +33,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
-@@ -65,7 +65,7 @@
- int argc2 = argc+2;
- QApplication app(argc2, argv2);
+-#if defined(Q_OS_MAC) || defined(__APPLE__) || defined(__APPLE_CC__)
++#if defined(MACOSX_APP)
+ # include <OpenGL/gl.h>
+ #elif defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
+ # include <GLES/gl.h>
+diff -ru stellarium-0.10.4.orig/src/external/glues_stel/source/glues_mipmap.h
stellarium-0.10.4/src/external/glues_stel/source/glues_mipmap.h
+--- stellarium-0.10.4.orig/src/external/glues_stel/source/glues_mipmap.h
2010-02-22 06:22:31.000000000 -0500
++++ stellarium-0.10.4/src/external/glues_stel/source/glues_mipmap.h
2010-02-24 17:27:53.000000000 -0500
+@@ -33,7 +33,7 @@
+ #ifndef __GLUESES_MIPMAP_H__
+ #define __GLUESES_MIPMAP_H__
--#ifdef MACOSX
-+#ifdef MACOSX_APP
- StelMacosxDirs::addApplicationPluginDirectory();
- #endif
- GettextStelTranslator trans;
-diff -ru stellarium-0.10.2.orig/util/macosx_bundle.sh
stellarium-0.10.2/util/macosx_bundle.sh
---- stellarium-0.10.2.orig/util/macosx_bundle.sh 2009-03-09
07:28:34.000000000 -0400
-+++ stellarium-0.10.2/util/macosx_bundle.sh 2009-06-14 14:17:15.000000000
-0400
-@@ -17,19 +17,5 @@
+-#if defined(Q_OS_MAC) || defined(__APPLE__) || defined(__APPLE_CC__)
++#if defined(MACOSX_APP)
+ # include <OpenGL/gl.h>
+ #elif defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_1_CL)
+ # include <GLES/gl.h>
+diff -ru stellarium-0.10.4.orig/util/macosx_bundle.sh
stellarium-0.10.4/util/macosx_bundle.sh
+--- stellarium-0.10.4.orig/util/macosx_bundle.sh 2010-02-22
06:22:31.000000000 -0500
++++ stellarium-0.10.4/util/macosx_bundle.sh 2010-02-24 17:23:25.000000000
-0500
+@@ -17,22 +17,6 @@
rmdir ${CMAKE_INSTALL_PREFIX}/Resources/stellarium
-mkdir ${CMAKE_INSTALL_PREFIX}/Frameworks
-/usr/bin/perl util/pkgApp.pl ${CMAKE_INSTALL_PREFIX} MacOS/stellarium
Frameworks
-cp -pr /Developer/Applications/Qt/plugins/{imageformats,iconengines}
${CMAKE_INSTALL_PREFIX}/MacOS
--for f in ${CMAKE_INSTALL_PREFIX}/MacOS/{imageformats,iconengines}/*.dylib; do
+-mkdir ${CMAKE_INSTALL_PREFIX}/MacOS/sqldrivers/
+-cp -pr /Developer/Applications/Qt/plugins/sqldrivers/libqsqlite.dylib
${CMAKE_INSTALL_PREFIX}/MacOS/sqldrivers/
+-for f in
${CMAKE_INSTALL_PREFIX}/MacOS/{imageformats,iconengines,sqldrivers}/*.dylib; do
- fdir=`dirname $f`
- dir=`basename $fdir`
- base=`basename $f`
@@ -142,3 +160,6 @@
-
cp -pr $PROJECT_SOURCE_DIR/data/Icon.icns $CMAKE_INSTALL_PREFIX/Resources
cp -pr $PROJECT_SOURCE_DIR/data/{PkgInfo,Info.plist} $CMAKE_INSTALL_PREFIX
+-cp -pr $PROJECT_SOURCE_DIR/util/qt.conf $CMAKE_INSTALL_PREFIX/Resources
+\ No newline at end of file
++cp -pr $PROJECT_SOURCE_DIR/util/qt.conf $CMAKE_INSTALL_PREFIX/Resources
Index: stellarium.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/stellarium.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- stellarium.info 14 Jun 2009 19:37:44 -0000 1.7
+++ stellarium.info 25 Feb 2010 00:55:39 -0000 1.8
@@ -1,45 +1,34 @@
Info2: <<
Package: stellarium-%type_pkg[qt]
-Version: 0.10.2
-Revision: 3
+Version: 0.10.4
+Revision: 1
Type: qt (mac x11)
Description: Real time 3D sky renderer
Maintainer: Daniel Johnson <dan...@daniel-johnson.org>
Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
-Source-MD5: c544fff9e75e9317055075b658ae5924
+Source-MD5: ebb81f609c91be6ecd7e91cf7d3a4afa
PatchFile: stellarium.patch
-PatchFile-MD5: 3757e157d7c8014f1efd7086a964ff7e
-PatchScript: <<
- #!/bin/bash -ev
- %{default_script}
- if [ %type_raw[qt] = x11 ]; then
- perl -pi -e 's,-dylib_file,-L/usr/X11R6/lib -L%p/lib
-dylib_file,' CMakeLists.txt
- fi
-<<
+PatchFile-MD5: b7f90f99fdcf44b6b9a7da992d280754
BuildDepends: <<
- boost1.35.nopython,
+ boost1.41.cmake,
cmake,
fink (>= 0.24.12-1),
- freetype219,
gettext-tools,
- libgettext3-dev,
+ libgettext8-dev,
( %type_raw[qt] = x11 ) libgl-dev,
libiconv-dev,
- libjpeg,
libpng3,
- qt4-%type_pkg[qt] (>= 4.5.0-3),
+ qt4-%type_pkg[qt] (>= 4.6.2-2),
system-openssl-dev,
( %type_raw[qt] = x11 ) x11-dev
<<
Depends: <<
- freetype219-shlibs,
- libgettext3-shlibs,
+ libgettext8-shlibs,
( %type_raw[qt] = x11 ) libgl-shlibs,
libiconv,
- libjpeg-shlibs,
libpng3-shlibs,
- qt4-%type_pkg[qt]-core-shlibs (>= 4.5.0-3),
- qt4-%type_pkg[qt]-gui-shlibs (>= 4.5.0-3),
+ qt4-%type_pkg[qt]-core-shlibs (>= 4.6.2-2),
+ qt4-%type_pkg[qt]-gui-shlibs (>= 4.6.2-2),
( %type_raw[qt] = x11 ) x11-shlibs
<<
Conflicts: stellarium (<< 0.10.2-3), stellarium-x11 (<< 0.10.2-3)
@@ -52,7 +41,7 @@
cd build/unix
if [ %type_raw[qt] = x11 ]; then
- params="-DOPENGL_gl_LIBRARY:FILEPATH=/usr/X11R6/lib/libGL.dylib
-DOPENGL_glu_LIBRARY:FILEPATH=/usr/X11R6/lib/libGLU.dylib
-DOPENGL_INCLUDE_DIR:PATH=/usr/X11R6/include -DCMAKE_INSTALL_PREFIX:PATH=%p"
+ params="-DOPENGL_gl_LIBRARY:FILEPATH=/usr/X11R6/lib/libGL.dylib
-DOPENGL_glu_LIBRARY:FILEPATH=/usr/X11R6/lib/libGLU.dylib
-DOPENGL_INCLUDE_DIR:PATH=/usr/X11R6/include
-DCMAKE_EXE_LINKER_FLAGS=-L/usr/X11R6/lib -DCMAKE_INSTALL_PREFIX:PATH=%p"
else
params="-DAPPLE_APP=1
-DCMAKE_INSTALL_PREFIX:PATH=%p/Applications/stellarium.app/Contents"
fi
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
