From d5640c587f141ff60127848dc95528ca1a4f1b14 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 28 Mar 2019 09:33:34 +0100
Subject: gnu: googletest: Don't use unstable tarball.

* gnu/packages/check.scm (googletest)[source]: Download using git-fetch.
* gnu/packages/crypto.scm (encfs)[arguments]: Adjust accordingly.
* gnu/packages/gnucash.scm (gnucash)[arguments]: Same.
* gnu/packages/terminals.scm (eternalterminal)[arguments]: Same.
* gnu/packages/graphics.scm (ogre)[arguments]: Same. Remove now
unnecessary custom 'pre-build phase.
---
 gnu/packages/graphics.scm | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'gnu/packages/graphics.scm')

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 11158bdfd1..e4a6ee8476 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -366,21 +366,10 @@ exception-handling library.")
      '(#:phases
        (modify-phases %standard-phases
          (add-before 'configure 'pre-configure
-           (lambda _
-             ;; It expects googletest source to be downloaded and
-             ;; be in a specific place.
-             (substitute* "Tests/CMakeLists.txt"
-               (("URL(.*)$" _ suffix)
-                (string-append "URL " suffix
-                               "\t\tURL_HASH "
-                               "MD5=16877098823401d1bf2ed7891d7dce36\n")))
-             #t))
-         (add-before 'build 'pre-build
            (lambda* (#:key inputs #:allow-other-keys)
-             (copy-file (assoc-ref inputs "googletest-source")
-                        (string-append (getcwd)
-                                       "/Tests/googletest-prefix/src/"
-                                       "release-1.8.0.tar.gz"))
+             (substitute* "Tests/CMakeLists.txt"
+               (("URL(.*)$")
+                (string-append "URL " (assoc-ref inputs "googletest-source"))))
              #t)))
        #:configure-flags
        (list "-DOGRE_BUILD_TESTS=TRUE"
-- 
cgit v1.2.3


From 1aa662b3094172c9f34a220d15c6ba53b9280b79 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 28 Mar 2019 11:07:40 +0100
Subject: gnu: ogre: Don't use unstable tarball.

* gnu/packages/graphics.scm (ogre)[source]: Download using git-fetch.
---
 gnu/packages/graphics.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/graphics.scm')

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index e4a6ee8476..25c9e0b476 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -354,13 +354,14 @@ exception-handling library.")
     (version "1.10.11")
     (source
      (origin
-       (method url-fetch)
-       (uri (string-append "https://github.com/OGRECave/" name
-                           "/archive/v" version ".tar.gz"))
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/OGRECave/ogre.git")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
        (sha256
         (base32
-         "13bdh9v4026qf8w8rbfln2rmwf0rby1a8fz55zpdvpy105i6cbpz"))
-       (file-name (string-append name "-" version ".tar.gz"))))
+         "072rzw9mxymbiypgkrbkk9h10rgly6gczik4dlmssk6xkpqckaqr"))))
     (build-system cmake-build-system)
     (arguments
      '(#:phases
-- 
cgit v1.2.3