CVS commit: pkgsrc/misc/stellarium

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Oct  1 17:47:01 UTC 2019

Modified Files:
        pkgsrc/misc/stellarium: Makefile PLIST distinfo
        pkgsrc/misc/stellarium/patches: patch-CMakeLists.txt
Added Files:
        pkgsrc/misc/stellarium/patches: patch-data_CMakeLists.txt
            patch-src_CMakeLists.txt

Log Message:
stellarium: updated to 0.19.2

0.19.2:
The second bugfix release for series 0.19


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/misc/stellarium/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/misc/stellarium/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/misc/stellarium/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt \
    pkgsrc/misc/stellarium/patches/patch-src_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/stellarium/Makefile
diff -u pkgsrc/misc/stellarium/Makefile:1.101 pkgsrc/misc/stellarium/Makefile:1.102
--- pkgsrc/misc/stellarium/Makefile:1.101       Wed Sep 18 14:17:12 2019
+++ pkgsrc/misc/stellarium/Makefile     Tue Oct  1 17:47:01 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2019/09/18 14:17:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.102 2019/10/01 17:47:01 adam Exp $
 
-DISTNAME=      stellarium-0.19.1
-PKGREVISION=   2
+DISTNAME=      stellarium-0.19.2
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Stellarium/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}

Index: pkgsrc/misc/stellarium/PLIST
diff -u pkgsrc/misc/stellarium/PLIST:1.31 pkgsrc/misc/stellarium/PLIST:1.32
--- pkgsrc/misc/stellarium/PLIST:1.31   Mon Jul  1 19:13:40 2019
+++ pkgsrc/misc/stellarium/PLIST        Tue Oct  1 17:47:01 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2019/07/01 19:13:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.32 2019/10/01 17:47:01 adam Exp $
 bin/stellarium
 man/man1/stellarium.1
 ${PLIST.desktop}share/applications/stellarium.desktop
@@ -21,7 +21,7 @@ share/stellarium/data/countryCodes.dat
 share/stellarium/data/default_cfg.ini
 share/stellarium/data/iso3166.tab
 share/stellarium/data/iso639-1.utf8
-share/stellarium/data/nomenclature.fab
+share/stellarium/data/nomenclature.dat
 share/stellarium/data/shaders/planet.frag
 share/stellarium/data/shaders/planet.vert
 share/stellarium/data/shaders/s3d_cube.frag
@@ -365,6 +365,7 @@ share/stellarium/nebulae/default/GammaCy
 share/stellarium/nebulae/default/Jones-Emberson1-vasey.png
 share/stellarium/nebulae/default/Medusa-vasey.png
 share/stellarium/nebulae/default/barnard142-vasey.png
+share/stellarium/nebulae/default/barnard150.png
 share/stellarium/nebulae/default/barnard173-vasey.png
 share/stellarium/nebulae/default/barnard207.png
 share/stellarium/nebulae/default/barnard22-vasey.png
@@ -412,6 +413,9 @@ share/stellarium/nebulae/default/ic4628-
 share/stellarium/nebulae/default/ic5146.png
 share/stellarium/nebulae/default/ic883h.png
 share/stellarium/nebulae/default/lbn438.png
+share/stellarium/nebulae/default/ldn1622.png
+share/stellarium/nebulae/default/ldn673.png
+share/stellarium/nebulae/default/leo_cluster.png
 share/stellarium/nebulae/default/lmc_01.png
 share/stellarium/nebulae/default/lmc_02.png
 share/stellarium/nebulae/default/lmc_03.png
@@ -683,6 +687,7 @@ share/stellarium/nebulae/default/n5257h.
 share/stellarium/nebulae/default/n5286.png
 share/stellarium/nebulae/default/n5367.png
 share/stellarium/nebulae/default/n5466.png
+share/stellarium/nebulae/default/n5474.png
 share/stellarium/nebulae/default/n55.png
 share/stellarium/nebulae/default/n5566.png
 share/stellarium/nebulae/default/n5694-dss.png
@@ -712,8 +717,11 @@ share/stellarium/nebulae/default/n6388.p
 share/stellarium/nebulae/default/n6397.png
 share/stellarium/nebulae/default/n6441-2mass.png
 share/stellarium/nebulae/default/n6445.png
