bug#27317: [PATCH 0/2] Make stellarium work again.

bug#27317: [PATCH 0/2] Make stellarium work again.

[Danny Milosavljevic]

The Qt update to 5.9 broke stellarium.
This patchset fixes it.

Danny Milosavljevic (2):
  gnu: stellarium: Fix build with Qt 5.9.
  gnu: stellarium: Update to 0.15.2.

 gnu/packages/astronomy.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

bug#27318: [PATCH 1/2] gnu: stellarium: Fix build with Qt 5.9.

[Danny Milosavljevic]

* gnu/packages/astronomy.scm (stellarium)[arguments]:
Add phase "patch-version-check".
---
 gnu/packages/astronomy.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 2aa65d588..6c486469d 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -141,6 +141,14 @@ programs for the manipulation and analysis of astronomical data.")
     (arguments
       `(#:test-target "tests"
         #:phases (modify-phases %standard-phases
+                   (add-after 'unpack 'patch-version-check
+                     (lambda _
+                       ;; Previously-deprecated cmake variable vanished in
+                       ;; Qt 5.9.
+                       ;; See <https://bugreports.qt.io/browse/QTBUG-60936>.
+                       (substitute* "CMakeLists.txt"
+                         (("Qt5Core_VERSION_STRING") "Qt5Core_VERSION"))
+                       #t))
                    (add-before 'check 'set-offscreen-display
                      (lambda _
                        ;; make Qt render "offscreen", required for tests

bug#27319: [PATCH 2/2] gnu: stellarium: Update to 0.15.2.

[Danny Milosavljevic]

* gnu/packages/astronomy.scm (stellarium): Update to 0.15.2.
---
 gnu/packages/astronomy.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 6c486469d..879c6ba6a 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -117,7 +117,7 @@ programs for the manipulation and analysis of astronomical data.")
 (define-public stellarium
   (package
     (name "stellarium")
-    (version "0.15.1")
+    (version "0.15.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://sourceforge/stellarium/"
@@ -125,7 +125,7 @@ programs for the manipulation and analysis of astronomical data.")
                                  version "/stellarium-" version ".tar.gz"))
              (sha256
               (base32
-               "04avigz8i8mi2x6x71bqr9np85n1p9qnvbj2hxr947f1jv22zr8g"))))
+               "19nxj482g1hh9qicgskpcgy61pri254jgxnkd10icxbnza4c0hv9"))))
     (build-system cmake-build-system)
     (inputs
      `(("qtbase" ,qtbase)

bug#27318: [PATCH 1/2] gnu: stellarium: Fix build with Qt 5.9.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/astronomy.scm (stellarium)[arguments]:
> Add phase "patch-version-check".
> ---
>  gnu/packages/astronomy.scm | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> index 2aa65d588..6c486469d 100644
> --- a/gnu/packages/astronomy.scm
> +++ b/gnu/packages/astronomy.scm
> @@ -141,6 +141,14 @@ programs for the manipulation and analysis of astronomical data.")
>      (arguments
>        `(#:test-target "tests"
>          #:phases (modify-phases %standard-phases
> +                   (add-after 'unpack 'patch-version-check
> +                     (lambda _
> +                       ;; Previously-deprecated cmake variable vanished in
> +                       ;; Qt 5.9.
> +                       ;; See <https://bugreports.qt.io/browse/QTBUG-60936>.
> +                       (substitute* "CMakeLists.txt"
> +                         (("Qt5Core_VERSION_STRING") "Qt5Core_VERSION"))
> +                       #t))
>                     (add-before 'check 'set-offscreen-display
>                       (lambda _
>                         ;; make Qt render "offscreen", required for tests

LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#27319: [PATCH 2/2] gnu: stellarium: Update to 0.15.2.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 1195 bytes --]

Danny Milosavljevic <dannym@scratchpost.org> writes:

> * gnu/packages/astronomy.scm (stellarium): Update to 0.15.2.
> ---
>  gnu/packages/astronomy.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
> index 6c486469d..879c6ba6a 100644
> --- a/gnu/packages/astronomy.scm
> +++ b/gnu/packages/astronomy.scm
> @@ -117,7 +117,7 @@ programs for the manipulation and analysis of astronomical data.")
>  (define-public stellarium
>    (package
>      (name "stellarium")
> -    (version "0.15.1")
> +    (version "0.15.2")
>      (source (origin
>               (method url-fetch)
>               (uri (string-append "mirror://sourceforge/stellarium/"
> @@ -125,7 +125,7 @@ programs for the manipulation and analysis of astronomical data.")
>                                   version "/stellarium-" version ".tar.gz"))
>               (sha256
>                (base32
> -               "04avigz8i8mi2x6x71bqr9np85n1p9qnvbj2hxr947f1jv22zr8g"))))
> +               "19nxj482g1hh9qicgskpcgy61pri254jgxnkd10icxbnza4c0hv9"))))
>      (build-system cmake-build-system)
>      (inputs
>       `(("qtbase" ,qtbase)

LGTM.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]