Received: by mail.netbsd.org (Postfix, from userid 605) id DC74184E7A; Mon, 3 Oct 2022 09:07:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1499384E65 for ; Mon, 3 Oct 2022 09:07:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 0VK9L0ssVCYD for ; Mon, 3 Oct 2022 09:07:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 84F7B84E60 for ; Mon, 3 Oct 2022 09:07:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 791A1FA90; Mon, 3 Oct 2022 09:07:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_166478802345700" MIME-Version: 1.0 Date: Mon, 3 Oct 2022 09:07:03 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/misc/stellarium To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20221003090703.791A1FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_166478802345700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Mon Oct 3 09:07:03 UTC 2022 Modified Files: pkgsrc/misc/stellarium: Makefile PLIST distinfo pkgsrc/misc/stellarium/patches: patch-CMakeLists.txt patch-data_CMakeLists.txt patch-src_core_StelFileMgr.cpp Log Message: stellarium: updated to 1.0 1.0 [2022-10-01] The Stellarium team did it. Stellarium 1.0 is here! What makes this 1.0? - After more than 20 years of development the program is finally accurate enough for historical application. - This is the first release based on the Qt6 framework, so the project is safe for future development. These packages are tagged with a version number like 1.22.3. - We keep releasing Qt5-based packages for legacy or obsolete systems. This may include many Windows users who have to run ANGLE mode. These packages are tagged with a version number like 0.22.3. What is new for users? - A new, much better skylight model (Not for MacOS and OpenGL ES2 systems, sorry.) - Many details around eclipses - Updated Observation List features - New features in AstroCalc tool - HiDPI improvements - Better dithering - Able to use Windows location service (Windows) - New skyculture: Samoan - Updated several skycultures - Updates in Angle Measure, Satellites, Oculars, Remote Control, Pulsars plugins - Many more bugfixes. To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 pkgsrc/misc/stellarium/Makefile cvs rdiff -u -r1.46 -r1.47 pkgsrc/misc/stellarium/PLIST cvs rdiff -u -r1.57 -r1.58 pkgsrc/misc/stellarium/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/misc/stellarium/patches/patch-src_core_StelFileMgr.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_166478802345700 Content-Disposition: inline Content-Length: 13777 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/stellarium/Makefile diff -u pkgsrc/misc/stellarium/Makefile:1.138 pkgsrc/misc/stellarium/Makefile:1.139 --- pkgsrc/misc/stellarium/Makefile:1.138 Sun Sep 11 12:52:00 2022 +++ pkgsrc/misc/stellarium/Makefile Mon Oct 3 09:07:03 2022 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.138 2022/09/11 12:52:00 wiz Exp $ +# $NetBSD: Makefile,v 1.139 2022/10/03 09:07:03 adam Exp $ -DISTNAME= stellarium-0.22.2 -PKGREVISION= 1 +DISTNAME= stellarium-1.0 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GITHUB:=Stellarium/} GITHUB_RELEASE= v${PKGVERSION_NOREV} @@ -16,6 +15,7 @@ USE_LANGUAGES= c c++ USE_TOOLS+= msgfmt perl pod2man CMAKE_ARGS+= -DENABLE_GPS=OFF +CMAKE_ARGS+= -DENABLE_SHOWMYSKY=OFF LDFLAGS.SunOS+= -lnsl -lsocket Index: pkgsrc/misc/stellarium/PLIST diff -u pkgsrc/misc/stellarium/PLIST:1.46 pkgsrc/misc/stellarium/PLIST:1.47 --- pkgsrc/misc/stellarium/PLIST:1.46 Mon Jul 11 10:23:32 2022 +++ pkgsrc/misc/stellarium/PLIST Mon Oct 3 09:07:03 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.46 2022/07/11 10:23:32 adam Exp $ +@comment $NetBSD: PLIST,v 1.47 2022/10/03 09:07:03 adam Exp $ bin/stellarium man/man1/stellarium.1 ${PLIST.desktop}share/applications/org.stellarium.Stellarium.desktop @@ -1288,6 +1288,7 @@ share/stellarium/scenery3d/Sterngarten/d share/stellarium/scenery3d/Sterngarten/description.ko.utf8 share/stellarium/scenery3d/Sterngarten/description.nl.utf8 share/stellarium/scenery3d/Sterngarten/description.pt_BR.utf8 +share/stellarium/scenery3d/Sterngarten/description.ro.utf8 share/stellarium/scenery3d/Sterngarten/description.ru.utf8 share/stellarium/scenery3d/Sterngarten/description.sk.utf8 share/stellarium/scenery3d/Sterngarten/description.uk.utf8 @@ -1340,6 +1341,7 @@ share/stellarium/scenery3d/Testscene/des share/stellarium/scenery3d/Testscene/description.ko.utf8 share/stellarium/scenery3d/Testscene/description.nl.utf8 share/stellarium/scenery3d/Testscene/description.pt_BR.utf8 +share/stellarium/scenery3d/Testscene/description.ro.utf8 share/stellarium/scenery3d/Testscene/description.ru.utf8 share/stellarium/scenery3d/Testscene/description.sk.utf8 share/stellarium/scenery3d/Testscene/description.uk.utf8 @@ -1510,6 +1512,7 @@ share/stellarium/skycultures/arabic_indi share/stellarium/skycultures/arabic_indigenous/description.es.utf8 share/stellarium/skycultures/arabic_indigenous/description.gl.utf8 share/stellarium/skycultures/arabic_indigenous/description.nl.utf8 +share/stellarium/skycultures/arabic_indigenous/description.ru.utf8 share/stellarium/skycultures/arabic_indigenous/description.sk.utf8 share/stellarium/skycultures/arabic_indigenous/description.uk.utf8 share/stellarium/skycultures/arabic_indigenous/dso_names.fab @@ -1634,8 +1637,20 @@ share/stellarium/skycultures/babylonian_ share/stellarium/skycultures/babylonian_mulapin/planet_names.fab share/stellarium/skycultures/babylonian_mulapin/star_names.fab share/stellarium/skycultures/babylonian_mulapin/ukadua_bg.png +share/stellarium/skycultures/babylonian_seleucid/JNG_01_fische_bab_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_02_Aries_sk_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_03_taurus_bab_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_04_gemini_bab_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_05_Cancer_sk_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_06_leo_bab_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_08_libra_bab_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_10_sagittarius_bab_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_12_aquarius_bab_ohnevogel_1024.png +share/stellarium/skycultures/babylonian_seleucid/JNG_13_scorpius_sk_1024.png share/stellarium/skycultures/babylonian_seleucid/asterism_lines.fab +share/stellarium/skycultures/babylonian_seleucid/cap_blau_1024.png share/stellarium/skycultures/babylonian_seleucid/constellation_names.eng.fab +share/stellarium/skycultures/babylonian_seleucid/constellationsart.fab share/stellarium/skycultures/babylonian_seleucid/constellationship.fab share/stellarium/skycultures/babylonian_seleucid/description.bn.utf8 share/stellarium/skycultures/babylonian_seleucid/description.de.utf8 @@ -1804,6 +1819,7 @@ share/stellarium/skycultures/chinese_con share/stellarium/skycultures/chinese_contemporary/cygnus.png share/stellarium/skycultures/chinese_contemporary/delphinus.png share/stellarium/skycultures/chinese_contemporary/description.bn.utf8 +share/stellarium/skycultures/chinese_contemporary/description.de.utf8 share/stellarium/skycultures/chinese_contemporary/description.en.utf8 share/stellarium/skycultures/chinese_contemporary/description.es.utf8 share/stellarium/skycultures/chinese_contemporary/description.gl.utf8 @@ -2224,6 +2240,7 @@ share/stellarium/skycultures/indian/desc share/stellarium/skycultures/indian/description.zh_HK.utf8 share/stellarium/skycultures/indian/description.zh_TW.utf8 share/stellarium/skycultures/indian/dhaniShThA.png +share/stellarium/skycultures/indian/eridanus.png share/stellarium/skycultures/indian/gemini.png share/stellarium/skycultures/indian/hasta.png share/stellarium/skycultures/indian/hydra.png @@ -2365,6 +2382,8 @@ share/stellarium/skycultures/khoi-san/co share/stellarium/skycultures/khoi-san/constellationsart.fab share/stellarium/skycultures/khoi-san/constellationship.fab share/stellarium/skycultures/khoi-san/description.en.utf8 +share/stellarium/skycultures/khoi-san/description.es.utf8 +share/stellarium/skycultures/khoi-san/description.gl.utf8 share/stellarium/skycultures/khoi-san/description.ru.utf8 share/stellarium/skycultures/khoi-san/description.sk.utf8 share/stellarium/skycultures/khoi-san/description.uk.utf8 @@ -2747,6 +2766,17 @@ share/stellarium/skycultures/sami/descri share/stellarium/skycultures/sami/description.zh_CN.utf8 share/stellarium/skycultures/sami/info.ini share/stellarium/skycultures/sami/star_names.fab +share/stellarium/skycultures/samoan/constellation_names.eng.fab +share/stellarium/skycultures/samoan/constellationship.fab +share/stellarium/skycultures/samoan/description.en.utf8 +share/stellarium/skycultures/samoan/description.es.utf8 +share/stellarium/skycultures/samoan/description.ru.utf8 +share/stellarium/skycultures/samoan/description.sk.utf8 +share/stellarium/skycultures/samoan/description.uk.utf8 +share/stellarium/skycultures/samoan/dso_names.fab +share/stellarium/skycultures/samoan/info.ini +share/stellarium/skycultures/samoan/planet_names.fab +share/stellarium/skycultures/samoan/star_names.fab share/stellarium/skycultures/sardinian/constellation_names.eng.fab share/stellarium/skycultures/sardinian/constellationsart.fab share/stellarium/skycultures/sardinian/constellationship.fab Index: pkgsrc/misc/stellarium/distinfo diff -u pkgsrc/misc/stellarium/distinfo:1.57 pkgsrc/misc/stellarium/distinfo:1.58 --- pkgsrc/misc/stellarium/distinfo:1.57 Mon Jul 11 10:23:32 2022 +++ pkgsrc/misc/stellarium/distinfo Mon Oct 3 09:07:03 2022 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.57 2022/07/11 10:23:32 adam Exp $ +$NetBSD: distinfo,v 1.58 2022/10/03 09:07:03 adam Exp $ -BLAKE2s (stellarium-0.22.2.tar.gz) = b6d18460d4e30dbe9cf256e84ac1dc5866bb6928cdfc5886f534f74de1bdf54e -SHA512 (stellarium-0.22.2.tar.gz) = ed905f58e1ff8b257b1e054ca76c83470915b00a04f7925b63784aa62b74e972f332e0b7dc605ffc17bb6516ef4f045943cb564d9637238726b9d7ceb2d44dda -Size (stellarium-0.22.2.tar.gz) = 409151525 bytes -SHA1 (patch-CMakeLists.txt) = 63829df5ab362ca143104ae11fcc3a77d44d03ff -SHA1 (patch-data_CMakeLists.txt) = 760c38c5a5d3bf60a4039a2fbe177b2e49dee128 +BLAKE2s (stellarium-1.0.tar.gz) = 3caf2544283909cfcc09641954842e044ac94e52f2e3daf3094ec60eb7e2428b +SHA512 (stellarium-1.0.tar.gz) = b0613b5b2921c02e89315971e6a211ac8f09a3031320836f7cb76c6abb951c392834cf08f64ecfdac57227ba8ecc7367e7e7e7ee044243866494494ca12b9167 +Size (stellarium-1.0.tar.gz) = 439765579 bytes +SHA1 (patch-CMakeLists.txt) = 22e9043b6b05a8b564189516aa40315040d753c5 +SHA1 (patch-data_CMakeLists.txt) = 29a5c1c8eb64baff1ef7bf64e3c0ea6bcdc7704f SHA1 (patch-doc_CMakeLists.txt) = 8df6cc953f5ce2b3e87d6da30750061c62535315 SHA1 (patch-src_CMakeLists.txt) = 696989cfc123d5e2636add4e91f3e519ff5ac6fc -SHA1 (patch-src_core_StelFileMgr.cpp) = 016546192cf50cb5ab72090e7092f9aeea63b1c9 +SHA1 (patch-src_core_StelFileMgr.cpp) = fa54c05eddbb8db25a3aaa056f838e9e3a361596 Index: pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt diff -u pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt:1.6 pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt:1.7 --- pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt:1.6 Mon Jul 11 10:23:32 2022 +++ pkgsrc/misc/stellarium/patches/patch-CMakeLists.txt Mon Oct 3 09:07:03 2022 @@ -1,11 +1,11 @@ -$NetBSD: patch-CMakeLists.txt,v 1.6 2022/07/11 10:23:32 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.7 2022/10/03 09:07:03 adam Exp $ Do not use ccache. Do not use application bundle on Darwin. ---- CMakeLists.txt.orig 2022-07-07 14:03:54.000000000 +0000 +--- CMakeLists.txt.orig 2022-10-01 09:08:24.000000000 +0000 +++ CMakeLists.txt -@@ -159,14 +159,6 @@ IF(OPENGL_DEBUG_LOGGING) +@@ -204,14 +204,6 @@ IF(OPENGL_DEBUG_LOGGING) ADD_DEFINITIONS(-DQ_ENABLE_OPENGL_FUNCTIONS_DEBUG) ENDIF() @@ -20,8 +20,8 @@ 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") -@@ -195,7 +187,7 @@ IF(${CMAKE_BUILD_TYPE} MATCHES "UBSan") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -g") +@@ -259,7 +251,7 @@ IF(${CMAKE_BUILD_TYPE} MATCHES "Fuzzer") + ENDIF() ENDIF() -IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") @@ -29,7 +29,7 @@ Do not use application bundle on Darwin. SET(APPLE 1) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") # share data location: -@@ -297,7 +289,7 @@ IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "C +@@ -364,7 +356,7 @@ IF("${CMAKE_CXX_COMPILER_ID}" MATCHES "C IF(${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 3.3) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-const-variable -Wno-unused-result") ENDIF() @@ -37,8 +37,8 @@ Do not use application bundle on Darwin. + IF(FALSE) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-common -Wall -Wextra -Wno-unused-parameter") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-common -Wall -Wextra -Wno-unknown-warning-option") - # macOS architectures: x86_64 or arm64 (default: current system's processor architecture) -@@ -641,7 +633,7 @@ ENDIF() + ENDIF() +@@ -802,7 +794,7 @@ endif() ########### Set some global variables ########### IF(UNIX AND NOT WIN32) @@ -47,12 +47,12 @@ Do not use application bundle on Darwin. SET(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/Stellarium.app/Contents") ELSE() ADD_DEFINITIONS(-DINSTALL_DATADIR="${CMAKE_INSTALL_PREFIX}/${SDATALOC}") -@@ -780,7 +772,7 @@ IF(GENERATE_PACKAGE_TARGET) +@@ -946,7 +938,7 @@ IF(GENERATE_PACKAGE_TARGET) ENDIF() - ########### OS X Bundling ############### + ########### macOS Bundling ############### -IF(APPLE) +IF(FALSE) GET_FILENAME_COMPONENT(_qt_bin_dir "${QMAKE_LOCATION}" DIRECTORY) FIND_PROGRAM(MACDEPLOYQT_COMMAND macdeployqt HINTS "${_qt_bin_dir}") - + IF(MACDEPLOYQT_COMMAND) Index: pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt diff -u pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt:1.1 pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt:1.2 --- pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt:1.1 Tue Oct 1 17:47:01 2019 +++ pkgsrc/misc/stellarium/patches/patch-data_CMakeLists.txt Mon Oct 3 09:07:03 2022 @@ -1,8 +1,8 @@ -$NetBSD: patch-data_CMakeLists.txt,v 1.1 2019/10/01 17:47:01 adam Exp $ +$NetBSD: patch-data_CMakeLists.txt,v 1.2 2022/10/03 09:07:03 adam Exp $ Do not use application bundle on Darwin. ---- data/CMakeLists.txt.orig 2019-10-01 15:30:10.000000000 +0000 +--- data/CMakeLists.txt.orig 2022-09-21 12:07:05.000000000 +0000 +++ data/CMakeLists.txt @@ -24,7 +24,7 @@ SET_TARGET_PROPERTIES(splash PROPERTIES @@ -10,9 +10,9 @@ Do not use application bundle on Darwin. ADD_CUSTOM_TARGET(icon ALL) -IF(APPLE) +IF(FALSE) - SET(_iconFile Icon.icns) + SET(_iconFile stellarium.icns) IF(NOT STELLARIUM_RELEASE_BUILD) - GET_FILENAME_COMPONENT(_iconSrcFile IconGray.icns ABSOLUTE) + GET_FILENAME_COMPONENT(_iconSrcFile stellarium-gray.icns ABSOLUTE) @@ -48,7 +48,7 @@ ADD_CUSTOM_COMMAND( SET_TARGET_PROPERTIES(icon PROPERTIES FOLDER "data") Index: pkgsrc/misc/stellarium/patches/patch-src_core_StelFileMgr.cpp diff -u pkgsrc/misc/stellarium/patches/patch-src_core_StelFileMgr.cpp:1.2 pkgsrc/misc/stellarium/patches/patch-src_core_StelFileMgr.cpp:1.3 --- pkgsrc/misc/stellarium/patches/patch-src_core_StelFileMgr.cpp:1.2 Tue Mar 26 11:15:37 2019 +++ pkgsrc/misc/stellarium/patches/patch-src_core_StelFileMgr.cpp Mon Oct 3 09:07:03 2022 @@ -1,14 +1,14 @@ -$NetBSD: patch-src_core_StelFileMgr.cpp,v 1.2 2019/03/26 11:15:37 adam Exp $ +$NetBSD: patch-src_core_StelFileMgr.cpp,v 1.3 2022/10/03 09:07:03 adam Exp $ On Darwin, do not use bundles. ---- src/core/StelFileMgr.cpp.orig 2019-03-23 14:43:26.000000000 +0000 +--- src/core/StelFileMgr.cpp.orig 2022-09-21 12:07:19.000000000 +0000 +++ src/core/StelFileMgr.cpp -@@ -101,7 +101,7 @@ void StelFileMgr::init() +@@ -103,7 +103,7 @@ void StelFileMgr::init() } else { -- #if defined(Q_OS_MAC) +- #if defined(Q_OS_MACOS) + #if 0 QString relativePath = "/../Resources"; if (QCoreApplication::applicationDirPath().contains("src")) { --_----------=_166478802345700--