+share/stellarium/nebulae/default/n6522.png
 share/stellarium/nebulae/default/n6541-dss.png
 share/stellarium/nebulae/default/n6543kepler.png
+share/stellarium/nebulae/default/n6544.png
+share/stellarium/nebulae/default/n6553.png
 share/stellarium/nebulae/default/n6563.png
 share/stellarium/nebulae/default/n6590.png
 share/stellarium/nebulae/default/n660.png
@@ -791,6 +799,7 @@ share/stellarium/nebulae/default/rho-a01
 share/stellarium/nebulae/default/rho-a10.png
 share/stellarium/nebulae/default/rho-a11.png
 share/stellarium/nebulae/default/sh2-101-vasey.png
+share/stellarium/nebulae/default/sh2-106.png
 share/stellarium/nebulae/default/sh2-136.png
 share/stellarium/nebulae/default/sh2-155.png
 share/stellarium/nebulae/default/sh2-240.png
@@ -799,6 +808,7 @@ share/stellarium/nebulae/default/sh2-263
 share/stellarium/nebulae/default/sh2-264.png
 share/stellarium/nebulae/default/sh2-297.png
 share/stellarium/nebulae/default/sh2-308.png
+share/stellarium/nebulae/default/sh2-80.png
 share/stellarium/nebulae/default/smc-ha.png
 share/stellarium/nebulae/default/smc29-1.png
 share/stellarium/nebulae/default/smc29-2.png
@@ -908,6 +918,7 @@ share/stellarium/scripts/largest_known_s
 share/stellarium/scripts/lunar_partial.ssc
 share/stellarium/scripts/lunar_total.ssc
 share/stellarium/scripts/martian_analemma.ssc
+share/stellarium/scripts/messier_marathon.ssc
 share/stellarium/scripts/messier_tour.ssc
 share/stellarium/scripts/morsels_1.ssc
 share/stellarium/scripts/morsels_2.ssc
@@ -919,6 +930,7 @@ share/stellarium/scripts/phobos_phun_3.s
 share/stellarium/scripts/phobos_phun_4.ssc
 share/stellarium/scripts/phobos_phun_5.ssc
 share/stellarium/scripts/planets_tour.ssc
+share/stellarium/scripts/saturnian_analemma.ssc
 share/stellarium/scripts/save_state.inc
 share/stellarium/scripts/screensaver.ssc
 share/stellarium/scripts/sky_cultures.ssc
@@ -931,8 +943,16 @@ share/stellarium/scripts/supernova.ssc
 share/stellarium/scripts/transit_of_venus.ssc
 share/stellarium/scripts/translation.inc
 share/stellarium/scripts/triple_sunrise_and_sunsets.ssc
+share/stellarium/scripts/uranian_analemma.ssc
 share/stellarium/scripts/western_constellations_tour.ssc
 share/stellarium/scripts/zodiac.ssc
+share/stellarium/skycultures/anutan/constellation_names.eng.fab
+share/stellarium/skycultures/anutan/constellationship.fab
+share/stellarium/skycultures/anutan/description.en.utf8
+share/stellarium/skycultures/anutan/dso_names.fab
+share/stellarium/skycultures/anutan/info.ini
+share/stellarium/skycultures/anutan/planet_names.fab
+share/stellarium/skycultures/anutan/star_names.fab
 share/stellarium/skycultures/arabic/Bearer-of-the-Demons-Head.png
 share/stellarium/skycultures/arabic/Book_of_Fixed_Stars3.png
 share/stellarium/skycultures/arabic/CentaurAndThe-Beast-of-Prey.png
@@ -1814,6 +1834,26 @@ share/stellarium/skycultures/tupi/descri
 share/stellarium/skycultures/tupi/description.zh_TW.utf8
 share/stellarium/skycultures/tupi/info.ini
 share/stellarium/skycultures/tupi/star_names.fab
