From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d72fi-0002FW-3W for guix-patches@gnu.org; Sat, 06 May 2017 12:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d72fe-0003B2-DT for guix-patches@gnu.org; Sat, 06 May 2017 12:35:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:60229) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d72fe-0003AG-8B for guix-patches@gnu.org; Sat, 06 May 2017 12:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d72fd-0003n6-TB for guix-patches@gnu.org; Sat, 06 May 2017 12:35:01 -0400 Subject: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. Resent-Message-ID: From: Kei Kebreau References: <20170429220942.26880-1-kei@openmailbox.org> <20170430191306.GA26169@jasmine> <87shkpoehf.fsf@openmailbox.org> <87o9vdo805.fsf@openmailbox.org> <87lgqaghsh.fsf@openmailbox.org> <87pofmypni.fsf@fastmail.com> Date: Sat, 06 May 2017 12:34:36 -0400 In-Reply-To: <87pofmypni.fsf@fastmail.com> (Marius Bakke's message of "Sat, 06 May 2017 17:24:17 +0200") Message-ID: <87h90ygd0j.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Marius Bakke Cc: 26713@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau 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. --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Move-netsurf-to-web-browsers.scm.patch Content-Transfer-Encoding: quoted-printable From=2059573cd0e9ebf9b312aca9f7565bd59670880eb2 Mon Sep 17 00:00:00 2001 From: Kei Kebreau 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. =2D-- 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 =2D-- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2016 Efraim Flashner ;;; Copyright =C2=A9 2016 Kei Kebreau ;;; Copyright =C2=A9 2017 Eric Bavier ;;; @@ -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)) =20 @@ -67,6 +76,147 @@ older or slower computers and embedded systems.") (home-page "http://www.dillo.org") (license license:gpl3+))) =20 +(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=3Dgcc" "BUILD_CC=3Dgcc" + ,(string-append "PREFIX=3D" %output) + ,(string-append "NSSHARED=3D" + (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=3D\"btnG\"") "")) + ;; Remove default links so it doesn't seem we're endorsing th= em + (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/relea= ses/" + "buildsystem-" version ".tar.gz")) + (sha256 + (base32 + "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv")))) + (build-system gnu-build-system) + (inputs `(("perl" ,perl))) + (arguments + '(#:make-flags (list (string-append "PREFIX=3D" %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 =2D-- 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) =2D #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) =2D #: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))) =20 =2D(define-public netsurf =2D (package =2D (name "netsurf") =2D (version "3.6") =2D (source =2D (origin =2D (method url-fetch) =2D (uri (string-append "http://download.netsurf-browser.org/netsurf/" =2D "releases/source/netsurf-" version "-src.tar.= gz")) =2D (sha256 =2D (base32 =2D "174sjx0566agckwmlj4w2cip5qbxdiafyhlp185a1qprxx84pbjr")) =2D (patches (search-patches "netsurf-system-utf8proc.patch" =2D "netsurf-y2038-tests.patch" =2D "netsurf-longer-test-timeout.patch")))) =2D (build-system glib-or-gtk-build-system) =2D (native-inputs =2D `(("netsurf-buildsystem" ,netsurf-buildsystem) =2D ("nsgenbind" ,nsgenbind) =2D ("libidn" ,libidn) ;only for tests =2D ("check" ,check) =2D ("perl" ,perl) =2D ("perl-html-parser" ,perl-html-parser) =2D ("pkg-config" ,pkg-config))) =2D (inputs =2D `(("curl" ,curl) =2D ("gtk+" ,gtk+-2) =2D ("openssl" ,openssl) =2D ("utf8proc" ,utf8proc) =2D ("libpng" ,libpng) =2D ("libjpeg" ,libjpeg) =2D ("libcss" ,libcss) =2D ("libdom" ,libdom) =2D ("libnsbmp" ,libnsbmp) =2D ("libnsgif" ,libnsgif) =2D ("libnspsl" ,libnspsl) =2D ("libnsutils" ,libnsutils) =2D ("libsvgtiny" ,libsvgtiny) =2D ("miscfiles" ,miscfiles))) =2D (arguments =2D `(#:make-flags `("CC=3Dgcc" "BUILD_CC=3Dgcc" =2D ,(string-append "PREFIX=3D" %output) =2D ,(string-append "NSSHARED=3D" =2D (assoc-ref %build-inputs =2D "netsurf-buildsystem") =2D "/share/netsurf-buildsystem")) =2D #:test-target "test" =2D #:modules ((ice-9 rdelim) =2D (ice-9 match) =2D (srfi srfi-1) =2D (sxml simple) =2D ,@%glib-or-gtk-build-system-modules) =2D #:phases =2D (modify-phases %standard-phases =2D (delete 'configure) =2D (add-after 'build 'adjust-welcome =2D (lambda _ =2D ;; First, fix some unended tags and simple substitutions =2D (substitute* "frontends/gtk/res/welcome.html" =2D (("<(img|input)([^>]*)>" _ tag contents) =2D (string-append "<" tag contents " />")) =2D (("Licence") "License") ;prefer GNU spelling =2D ((" open source") ", free software") =2D (("web site") "website") =2D ;; Prefer privacy-respecting default search engine =2D (("www.google.co.uk") "www.duckduckgo.com/html") =2D (("Google Search") "DuckDuckGo Search") =2D (("name=3D\"btnG\"") "")) =2D ;; Remove default links so it doesn't seem we're endorsing = them =2D (with-atomic-file-replacement "frontends/gtk/res/welcome.ht= ml" =2D (lambda (in out) =2D ;; Leave the DOCTYPE header as is =2D (display (read-line in 'concat) out) =2D (sxml->xml =2D (let rec ((sxml (xml->sxml in))) =2D ;; We'd like to use sxml-match here, but it can't =2D ;; match against generic tag symbols... =2D (match sxml =2D (`(div (@ (class "links")) . ,rest) =2D '()) =2D ((x ...) =2D (map rec x)) =2D (x x))) =2D out))) =2D #t)) =2D (add-before 'check 'patch-check =2D (lambda* (#:key inputs #:allow-other-keys) =2D (substitute* '("test/bloom.c" "test/hashtable.c") =2D (("/usr/share/dict/words") =2D (string-append (assoc-ref inputs "miscfiles") "/share/we= b2"))) =2D #t)) =2D (add-after 'install 'install-more =2D (lambda* (#:key outputs #:allow-other-keys) =2D (let* ((out (assoc-ref outputs "out")) =2D (desktop (string-append out "/share/applications/" =2D "netsurf.desktop"))) =2D (mkdir-p (dirname desktop)) =2D (copy-file "frontends/gtk/res/netsurf-gtk.desktop" =2D desktop) =2D (substitute* desktop =2D (("netsurf-gtk") (string-append out "/bin/netsurf")) =2D (("netsurf.png") (string-append out "/share/netsurf/" =2D "netsurf.xpm"))) =2D (install-file "Docs/netsurf-gtk.1" =2D (string-append out "/share/man/man1/")) =2D #t)))))) =2D (home-page "http://www.netsurf-browser.org") =2D (synopsis "Web browser") =2D (description =2D "NetSurf is a lightweight web browser that has its own layout and =2Drendering engine entirely written from scratch. It is small and capable= of =2Dhandling many of the web standards in use today.") =2D (license l:gpl2+))) =2D (define-public surfraw (package (name "surfraw") =2D-=20 2.12.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkN+x0ACgkQ5qXuPBlG eg07vQ/+OM9uadLHIZrjXR050cwkDj31Ww6i+gtf8+i5LsiecuY11Cx7nScTG+cy oH8v/9xLsxJitO9xLChlszScNcK0upDDcK1NiAWIYdl8BXJm6x1xavwoDo+adWFZ 3WmjAfrYhn5h0b6CNS++CnI29ef2/97jQkdddQtHWsUDkZvwQFy6lN7b/MP/VhxP u7rwFeHsftrcJDP4uNmapvJSuKrOC4pdusU1ty6n01KsQC8uCDedRj/V/wZ2hCTf fJqXHfvWMNwfDY+uE5UTUd79BUr9oOGS2JBy/0cWa6Qxm6F+CUklP/CEbRbg7Nv9 C2TGPXHHd1+i8PdH3CIQ4nehJxWDAuyq8QOHajAsY01BeSlJmhmHkPCbCh4EPdkX x50XfdMf9qdXAPrfrcRyGtDH4WUBu6PR7W1Cn3al1bqLk3v9+CiClMGNmExqO+ju LDRI/iLFMY55t8N1rtz9CSjFUILz9IHMalbySMYb8zm0jjuPObEn0CToF2Kh2W5x zDkx7HALammEQ4LyiSe3elviBt3shf+h8vv3A1GRs/BLkxfXK1CQsoDghQl4cOXp qqroh56vWpvNxAgbu+slfkCHiWT6X7TEIx3men7keeRIBANAUCfXT0tpsxmFkwd4 nByJu9cmgLLISCNdIlI5i/wH7yuycR0Aa3ILO/SB/MJuzDX8kys= =jRLy -----END PGP SIGNATURE----- --==-=-=--