diff options
Diffstat (limited to 'astro')
| -rw-r--r-- | astro/stellarium-qt4/Makefile | 4 | ||||
| -rw-r--r-- | astro/stellarium-qt4/distinfo | 4 | ||||
| -rw-r--r-- | astro/stellarium-qt4/files/patch-doc_CMakeLists.txt | 11 | ||||
| -rw-r--r-- | astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp | 27 | ||||
| -rw-r--r-- | astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp | 18 |
5 files changed, 3 insertions, 61 deletions
diff --git a/astro/stellarium-qt4/Makefile b/astro/stellarium-qt4/Makefile index bda0e227cf0f..cf85f4bedfda 100644 --- a/astro/stellarium-qt4/Makefile +++ b/astro/stellarium-qt4/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= stellarium -PORTVERSION= 0.12.5 -PORTREVISION= 1 +PORTVERSION= 0.12.6 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/Stellarium-sources/${PORTVERSION} PKGNAMESUFFIX= -qt4 @@ -21,7 +20,6 @@ PORTSCOUT= limit:^0\.12\. # track only 0.12.x (legacy) USES= cmake gettext iconv USE_QT4= moc_build rcc_build uic_build qmake_build \ corelib gui network opengl -INSTALLS_ICONS= yes PORTDOCS= AUTHORS ChangeLog README diff --git a/astro/stellarium-qt4/distinfo b/astro/stellarium-qt4/distinfo index a6785dc2a768..d7d9b8396105 100644 --- a/astro/stellarium-qt4/distinfo +++ b/astro/stellarium-qt4/distinfo @@ -1,5 +1,5 @@ -SHA256 (stellarium-0.12.5.tar.gz) = 15fbc0f12f25e4dbf7eb360c422987ca312201e3b41e6eadba028f1af9174559 -SIZE (stellarium-0.12.5.tar.gz) = 107604546 +SHA256 (stellarium-0.12.6.tar.gz) = c16bf8076d568a05d913f10c9942837dfb1a6758444d7ebbce474c34ec50f447 +SIZE (stellarium-0.12.6.tar.gz) = 107604772 SHA256 (stars_4_1v0_1.cat) = 7a2084e5e45610bbffae9448d9552d8a8dd191e5b1a07b0e47d27622fab4a979 SIZE (stars_4_1v0_1.cat) = 17040932 SHA256 (stars_5_2v0_1.cat) = c4ebd18d05a805308cfac85fe224e3f0a75db6579cae65c935a0954da13f4164 diff --git a/astro/stellarium-qt4/files/patch-doc_CMakeLists.txt b/astro/stellarium-qt4/files/patch-doc_CMakeLists.txt deleted file mode 100644 index 895468eea55d..000000000000 --- a/astro/stellarium-qt4/files/patch-doc_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/CMakeLists.txt.orig 2014-10-11 11:24:38 UTC -+++ doc/CMakeLists.txt -@@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND( - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 - ) - --IF(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|NetBSD|OpenBSD)" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") -+IF(${CMAKE_SYSTEM_NAME} MATCHES "(DragonFly|FreeBSD|NetBSD|OpenBSD)" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION man/man1) - ELSE(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|NetBSD|OpenBSD)" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "kFreeBSD") - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/stellarium.1 DESTINATION share/man/man1) diff --git a/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp b/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp deleted file mode 100644 index a4a1fa8a963a..000000000000 --- a/astro/stellarium-qt4/files/patch-src_core_StelFileMgr.cpp +++ /dev/null @@ -1,27 +0,0 @@ ---- src/core/StelFileMgr.cpp.orig 2014-10-11 11:24:38 UTC -+++ src/core/StelFileMgr.cpp -@@ -84,7 +84,23 @@ void StelFileMgr::init() - qWarning() << "WARNING: could not locate installation directory"; - } - -- screenshotDir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation); -+ // Wasn't set path to screenshots directory via --screenshot-dir? -+ if (screenshotDir.isEmpty()) -+ { -+ QString screenshotDirSuffix = "/Stellarium"; -+ if (!QDesktopServices::storageLocation(QDesktopServices::PicturesLocation).isEmpty()) -+ screenshotDir = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation).append(screenshotDirSuffix); -+ else -+ screenshotDir = userDir.append(screenshotDirSuffix); -+ } -+ try -+ { -+ makeSureDirExistsAndIsWritable(screenshotDir); -+ } -+ catch (std::runtime_error &e) -+ { -+ qDebug("Error: cannot create screenshot directory: %s", e.what()); -+ } - } - - diff --git a/astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp b/astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp deleted file mode 100644 index ecdae1903d64..000000000000 --- a/astro/stellarium-qt4/files/patch-src_core_modules_Planet.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- src/core/modules/Planet.cpp.orig 2014-10-11 11:24:38 UTC -+++ src/core/modules/Planet.cpp -@@ -879,13 +879,13 @@ Vec3d Planet::getHeliocentricPos(Vec3d p - // } - // } - Vec3d pos = p; -- const Planet* ourParent = &(*parent); -+ const Planet* ourParent = parent.data(); - const Planet* parentsParent; - // int i = 0; - if (NULL != ourParent) - { - // const Planet* const parentsParent = &(*(ourParent->parent)); -- while (NULL != (parentsParent = &(*(ourParent->parent)))) -+ while (NULL != (parentsParent = ourParent->parent.data())) - { - pos += ourParent->eclipticPos; - ourParent = parentsParent; |