Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv7722
Modified Files:
stellarium.info stellarium.patch
Log Message:
New upstream stellarium 0.10.6 and update for new qt4 layout.
Index: stellarium.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/stellarium.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- stellarium.patch 24 Jul 2010 22:58:29 -0000 1.5
+++ stellarium.patch 19 May 2011 02:20:23 -0000 1.6
@@ -1,26 +1,7 @@
-diff -ru stellarium-0.10.5.orig/CMakeLists.txt stellarium-0.10.5/CMakeLists.txt
---- stellarium-0.10.5.orig/CMakeLists.txt 2010-06-02 10:23:55.000000000
-0400
-+++ stellarium-0.10.5/CMakeLists.txt 2010-07-24 17:51:23.000000000 -0400
-@@ -55,12 +55,12 @@
-
- # best way to get to APPLE?
- IF(APPLE)
-- SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra
-mmacosx-version-min=10.4")
-- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra
-Wno-unused-parameter")
-- SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
-- SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk/")
-- # Universal binary
-- SET(CMAKE_OSX_ARCHITECTURES "i386;ppc")
-+ IF(APPLE_APP)
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra
-Wno-unused-parameter -DMACOSX_APP")
-+ ELSE(APPLE_APP)
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra
-Wno-unused-parameter")
-+ ENDIF(APPLE_APP)
-+SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
- ENDIF()
-
- ########### Check functions ###########
-@@ -217,9 +217,10 @@
+diff -ru stellarium-0.10.6.orig/CMakeLists.txt stellarium-0.10.6/CMakeLists.txt
+--- stellarium-0.10.6.orig/CMakeLists.txt 2010-12-05 11:31:01.000000000
-0500
++++ stellarium-0.10.6/CMakeLists.txt 2011-05-18 21:36:15.000000000 -0400
+@@ -216,9 +216,10 @@
########### Set some global variables ###########
IF(UNIX AND NOT WIN32)
@@ -34,7 +15,7 @@
ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/stellarium")
ADD_DEFINITIONS(-DINSTALL_LOCALEDIR="${CMAKE_INSTALL_PREFIX}/share/locale")
ENDIF()
-@@ -285,7 +286,7 @@
+@@ -290,7 +291,7 @@
ENDIF()
########### Macosx Bundling ###############
@@ -43,9 +24,9 @@
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.5.orig/src/core/StelFileMgr.cpp
stellarium-0.10.5/src/core/StelFileMgr.cpp
---- stellarium-0.10.5.orig/src/core/StelFileMgr.cpp 2010-06-02
10:23:47.000000000 -0400
-+++ stellarium-0.10.5/src/core/StelFileMgr.cpp 2010-07-24 17:55:02.000000000
-0400
+diff -ru stellarium-0.10.6.orig/src/core/StelFileMgr.cpp
stellarium-0.10.6/src/core/StelFileMgr.cpp
+--- stellarium-0.10.6.orig/src/core/StelFileMgr.cpp 2010-12-05
11:31:00.000000000 -0500
++++ stellarium-0.10.6/src/core/StelFileMgr.cpp 2011-05-18 21:45:44.000000000
-0400
@@ -51,7 +51,7 @@
{
userDir = winApiPath + "\\Stellarium";
@@ -71,16 +52,16 @@
QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
#endif
}
-@@ -348,7 +348,7 @@
+@@ -400,7 +400,7 @@
return ".";
}
-#ifdef Q_OS_MAC
+#ifdef MACOSX_APP
- QFileInfo MacOSdir(QCoreApplication::applicationDirPath() +
"/../Resources");
- QDir ResourcesDir = MacOSdir.dir();
- ResourcesDir.cd(QString("Resources"));
-@@ -398,7 +398,7 @@
+ QString relativePath = "/../Resources";
+ if (QCoreApplication::applicationDirPath().contains("src")) {
+ relativePath = "/../../../../..";
+@@ -457,7 +457,7 @@
{
#ifdef ENABLE_NLS
QFileInfo localePath;
@@ -89,9 +70,9 @@
// Windows and MacOS X have the locale dir in the installation folder
localePath = QFileInfo(getInstallationDir() + "/locale");
// or MacosxDirs::getApplicationResourcesDirectory().append( "/locale"
);
-diff -ru stellarium-0.10.5.orig/src/core/external/glues_stel/source/glues.h
stellarium-0.10.5/src/core/external/glues_stel/source/glues.h
---- stellarium-0.10.5.orig/src/core/external/glues_stel/source/glues.h
2010-06-02 10:23:47.000000000 -0400
-+++ stellarium-0.10.5/src/core/external/glues_stel/source/glues.h
2010-07-24 17:59:49.000000000 -0400
+diff -ru stellarium-0.10.6.orig/src/core/external/glues_stel/source/glues.h
stellarium-0.10.6/src/core/external/glues_stel/source/glues.h
+--- stellarium-0.10.6.orig/src/core/external/glues_stel/source/glues.h
2010-12-05 11:31:00.000000000 -0500
++++ stellarium-0.10.6/src/core/external/glues_stel/source/glues.h
2011-05-18 21:36:15.000000000 -0400
@@ -39,7 +39,7 @@
#ifdef USE_OPENGL_ES2
@@ -101,9 +82,9 @@
# 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.5.orig/src/core/external/glues_stel/source/glues_error.c
stellarium-0.10.5/src/core/external/glues_stel/source/glues_error.c
---- stellarium-0.10.5.orig/src/core/external/glues_stel/source/glues_error.c
2010-06-02 10:23:47.000000000 -0400
-+++ stellarium-0.10.5/src/core/external/glues_stel/source/glues_error.c
2010-07-24 18:00:14.000000000 -0400
+diff -ru
stellarium-0.10.6.orig/src/core/external/glues_stel/source/glues_error.c
stellarium-0.10.6/src/core/external/glues_stel/source/glues_error.c
+--- stellarium-0.10.6.orig/src/core/external/glues_stel/source/glues_error.c
2010-12-05 11:31:00.000000000 -0500
++++ stellarium-0.10.6/src/core/external/glues_stel/source/glues_error.c
2011-05-18 21:36:15.000000000 -0400
@@ -33,7 +33,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -113,9 +94,9 @@
# 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.5.orig/util/macosx_bundle.sh
stellarium-0.10.5/util/macosx_bundle.sh
---- stellarium-0.10.5.orig/util/macosx_bundle.sh 2010-06-02
10:23:57.000000000 -0400
-+++ stellarium-0.10.5/util/macosx_bundle.sh 2010-07-24 18:03:28.000000000
-0400
+diff -ru stellarium-0.10.6.orig/util/macosx_bundle.sh
stellarium-0.10.6/util/macosx_bundle.sh
+--- stellarium-0.10.6.orig/util/macosx_bundle.sh 2010-12-05
11:31:00.000000000 -0500
++++ stellarium-0.10.6/util/macosx_bundle.sh 2011-05-18 21:36:15.000000000
-0400
@@ -17,22 +17,6 @@
rmdir ${CMAKE_INSTALL_PREFIX}/Resources/stellarium
Index: stellarium.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/stellarium.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- stellarium.info 24 Jul 2010 22:58:29 -0000 1.9
+++ stellarium.info 19 May 2011 02:20:23 -0000 1.10
@@ -1,33 +1,38 @@
Info2: <<
Package: stellarium-%type_pkg[qt]
-Version: 0.10.5
+Version: 0.10.6
Revision: 1
Type: qt (mac x11)
Description: Real time 3D sky renderer
Maintainer: Daniel Johnson <[email protected]>
Source: mirror:sourceforge:stellarium/stellarium-%v.tar.gz
-Source-MD5: 4038585e3554febde92f2166d52bc8a8
+Source-MD5: daab49529f0ad76efe871b639ac79295
PatchFile: stellarium.patch
-PatchFile-MD5: 4da2a6c8501b5f0536b96df2b5a56b9d
+PatchFile-MD5: 8f2031d914368f7f0bab429012ffa0dc
+
BuildDepends: <<
boost1.41.cmake,
- cmake (>= 2.8.2-1),
+ cmake (>= 2.8.4-1),
fink (>= 0.24.12-1),
gettext-tools,
libgettext8-dev,
- ( %type_raw[qt] = x11 ) libgl-dev,
+ ( %type_pkg[qt] = x11 ) libgl-dev,
libiconv-dev,
- qt4-%type_pkg[qt] (>= 4.6.2-2),
- system-openssl-dev,
- ( %type_raw[qt] = x11 ) x11-dev
+ phonon-%type_pkg[qt] (>= 4.5.0-1),
+ qt4-base-%type_pkg[qt] (>= 4.7.3-1)
<<
Depends: <<
libgettext8-shlibs,
- ( %type_raw[qt] = x11 ) libgl-shlibs,
+ ( %type_pkg[qt] = x11 ) libgl-shlibs,
libiconv,
- 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
+ phonon-%type_pkg[qt]-shlibs (>= 4.5.0-1),
+ qt4-base-%type_pkg[qt]-qtcore-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtdbus-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtgui-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtnetwork-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtopengl-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtscript-shlibs (>= 4.7.3-1),
+ qt4-base-%type_pkg[qt]-qtxml-shlibs (>= 4.7.3-1)
<<
Conflicts: stellarium (<< 0.10.2-3), stellarium-x11 (<< 0.10.2-3)
Replaces: stellarium (<< 0.10.2-3), stellarium-x11 (<< 0.10.2-3)
@@ -41,15 +46,12 @@
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_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"
+ params="-DAPPLE_APP=1 -DCMAKE_C_FLAGS=-DMACOSX_APP
-DCMAKE_INSTALL_PREFIX:PATH=%p/Applications/stellarium.app/Contents"
fi
cmake -DCMAKE_PREFIX_PATH:PATH=%p \
-DQT_QMAKE_EXECUTABLE:FILEPATH=%p/lib/qt4-%type_pkg[qt]/bin/qmake \
- -DFreeType2_INCLUDE_DIR:PATH=%p/include/freetype2 \
- -DFreeType2_LIBRARIES:FILEPATH=%p/lib/libfreetype.dylib
\
-
-DOPENSSL_INCLUDE_DIR:PATH=%p/lib/system-openssl/include \
-
-DOPENSSL_LIBRARIES:FILEPATH=%p/lib/system-openssl/lib/libssl.dylib \
+ -DENABLE_SOUND=1 \
$params \
../..
make
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
