* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
@ 2017-04-29 22:09 Kei Kebreau
2017-04-30 15:31 ` Christopher Allan Webber
2017-04-30 19:13 ` Leo Famulari
0 siblings, 2 replies; 11+ messages in thread
From: Kei Kebreau @ 2017-04-29 22:09 UTC (permalink / raw)
To: 26713; +Cc: Kei Kebreau
* 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@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kei@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 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 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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-04-29 22:09 bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm Kei Kebreau
@ 2017-04-30 15:31 ` Christopher Allan Webber
2017-04-30 18:12 ` Kei Kebreau
2017-04-30 19:13 ` Leo Famulari
1 sibling, 1 reply; 11+ messages in thread
From: Christopher Allan Webber @ 2017-04-30 15:31 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26713
Good call... lgtm!
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-04-30 15:31 ` Christopher Allan Webber
@ 2017-04-30 18:12 ` Kei Kebreau
0 siblings, 0 replies; 11+ messages in thread
From: Kei Kebreau @ 2017-04-30 18:12 UTC (permalink / raw)
To: Christopher Allan Webber; +Cc: 26713-done
[-- Attachment #1: Type: text/plain, Size: 112 bytes --]
Christopher Allan Webber <cwebber@dustycloud.org> writes:
> Good call... lgtm!
Pushed! Thanks for the review.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-04-29 22:09 bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm Kei Kebreau
2017-04-30 15:31 ` Christopher Allan Webber
@ 2017-04-30 19:13 ` Leo Famulari
2017-04-30 19:57 ` Kei Kebreau
1 sibling, 1 reply; 11+ messages in thread
From: Leo Famulari @ 2017-04-30 19:13 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26713
[-- Attachment #1: Type: text/plain, Size: 565 bytes --]
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?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-04-30 19:13 ` Leo Famulari
@ 2017-04-30 19:57 ` Kei Kebreau
2017-04-30 22:17 ` Kei Kebreau
0 siblings, 1 reply; 11+ messages in thread
From: Kei Kebreau @ 2017-04-30 19:57 UTC (permalink / raw)
To: Leo Famulari; +Cc: 26713
[-- Attachment #1: Type: text/plain, Size: 721 bytes --]
Leo Famulari <leo@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-04-30 19:57 ` Kei Kebreau
@ 2017-04-30 22:17 ` Kei Kebreau
2017-05-06 14:51 ` Kei Kebreau
0 siblings, 1 reply; 11+ messages in thread
From: Kei Kebreau @ 2017-04-30 22:17 UTC (permalink / raw)
To: Leo Famulari; +Cc: 26713
[-- Attachment #1.1: Type: text/plain, Size: 1012 bytes --]
Kei Kebreau <kei@openmailbox.org> writes:
> Leo Famulari <leo@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?
[-- Attachment #1.2: 0001-gnu-Move-netsurf-to-web-browsers.scm.patch --]
[-- Type: text/plain, Size: 12962 bytes --]
From 77be2770f571ac7e76783701eb44323cc33cf92a Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Sat, 29 Apr 2017 18:08:25 -0400
Subject: [PATCH] gnu: Move netsurf to web-browsers.scm.
To: guix-patches@gnu.org
* gnu/packages/web.scm: Move netsurf...
* gnu/packages/web-browsers.scm: ...here.
(netsurf-buildsystem): Copy defintion from web.scm to web-browsers.scm.
---
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@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kei@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 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 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-04-30 22:17 ` Kei Kebreau
@ 2017-05-06 14:51 ` Kei Kebreau
2017-05-06 15:24 ` Marius Bakke
0 siblings, 1 reply; 11+ messages in thread
From: Kei Kebreau @ 2017-05-06 14:51 UTC (permalink / raw)
To: Leo Famulari; +Cc: 26713
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
Kei Kebreau <kei@openmailbox.org> writes:
> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Leo Famulari <leo@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-05-06 14:51 ` Kei Kebreau
@ 2017-05-06 15:24 ` Marius Bakke
2017-05-06 16:34 ` Kei Kebreau
0 siblings, 1 reply; 11+ messages in thread
From: Marius Bakke @ 2017-05-06 15:24 UTC (permalink / raw)
To: Kei Kebreau, Leo Famulari; +Cc: 26713
[-- Attachment #1: Type: text/plain, Size: 1689 bytes --]
Kei Kebreau <kei@openmailbox.org> writes:
> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Kei Kebreau <kei@openmailbox.org> writes:
>>
>>> Leo Famulari <leo@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@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-05-06 15:24 ` Marius Bakke
@ 2017-05-06 16:34 ` Kei Kebreau
2017-05-06 17:38 ` Marius Bakke
0 siblings, 1 reply; 11+ messages in thread
From: Kei Kebreau @ 2017-05-06 16:34 UTC (permalink / raw)
To: Marius Bakke; +Cc: 26713
[-- Attachment #1.1: Type: text/plain, Size: 789 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> Kei Kebreau <kei@openmailbox.org> writes:
>
>
> AFAICT, the latest patch (id:87o9vdo805.fsf@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.
[-- Attachment #1.2: 0001-gnu-Move-netsurf-to-web-browsers.scm.patch --]
[-- Type: text/plain, Size: 14230 bytes --]
From 59573cd0e9ebf9b312aca9f7565bd59670880eb2 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kei@openmailbox.org>
Date: Sat, 29 Apr 2017 18:08:25 -0400
Subject: [PATCH] gnu: Move netsurf to web-browsers.scm.
* gnu/packages/web.scm: Move netsurf...
* gnu/packages/web-browsers.scm: ...here.
(netsurf-buildsystem): Copy defintion from web.scm to web-browsers.scm.
---
gnu/packages/web-browsers.scm | 150 ++++++++++++++++++++++++++++++++++++++++++
gnu/packages/web.scm | 116 --------------------------------
2 files changed, 150 insertions(+), 116 deletions(-)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 07b61dd25..6600085e5 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@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;;
@@ -21,18 +22,26 @@
#: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 documentation)
#:use-module (gnu packages fltk)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages gnu-doc)
+ #:use-module (gnu packages gtk)
+ #:use-module (gnu packages libidn)
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages qt)
#: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 glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python))
@@ -67,6 +76,147 @@ 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 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+)))
+
+(define netsurf-buildsystem
+ (package
+ (name "netsurf-buildsystem")
+ (version "1.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "http://download.netsurf-browser.org/libs/releases/"
+ "buildsystem-" version ".tar.gz"))
+ (sha256
+ (base32
+ "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv"))))
+ (build-system gnu-build-system)
+ (inputs `(("perl" ,perl)))
+ (arguments
+ '(#:make-flags (list (string-append "PREFIX=" %output))
+ #:tests? #f ;no tests
+ #:phases (modify-phases %standard-phases
+ (delete 'configure)
+ (delete 'build))))
+ (home-page "http://www.netsurf-browser.org")
+ (synopsis "Build system for the Netsurf project")
+ (description
+ "This package provides the shared build system for Netsurf project
+libraries.")
+ (license license:expat)))
+
(define-public qutebrowser
(package
(name "qutebrowser")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 9c2074d86..3bed8c521 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)
@@ -4100,120 +4098,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 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-05-06 16:34 ` Kei Kebreau
@ 2017-05-06 17:38 ` Marius Bakke
2017-05-08 15:17 ` Kei Kebreau
0 siblings, 1 reply; 11+ messages in thread
From: Marius Bakke @ 2017-05-06 17:38 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 26713
[-- Attachment #1: Type: text/plain, Size: 778 bytes --]
Kei Kebreau <kei@openmailbox.org> writes:
> Marius Bakke <mbakke@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm.
2017-05-06 17:38 ` Marius Bakke
@ 2017-05-08 15:17 ` Kei Kebreau
0 siblings, 0 replies; 11+ messages in thread
From: Kei Kebreau @ 2017-05-08 15:17 UTC (permalink / raw)
To: Marius Bakke; +Cc: 26713
[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> Kei Kebreau <kei@openmailbox.org> writes:
>
>> Marius Bakke <mbakke@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-05-08 15:18 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-29 22:09 bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm Kei Kebreau
2017-04-30 15:31 ` Christopher Allan Webber
2017-04-30 18:12 ` Kei Kebreau
2017-04-30 19:13 ` Leo Famulari
2017-04-30 19:57 ` Kei Kebreau
2017-04-30 22:17 ` Kei Kebreau
2017-05-06 14:51 ` Kei Kebreau
2017-05-06 15:24 ` Marius Bakke
2017-05-06 16:34 ` Kei Kebreau
2017-05-06 17:38 ` Marius Bakke
2017-05-08 15:17 ` Kei Kebreau
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).