Date: Fri, 2 Jun 2023 19:30:21 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 33233fe5d44f - main - astro/kstars: update to 3.6.5, latest upstream Message-ID: <202306021930.352JULU7083135@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=33233fe5d44f72252c5a2e83873ecbb2ab498d46 commit 33233fe5d44f72252c5a2e83873ecbb2ab498d46 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2023-06-01 17:49:49 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2023-06-02 19:30:19 +0000 astro/kstars: update to 3.6.5, latest upstream Release notes are at http://knro.blogspot.com/2023/06/kstars-v365-is-released.html --- astro/kstars/Makefile | 3 +- astro/kstars/distinfo | 6 +-- astro/kstars/files/patch-kstars_CMakeLists.txt | 56 ++++++++++++++++++++++++++ astro/kstars/pkg-plist | 16 ++++++++ 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index d85d2ce4aa54..63d13534aacf 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -1,6 +1,5 @@ PORTNAME= kstars -DISTVERSION= 3.6.4 -PORTREVISION= 2 +DISTVERSION= 3.6.5 PORTEPOCH= 1 CATEGORIES= astro kde MASTER_SITES= KDE/stable/${PORTNAME} diff --git a/astro/kstars/distinfo b/astro/kstars/distinfo index 59a98255d21e..0030ac2b7941 100644 --- a/astro/kstars/distinfo +++ b/astro/kstars/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681627040 -SHA256 (kstars-3.6.4.tar.xz) = f4c26a25581265507394bbf4f19ea2f323b8615d5ec6c0f9fb22c98ea2060f6d -SIZE (kstars-3.6.4.tar.xz) = 113252480 +TIMESTAMP = 1685647969 +SHA256 (kstars-3.6.5.tar.xz) = 1c2a4510f0029e05e0cf3e76d83fabb6cf620165f142f95aad744f89fbaf2eb6 +SIZE (kstars-3.6.5.tar.xz) = 114135376 diff --git a/astro/kstars/files/patch-kstars_CMakeLists.txt b/astro/kstars/files/patch-kstars_CMakeLists.txt new file mode 100644 index 000000000000..464d7abf26fa --- /dev/null +++ b/astro/kstars/files/patch-kstars_CMakeLists.txt @@ -0,0 +1,56 @@ +Patch by Heiko Becker upstream: + +Without INDI present I get the following error: + +"x86_64-pc-linux-gnu-ld: ../lib/libKStarsLib.a(robuststatistics.cpp.o): +in function `Mathematics::GSLHelpers::gslMedianFromSortedData( +double const*, unsigned long, unsigned long)': +.../work/kstars-3.6.5/kstars/auxiliary/gslhelpers.h:306: undefined +reference to `gsl_stats_median_from_sorted_data'" + +That is the case because Mathematics::RobustStatistics is used +unconditionally, which pulls in gslhelpers and the need to link with +GSL. + +Also drop the duplicate linking of KF5::Notifications, KStarsLib already +links to it in the NOT ANDROID case. + + +--- kstars/CMakeLists.txt.orig 2023-05-31 08:23:38 UTC ++++ kstars/CMakeLists.txt +@@ -1169,6 +1169,8 @@ set(kstars_SRCS ${kstars_SRCS} ${fits2_SRCS} ${sep_SRC + set(kstarslite_SRCS ${kstarslite_SRCS} ${fits_klite_SRCS} ${sep_SRCS} ${hough_SRCS} ${fits2_klite_SRCS} ${kstarslite_libtess_SRC}) + + IF (NOT ANDROID) ++ # GSL ++ find_package(GSL REQUIRED) + qt5_add_dbus_adaptor(kstars_SRCS org.kde.kstars.xml kstars.h KStars) + qt5_add_dbus_adaptor(kstars_SRCS org.kde.kstars.SimClock.xml simclock.h SimClock) + qt5_add_dbus_adaptor(kstars_SRCS org.kde.kstars.FOV.xml fov.h FOV) +@@ -1213,6 +1215,7 @@ IF (NOT ANDROID) + ) + + add_library(KStarsLib STATIC ${kstars_SRCS}) ++ target_link_options(KStarsLib PUBLIC ${CMAKE_THREAD_LIBS_INIT}) + + if (BUILD_PYKSTARS) + set_target_properties(KStarsLib PROPERTIES POSITION_INDEPENDENT_CODE ON) +@@ -1243,6 +1246,7 @@ IF (NOT ANDROID) + Qt5::WebSockets + ${ZLIB_LIBRARIES} + Eigen3::Eigen ++ GSL::gsl + ) + + if (Qt5Keychain_FOUND) +@@ -1313,10 +1317,6 @@ if(INDI_FOUND) + ## Linux + MacOS Lite: Requires INDI Qt5 Client + ## Android: Requires INDI Qt5 Client built for Android + if (NOT ANDROID) +- # GSL +- find_package(GSL REQUIRED) +- include_directories(${GSL_INCLUDE_DIRS}) +- target_link_libraries(KStarsLib ${GSL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} KF5::Notifications) + # StellarSolver + target_link_libraries(KStarsLib StellarSolver::stellarsolver) + endif () diff --git a/astro/kstars/pkg-plist b/astro/kstars/pkg-plist index 777b3f3bf342..671b6437e19a 100644 --- a/astro/kstars/pkg-plist +++ b/astro/kstars/pkg-plist @@ -1231,6 +1231,21 @@ share/knotifications5/kstars.notifyrc %%DATADIR%%/TZrules.dat %%DATADIR%%/advinterface.dat %%DATADIR%%/asteroids.dat +%%DATADIR%%/cameradata/Canon_DSLR_EOS_Ra.xml +%%DATADIR%%/cameradata/MI_CCD_C3.xml +%%DATADIR%%/cameradata/Nikon_DSLR_DSC_D5000_(PTP_mode).xml +%%DATADIR%%/cameradata/QHY_CCD_268M.xml +%%DATADIR%%/cameradata/QHY_CCD_533M.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI071MC_Pro.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI120MC.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI1600MM.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI178MC.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI183MC_Pro.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI183MM_Pro.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI224MC.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI2600MM_Pro.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI290MM_Mini.xml +%%DATADIR%%/cameradata/ZWO_CCD_ASI6200MM.xml %%DATADIR%%/catalog.min.json %%DATADIR%%/cbounds-3.idx %%DATADIR%%/cbounds-4.idx @@ -1789,6 +1804,7 @@ share/knotifications5/kstars.notifyrc %%DATADIR%%/themes/sunsetcolor.colors %%DATADIR%%/themes/whitebalance.colors %%DATADIR%%/tips +%%DATADIR%%/tns_public_objects.csv %%DATADIR%%/unnamedstars.dat %%DATADIR%%/uranus.B0.vsop %%DATADIR%%/uranus.B1.vsop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306021930.352JULU7083135>