From: ericbavier@openmailbox.org
To: guix-devel@gnu.org
Cc: Eric Bavier <bavier@member.fsf.org>
Subject: [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730.
Date: Wed, 21 Oct 2015 16:45:58 -0500 [thread overview]
Message-ID: <1445463958-3312-1-git-send-email-ericbavier@openmailbox.org> (raw)
In-Reply-To: <83eaeebe60dcd79f5d624dc1ac2e0804@hcoop.net>
From: Eric Bavier <bavier@member.fsf.org>
* gnu/packages/conkeror.scm (conkeror): Upgrade to 1.0pre1.20150730.
[arguments]: Adjust #:make-flags and #:phases for new Makefile, and
use modify-phases.
---
gnu/packages/conkeror.scm | 53 +++++++++++++++++++++--------------------------
1 file changed, 24 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/conkeror.scm b/gnu/packages/conkeror.scm
index 51bb1a2..ebc66d1 100644
--- a/gnu/packages/conkeror.scm
+++ b/gnu/packages/conkeror.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Cyrill Schenkel <cyrill.schenkel@gmail.com>
-;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -28,46 +28,41 @@
(define-public conkeror
(package
(name "conkeror")
- (version "1.0pre1")
+ (version "1.0pre1.20150730")
(source (origin
(method url-fetch)
(uri
(string-append "http://repo.or.cz/w/conkeror.git/snapshot/"
- "8a26fff5896a3360549e2adfbf06b1d57e909266"
- ".tar.gz")) ; tag: debian-1.0--pre-1+git140616-1
+ "a1f7e879b129df5cf14ea4ce80a9c1407380ed58"
+ ".tar.gz")) ; tag: debian-1.0--pre-1+git150730-1
(sha256
(base32
- "1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1"))))
+ "1q45hc30733gz3ca2ixvw0rzzcbi7rlay7gx7kvzjv17a030nyk0"))))
(build-system gnu-build-system)
(inputs `(("icecat" ,icecat)))
(arguments
`(#:tests? #f ;no tests
- #:make-flags '("CC=gcc")
+ #:make-flags `("CC=gcc"
+ ,(string-append "PREFIX=" (assoc-ref %outputs "out")))
#:phases
- (alist-delete
- 'configure
- (alist-replace
- 'install
- (lambda _
- (begin
- (use-modules (guix build utils))
- (let* ((datadir (string-append %output "/share/conkeror"))
- (bindir (string-append %output "/bin"))
- (launcher (string-append bindir "/conkeror"))
- (spawn (string-append bindir "/conkeror-spawn-helper")))
- (copy-recursively "." datadir)
- (mkdir-p bindir)
- (copy-file "conkeror-spawn-helper" spawn)
- (call-with-output-file launcher
- (lambda (p)
- (format p "#!~a/bin/bash
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-after
+ 'install 'install-app-launcher
+ (lambda _
+ ;; This overwrites the installed launcher, which execs xulrunner,
+ ;; with one that execs 'icecat --app'
+ (let* ((datadir (string-append %output "/share/conkeror"))
+ (launcher (string-append %output "/bin/conkeror")))
+ (call-with-output-file launcher
+ (lambda (p)
+ (format p "#!~a/bin/bash
exec ~a/bin/icecat --app ~a \"$@\"~%"
- (assoc-ref %build-inputs "bash") ;implicit input
- (assoc-ref %build-inputs "icecat")
- (string-append datadir
- "/application.ini"))))
- (chmod launcher #o555))))
- %standard-phases))))
+ (assoc-ref %build-inputs "bash") ;implicit input
+ (assoc-ref %build-inputs "icecat")
+ (string-append datadir
+ "/application.ini"))))
+ (chmod launcher #o555)))))))
(synopsis "Keyboard focused web browser with Emacs look and feel")
(description "Conkeror is a highly-programmable web browser based on
Mozilla XULRunner which is the base of all Mozilla products including Firefox.
--
2.5.0
next prev parent reply other threads:[~2015-10-22 2:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-20 14:55 Latest git pull - conkeror broken 白い熊@相撲道
2015-10-20 15:05 ` Efraim Flashner
2015-10-21 6:22 ` 白い熊@相撲道
2015-10-21 7:25 ` Efraim Flashner
2015-10-21 9:23 ` Eric Bavier
2015-10-21 9:26 ` Eric Bavier
2015-10-21 21:45 ` ericbavier [this message]
2015-10-22 13:44 ` [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730 Mark H Weaver
2015-10-22 9:03 ` Eric Bavier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445463958-3312-1-git-send-email-ericbavier@openmailbox.org \
--to=ericbavier@openmailbox.org \
--cc=bavier@member.fsf.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.