Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kstars for openSUSE:Factory checked in at 2021-07-23 23:41:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kstars (Old) and /work/SRC/openSUSE:Factory/.kstars.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kstars" Fri Jul 23 23:41:13 2021 rev:120 rq:907912 version:3.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/kstars/kstars.changes 2021-05-17 18:45:23.476604114 +0200 +++ /work/SRC/openSUSE:Factory/.kstars.new.1899/kstars.changes 2021-07-23 23:41:33.409804882 +0200 @@ -1,0 +2,31 @@ +Thu Jul 8 06:25:47 UTC 2021 - Paolo Stivanin <i...@paolostivanin.com> + +- Update to 3.5.4: + * clear texture cache before reloading the deeps sky, cache not found + * Set correct frame information for DSLR + * Fix twilight calculation + * don't show catalog identifier + * Better dso search + * fix descriptions due to wikipedia API update + * fix the thumbnails in what's interesting + * bring back the moon (and other solar system textures) + * Implement inline images for DSO, organize thumbnail downloads into separate directory + * Add filter synonyms for Analyze + * make the label density for catalogs cleverer + * Dso overhaul + * Increase sensitivity of pixel scale difference by an order of magnitude to detect small variations in focal length + * Add temperature regulation dialog box + * Magnifying glass for fitsviewer. + * Small update to the Scheduler docbook for the Mosaic Tool. + * Improve Mosaic Tool state + * Sync setting when temperature source changes + * Set calibration mode (previously preview_mode) whenever calibration is started... + * Make user select explicit temperature source for focus instead of assuming which source to use + * Refactor artificial horizon constraints. Add ceiling constraint. Add unit tests. Use Great circle. + * Bugfix meridian flip for lower culmination + * Lots of others small fixes +- Add hotfix-twilight.patch: this patch fixes an issue with the + twilight calculation. This fix is part of the 3.5.5-dev, and it + seems that no new release will be made for 3.5.4 (e.g. 3.5.4.1) + +------------------------------------------------------------------- Old: ---- kstars-3.5.3.tar.xz New: ---- hotfix-twilight.patch kstars-3.5.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kstars.spec ++++++ --- /var/tmp/diff_new_pack.j8cRlK/_old 2021-07-23 23:41:34.761803155 +0200 +++ /var/tmp/diff_new_pack.j8cRlK/_new 2021-07-23 23:41:34.761803155 +0200 @@ -20,7 +20,7 @@ %global __requires_exclude qmlimport\\((KStarsLiteEnums|TelescopeLiteEnums).* %bcond_without lang Name: kstars -Version: 3.5.3 +Version: 3.5.4 Release: 0 Summary: Desktop Planetarium # Note for legal: the Apache licensed files in the tarball are for the @@ -31,6 +31,8 @@ Group: Productivity/Scientific/Astronomy URL: https://edu.kde.org/kstars/ Source0: https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM 563c5f336ed4ed6a931b914fc4e836276dccfb70 -- this patch fixes an issue with the twilight calculation +Patch0: hotfix-twilight.patch BuildRequires: Mesa-devel BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -83,6 +85,9 @@ %prep %autosetup -p1 +# kde#439627 +rm po/de/docs/kstars/index.docbook + %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" ++++++ hotfix-twilight.patch ++++++ commit 563c5f336ed4ed6a931b914fc4e836276dccfb70 Author: Eric Dejouhanet <eric.dejouha...@gmail.com> Date: Wed Jul 7 19:53:06 2021 +0000 Hotfix for the twilight restriction diff --git a/kstars/ekos/scheduler/scheduler.cpp b/kstars/ekos/scheduler/scheduler.cpp index a1692de48..ea0dfb7ba 100644 --- a/kstars/ekos/scheduler/scheduler.cpp +++ b/kstars/ekos/scheduler/scheduler.cpp @@ -71,7 +71,7 @@ Scheduler::Scheduler() dirPath = QUrl::fromLocalFile(QDir::homePath()); // Get current KStars time and set seconds to zero - QDateTime currentDateTime = KStarsData::Instance()->lt(); + QDateTime currentDateTime = getLocalTime(); QTime currentTime = currentDateTime.time(); currentTime.setHMS(currentTime.hour(), currentTime.minute(), 0); currentDateTime.setTime(currentTime); @@ -419,7 +419,7 @@ void Scheduler::appendLogText(const QString &text) m_LogText.removeLast(); m_LogText.prepend(i18nc("log entry; %1 is the date, %2 is the text", "%1 %2", - KStarsData::Instance()->lt().toString("yyyy-MM-ddThh:mm:ss"), text)); + getLocalTime().toString("yyyy-MM-ddThh:mm:ss"), text)); qCInfo(KSTARS_EKOS_SCHEDULER) << text; @@ -2328,7 +2328,7 @@ void Scheduler::processJobs(QList<SchedulerJob *> sortedJobs, bool jobEvaluation } /* FIXME: it is possible to evaluate jobs while KStars has a time offset, so warn the user about this */ - QDateTime const now = KStarsData::Instance()->lt(); + QDateTime const now = getLocalTime(); /* Check if job can be processed right now */ SchedulerJob * const job_to_execute = *job_to_execute_iterator; @@ -2398,7 +2398,7 @@ int16_t Scheduler::getDarkSkyScore(QDateTime const &dawn, QDateTime const &dusk, // If both dawn and dusk are in the past, (incorrectly) readjust the dawn and dusk to the next day // This was OK for next-day calculations, but Scheduler should now drop dark sky scores and rely on SchedulerJob dawn and dusk QDateTime const now = when.isValid() ? when : getLocalTime(); - int const earlyDawnSecs = now.secsTo(dawn.addDays(dawn < now ? dawn.daysTo(now)+1 : 0).addSecs(-60.0 * Options::preDawnTime())); + int const earlyDawnSecs = now.secsTo(dawn.addDays(dawn < now ? dawn.daysTo(now)+1 : 0).addSecs(-60.0 * abs(Options::preDawnTime()))); int const dawnSecs = now.secsTo(dawn.addDays(dawn < now ? dawn.daysTo(now)+1 : 0)); int const duskSecs = now.secsTo(dusk.addDays(dawn < now ? dusk.daysTo(now)+1 : 0)); int const obsSecs = now.secsTo(when); @@ -2489,7 +2489,10 @@ void Scheduler::calculateDawnDusk() { SchedulerJob::calculateDawnDusk(QDateTime(), Dawn, Dusk); - preDawnDateTime = Dawn.addSecs(Options::preDawnTime() * 60.0); + preDawnDateTime = Dawn.addSecs(-60.0 * abs(Options::preDawnTime())); + + int const currentRow = queueTable->currentRow(); + updateNightTime(0 < currentRow ? jobs.at(currentRow) : nullptr); } void Scheduler::executeJob(SchedulerJob *job) @@ -2507,8 +2510,6 @@ void Scheduler::executeJob(SchedulerJob *job) if (index >= 0) queueTable->selectRow(index); - QDateTime const now = KStarsData::Instance()->lt(); - // If we already started, we check when the next object is scheduled at. // If it is more than 30 minutes in the future, we park the mount if that is supported // and we unpark when it is due to start. @@ -2519,7 +2520,7 @@ void Scheduler::executeJob(SchedulerJob *job) if (shouldSchedulerSleep(currentJob)) return; // If job schedule isn't now, wait - continuing to execute would cancel a parking attempt - else if (0 < KStarsData::Instance()->lt().secsTo(currentJob->getStartupTime())) + else if (0 < getLocalTime().secsTo(currentJob->getStartupTime())) return; // From this point job can be executed now @@ -3300,7 +3301,7 @@ void Scheduler::checkJobStage() checkJobStageCounter = 0; } - QDateTime const now = KStarsData::Instance()->lt(); + QDateTime const now = getLocalTime(); /* Refresh the score of the current job */ /* currentJob->setScore(calculateJobScore(currentJob, now)); */ @@ -3377,8 +3378,8 @@ void Scheduler::checkJobStage() } } - // #4 Check if we're not at dawn - if (currentJob->getEnforceTwilight() && now > KStarsDateTime(preDawnDateTime)) + // #4 Check if we're not at dawn - dawn is still next event before dusk, and early dawn is past + if (currentJob->getEnforceTwilight() && ((Dawn < Dusk && preDawnDateTime < now) || (Dusk < Dawn))) { // If either mount or dome are not parked, we shutdown if we approach dawn if (isMountParked() == false || (parkDomeCheck->isEnabled() && isDomeParked() == false)) @@ -3386,7 +3387,7 @@ void Scheduler::checkJobStage() // Minute is a DOUBLE value, do not use i18np appendLogText(i18n( "Job '%3' is now approaching astronomical twilight rise limit at %1 (%2 minutes safety margin), marking idle.", - preDawnDateTime.toString(), Options::preDawnTime(), currentJob->getName())); + preDawnDateTime.toString(), abs(Options::preDawnTime()), currentJob->getName())); currentJob->setState(SchedulerJob::JOB_IDLE); stopCurrentJobAction(); findNextJob(); @@ -4565,7 +4566,7 @@ void Scheduler::findNextJob() } else if (currentJob->getCompletionCondition() == SchedulerJob::FINISH_AT) { - if (KStarsData::Instance()->lt().secsTo(currentJob->getCompletionTime()) <= 0) + if (getLocalTime().secsTo(currentJob->getCompletionTime()) <= 0) { /* Mark the job idle as well as all its duplicates for re-evaluation */ foreach(SchedulerJob *a_job, jobs) @@ -6741,7 +6742,7 @@ void Scheduler::setAlignStatus(Ekos::AlignState status) /* If current job is scheduled and has not started yet, wait */ if (SchedulerJob::JOB_SCHEDULED == currentJob->getState()) { - QDateTime const now = KStarsData::Instance()->lt(); + QDateTime const now = getLocalTime(); if (now < currentJob->getStartupTime()) return; } @@ -6793,7 +6794,7 @@ void Scheduler::setGuideStatus(Ekos::GuideState status) /* If current job is scheduled and has not started yet, wait */ if (SchedulerJob::JOB_SCHEDULED == currentJob->getState()) { - QDateTime const now = KStarsData::Instance()->lt(); + QDateTime const now = getLocalTime(); if (now < currentJob->getStartupTime()) return; } @@ -6872,7 +6873,7 @@ void Scheduler::setCaptureStatus(Ekos::CaptureState status) /* If current job is scheduled and has not started yet, wait */ if (SchedulerJob::JOB_SCHEDULED == currentJob->getState()) { - QDateTime const now = KStarsData::Instance()->lt(); + QDateTime const now = getLocalTime(); if (now < currentJob->getStartupTime()) return; } @@ -6951,7 +6952,7 @@ void Scheduler::setFocusStatus(Ekos::FocusState status) /* If current job is scheduled and has not started yet, wait */ if (SchedulerJob::JOB_SCHEDULED == currentJob->getState()) { - QDateTime const now = KStarsData::Instance()->lt(); + QDateTime const now = getLocalTime(); if (now < currentJob->getStartupTime()) return; } @@ -7002,7 +7003,7 @@ void Scheduler::setMountStatus(ISD::Telescope::Status status) /* If current job is scheduled and has not started yet, wait */ if (SchedulerJob::JOB_SCHEDULED == currentJob->getState()) - if (static_cast<QDateTime const>(KStarsData::Instance()->lt()) < currentJob->getStartupTime()) + if (static_cast<QDateTime const>(getLocalTime()) < currentJob->getStartupTime()) return; switch (currentJob->getStage()) @@ -7147,7 +7148,7 @@ bool Scheduler::shouldSchedulerSleep(SchedulerJob *currentJob) if (currentJob->getLightFramesRequired() == false) return false; - QDateTime const now = KStarsData::Instance()->lt(); + QDateTime const now = getLocalTime(); int const nextObservationTime = now.secsTo(currentJob->getStartupTime()); // If start up procedure is complete and the user selected pre-emptive shutdown, let us check if the next observation time exceed diff --git a/kstars/ekos/scheduler/scheduler.ui b/kstars/ekos/scheduler/scheduler.ui index 3274dc1a3..5175d585e 100644 --- a/kstars/ekos/scheduler/scheduler.ui +++ b/kstars/ekos/scheduler/scheduler.ui @@ -1708,7 +1708,7 @@ font-weight:bold; <item row="3" column="1"> <widget class="QLabel" name="nightTime"> <property name="toolTip"> - <string><html><head/><body><p>Astronomical dawn and dusk for the Scheduler job currently selected, or for today if no job is selected.</p><p>- The first value is <span style=" font-weight:600;">dusk</span>, specifically the next local time the Sun sets below an altitude of -18?? after the job starts.</p><p>- The second value is <span style=" font-weight:600;">dawn</span>, specifically the next local time the Sun rises higher than an altitude of -18?? after the job starts.</p><p>A warning symbol indicates the Sun will not travel below the astronomical dusk boundary after the job starts, and that dawn and dusk times are calculated from its minimal altitude. In that situation, the Twilight restriction prevents job execution unless the Ekos Dawn Offset and Dusk Offset options are configured appropriately.</p><p>Note that the Ekos Pre-Dawn Offset option virtual ly advances dawn by a default of 30 minutes and will thus prevent a job from starting just before than moment.</p></body></html></string> + <string><html><head/><body><p>Astronomical dawn and dusk for the Scheduler job currently selected, or for today if no job is selected.</p><p>- The first value is <span style=" font-weight:600;">dusk</span>, specifically the next local time the Sun sets below an altitude of -18?? after the job starts.</p><p>- The second value is <span style=" font-weight:600;">dawn</span>, specifically the next local time the Sun rises higher than an altitude of -18?? after the job starts.</p><p>A warning symbol indicates the Sun will not travel below the astronomical dusk boundary after the job starts, and that dawn and dusk times are calculated from its minimal altitude. In that situation, the Twilight restriction prevents job execution unless the Ekos Dawn Offset and Dusk Offset options are configured appropriately.</p><p>Note that the Ekos Pre-Dawn Offset option virtual ly advances dawn by a default of 30 minutes and will thus prevent a job from starting just before that moment.</p></body></html></string> </property> <property name="text"> <string/> diff --git a/kstars/ekos/scheduler/schedulerjob.cpp b/kstars/ekos/scheduler/schedulerjob.cpp index b8a5b39e5..1afd5ec92 100644 --- a/kstars/ekos/scheduler/schedulerjob.cpp +++ b/kstars/ekos/scheduler/schedulerjob.cpp @@ -1140,7 +1140,7 @@ void SchedulerJob::calculateDawnDusk(QDateTime const &when, QDateTime &nextDawn, bool SchedulerJob::runsDuringAstronomicalNightTime() const { // Calculate the next astronomical dawn time, adjusted with the Ekos pre-dawn offset - QDateTime const earlyDawn = nextDawn; //.addSecs(-60.0 * abs(Options::preDawnTime())); + QDateTime const earlyDawn = nextDawn.addSecs(-60.0 * abs(Options::preDawnTime())); // Dawn and dusk are ordered as the immediate next events following the observation time // Thus if dawn comes first, the job startup time occurs during the dusk/dawn interval. ++++++ kstars-3.5.3.tar.xz -> kstars-3.5.4.tar.xz ++++++ /work/SRC/openSUSE:Factory/kstars/kstars-3.5.3.tar.xz /work/SRC/openSUSE:Factory/.kstars.new.1899/kstars-3.5.4.tar.xz differ: char 25, line 1