+share/stellarium/skycultures/vanuatu_netwar/constellation_names.eng.fab
+share/stellarium/skycultures/vanuatu_netwar/constellation_names.fra.fab
+share/stellarium/skycultures/vanuatu_netwar/constellationsart.fab
+share/stellarium/skycultures/vanuatu_netwar/constellationship.fab
+share/stellarium/skycultures/vanuatu_netwar/description.cs.utf8
+share/stellarium/skycultures/vanuatu_netwar/description.en.utf8
+share/stellarium/skycultures/vanuatu_netwar/description.fr.utf8
+share/stellarium/skycultures/vanuatu_netwar/dso_names.fab
+share/stellarium/skycultures/vanuatu_netwar/info.ini
+share/stellarium/skycultures/vanuatu_netwar/kahau.png
+share/stellarium/skycultures/vanuatu_netwar/kasulia_apam.png
+share/stellarium/skycultures/vanuatu_netwar/kasulia_rerparep.png
+share/stellarium/skycultures/vanuatu_netwar/kilil.png
+share/stellarium/skycultures/vanuatu_netwar/kou.png
+share/stellarium/skycultures/vanuatu_netwar/nemrau.png
+share/stellarium/skycultures/vanuatu_netwar/nowanuman_l.png
+share/stellarium/skycultures/vanuatu_netwar/nowanuman_s.png
+share/stellarium/skycultures/vanuatu_netwar/planet_names.fab
+share/stellarium/skycultures/vanuatu_netwar/star_names.fab
+share/stellarium/skycultures/vanuatu_netwar/suatu_kywer.png
 share/stellarium/skycultures/western/andromeda.png
 share/stellarium/skycultures/western/antlia.png
 share/stellarium/skycultures/western/apus.png
@@ -2140,6 +2180,7 @@ share/stellarium/translations/stellarium
 share/stellarium/translations/stellarium-planetary-features/sv.qm
 share/stellarium/translations/stellarium-planetary-features/sw.qm
 share/stellarium/translations/stellarium-planetary-features/ta.qm
+share/stellarium/translations/stellarium-planetary-features/te.qm
 share/stellarium/translations/stellarium-planetary-features/tg.qm
 share/stellarium/translations/stellarium-planetary-features/th.qm
 share/stellarium/translations/stellarium-planetary-features/tl.qm
@@ -2229,6 +2270,7 @@ share/stellarium/translations/stellarium
 share/stellarium/translations/stellarium-remotecontrol/sv.qm
 share/stellarium/translations/stellarium-remotecontrol/sw.qm
 share/stellarium/translations/stellarium-remotecontrol/ta.qm
+share/stellarium/translations/stellarium-remotecontrol/te.qm
 share/stellarium/translations/stellarium-remotecontrol/tg.qm
 share/stellarium/translations/stellarium-remotecontrol/th.qm
 share/stellarium/translations/stellarium-remotecontrol/tl.qm
@@ -2318,6 +2360,7 @@ share/stellarium/translations/stellarium
 share/stellarium/translations/stellarium-scripts/sv.qm
 share/stellarium/translations/stellarium-scripts/sw.qm
 share/stellarium/translations/stellarium-scripts/ta.qm
+share/stellarium/translations/stellarium-scripts/te.qm
 share/stellarium/translations/stellarium-scripts/tg.qm
 share/stellarium/translations/stellarium-scripts/th.qm
 share/stellarium/translations/stellarium-scripts/tl.qm
@@ -2423,6 +2466,7 @@ share/stellarium/translations/stellarium
 share/stellarium/translations/stellarium-skycultures/sv.qm
 share/stellarium/translations/stellarium-skycultures/sw.qm
 share/stellarium/translations/stellarium-skycultures/ta.qm
+share/stellarium/translations/stellarium-skycultures/te.qm
 share/stellarium/translations/stellarium-skycultures/tg.qm
 share/stellarium/translations/stellarium-skycultures/th.qm
 share/stellarium/translations/stellarium-skycultures/tl.qm
@@ -2527,6 +2571,7 @@ share/stellarium/translations/stellarium
 share/stellarium/translations/stellarium/sv.qm
 share/stellarium/translations/stellarium/sw.qm
 share/stellarium/translations/stellarium/ta.qm
