[neon/extras/kstars/Neon/release] debian: update the patches

[Pino Toscano]

Git commit 37c481ebfb8a6d61f799f523db19cf6c1badc313 by Pino Toscano.
Committed on 14/01/2021 at 10:22.
Pushed by jriddell into branch 'Neon/release'.

update the patches

- upstream_tests-do-not-pass-a-literal-string-as-format-string.patch:
  drop, backported from upstream
- skip-fitsdata-test-i386.diff: update

M  +4    -0    debian/changelog
M  +0    -1    debian/patches/series
M  +6    -6    debian/patches/skip-fitsdata-test-i386.diff
D  +0    -32   debian/patches/upstream_tests-do-not-pass-a-literal-string-as-format-string.patch

https://invent.kde.org/neon/extras/kstars/commit/37c481ebfb8a6d61f799f523db19cf6c1badc313

diff --git a/debian/changelog b/debian/changelog
index c9cee80..692283f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ kstars (5:3.5.1-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - upstream_tests-do-not-pass-a-literal-string-as-format-string.patch: drop,
+      backported from upstream
+    - skip-fitsdata-test-i386.diff: update
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 14 Jan 2021 11:16:50 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index a9441b1..ddb363b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-upstream_tests-do-not-pass-a-literal-string-as-format-string.patch
 skip-fitsdata-test-i386.diff
diff --git a/debian/patches/skip-fitsdata-test-i386.diff b/debian/patches/skip-fitsdata-test-i386.diff
index 8aff15d..50820a1 100644
--- a/debian/patches/skip-fitsdata-test-i386.diff
+++ b/debian/patches/skip-fitsdata-test-i386.diff
@@ -1,21 +1,21 @@
 Author: Pino Toscano <pino at debian.org>
 Description: Skip failing test on i386
  getHFR() returns 1.84649, i.e. 0.04 more than the expected value; unclear why.
-Last-Update: 2020-05-10
+Last-Update: 2021-01-14
 Forwarded: not-needed
 
 --- a/Tests/fitsviewer/testfitsdata.cpp
 +++ b/Tests/fitsviewer/testfitsdata.cpp
-@@ -111,11 +111,13 @@ void TestFitsData::testLoadFits()
-     QCOMPARE(fd->getStarCenters().count(), 80);
-     QVERIFY(abs(fd->getHFR() - 1.49) < 0.01);
+@@ -259,11 +259,13 @@ void TestFitsData::testLoadFits()
+     QCOMPARE(fd->getStarCenters().count(), NSTARS_CENTROID);
+     QVERIFY(abs(fd->getHFR() - HFR_CENTROID) < 0.01);
  
 +#ifndef Q_PROCESSOR_X86_32
      // With the gradient algorithm, one single star found with HFR 1.801
-     QCOMPARE(fd->findStars(ALGORITHM_GRADIENT), 1);
+     fd->findStars(ALGORITHM_GRADIENT).waitForFinished();
      QCOMPARE(fd->getDetectedStars(), 1);
      QCOMPARE(fd->getStarCenters().count(), 1);
-     QVERIFY(abs(fd->getHFR() - 1.80) < 0.01);
+     QVERIFY(abs(fd->getHFR() - HFR_GRADIENT) < 0.01);
 +#endif
  
      // The threshold algorithm depends on a global option - skip until we know how to fiddle with that
diff --git a/debian/patches/upstream_tests-do-not-pass-a-literal-string-as-format-string.patch b/debian/patches/upstream_tests-do-not-pass-a-literal-string-as-format-string.patch
deleted file mode 100644
index c01dadf..0000000
--- a/debian/patches/upstream_tests-do-not-pass-a-literal-string-as-format-string.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f0bfcdf13737cb2dc3401475c68d6afea6bbd055 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Mon, 20 Jul 2020 07:29:10 +0200
-Subject: [PATCH] tests: do not pass a literal string as format string
-
-Use the stream-like syntax of qDebug instead.
-
-Fixes commit 82569890a821d11c409c68534bd347b2eb071759.
----
- Tests/skyobjects/test_skypoint.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Tests/skyobjects/test_skypoint.cpp b/Tests/skyobjects/test_skypoint.cpp
-index f7087c870..7818d8b2c 100644
---- a/Tests/skyobjects/test_skypoint.cpp
-+++ b/Tests/skyobjects/test_skypoint.cpp
-@@ -494,9 +494,9 @@ void TestSkyPoint::compare(QString msg, SkyPoint *sp)
- 
- void TestSkyPoint::compare(QString msg, double ra1, double dec1, double ra2, double dec2, double err)
- {
--    qDebug(qPrintable(QString("%1 pos1 %2, %3 pos2 %4, %5 errors %6, %7 secs").arg(msg)
--                      .arg(ra1).arg(dec1).arg(ra2).arg(dec2)
--                      .arg((ra1 - ra2) * 3600.0, 6, 'f', 1).arg((dec1 - dec2) * 3600., 6, 'f', 1)));
-+    qDebug() << qPrintable(QString("%1 pos1 %2, %3 pos2 %4, %5 errors %6, %7 secs").arg(msg)
-+                           .arg(ra1).arg(dec1).arg(ra2).arg(dec2)
-+                           .arg((ra1 - ra2) * 3600.0, 6, 'f', 1).arg((dec1 - dec2) * 3600., 6, 'f', 1));
-     //QString str;
-     //str.sprintf("%s pos1 %f, %f pos2 %f, %f errors %.1f, %.1f sec", msg.data(), ra1, dec1, ra2, dec2, (ra1 - ra2) *3600, (dec1 - dec2) * 3600 );
-     //qDebug() << str;// << msg << "SP " << ra1 << ", " << dec1 << " Sp0 " << ra2 << ", " << dec2
--- 
-2.27.0
-