From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42584) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eXZ9r-0000b0-IZ for guix-patches@gnu.org; Fri, 05 Jan 2018 16:04:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eXZ9m-0007mQ-LZ for guix-patches@gnu.org; Fri, 05 Jan 2018 16:04:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:56901) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eXZ9m-0007mF-Bl for guix-patches@gnu.org; Fri, 05 Jan 2018 16:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eXZ9m-00085E-40 for guix-patches@gnu.org; Fri, 05 Jan 2018 16:04:02 -0500 Subject: [bug#29997] [PATCH] gnu: stellarium: Update to 0.17.0. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eXZ8f-0000QQ-Bg for guix-patches@gnu.org; Fri, 05 Jan 2018 16:02:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eXZ8c-00071f-4f for guix-patches@gnu.org; Fri, 05 Jan 2018 16:02:53 -0500 Received: from mout01.posteo.de ([185.67.36.65]:48432) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eXZ8b-0006uP-M3 for guix-patches@gnu.org; Fri, 05 Jan 2018 16:02:50 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 8EE7020F37 for ; Fri, 5 Jan 2018 22:02:40 +0100 (CET) From: Kei Kebreau Date: Fri, 5 Jan 2018 16:01:47 -0500 Message-Id: <20180105210147.9825-1-kkebreau@posteo.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29997@debbugs.gnu.org Cc: Kei Kebreau * gnu/packages/astronomy.scm (stellarium): Update to 0.17.0. [source]: Use new upstream URL. [arguments]: Adjust #:test-target; add #:configure-flags to locate the qtserialport header files and enable the building of tests.; remove 'patch-tests' phase. --- gnu/packages/astronomy.scm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d21c09387..61197ccea 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -117,15 +117,16 @@ programs for the manipulation and analysis of astronomical data.") (define-public stellarium (package (name "stellarium") - (version "0.16.0") + (version "0.17.0") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/stellarium/" - "Stellarium-sources/" - version "/stellarium-" version ".tar.gz")) + (uri (string-append "https://github.com/Stellarium/" name + "/releases/download/v" version + "/" name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1krxj51lix096xbz64lys166a8zdwhill5vvs7dlxdn14amc8d98")))) + "0d6b3fs5aify7i1lwgkcickppnj73cbh24g8qschnfs3ypdf48fc")))) (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase) @@ -140,19 +141,19 @@ programs for the manipulation and analysis of astronomical data.") ("qtbase" ,qtbase) ; Qt MOC is needed at compile time ("qttools" ,qttools))) (arguments - `(#:test-target "tests" - #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "src/tests/testStelSphereGeometry.cpp" - (("Vec3d v[(]0[)]") "Vec3d v(0.0)")) - #t)) - (add-before 'check 'set-offscreen-display - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "HOME" "/tmp") - #t))))) + `(#:test-target "test" + #:configure-flags (list "-DENABLE_TESTING=1" + (string-append + "-DCMAKE_CXX_FLAGS=-isystem " + (assoc-ref %build-inputs "qtserialport") + "/include/qt5")) + #:phases (modify-phases %standard-phases + (add-before 'check 'set-offscreen-display + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" "/tmp") + #t))))) (home-page "http://www.stellarium.org/") (synopsis "3D sky viewer") (description "Stellarium is a planetarium. It shows a realistic sky in -- 2.15.1