+share/stellarium/translations/stellarium/te.qm
 share/stellarium/translations/stellarium/tg.qm
 share/stellarium/translations/stellarium/th.qm
 share/stellarium/translations/stellarium/tl.qm

Index: pkgsrc/misc/stellarium/distinfo
diff -u pkgsrc/misc/stellarium/distinfo:1.41 pkgsrc/misc/stellarium/distinfo:1.42
--- pkgsrc/misc/stellarium/distinfo:1.41        Mon Jul  1 19:13:40 2019
+++ pkgsrc/misc/stellarium/distinfo     Tue Oct  1 17:47:01 2019
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.41 2019/07/01 19:13:40 adam Exp $
+$NetBSD: distinfo,v 1.42 2019/10/01 17:47:01 adam Exp $
 
-SHA1 (stellarium-0.19.1.tar.gz) = ff344208d71e9f66bb3b893acf7d92358bed1760
-RMD160 (stellarium-0.19.1.tar.gz) = 6d6997b1efe2faab06336db58b9550571555aa6e
-SHA512 (stellarium-0.19.1.tar.gz) = 59ab715f7b81e037ed3d23444547dcd00a41b9a1925d58b40a17372e286bbea2c1b762582cd7e1f81d690204840cc23dd9627e2c0bd4abf52367a456849eefe9
-Size (stellarium-0.19.1.tar.gz) = 314373270 bytes
-SHA1 (patch-CMakeLists.txt) = 9faab37daafe63ad854c151ed2317fc7245e8382
+SHA1 (stellarium-0.19.2.tar.gz) = 49dd7405e5be98e003829f5c220f780b68a1dc31
+RMD160 (stellarium-0.19.2.tar.gz) = 210cd9fd5456e5b36f7129259d6c6101f31cc4ca
+SHA512 (stellarium-0.19.2.tar.gz) = a0002dc8a1e43aa264cdf013b57362880d4809207a1f867285d3e1187c4c88c67d166652afe0edeec5a98eff1167e6c3693594d467605ba78ee29d6eb7878d4b
+Size (stellarium-0.19.2.tar.gz) = 318402838 bytes
+SHA1 (patch-CMakeLists.txt) = d7900c3e024bd817e14c1426e6f35b4b96367ee2
+SHA1 (patch-data_CMakeLists.txt) = 760c38c5a5d3bf60a4039a2fbe177b2e49dee128
 SHA1 (patch-doc_CMakeLists.txt) = c0505c73dc051b4416deb08b2127a49591cd1aed
+SHA1 (patch-src_CMakeLists.txt) = 696989cfc123d5e2636add4e91f3e519ff5ac6fc
 SHA1 (patch-src_core_StelFileMgr.cpp) = 016546192cf50cb5ab72090e7092f9aeea63b1c9

Index: pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt
diff -u pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt:1.2 pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt:1.2     Mon Apr  2 19:37:36 2018
+++ pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt Tue Oct  1 17:47:01 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2018/04/02 19:37:36 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2019/10/01 17:47:01 adam Exp $
 
 Do not use ccache.
 Do not use application bundle on Darwin.
 
---- CMakeLists.txt.orig        2018-03-25 08:19:33.000000000 +0000
+--- CMakeLists.txt.orig        2019-09-29 09:29:34.000000000 +0000
 +++ CMakeLists.txt
-@@ -76,12 +76,6 @@ IF(OPENGL_DEBUG_LOGGING)
+@@ -89,12 +89,6 @@ IF(OPENGL_DEBUG_LOGGING)
       ADD_DEFINITIONS(-DQ_ENABLE_OPENGL_FUNCTIONS_DEBUG)
  ENDIF()
  
@@ -18,38 +18,39 @@ Do not use application bundle on Darwin.
  
  # Add gprof build options if necessary.  Note gmon.out will be created in working directory when Stellarium is executed
  IF(${CMAKE_BUILD_TYPE} MATCHES "GProf")
