unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Latest git pull - conkeror broken
@ 2015-10-20 14:55 白い熊@相撲道
  2015-10-20 15:05 ` Efraim Flashner
  2015-10-21 21:45 ` [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730 ericbavier
  0 siblings, 2 replies; 9+ messages in thread
From: 白い熊@相撲道 @ 2015-10-20 14:55 UTC (permalink / raw)
  To: guix-devel

Since yesterday I can't run conkeror, without any changes in conkeror's 
config, just guix git pull, make and package -u

The log:

shiroikuma@skggxtzz ~$ conkeror

(process:4960): GLib-CRITICAL **: g_slice_set_config: assertion 
'sys_page_size == 0' failed

(conkeror:4960): Gtk-WARNING **: Locale not supported by C library.
	Using the fallback 'C' locale.
JavaScript strict warning: resource://gre/modules/GMPUtils.jsm, line 92: 
ReferenceError: reference to undefined property this.KEY_LOG_BASE
JavaScript strict warning: chrome://conkeror/content/keywords.js, line 
20: SyntaxError: in strict mode code, functions may be declared only at 
top level or immediately within another function
JavaScript strict warning: chrome://conkeror/content/keywords.js, line 
30: SyntaxError: in strict mode code, functions may be declared only at 
top level or immediately within another function
JavaScript strict warning: chrome://conkeror/content/keywords.js, line 
62: SyntaxError: in strict mode code, functions may be declared only at 
top level or immediately within another function
JavaScript strict warning: chrome://conkeror/content/keywords.js, line 
68: SyntaxError: in strict mode code, functions may be declared only at 
top level or immediately within another function
JavaScript strict warning: chrome://conkeror/content/keywords.js, line 
72: SyntaxError: in strict mode code, functions may be declared only at 
top level or immediately within another function
JavaScript warning: chrome://conkeror/content/coroutine.js, line 354: 
mutating the [[Prototype]] of an object will cause your code to run very 
slowly; instead create the object with the correct initial [[Prototype]] 
value using Object.create
JavaScript warning: chrome://conkeror/content/debug.js, line 87: 
JavaScript 1.7's let blocks are deprecated
JavaScript strict warning: chrome://conkeror/content/env.js, line 16: 
SyntaxError: in strict mode code, functions may be declared only at top 
level or immediately within another function
JavaScript warning: chrome://conkeror/content/env.js, line 15: 
JavaScript 1.7's let blocks are deprecated
JavaScript strict warning: chrome://conkeror/content/env.js, line 42: 
SyntaxError: in strict mode code, functions may be declared only at top 
level or immediately within another function
JavaScript warning: chrome://conkeror/content/env.js, line 41: 
JavaScript 1.7's let blocks are deprecated
JavaScript strict warning: chrome://conkeror/content/env.js, line 79: 
SyntaxError: in strict mode code, functions may be declared only at top 
level or immediately within another function
JavaScript warning: chrome://conkeror/content/env.js, line 78: 
JavaScript 1.7's let blocks are deprecated
JavaScript strict warning: chrome://conkeror/content/utils.js, line 207: 
SyntaxError: octal literals and octal escape sequences are deprecated
JavaScript strict warning: chrome://conkeror/content/utils.js, line 207: 
SyntaxError: octal literals and octal escape sequences are deprecated
JavaScript strict warning: chrome://conkeror/content/utils.js, line 207: 
SyntaxError: octal literals and octal escape sequences are deprecated
JavaScript strict warning: 
file:///gnu/store/s507v0spxkh38x2i7bmfpkflkib62mqd-conkeror-1.0pre1/share/conkeror/components/application.js, 
line 167: ReferenceError: reference to undefined property (intermediate 
value)[e]
Error initializing.
Error: Error opening input stream (invalid filename?): 
chrome://conkeror/content/io
JavaScript error: 
file:///gnu/store/s507v0spxkh38x2i7bmfpkflkib62mqd-conkeror-1.0pre1/share/conkeror/components/command-line.js, 
line 23: TypeError: conkeror.handle_command_line is not a function
Console error: [JavaScript Warning: "SyntaxError: in strict mode code, 
functions may be declared only at top level or immediately within 
another function" {file: "chrome://conkeror/content/env.js" line: 16 
column: 13 source: "    function get_os () {
"}]
   Category: chrome javascript
Console error: [JavaScript Warning: "JavaScript 1.7's let blocks are 
deprecated" {file: "chrome://conkeror/content/env.js" line: 15}]
   Category: chrome javascript
Console error: [JavaScript Warning: "SyntaxError: in strict mode code, 
functions may be declared only at top level or immediately within 
another function" {file: "chrome://conkeror/content/env.js" line: 42 
column: 13 source: "    function getenv (variable) {
"}]
   Category: chrome javascript
Console error: [JavaScript Warning: "JavaScript 1.7's let blocks are 
deprecated" {file: "chrome://conkeror/content/env.js" line: 41}]
   Category: chrome javascript
Console error: [JavaScript Warning: "SyntaxError: in strict mode code, 
functions may be declared only at top level or immediately within 
another function" {file: "chrome://conkeror/content/env.js" line: 79 
column: 13 source: "    function get_current_profile () {
"}]
   Category: chrome javascript
Console error: [JavaScript Warning: "JavaScript 1.7's let blocks are 
deprecated" {file: "chrome://conkeror/content/env.js" line: 78}]
   Category: chrome javascript
Console error: [JavaScript Warning: "SyntaxError: octal literals and 
octal escape sequences are deprecated" {file: 
"chrome://conkeror/content/utils.js" line: 207 column: 51 source: "    
file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
"}]
   Category: chrome javascript
Console error: [JavaScript Warning: "SyntaxError: octal literals and 
octal escape sequences are deprecated" {file: 
"chrome://conkeror/content/utils.js" line: 207 column: 51 source: "    
file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
"}]
   Category: chrome javascript
Console error: [JavaScript Warning: "SyntaxError: octal literals and 
octal escape sequences are deprecated" {file: 
"chrome://conkeror/content/utils.js" line: 207 column: 51 source: "    
file.createUnique(Ci.nsIFile.NORMAL_FILE_TYPE, 0600);
"}]
   Category: chrome javascript
Console error: [JavaScript Warning: "ReferenceError: reference to 
undefined property (intermediate value)[e]" {file: 
"file:///gnu/store/s507v0spxkh38x2i7bmfpkflkib62mqd-conkeror-1.0pre1/share/conkeror/components/application.js" 
line: 167}]
   Category: chrome javascript
Console error: [JavaScript Error: "TypeError: 
conkeror.handle_command_line is not a function" {file: 
"file:///gnu/store/s507v0spxkh38x2i7bmfpkflkib62mqd-conkeror-1.0pre1/share/conkeror/components/command-line.js" 
line: 23}]
   Category: chrome javascript

Anyone have an idea what's going on?

-- 
白い熊@相撲道

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Latest git pull - conkeror broken
  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 21:45 ` [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730 ericbavier
  1 sibling, 1 reply; 9+ messages in thread
From: Efraim Flashner @ 2015-10-20 15:05 UTC (permalink / raw)
  To: 白い熊@相撲道; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

On Tue, 20 Oct 2015 16:55:03 +0200
白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:

> Since yesterday I can't run conkeror, without any changes in conkeror's 
> config, just git pull, make and guix package -u
> 

do you know when the last time before yesterday you ran git pull?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Latest git pull - conkeror broken
  2015-10-20 15:05 ` Efraim Flashner
@ 2015-10-21  6:22   ` 白い熊@相撲道
  2015-10-21  7:25     ` Efraim Flashner
  0 siblings, 1 reply; 9+ messages in thread
From: 白い熊@相撲道 @ 2015-10-21  6:22 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: guix-devel



On October 20, 2015 6:05:49 PM GMT+03:00, Efraim Flashner <efraim@flashner.co.il> wrote:
>On Tue, 20 Oct 2015 16:55:03 +0200
>白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:
>
>> Since yesterday I can't run conkeror, without any changes in
>conkeror's 
>> config, just git pull, make and guix package -u
>> 
>
>do you know when the last time before yesterday you ran git pull?

I really do not, a week ago I'd think. 
--
白い熊@相撲道

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Latest git pull - conkeror broken
  2015-10-21  6:22   ` 白い熊@相撲道
@ 2015-10-21  7:25     ` Efraim Flashner
  2015-10-21  9:23       ` Eric Bavier
  0 siblings, 1 reply; 9+ messages in thread
From: Efraim Flashner @ 2015-10-21  7:25 UTC (permalink / raw)
  To: 白い熊@相撲道; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 1059 bytes --]

On Wed, 21 Oct 2015 09:22:39 +0300
白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:

> On October 20, 2015 6:05:49 PM GMT+03:00, Efraim Flashner <efraim@flashner.co.il> wrote:
> >On Tue, 20 Oct 2015 16:55:03 +0200
> >白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:
> >  
> >> Since yesterday I can't run conkeror, without any changes in  
> >conkeror's   
> >> config, just git pull, make and guix package -u
> >>   
> >
> >do you know when the last time before yesterday you ran git pull?  
> 
> I really do not, a week ago I'd think. 
> --
> 白い熊@相撲道

I see that conkeror is dependant on icecat, and looking at gitk, after the last core-updates merge, the only change I can see that would be related to icecat or its dependancies is that icecat was updated to 38.3.0-gnu1 around the 13th.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Latest git pull - conkeror broken
  2015-10-21  7:25     ` Efraim Flashner
@ 2015-10-21  9:23       ` Eric Bavier
  2015-10-21  9:26         ` Eric Bavier
  0 siblings, 1 reply; 9+ messages in thread
From: Eric Bavier @ 2015-10-21  9:23 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: guix-devel

On Wed, 21 Oct 2015 10:25:43 +0300
Efraim Flashner <efraim@flashner.co.il> wrote:

> On Wed, 21 Oct 2015 09:22:39 +0300
> 白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:
> 
> > On October 20, 2015 6:05:49 PM GMT+03:00, Efraim Flashner <efraim@flashner.co.il> wrote:
> > >On Tue, 20 Oct 2015 16:55:03 +0200
> > >白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:
> > >  
> > >> Since yesterday I can't run conkeror, without any changes in  
> > >conkeror's   
> > >> config, just git pull, make and guix package -u
> > >>   
> > >
> > >do you know when the last time before yesterday you ran git pull?  
> > 
> > I really do not, a week ago I'd think. 
> > --
> > 白い熊@相撲道
> 
> I see that conkeror is dependant on icecat, and looking at gitk, after the last core-updates merge, the only change I can see that would be related to icecat or its dependancies is that icecat was updated to 38.3.0-gnu1 around the 13th.
> 

FWIW, this appears to be the upstream bug, filed 2015-03-30:
http://bugs.conkeror.org/issue490

`~Eric

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Latest git pull - conkeror broken
  2015-10-21  9:23       ` Eric Bavier
@ 2015-10-21  9:26         ` Eric Bavier
  0 siblings, 0 replies; 9+ messages in thread
From: Eric Bavier @ 2015-10-21  9:26 UTC (permalink / raw)
  To: Efraim Flashner; +Cc: guix-devel

On Wed, 21 Oct 2015 04:23:42 -0500
Eric Bavier <ericbavier@openmailbox.org> wrote:

> On Wed, 21 Oct 2015 10:25:43 +0300
> Efraim Flashner <efraim@flashner.co.il> wrote:
> 
> > On Wed, 21 Oct 2015 09:22:39 +0300
> > 白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:
> > 
> > > On October 20, 2015 6:05:49 PM GMT+03:00, Efraim Flashner <efraim@flashner.co.il> wrote:
> > > >On Tue, 20 Oct 2015 16:55:03 +0200
> > > >白い熊@相撲道 <guix-devel_gnu.org@sumou.com> wrote:
> > > >  
> > > >> Since yesterday I can't run conkeror, without any changes in  
> > > >conkeror's   
> > > >> config, just git pull, make and guix package -u
> > > >>   
> > > >
> > > >do you know when the last time before yesterday you ran git pull?  
> > > 
> > > I really do not, a week ago I'd think. 
> > > --
> > > 白い熊@相撲道
> > 
> > I see that conkeror is dependant on icecat, and looking at gitk, after the last core-updates merge, the only change I can see that would be related to icecat or its dependancies is that icecat was updated to 38.3.0-gnu1 around the 13th.
> > 
> 
> FWIW, this appears to be the upstream bug, filed 2015-03-30:
> http://bugs.conkeror.org/issue490

And I sent before thoroughly reading the bug log.

http://bugs.conkeror.org/issue489 and
http://bugs.conkeror.org/issue488 are also related.

`~Eric

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730.
  2015-10-20 14:55 Latest git pull - conkeror broken 白い熊@相撲道
  2015-10-20 15:05 ` Efraim Flashner
@ 2015-10-21 21:45 ` ericbavier
  2015-10-22 13:44   ` Mark H Weaver
  1 sibling, 1 reply; 9+ messages in thread
From: ericbavier @ 2015-10-21 21:45 UTC (permalink / raw)
  To: guix-devel; +Cc: Eric Bavier

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

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730.
  2015-10-22 13:44   ` Mark H Weaver
@ 2015-10-22  9:03     ` Eric Bavier
  0 siblings, 0 replies; 9+ messages in thread
From: Eric Bavier @ 2015-10-22  9:03 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: guix-devel

On Thu, 22 Oct 2015 09:44:32 -0400
Mark H Weaver <mhw@netris.org> wrote:

> ericbavier@openmailbox.org writes:
> 
> > 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.
> 
> Please see below for comments.

Thanks for the review.

> 
> > 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)))))))
> 
> In the phase above, instead of using %output and %build-inputs, please
> change "lambda _" to "lambda* (#:key inputs outputs #:allow-other-keys)"
> and then extract the data from 'inputs' and 'outputs'.

Ok.

> Otherwise it looks good to me.

Great, pushed with those changes as 1a65667.

BTW, this should fix the startup issues with the latest icecat that we
were seeing.

`~Eric

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730.
  2015-10-21 21:45 ` [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730 ericbavier
@ 2015-10-22 13:44   ` Mark H Weaver
  2015-10-22  9:03     ` Eric Bavier
  0 siblings, 1 reply; 9+ messages in thread
From: Mark H Weaver @ 2015-10-22 13:44 UTC (permalink / raw)
  To: ericbavier; +Cc: guix-devel, Eric Bavier

ericbavier@openmailbox.org writes:

> 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.

Please see below for comments.

> 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)))))))

In the phase above, instead of using %output and %build-inputs, please
change "lambda _" to "lambda* (#:key inputs outputs #:allow-other-keys)"
and then extract the data from 'inputs' and 'outputs'.

Otherwise it looks good to me.

     Thanks!
       Mark

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2015-10-22 13:57 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH] gnu: conkeror: Upgrade to 1.0pre1.20150730 ericbavier
2015-10-22 13:44   ` Mark H Weaver
2015-10-22  9:03     ` Eric Bavier

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).