GNU bug report logs - #26713
[PATCH] gnu: Move netsurf to web-browsers.scm.

Previous Next

Package: guix-patches;

Reported by: Kei Kebreau <kei <at> openmailbox.org>

Date: Sat, 29 Apr 2017 22:11:02 UTC

Severity: normal

Tags: patch

Done: Kei Kebreau <kei <at> openmailbox.org>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 26713 in the body.
You can then email your comments to 26713 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sat, 29 Apr 2017 22:11:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to Kei Kebreau <kei <at> openmailbox.org>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 29 Apr 2017 22:11:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kei <at> openmailbox.org>
Subject: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sat, 29 Apr 2017 18:09:42 -0400
* gnu/packages/web.scm: Move netsurf...
* gnu/packages/web-browsers.scm: ...here.
---
 gnu/packages/web-browsers.scm | 122 ++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/web.scm          | 116 ---------------------------------------
 2 files changed, 122 insertions(+), 116 deletions(-)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 3ff69611b..fe971de91 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -1,4 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Efraim Flashner <efraim <at> flashner.co.il>
 ;;; Copyright © 2016 Kei Kebreau <kei <at> openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -20,13 +21,20 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fontutils)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages image)
+  #:use-module (gnu packages libidn)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xorg)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -61,3 +69,117 @@
 older or slower computers and embedded systems.")
     (home-page "http://www.dillo.org")
     (license license:gpl3+)))