-@@ -97,7 +91,6 @@ IF(${CMAKE_BUILD_TYPE} MATCHES "Valgrind
+@@ -109,7 +103,7 @@ IF(${CMAKE_BUILD_TYPE} MATCHES "Valgrind
+      SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
  ENDIF()
  
- IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--     SET(APPLE 1)
+-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
++IF(FALSE)
+      SET(APPLE 1)
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
- ENDIF()
- 
-@@ -183,7 +176,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBS
+      # share data location:
+@@ -224,7 +218,7 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBS
  ENDIF()
  
  # best way to get to APPLE?
 -IF(APPLE)
-+IF(ELPPA)
++IF(FALSE)
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Wall -Wextra")
       # using regular Clang or AppleClang
       IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-@@ -505,7 +498,7 @@ ENDIF()
+@@ -542,7 +536,7 @@ ENDIF()
  
  ########### Set some global variables ###########
  IF(UNIX AND NOT WIN32)
 -     IF(APPLE)
-+     IF(ELPPA)
++     IF(FALSE)
            SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents")
       ELSE()
-           ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/share/${PACKAGE}")
-@@ -671,7 +664,7 @@ IF(GENERATE_PACKAGE_TARGET)
+           ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/${SDATALOC}")          
+@@ -707,7 +701,7 @@ IF(GENERATE_PACKAGE_TARGET)
  ENDIF()
  
  ########### OS X Bundling ###############
 -IF(APPLE)
-+IF(ELPPA)
-      IF(CMAKE_OSX_DEPLOYMENT_TARGET)
-           SET(PACKAGE_OSX_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
-      ELSE()
++IF(FALSE)
+      GET_FILENAME_COMPONENT(_qt_bin_dir "${QMAKE_LOCATION}" DIRECTORY)
+      FIND_PROGRAM(MACDEPLOYQT_COMMAND macdeployqt HINTS "${_qt_bin_dir}")
+ 

Added files:

Index: pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt
diff -u /dev/null pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt:1.1
--- /dev/null   Tue Oct  1 17:47:01 2019
+++ pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt    Tue Oct  1 17:47:01 2019
@@ -0,0 +1,24 @@
+$NetBSD: patch-data_CMakeLists.txt,v 1.1 2019/10/01 17:47:01 adam Exp $
+
+Do not use application bundle on Darwin.
+
+--- data/CMakeLists.txt.orig   2019-10-01 15:30:10.000000000 +0000
++++ data/CMakeLists.txt
+@@ -24,7 +24,7 @@ SET_TARGET_PROPERTIES(splash PROPERTIES 
+ 
+ ########### icon target ###############
+ ADD_CUSTOM_TARGET(icon ALL)
+-IF(APPLE)
++IF(FALSE)
+       SET(_iconFile Icon.icns)
+       IF(NOT STELLARIUM_RELEASE_BUILD)
+               GET_FILENAME_COMPONENT(_iconSrcFile IconGray.icns ABSOLUTE)
+@@ -48,7 +48,7 @@ ADD_CUSTOM_COMMAND(
+ SET_TARGET_PROPERTIES(icon PROPERTIES FOLDER "data")
+ 
+ # install splash and icon
+-IF(APPLE)
++IF(FALSE)
+         INSTALL(FILES ${_iconDstFile} DESTINATION ${SDATALOC} RENAME ${_iconFile})
+         INSTALL(FILES ${_splashDstFile} DESTINATION ${SDATALOC}/data RENAME ${_splashFile})
+       INSTALL(FILES Info.plist PkgInfo DESTINATION .)
Index: pkgsrc/misc/stellarium/patches/patch-src_CMakeLists.txt
diff -u /dev/null pkgsrc/misc/stellarium/patches/patch-src_CMakeLists.txt:1.1
--- /dev/null   Tue Oct  1 17:47:01 2019
+++ pkgsrc/misc/stellarium/patches/patch-src_CMakeLists.txt     Tue Oct  1 17:47:01 2019
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2019/10/01 17:47:01 adam Exp $
+
+Do not use application bundle on Darwin.
+
+--- src/CMakeLists.txt.orig    2019-10-01 15:36:42.000000000 +0000
++++ src/CMakeLists.txt
+@@ -493,7 +493,7 @@ IF(MSVC)
+      )
+ ENDIF(MSVC)
+ 
+-IF(APPLE)
++IF(FALSE)
+      INSTALL(TARGETS stellarium DESTINATION MacOS)
+      INSTALL(CODE
+         "