diff --git a/kstars-17.08-matrix-namespace.patch b/kstars-17.08-matrix-namespace.patch new file mode 100644 index 0000000..187d7b2 --- /dev/null +++ b/kstars-17.08-matrix-namespace.patch @@ -0,0 +1,113 @@ +diff -Naurp a/kstars/ekos/guide/internalguide/gmath.cpp b/kstars/ekos/guide/internalguide/gmath.cpp +--- a/kstars/ekos/guide/internalguide/gmath.cpp 2017-10-05 04:42:17.000000000 +0000 ++++ b/kstars/ekos/guide/internalguide/gmath.cpp 2018-09-09 21:24:22.904020073 +0000 +@@ -56,7 +56,7 @@ cgmath::cgmath() : QObject() + ccd_pixel_height = 0; + focal = 0; + aperture = 0; +- ROT_Z = Matrix(0); ++ ROT_Z = Ekos::Matrix(0); + preview_mode = true; + suspended = false; + lost_star = false; +@@ -176,7 +176,7 @@ bool cgmath::setReticleParameters(double + if (ang >= 0) + reticle_angle = ang; + +- ROT_Z = RotateZ(-M_PI * reticle_angle / 180.0); // NOTE!!! sing '-' derotates star coordinate system ++ ROT_Z = Ekos::RotateZ(-M_PI * reticle_angle / 180.0); // NOTE!!! sing '-' derotates star coordinate system + + reticle_orts[0] = Vector(1, 0, 0) * 100; + reticle_orts[1] = Vector(0, 1, 0) * 100; +@@ -360,8 +360,8 @@ bool cgmath::calculateAndSetReticle2D(do + Vector ra_vect = Normalize(Vector(end_ra_x - start_ra_x, -(end_ra_y - start_ra_y), 0)); + Vector dec_vect = Normalize(Vector(end_dec_x - start_dec_x, -(end_dec_y - start_dec_y), 0)); + +- Vector try_increase = dec_vect * RotateZ(M_PI / 2); +- Vector try_decrease = dec_vect * RotateZ(-M_PI / 2); ++ Vector try_increase = dec_vect * Ekos::RotateZ(M_PI / 2); ++ Vector try_decrease = dec_vect * Ekos::RotateZ(-M_PI / 2); + + double cos_increase = try_increase & ra_vect; + double cos_decrease = try_decrease & ra_vect; +diff -Naurp a/kstars/ekos/guide/internalguide/gmath.h b/kstars/ekos/guide/internalguide/gmath.h +--- a/kstars/ekos/guide/internalguide/gmath.h 2017-10-05 04:42:17.000000000 +0000 ++++ b/kstars/ekos/guide/internalguide/gmath.h 2018-09-09 21:24:05.196983858 +0000 +@@ -117,7 +117,7 @@ class cgmath : public QObject + int getSquareSize() { return squareSize; } + void setSquareAlgorithm(int alg_idx); + +- Matrix getROTZ() { return ROT_Z; } ++ Ekos::Matrix getROTZ() { return ROT_Z; } + const cproc_out_params *getOutputParameters() const { return &out_params; } + info_params_t getInfoParameters(void) const; + uint32_t getTicks(void) const; +@@ -184,7 +184,7 @@ class cgmath : public QObject + QPointer guideView; // pointer to image + int video_width, video_height; // video frame dimensions + double ccd_pixel_width, ccd_pixel_height, aperture, focal; +- Matrix ROT_Z; ++ Ekos::Matrix ROT_Z; + bool preview_mode, suspended, lost_star, dec_swap; + + // square variables +diff -Naurp a/kstars/ekos/guide/internalguide/internalguider.cpp b/kstars/ekos/guide/internalguide/internalguider.cpp +--- a/kstars/ekos/guide/internalguide/internalguider.cpp 2017-10-05 04:42:17.000000000 +0000 ++++ b/kstars/ekos/guide/internalguide/internalguider.cpp 2018-09-09 21:23:21.733894968 +0000 +@@ -160,7 +160,7 @@ bool InternalGuider::dither(double pixel + double cur_x, cur_y, ret_angle; + pmath->getReticleParameters(&cur_x, &cur_y, &ret_angle); + pmath->getStarScreenPosition(&cur_x, &cur_y); +- Matrix ROT_Z = pmath->getROTZ(); ++ Ekos::Matrix ROT_Z = pmath->getROTZ(); + + //qDebug() << "Star Pos X " << cur_x << " Y " << cur_y; + +diff -Naurp a/kstars/ekos/guide/internalguide/internalguider.h b/kstars/ekos/guide/internalguide/internalguider.h +--- a/kstars/ekos/guide/internalguide/internalguider.h 2017-10-05 04:42:17.000000000 +0000 ++++ b/kstars/ekos/guide/internalguide/internalguider.h 2018-09-09 21:24:55.303205249 +0000 +@@ -148,7 +148,7 @@ class InternalGuider : public GuideInter + double end_x2, end_y2; + int iterations, dec_iterations; + double phi; +- Matrix ROT_Z; ++ Ekos::Matrix ROT_Z; + + CalibrationStage calibrationStage; + CalibrationType calibrationType; +diff -Naurp a/kstars/ekos/guide/internalguide/matr.cpp b/kstars/ekos/guide/internalguide/matr.cpp +--- a/kstars/ekos/guide/internalguide/matr.cpp 2017-10-05 04:42:17.000000000 +0000 ++++ b/kstars/ekos/guide/internalguide/matr.cpp 2018-09-09 21:23:21.733894968 +0000 +@@ -17,6 +17,8 @@ + + //--------------------------------------------------------------------------- + ++namespace Ekos ++{ + Matrix ::Matrix(double v) + { + for (int i = 0; i < 4; i++) +@@ -358,3 +360,4 @@ Matrix MirrorZ() + res.x[2][2] = -1; + return res; + } ++} +diff -Naurp a/kstars/ekos/guide/internalguide/matr.h b/kstars/ekos/guide/internalguide/matr.h +--- a/kstars/ekos/guide/internalguide/matr.h 2017-10-05 04:42:17.000000000 +0000 ++++ b/kstars/ekos/guide/internalguide/matr.h 2018-09-09 21:23:21.733894968 +0000 +@@ -15,6 +15,8 @@ + + #include "vect.h" + ++namespace Ekos ++{ + class Matrix + { + public: +@@ -46,5 +48,6 @@ Matrix Transform(const Vector &v1, const + Matrix MirrorX(); + Matrix MirrorY(); + Matrix MirrorZ(); ++} + //--------------------------------------------------------------------------- + #endif diff --git a/kstars.spec b/kstars.spec index 90ba0f1..79e417a 100644 --- a/kstars.spec +++ b/kstars.spec @@ -1,7 +1,7 @@ Name: kstars Summary: Desktop Planetarium Version: 17.08.2 -Release: 2.1%{?dist} +Release: 2.2%{?dist} License: GPLv2+ URL: http://edu.kde.org/kstars @@ -20,6 +20,7 @@ Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-% ## Fedora specific patches Patch100: kstars-17.08.1-make_libindi_required.patch +Patch101: kstars-17.08-matrix-namespace.patch BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules @@ -95,6 +96,7 @@ all 8 planets, the Sun and Moon, and thousands of comets and asteroids. %setup -q %patch100 -p1 -b .make_libindi_required +%patch101 -p1 -b .matrix-namespace %build @@ -152,6 +154,9 @@ fi %changelog +* Mon Oct 01 2018 Pablo Greco - 17.08.2-2.2 +- Fix FTBFS (cherry pick from commit 89ea1e1f6d5c18fc28abb6f63ddc9f579e01c7a0) + * Mon Nov 06 2017 Mattia Verga - 17.08.2-2.1 - Remove astronomy from suggested packages (not in EPEL7 repos) - find_lang macro doesn't have --with-html option in EPEL7