diff -Nru stellarium-0.13.1/debian/changelog stellarium-0.13.1/debian/changelog --- stellarium-0.13.1/debian/changelog 2014-10-29 05:53:59.000000000 +0000 +++ stellarium-0.13.1/debian/changelog 2015-02-11 08:42:38.000000000 +0000 @@ -1,8 +1,10 @@ -stellarium (0.13.1-1build1) vivid; urgency=medium +stellarium (0.13.1-1ubuntu1) vivid; urgency=medium - * No-change rebuild against Qt 5.3.2. + * debian/patches/fix_ftbfs_armhf_qt5.4.diff: + - Re-include the removed in Qt GL_DOUBLE and GLdouble typedefs to enable + properly building on GLES platforms against Qt 5.4 (LP: #1395655) - -- Timo Jyrinki Wed, 29 Oct 2014 07:53:58 +0200 + -- Ɓukasz 'sil2100' Zemczak Fri, 16 Jan 2015 12:06:48 +0100 stellarium (0.13.1-1) unstable; urgency=medium diff -Nru stellarium-0.13.1/debian/patches/fix_ftbfs_armhf_qt5.4.diff stellarium-0.13.1/debian/patches/fix_ftbfs_armhf_qt5.4.diff --- stellarium-0.13.1/debian/patches/fix_ftbfs_armhf_qt5.4.diff 1970-01-01 00:00:00.000000000 +0000 +++ stellarium-0.13.1/debian/patches/fix_ftbfs_armhf_qt5.4.diff 2015-01-16 14:14:41.000000000 +0000 @@ -0,0 +1,20 @@ +Index: stellarium-0.13.1/src/core/StelOpenGL.hpp +=================================================================== +--- stellarium-0.13.1.orig/src/core/StelOpenGL.hpp ++++ stellarium-0.13.1/src/core/StelOpenGL.hpp +@@ -152,4 +152,15 @@ + const char* getGLErrorText(int code); + int checkGLErrors(const char *file, int line); + ++// To build on arm platforms we need to re-introduce the Qt 5.4 removed ++// typedefs and defines of GLdouble/GL_DOUBLE, which are not present in GLES ++#if defined(QT_OPENGL_ES_2) ++# ifndef GL_DOUBLE ++# define GL_DOUBLE GL_FLOAT ++# endif ++# ifndef GLdouble ++typedef GLfloat GLdouble; ++# endif ++#endif ++ + #endif // _STELOPENGL_HPP_ diff -Nru stellarium-0.13.1/debian/patches/series stellarium-0.13.1/debian/patches/series --- stellarium-0.13.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ stellarium-0.13.1/debian/patches/series 2015-01-16 14:11:40.000000000 +0000 @@ -0,0 +1 @@ +fix_ftbfs_armhf_qt5.4.diff