From mboxrd@z Thu Jan 1 00:00:00 1970 From: ericbavier@openmailbox.org Subject: [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730. Date: Wed, 21 Oct 2015 16:45:58 -0500 Message-ID: <1445463958-3312-1-git-send-email-ericbavier@openmailbox.org> References: <83eaeebe60dcd79f5d624dc1ac2e0804@hcoop.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp5nO-0005lg-Ib for guix-devel@gnu.org; Wed, 21 Oct 2015 22:40:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zp5nL-0000Im-Br for guix-devel@gnu.org; Wed, 21 Oct 2015 22:40:02 -0400 Received: from smtp29.openmailbox.org ([62.4.1.63]:54839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zp5nL-0000Ii-0Z for guix-devel@gnu.org; Wed, 21 Oct 2015 22:39:59 -0400 In-Reply-To: <83eaeebe60dcd79f5d624dc1ac2e0804@hcoop.net> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org Cc: Eric Bavier From: Eric Bavier * 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 =C2=A9 2014 Cyrill Schenkel -;;; Copyright =C2=A9 2014 Eric Bavier +;;; Copyright =C2=A9 2014, 2015 Eric Bavier ;;; ;;; 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+git14= 0616-1 + "a1f7e879b129df5cf14ea4ce80a9c1407380ed58" + ".tar.gz")) ; tag: debian-1.0--pre-1+git15= 0730-1 (sha256 (base32 - "1cgjzi7g3g22zcx6bpfnid4i12sb45w6icmxdzjn8d3c0m8qsyp1"))= )) + "1q45hc30733gz3ca2ixvw0rzzcbi7rlay7gx7kvzjv17a030nyk0"))= )) (build-system gnu-build-system) (inputs `(("icecat" ,icecat))) (arguments `(#:tests? #f ;no tests - #:make-flags '("CC=3Dgcc") + #:make-flags `("CC=3Dgcc" + ,(string-append "PREFIX=3D" (assoc-ref %outputs "o= ut"))) #: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-he= lper"))) - (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 xulru= nner, + ;; 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 in= put - (assoc-ref %build-inputs "icecat") - (string-append datadir - "/application.ini")))) - (chmod launcher #o555)))) - %standard-phases)))) + (assoc-ref %build-inputs "bash") ;implicit inp= ut + (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 Fi= refox. --=20 2.5.0