From 152d6bf014a16c6759f3ebd8d5109b758990bae8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Dec 2018 11:49:16 +0200 Subject: gnu: fbreader: Fix building with newer curl. * gnu/packages/ebook.scm (fbreader)[source]: Add patch. * gnu/packages/patches/fbreader-curl-7.62.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/packages/ebook.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index e750c6cac8..46d4c2cfe8 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016 Andreas Enge -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen @@ -247,7 +247,8 @@ designed to be used in a generic text renderer.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gf1nl562fqkwlzcn6rgkp1j8jcixzmfsnwxbc0sm49zh8n3zqib")))) + "0gf1nl562fqkwlzcn6rgkp1j8jcixzmfsnwxbc0sm49zh8n3zqib")) + (patches (search-patches "fbreader-curl-7.62.patch")))) (build-system gnu-build-system) (inputs `(("curl" ,curl) -- cgit v1.2.3 From 6f0ae1439c6c8429d1da7f3c9b9ebf4ba6640a36 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Dec 2018 12:04:01 +0200 Subject: gnu: fbreader: Use 'git-fetch'. * gnu/packages/ebook.scm (fbreader)[source]: Use 'git-fetch'. --- gnu/packages/ebook.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 46d4c2cfe8..980d574c4b 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -25,6 +25,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (guix build-system python) @@ -241,13 +242,14 @@ designed to be used in a generic text renderer.") (name "fbreader") (version "0.99.6") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/geometer/FBReader/" - "archive/" version "-freebsdport.tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/geometer/FBReader") + (commit (string-append version "-freebsdport")))) + (file-name (git-file-name name version)) (sha256 (base32 - "0gf1nl562fqkwlzcn6rgkp1j8jcixzmfsnwxbc0sm49zh8n3zqib")) + "0c0s4silpax74kwfz3dfmzn4lkv6jsyb800vfak166vii0hvbv3d")) (patches (search-patches "fbreader-curl-7.62.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From 5dc5c5ea41fd72b0999c043148615bb2e585fe85 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Dec 2018 12:21:31 +0200 Subject: gnu: fbreader: Install desktop file. * gnu/packages/ebook.scm (fbreader)[arguments]: Add phase to remove hardcoded paths for desktop dir. --- gnu/packages/ebook.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 980d574c4b..c3805a7880 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -275,7 +275,13 @@ designed to be used in a generic text renderer.") (assoc-ref %outputs "out") "/lib")) #:phases (modify-phases %standard-phases - (delete 'configure)))) + (delete 'configure) + (add-after 'unpack 'fix-install-locations + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "fbreader/desktop/Makefile" + (("/usr") out)) + #t)))))) (home-page "https://fbreader.org/") (synopsis "E-Book reader") (description "@code{fbreader} is an E-Book reader. It supports the -- cgit v1.2.3