summaryrefslogtreecommitdiff
path: root/misc/stellarium/patches
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2008-10-26 14:03:37 +0000
committeradam <adam@pkgsrc.org>2008-10-26 14:03:37 +0000
commit185408954ad9fbe10b62e989db3b1f5fc667197b (patch)
tree39ff2a2c7fa232d91ce755fa22b6f873fc38d226 /misc/stellarium/patches
parent6eb686bb69baf907d1e650cc4eabed7ab12ac0aa (diff)
downloadpkgsrc-185408954ad9fbe10b62e989db3b1f5fc667197b.tar.gz
Changes 0.10.0:
* Global switch to Qt. Don't support SDL main application anymore. * The whole StelApp class is managed by a QGraphicsScene, inside a QGraphicsView. * Removed deprecated sources from the core of stellarium. * Continued API cleaning and simplifications. * Performed large refactorings to use portable Qt API. * Re-organized the source files into sub-directories. * Migrated config file parsing to a QSettings based implementation. * Exposed some methods as slots so that they can be scripted in the future. * Created the new Qt-based GUI button bars. * Recoded from scratch the new QWidget based GUI rendered in the QGraphicsView using style sheets. * Moved stars/planets halo rendering into SkyDrawer. * Implemented dynamic eye adaptation for bright objects. * Optimized atmosphere computation and others, speed can be increased up to a factor of 2. * Implemented light pollution following the Bortle scale index. * Improved and optimized stars rendering (updated colors, sizes and added large halo for very bright ones, use GL lists for drawing stars by bunch) * Created a new SkyTile class supporting lazy dynamic multi-resolution images loading and display. Image trees can be stored as JSON files. * Startup is much faster. * Migrated the previous nebula textures to the new format. * Added a LocationManager for managing observing locations and cleaned the code of observer. * Changed key bindings, use F1.. F6 for opening dialogs. * Tab completion on the search dialog. * Added descriptions for the sky cultures and improved the ones for landscapes. * Added a new mars landscape. * Fixed many bugs.
Diffstat (limited to 'misc/stellarium/patches')
-rw-r--r--misc/stellarium/patches/patch-aa105
-rw-r--r--misc/stellarium/patches/patch-ab33
-rw-r--r--misc/stellarium/patches/patch-ac13
-rw-r--r--misc/stellarium/patches/patch-ad58
4 files changed, 24 insertions, 185 deletions
diff --git a/misc/stellarium/patches/patch-aa b/misc/stellarium/patches/patch-aa
index 81d869b6fab..b1249d1fd36 100644
--- a/misc/stellarium/patches/patch-aa
+++ b/misc/stellarium/patches/patch-aa
@@ -1,94 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2008/09/16 13:23:42 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2008/10/26 14:03:37 adam Exp $
---- src/StelApp.cpp.orig 2008-09-15 13:42:12.000000000 +0200
-+++ src/StelApp.cpp
-@@ -141,7 +141,7 @@ void StelApp::init()
- {
- Translator::init(stelFileMgr->findFile("data/iso639-1.utf8"));
- }
-- catch (exception& e)
-+ catch (std::exception& e)
- {
- cerr << "ERROR while loading translations: " << e.what() << endl;
- }
-@@ -180,7 +180,7 @@ void StelApp::init()
- {
- fontMapFile = stelFileMgr->findFile(QFile::decodeName("data/fontmap.dat"));
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR when locating font map file: " << e.what() << endl;
- }
-@@ -243,7 +243,7 @@ void StelApp::init()
- {
- iconPath = stelFileMgr->findFile("data/icon.bmp");
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR when trying to locate icon file: " << e.what() << endl;
- }
-@@ -425,7 +425,7 @@ void StelApp::parseCLIArgsPreConfig(void
- stelFileMgr->findFile("landscapes/" + *i + "/landscape.ini");
- cout << (*i).toUtf8().data() << endl;
- }
-- catch(exception& e){}
-+ catch(std::exception& e){}
- }
- exit(0);
- }
-@@ -434,7 +434,7 @@ void StelApp::parseCLIArgsPreConfig(void
- {
- setConfigFile(qPrintable(argsGetOptionWithArg<QString>(argList, "-c", "--config-file", "config.ini")));
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR: while looking for --config-file option: " << e.what() << ". Using \"config.ini\"" << endl;
- setConfigFile("config.ini");
-@@ -463,7 +463,7 @@ void StelApp::parseCLIArgsPostConfig(Ini
- projectionType = argsGetOptionWithArg<QString>(argList, "", "--projection-type", "");
-
- }
-- catch (exception& e)
-+ catch (std::exception& e)
- {
- cerr << "ERROR while checking command line options: " << e.what() << endl;
- exit(0);
-@@ -746,7 +746,7 @@ void StelApp::setConfigFile(const QStrin
- configFile = stelFileMgr->findFile(configName, StelFileMgr::FLAGS(StelFileMgr::WRITABLE|StelFileMgr::FILE));
- return;
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- //cerr << "DEBUG StelApp::setConfigFile could not locate writable config file " << configName << endl;
- }
-@@ -756,7 +756,7 @@ void StelApp::setConfigFile(const QStrin
- configFile = stelFileMgr->findFile(configName, StelFileMgr::FILE);
- return;
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- //cerr << "DEBUG StelApp::setConfigFile could not find read only config file " << configName << endl;
- }
-@@ -767,7 +767,7 @@ void StelApp::setConfigFile(const QStrin
- //cerr << "DEBUG StelApp::setConfigFile found NEW file path: " << configFile << endl;
- return;
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR StelApp::setConfigFile could not find or create configuration file " << configName.toUtf8().data() << endl;
- exit(1);
-@@ -781,7 +781,7 @@ void StelApp::copyDefaultConfigFile()
- {
- defaultConfigFilePath = stelFileMgr->findFile("data/default_config.ini");
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR (copyDefaultConfigFile): failed to locate data/default_config.ini. Please check your installation." << endl;
- exit(1);
+--- src/modules/ConstellationMgr.cpp.orig 2008-10-26 14:25:08.000000000 +0100
++++ src/modules/ConstellationMgr.cpp
+@@ -402,7 +402,7 @@ void ConstellationMgr::loadLinesAndArt(c
+ {
+ texturePath = StelApp::getInstance().getFileMgr().findFile(QString("textures/")+texfile);
+ }
+- catch(exception& e2)
++ catch (std::exception& e2)
+ {
+ qWarning() << "ERROR: could not find texture, " << texfile << ": " << e2.what();
+ }
diff --git a/misc/stellarium/patches/patch-ab b/misc/stellarium/patches/patch-ab
index d1348c768e0..424eba7e807 100644
--- a/misc/stellarium/patches/patch-ab
+++ b/misc/stellarium/patches/patch-ab
@@ -1,22 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2008/09/16 13:23:42 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/26 14:03:37 adam Exp $
---- src/stel_command_interface.cpp.orig 2008-09-15 14:03:46.000000000 +0200
-+++ src/stel_command_interface.cpp
-@@ -436,7 +436,7 @@ int StelCommandInterface::execute_comman
- image_filename = stapp->getFileMgr().findFile(image_filename);
- script_images->load_image(image_filename, args["name"].c_str(), img_pos);
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR finding script: " << e.what() << endl;
- debug_message = _("Unable to open file: ") + image_filename.toStdWString();
-@@ -511,7 +511,7 @@ int StelCommandInterface::execute_comman
- audio = new Audio(QFile::encodeName(audioFilePath).constData(), "default track", StelUtils::stringToLong(args["output_rate"]));
- audio->play(args["loop"]=="on");
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR while trying to play audio file: " << args["filename"] << " : " << e.what() << endl;
- }
+--- doc/CMakeLists.txt.orig 2008-10-26 14:40:24.000000000 +0100
++++ doc/CMakeLists.txt
+@@ -20,7 +20,7 @@ ADD_CUSTOM_COMMAND(
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1
+ )
+
+-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION share/man/man1)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION man/man1)
+
+ ENDIF(UNIX AND NOT WIN32)
+
diff --git a/misc/stellarium/patches/patch-ac b/misc/stellarium/patches/patch-ac
deleted file mode 100644
index cd167a96e5c..00000000000
--- a/misc/stellarium/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2008/09/16 13:23:42 drochner Exp $
-
---- src/stel_ui_conf.cpp.orig 2008-09-15 14:05:32.000000000 +0200
-+++ src/stel_ui_conf.cpp
-@@ -620,7 +620,7 @@ void StelUI::load_cities(const string& p
- {
- fileName = StelApp::getInstance().getFileMgr().findFile(QString("data/cities_") + planetEnglishName.c_str() + ".fab");
- }
-- catch (exception& e)
-+ catch (std::exception& e)
- {
- cerr << "INFO StelUI::load_cities " << e.what() << endl;
- return;
diff --git a/misc/stellarium/patches/patch-ad b/misc/stellarium/patches/patch-ad
deleted file mode 100644
index 009eb260548..00000000000
--- a/misc/stellarium/patches/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/09/16 13:23:42 drochner Exp $
-
---- src/stel_ui_tuiconf.cpp.orig 2008-09-15 14:07:22.000000000 +0200
-+++ src/stel_ui_tuiconf.cpp
-@@ -155,7 +155,7 @@ void StelUI::init_tui(void)
- {
- tui_time_settmz = new s_tui::Time_zone_item(QFile::encodeName(app->getFileMgr().findFile("data/zone.tab")).constData(), wstring(L"2.2 "));
- }
-- catch(exception &e)
-+ catch(std::exception &e)
- {
- cerr << "ERROR locating zone file: " << e.what() << endl;
- }
-@@ -520,7 +520,7 @@ int StelUI::handle_keys_tui(Uint16 key,
- cmd = "script action play filename \"" + SelectedScript
- + "\" path \"" + QFile::encodeName(theParent).constData() + "/\"";
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR while executing script " << SelectedScript << ": " << e.what() << endl;
- }
-@@ -677,7 +677,7 @@ void StelUI::tui_cb_admin_save_default(v
- {
- saveCurrentConfig(app->getConfigFilePath());
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR: could not save config.ini file: " << e.what() << endl;
- }
-@@ -686,7 +686,7 @@ void StelUI::tui_cb_admin_save_default(v
- {
- system( QFile::encodeName(app->getFileMgr().findFile("data/script_save_config ")).constData());
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR while calling script_save_config: " << e.what() << endl;
- }
-@@ -699,7 +699,7 @@ void StelUI::tui_cb_admin_updateme(void)
- {
- system( QFile::encodeName(app->getFileMgr().findFile("data/script_internet_update ")).constData());
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR while calling script_internet_update: " << e.what() << endl;
- }
-@@ -713,7 +713,7 @@ void StelUI::tui_cb_admin_shutdown(void)
- {
- system( QFile::encodeName(app->getFileMgr().findFile("data/script_shutdown ")).constData());
- }
-- catch(exception& e)
-+ catch(std::exception& e)
- {
- cerr << "ERROR while calling script_shutdown: " << e.what() << endl;
- }