+
+(define-public netsurf
+  (package
+    (name "netsurf")
+    (version "3.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://download.netsurf-browser.org/netsurf/"
+                           "releases/source/netsurf-" version "-src.tar.gz"))
+       (sha256
+        (base32
+         "174sjx0566agckwmlj4w2cip5qbxdiafyhlp185a1qprxx84pbjr"))
+       (patches (search-patches "netsurf-system-utf8proc.patch"
+                                "netsurf-y2038-tests.patch"
+                                "netsurf-longer-test-timeout.patch"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("netsurf-buildsystem" ,netsurf-buildsystem)
+       ("nsgenbind" ,nsgenbind)
+       ("libidn" ,libidn)               ;only for tests
+       ("check" ,check)
+       ("perl" ,perl)
+       ("perl-html-parser" ,perl-html-parser)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("curl" ,curl)
+       ("gtk+" ,gtk+-2)
+       ("openssl" ,openssl)
+       ("utf8proc" ,utf8proc)
+       ("libpng" ,libpng)
+       ("libjpeg" ,libjpeg)
+       ("libcss" ,libcss)
+       ("libdom" ,libdom)
+       ("libnsbmp" ,libnsbmp)
+       ("libnsgif" ,libnsgif)
+       ("libnspsl" ,libnspsl)
+       ("libnsutils" ,libnsutils)
+       ("libsvgtiny" ,libsvgtiny)
+       ("miscfiles" ,miscfiles)))
+    (arguments
+     `(#:make-flags `("CC=gcc" "BUILD_CC=gcc"
+                      ,(string-append "PREFIX=" %output)
+                      ,(string-append "NSSHARED="
+                                      (assoc-ref %build-inputs
+                                                 "netsurf-buildsystem")
+                                      "/share/netsurf-buildsystem"))
+       #:test-target "test"
+       #:modules ((ice-9 rdelim)
+                  (ice-9 match)
+                  (srfi srfi-1)
+                  (sxml simple)
+                  ,@%glib-or-gtk-build-system-modules)
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-after 'build 'adjust-welcome
+           (lambda _
+             ;; First, fix some unended tags and simple substitutions
+             (substitute* "frontends/gtk/res/welcome.html"
+               (("<(img|input)([^>]*)>" _ tag contents)
+                (string-append "<" tag contents " />"))
+               (("Licence") "License") ;prefer GNU spelling
+               ((" open source") ", free software")
+               (("web&nbsp;site") "website")
+               ;; Prefer privacy-respecting default search engine
+               (("www.google.co.uk") "www.duckduckgo.com/html")
+               (("Google Search") "DuckDuckGo Search")
+               (("name=\"btnG\"") ""))
+             ;; Remove default links so it doesn't seem we're endorsing them
+             (with-atomic-file-replacement "frontends/gtk/res/welcome.html"
+               (lambda (in out)
+                 ;; Leave the DOCTYPE header as is
+                 (display (read-line in 'concat) out)
+                 (sxml->xml
+                  (let rec ((sxml (xml->sxml in)))
+                    ;; We'd like to use sxml-match here, but it can't
+                    ;; match against generic tag symbols...
+                    (match sxml
+                      (`(div (@ (class "links")) . ,rest)
+                       '())
+                      ((x ...)
+                       (map rec x))
+                      (x x)))
+                  out)))
+             #t))
+         (add-before 'check 'patch-check
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* '("test/bloom.c" "test/hashtable.c")
+               (("/usr/share/dict/words")
+                (string-append (assoc-ref inputs "miscfiles") "/share/web2")))
+             #t))
+         (add-after 'install 'install-more
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (desktop (string-append out "/share/applications/"
+                                            "netsurf.desktop")))
+               (mkdir-p (dirname desktop))
+               (copy-file "frontends/gtk/res/netsurf-gtk.desktop"
+                          desktop)
+               (substitute* desktop
+                 (("netsurf-gtk") (string-append out "/bin/netsurf"))
+                 (("netsurf.png") (string-append out "/share/netsurf/"
+                                                 "netsurf.xpm")))
+               (install-file "Docs/netsurf-gtk.1"
+                             (string-append out "/share/man/man1/"))
+               #t))))))
+    (home-page "http://www.netsurf-browser.org")
+    (synopsis "Web browser")
+    (description
+     "NetSurf is a lightweight web browser that has its own layout and
+rendering engine entirely written from scratch.  It is small and capable of
+handling many of the web standards in use today.")
+    (license license:gpl2+)))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 487366b4a..6a4489508 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -69,10 +69,8 @@
   #:use-module (gnu packages gnu-doc)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages gperf)
-  #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
-  #:use-module (gnu packages libidn)
   #:use-module (gnu packages lua)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages base)
@@ -4101,120 +4099,6 @@ Public Suffix List.  It is developed as part of the NetSurf project.")
 w3c webidl files and a binding configuration file.")
     (license l:expat)))
 
-(define-public netsurf
-  (package
-    (name "netsurf")
-    (version "3.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "http://download.netsurf-browser.org/netsurf/"
-                           "releases/source/netsurf-" version "-src.tar.gz"))
-       (sha256
-        (base32
-         "174sjx0566agckwmlj4w2cip5qbxdiafyhlp185a1qprxx84pbjr"))
-       (patches (search-patches "netsurf-system-utf8proc.patch"
-                                "netsurf-y2038-tests.patch"
-                                "netsurf-longer-test-timeout.patch"))))
-    (build-system glib-or-gtk-build-system)
-    (native-inputs
-     `(("netsurf-buildsystem" ,netsurf-buildsystem)
-       ("nsgenbind" ,nsgenbind)
-       ("libidn" ,libidn)               ;only for tests
-       ("check" ,check)
-       ("perl" ,perl)
-       ("perl-html-parser" ,perl-html-parser)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("curl" ,curl)
-       ("gtk+" ,gtk+-2)
-       ("openssl" ,openssl)
-       ("utf8proc" ,utf8proc)
-       ("libpng" ,libpng)
-       ("libjpeg" ,libjpeg)
-       ("libcss" ,libcss)
-       ("libdom" ,libdom)
-       ("libnsbmp" ,libnsbmp)
-       ("libnsgif" ,libnsgif)
-       ("libnspsl" ,libnspsl)
-       ("libnsutils" ,libnsutils)
-       ("libsvgtiny" ,libsvgtiny)
-       ("miscfiles" ,miscfiles)))
-    (arguments
-     `(#:make-flags `("CC=gcc" "BUILD_CC=gcc"
-                      ,(string-append "PREFIX=" %output)
-                      ,(string-append "NSSHARED="
-                                      (assoc-ref %build-inputs
-                                                 "netsurf-buildsystem")
-                                      "/share/netsurf-buildsystem"))
-       #:test-target "test"
-       #:modules ((ice-9 rdelim)
-                  (ice-9 match)
-                  (srfi srfi-1)
-                  (sxml simple)
-                  ,@%glib-or-gtk-build-system-modules)
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'configure)
-         (add-after 'build 'adjust-welcome
-           (lambda _
-             ;; First, fix some unended tags and simple substitutions
-             (substitute* "frontends/gtk/res/welcome.html"
-               (("<(img|input)([^>]*)>" _ tag contents)
-                (string-append "<" tag contents " />"))
-               (("Licence") "License") ;prefer GNU spelling
-               ((" open source") ", free software")
-               (("web&nbsp;site") "website")
-               ;; Prefer privacy-respecting default search engine
-               (("www.google.co.uk") "www.duckduckgo.com/html")
-               (("Google Search") "DuckDuckGo Search")
-               (("name=\"btnG\"") ""))
-             ;; Remove default links so it doesn't seem we're endorsing them
-             (with-atomic-file-replacement "frontends/gtk/res/welcome.html"
-               (lambda (in out)
-                 ;; Leave the DOCTYPE header as is
-                 (display (read-line in 'concat) out)
-                 (sxml->xml
-                  (let rec ((sxml (xml->sxml in)))
-                    ;; We'd like to use sxml-match here, but it can't
-                    ;; match against generic tag symbols...
-                    (match sxml
-                      (`(div (@ (class "links")) . ,rest)
-                       '())
-                      ((x ...)
-                       (map rec x))
-                      (x x)))
-                  out)))
-             #t))
-         (add-before 'check 'patch-check
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* '("test/bloom.c" "test/hashtable.c")
-               (("/usr/share/dict/words")
-                (string-append (assoc-ref inputs "miscfiles") "/share/web2")))
-             #t))
-         (add-after 'install 'install-more
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (desktop (string-append out "/share/applications/"
-                                            "netsurf.desktop")))
-               (mkdir-p (dirname desktop))
-               (copy-file "frontends/gtk/res/netsurf-gtk.desktop"
-                          desktop)
-               (substitute* desktop
-                 (("netsurf-gtk") (string-append out "/bin/netsurf"))
-                 (("netsurf.png") (string-append out "/share/netsurf/"
-                                                 "netsurf.xpm")))
-               (install-file "Docs/netsurf-gtk.1"
-                             (string-append out "/share/man/man1/"))
-               #t))))))
-    (home-page "http://www.netsurf-browser.org")
-    (synopsis "Web browser")
-    (description
-     "NetSurf is a lightweight web browser that has its own layout and
-rendering engine entirely written from scratch.  It is small and capable of
-handling many of the web standards in use today.")
-    (license l:gpl2+)))
-
 (define-public surfraw
   (package
     (name "surfraw")
-- 
2.12.2





Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sun, 30 Apr 2017 15:32:02 GMT) Full text and rfc822 format available.

Message #8 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Allan Webber <cwebber <at> dustycloud.org>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: 26713 <at> debbugs.gnu.org
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sun, 30 Apr 2017 10:31:21 -0500
Good call... lgtm!




Reply sent to Kei Kebreau <kei <at> openmailbox.org>:
You have taken responsibility. (Sun, 30 Apr 2017 18:16:02 GMT) Full text and rfc822 format available.

Notification sent to Kei Kebreau <kei <at> openmailbox.org>:
bug acknowledged by developer. (Sun, 30 Apr 2017 18:16:02 GMT) Full text and rfc822 format available.

Message #13 received at 26713-done <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Christopher Allan Webber <cwebber <at> dustycloud.org>
Cc: 26713-done <at> debbugs.gnu.org
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sun, 30 Apr 2017 14:12:49 -0400
[Message part 1 (text/plain, inline)]
Christopher Allan Webber <cwebber <at> dustycloud.org> writes:

> Good call... lgtm!

Pushed! Thanks for the review.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sun, 30 Apr 2017 19:14:01 GMT) Full text and rfc822 format available.

Message #16 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: 26713 <at> debbugs.gnu.org
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sun, 30 Apr 2017 15:13:06 -0400
[Message part 1 (text/plain, inline)]
On Sat, Apr 29, 2017 at 06:09:42PM -0400, Kei Kebreau wrote:
> * gnu/packages/web.scm: Move netsurf...
> * gnu/packages/web-browsers.scm: ...here.

This caused building Guix to fail because the glib-or-gtk build-system
module was not imported in (gnu packages web-browsers).

I planned to add that module in a followup commit, but I realized that
several other variables from (gnu packages web) need to be imported in
(gnu packages web-browsers) along with this change, and I decided to
revert the change for now.

Can you take another look at moving this package?
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sun, 30 Apr 2017 19:58:01 GMT) Full text and rfc822 format available.

Message #19 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 26713 <at> debbugs.gnu.org
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sun, 30 Apr 2017 15:57:32 -0400
[Message part 1 (text/plain, inline)]
Leo Famulari <leo <at> famulari.name> writes:

> On Sat, Apr 29, 2017 at 06:09:42PM -0400, Kei Kebreau wrote:
>> * gnu/packages/web.scm: Move netsurf...
>> * gnu/packages/web-browsers.scm: ...here.
>
> This caused building Guix to fail because the glib-or-gtk build-system
> module was not imported in (gnu packages web-browsers).
>

Oh no! :(

> I planned to add that module in a followup commit, but I realized that
> several other variables from (gnu packages web) need to be imported in
> (gnu packages web-browsers) along with this change, and I decided to
> revert the change for now.
>
> Can you take another look at moving this package?

Will do. I'll have to adjust the qutebrowser patch for corrections to
this one.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sun, 30 Apr 2017 22:18:01 GMT) Full text and rfc822 format available.

Message #22 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 26713 <at> debbugs.gnu.org
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sun, 30 Apr 2017 18:17:30 -0400
[Message part 1 (text/plain, inline)]
Kei Kebreau <kei <at> openmailbox.org> writes:

> Leo Famulari <leo <at> famulari.name> writes:
>
>> On Sat, Apr 29, 2017 at 06:09:42PM -0400, Kei Kebreau wrote:
>>> * gnu/packages/web.scm: Move netsurf...
>>> * gnu/packages/web-browsers.scm: ...here.
>>
>> This caused building Guix to fail because the glib-or-gtk build-system
>> module was not imported in (gnu packages web-browsers).
>>
>
> Oh no! :(
>
>> I planned to add that module in a followup commit, but I realized that
>> several other variables from (gnu packages web) need to be imported in
>> (gnu packages web-browsers) along with this change, and I decided to
>> revert the change for now.
>>
>> Can you take another look at moving this package?
>
> Will do. I'll have to adjust the qutebrowser patch for corrections to
> this one.

Try the attached patch. I'm not sure that copying the definition of
netsurf-buildsystem is the best way to handle the move, but I'm not sure
this is worth making netsurf-buildsystem a publicly-defined package.

Thoughts?

[0001-gnu-Move-netsurf-to-web-browsers.scm.patch (text/plain, attachment)]
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sat, 06 May 2017 14:53:01 GMT) Full text and rfc822 format available.

Message #25 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Leo Famulari <leo <at> famulari.name>
Cc: 26713 <at> debbugs.gnu.org
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sat, 06 May 2017 10:51:26 -0400
[Message part 1 (text/plain, inline)]
Kei Kebreau <kei <at> openmailbox.org> writes:

> Kei Kebreau <kei <at> openmailbox.org> writes:
>
>> Leo Famulari <leo <at> famulari.name> writes:
>>
>>> On Sat, Apr 29, 2017 at 06:09:42PM -0400, Kei Kebreau wrote:
>>>> * gnu/packages/web.scm: Move netsurf...
>>>> * gnu/packages/web-browsers.scm: ...here.
>>>
>>> This caused building Guix to fail because the glib-or-gtk build-system
>>> module was not imported in (gnu packages web-browsers).
>>>
>>
>> Oh no! :(
>>
>>> I planned to add that module in a followup commit, but I realized that
>>> several other variables from (gnu packages web) need to be imported in
>>> (gnu packages web-browsers) along with this change, and I decided to
>>> revert the change for now.
>>>
>>> Can you take another look at moving this package?
>>
>> Will do. I'll have to adjust the qutebrowser patch for corrections to
>> this one.
>
> Try the attached patch. I'm not sure that copying the definition of
> netsurf-buildsystem is the best way to handle the move, but I'm not sure
> this is worth making netsurf-buildsystem a publicly-defined package.
>
> Thoughts?

If you have no objections, I'd like to push this.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sat, 06 May 2017 15:25:02 GMT) Full text and rfc822 format available.

Message #28 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Kei Kebreau <kei <at> openmailbox.org>, Leo Famulari <leo <at> famulari.name>
Cc: 26713 <at> debbugs.gnu.org
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sat, 06 May 2017 17:24:17 +0200
[Message part 1 (text/plain, inline)]
Kei Kebreau <kei <at> openmailbox.org> writes:

> Kei Kebreau <kei <at> openmailbox.org> writes:
>
>> Kei Kebreau <kei <at> openmailbox.org> writes:
>>
>>> Leo Famulari <leo <at> famulari.name> writes:
>>>
>>>> On Sat, Apr 29, 2017 at 06:09:42PM -0400, Kei Kebreau wrote:
>>>>> * gnu/packages/web.scm: Move netsurf...
>>>>> * gnu/packages/web-browsers.scm: ...here.
>>>>
>>>> This caused building Guix to fail because the glib-or-gtk build-system
>>>> module was not imported in (gnu packages web-browsers).
>>>>
>>>
>>> Oh no! :(
>>>
>>>> I planned to add that module in a followup commit, but I realized that
>>>> several other variables from (gnu packages web) need to be imported in
>>>> (gnu packages web-browsers) along with this change, and I decided to
>>>> revert the change for now.
>>>>
>>>> Can you take another look at moving this package?
>>>
>>> Will do. I'll have to adjust the qutebrowser patch for corrections to
>>> this one.
>>
>> Try the attached patch. I'm not sure that copying the definition of
>> netsurf-buildsystem is the best way to handle the move, but I'm not sure
>> this is worth making netsurf-buildsystem a publicly-defined package.
>>
>> Thoughts?
>
> If you have no objections, I'd like to push this.

AFAICT, the latest patch (id:87o9vdo805.fsf <at> openmailbox.org) does not
actually move netsurf-build-system. Am I missing something?

There are other things using netsurf-build-system as well, so I would
just leave it for now. Also some copyright information is missing in the
patch.

As a side note, make sure to run `make` after moving code around like
this. And `make clean-go` when deleting modules. I've been bitten before
by Guix picking up code from stale .go files.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sat, 06 May 2017 16:35:01 GMT) Full text and rfc822 format available.

Message #31 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26713 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sat, 06 May 2017 12:34:36 -0400
[Message part 1 (text/plain, inline)]
Marius Bakke <mbakke <at> fastmail.com> writes:

> Kei Kebreau <kei <at> openmailbox.org> writes:
>
>
> AFAICT, the latest patch (id:87o9vdo805.fsf <at> openmailbox.org) does not
> actually move netsurf-build-system. Am I missing something?

No, I somehow posted an old patch. Please try the one attached.

>
> There are other things using netsurf-build-system as well, so I would
> just leave it for now.

I intend to copy, not move, netsurf-build-system into web-browsers.scm
so that NetSurf can build.

> Also some copyright information is missing in the patch.
>

What information in particular?

> As a side note, make sure to run `make` after moving code around like
> this. And `make clean-go` when deleting modules. I've been bitten before
> by Guix picking up code from stale .go files.

Noted.
[0001-gnu-Move-netsurf-to-web-browsers.scm.patch (text/plain, attachment)]
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Sat, 06 May 2017 17:39:02 GMT) Full text and rfc822 format available.

Message #34 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Kei Kebreau <kei <at> openmailbox.org>
Cc: 26713 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Sat, 06 May 2017 19:38:32 +0200
[Message part 1 (text/plain, inline)]
Kei Kebreau <kei <at> openmailbox.org> writes:

> Marius Bakke <mbakke <at> fastmail.com> writes:
>>
>> There are other things using netsurf-build-system as well, so I would
>> just leave it for now.
>
> I intend to copy, not move, netsurf-build-system into web-browsers.scm
> so that NetSurf can build.

There are many other packages in web.scm using netsurf-build-system. IMO
it would be "cleaner" to have all that in a "netsurf" module, but I'm not
sure if it's worth the hassle.

The current patch duplicates netsurf-build-system, which means we have
to maintain it two different places. I think we should avoid that.

>> Also some copyright information is missing in the patch.
>
> What information in particular?

Netsurf was added in 2016, but web-browsers.scm only includes 2017.
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#26713; Package guix-patches. (Mon, 08 May 2017 15:18:01 GMT) Full text and rfc822 format available.

Message #37 received at 26713 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kei <at> openmailbox.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 26713 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
Date: Mon, 08 May 2017 11:17:39 -0400
[Message part 1 (text/plain, inline)]
Marius Bakke <mbakke <at> fastmail.com> writes:

> Kei Kebreau <kei <at> openmailbox.org> writes:
>
>> Marius Bakke <mbakke <at> fastmail.com> writes:
>>>
>>> There are other things using netsurf-build-system as well, so I would
>>> just leave it for now.
>>
>> I intend to copy, not move, netsurf-build-system into web-browsers.scm
>> so that NetSurf can build.
>
> There are many other packages in web.scm using netsurf-build-system. IMO
> it would be "cleaner" to have all that in a "netsurf" module, but I'm not
> sure if it's worth the hassle.
>
> The current patch duplicates netsurf-build-system, which means we have
> to maintain it two different places. I think we should avoid that.
>

Another option is moving all of the "NetSurf components" into
web-browsers.scm. None of them are depended on by anything but NetSurf
and each other.

>>> Also some copyright information is missing in the patch.
>>
>> What information in particular?
>
> Netsurf was added in 2016, but web-browsers.scm only includes 2017.

Okay, this was fixed in the patch I just submitted.
[signature.asc (application/pgp-signature, inline)]

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Tue, 06 Jun 2017 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 8 years and 94 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.