From unknown Sun Sep 07 23:27:24 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#26713 <26713@debbugs.gnu.org> To: bug#26713 <26713@debbugs.gnu.org> Subject: Status: [PATCH] gnu: Move netsurf to web-browsers.scm. Reply-To: bug#26713 <26713@debbugs.gnu.org> Date: Mon, 08 Sep 2025 06:27:24 +0000 retitle 26713 [PATCH] gnu: Move netsurf to web-browsers.scm. reassign 26713 guix-patches submitter 26713 Kei Kebreau severity 26713 normal tag 26713 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 29 18:10:15 2017 Received: (at submit) by debbugs.gnu.org; 29 Apr 2017 22:10:15 +0000 Received: from localhost ([127.0.0.1]:46731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4aZ7-00064J-HO for submit@debbugs.gnu.org; Sat, 29 Apr 2017 18:10:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4aZ5-000645-9s for submit@debbugs.gnu.org; Sat, 29 Apr 2017 18:10:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4aYy-0003y2-65 for submit@debbugs.gnu.org; Sat, 29 Apr 2017 18:10:02 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:57940) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d4aYy-0003xw-1w for submit@debbugs.gnu.org; Sat, 29 Apr 2017 18:10:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4aYw-0001Mi-57 for guix-patches@gnu.org; Sat, 29 Apr 2017 18:09:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4aYs-0003x4-Ct for guix-patches@gnu.org; Sat, 29 Apr 2017 18:09:58 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:43922 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4aYs-0003wo-0H for guix-patches@gnu.org; Sat, 29 Apr 2017 18:09:54 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 742355146CA; Sun, 30 Apr 2017 00:09:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493503792; bh=R/T1jZkXOAJoNruPAIZSy+iGaUVj3527V4oipgRYe/Y=; h=From:To:Cc:Subject:Date:From; b=Y+1Om8JRBSak0SkeEvPwOafOu2pT7aWVbIlQE74S3+mZ+icXB1CJFo9bpswx5BSgY z2JcMUn/LiTZqNjzyCAVEzr6Vn20hRB+3XeOGpcMwbbmoQN/ICMnK2zi/kVS94nnvp DJq08lkNCKnIKFItIx4m0wNLIRWonZgmJ69C/wQk= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493503791; bh=R/T1jZkXOAJoNruPAIZSy+iGaUVj3527V4oipgRYe/Y=; h=From:To:Cc:Subject:Date:From; b=nUvfG2GBNCRToxjij4p5aOc1qI+lcQwEWm/yWCfK3Pk3lXgzmVu8bzHz6QOEdZOgp tFUlfbVHf+Q5wMA29X8d9alrZgm76R02ZvGamJYHMEZMTdWH57HGkpAZjpg3wSKZht PIykqknKl6CB9g9pSGG+Ez/FW3eFJbODXDT9aXMo= To: guix-patches@gnu.org Subject: [PATCH] gnu: Move netsurf to web-browsers.scm. Date: Sat, 29 Apr 2017 18:09:42 -0400 Message-Id: <20170429220942.26880-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * 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.sc= m 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 =C2=A9 2016 Efraim Flashner ;;; Copyright =C2=A9 2016 Kei Kebreau ;;; ;;; 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=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 = them + (with-atomic-file-replacement "frontends/gtk/res/welcome.ht= ml" + (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/we= b2"))) + #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 t= he NetSurf project.") w3c webidl files and a binding configuration file.") (license l:expat))) =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 = them - (with-atomic-file-replacement "frontends/gtk/res/welcome.ht= ml" - (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/we= b2"))) - #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") --=20 2.12.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 11:31:24 2017 Received: (at 26713) by debbugs.gnu.org; 30 Apr 2017 15:31:24 +0000 Received: from localhost ([127.0.0.1]:47922 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4qol-0001yF-Sg for submit@debbugs.gnu.org; Sun, 30 Apr 2017 11:31:23 -0400 Received: from dustycloud.org ([50.116.34.160]:53570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4qok-0001y8-CD for 26713@debbugs.gnu.org; Sun, 30 Apr 2017 11:31:22 -0400 Received: from oolong (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id E54072668B; Sun, 30 Apr 2017 11:31:21 -0400 (EDT) References: <20170429220942.26880-1-kei@openmailbox.org> User-agent: mu4e 0.9.18; emacs 25.2.1 From: Christopher Allan Webber To: Kei Kebreau Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. In-reply-to: <20170429220942.26880-1-kei@openmailbox.org> Date: Sun, 30 Apr 2017 10:31:21 -0500 Message-ID: <87mvaxdi9i.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Good call... lgtm! From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 14:15:06 2017 Received: (at 26713-done) by debbugs.gnu.org; 30 Apr 2017 18:15:06 +0000 Received: from localhost ([127.0.0.1]:48006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4tNC-0005nC-CX for submit@debbugs.gnu.org; Sun, 30 Apr 2017 14:15:06 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:35502 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4tNA-0005n2-4Y for 26713-done@debbugs.gnu.org; Sun, 30 Apr 2017 14:15:04 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 60913503262; Sun, 30 Apr 2017 20:12:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493576103; bh=1gGtVfkXDtZk/H/JnoXpGOtDQTaaVUP0GaGjm/UnvxU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=M2eV4fzNIwlBdwAITRkgLJBVEc8/lHGF/1J9VExHzyjJkyqBnD0ArE/3zsDb5I6pz ONpmuct2qpXSzMN4UBpV61ZGlvl+k4zMYntJWykJKy8zK5ZYp6RGsMeotMxX+IfL4E +Fnxwcz830uU81Efa8rTkDj2a1vufE8+xEw0E6DA= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR003 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493575974; bh=1gGtVfkXDtZk/H/JnoXpGOtDQTaaVUP0GaGjm/UnvxU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=mwyp4IlQ424Uxv/E4Q9RqdOfaIXIKT6iIqUyykwW2xk6YatRsObghnlpdqr00gSnW YOQc+QLp3TVnFZWREG9dsngmmNUylKA/8dxmXyhcDx1/8h4zP1wtmxI0BawdsOOAyB bURjEO+4bTR0ABTfCX6UXUBvyTlmpyGunJUQlBW8= To: Christopher Allan Webber Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. In-Reply-To: <87mvaxdi9i.fsf@dustycloud.org> (Christopher Allan Webber's message of "Sun, 30 Apr 2017 10:31:21 -0500") References: <20170429220942.26880-1-kei@openmailbox.org> <87mvaxdi9i.fsf@dustycloud.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Date: Sun, 30 Apr 2017 14:12:49 -0400 Message-ID: <87wpa1ojby.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 26713-done Cc: 26713-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) --=-=-= Content-Type: text/plain Christopher Allan Webber writes: > Good call... lgtm! Pushed! Thanks for the review. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkGKSIACgkQ5qXuPBlG eg0AKBAAviFUCkUQF2S6I8FgV+UnPDv+y+R+2f6BtXnr2rQAU6LZPTaPuzdHa9ah tyIQbzj5vDatH8epiTyuedULrWskAcXmhH85zxM93eQlX0dGduZys+F29zKNFoj5 5o7uYVYMUC55hsyjWHWzuxK/JACdqbOg8CJIOY0P1miE6lhCY8fivaVerFPkVbNR sNssCfW8bjkiArWTVL9GB0CgG1nEQzizhZ5cTJ6T4jQMH7TcfHhQPIcpvANsEmAc QXpkUz6lQpJ2i8VZNQ4P935MXmSalkWYVjUb6nnwn+b7axyzwNTUAIICUAvxjL6f b9u+Z7Z80jtykCuR7FbKhvCqzmPbG+WtMgLNr+U9Ak5RE5z/w9ZN6QzLt40hF7p7 CEB0WbfkFYen8ERWJ0zG9zhfJkywuyt6dDoKe8qhxABQ63DUHOynifZPGWHrO0Eq RYiL38jEwwd6IHEbLhShXTZ6lnPKmY9WxF1KGH95lFJtBZPE8pfHFx/DJD5Y0ecr 1xMYUcHpvDQVdoNzy7fWPUZXlPjBtyypgFuBdA/iszLyWx89fy+fJSHSoH/Ll++3 aA2JlMaF1OBchN542YDUXq3Nx2a+dFB0OQ0TrvPmnr7hhjbyuVCEpC2pjiYGbqfr SFP5fp7dINJDwUzHNlWd3lcBulVx6ki4HcwhBWpZNDtww5arwes= =e5Gq -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 15:13:09 2017 Received: (at 26713) by debbugs.gnu.org; 30 Apr 2017 19:13:10 +0000 Received: from localhost ([127.0.0.1]:48054 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4uHN-0000Sg-NG for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:13:09 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:33973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4uHL-0000SY-GV for 26713@debbugs.gnu.org; Sun, 30 Apr 2017 15:13:07 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 47E4420873; Sun, 30 Apr 2017 15:13:07 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Sun, 30 Apr 2017 15:13:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=0gJ3h4dcOtUsW5Ijzfa5vAnUkUunZg/NBivTzQ uz6ng=; b=TRkI+QIz0AeZQyvl2DYNc+L89Is0eHUZUDCMiIh8ACOGPj/TcHCXXE MaD6TR8nXW3dezxNSvQsfmCtak4+Y1ChLYoovp/EQvKUhYtGfbVbpuBVlc55Y4mq rFkkvrSQKKJg9UHOxTzsn8nkxTEHz5I5Dj6c0cam4aKood3TopOLs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=0gJ3h4dcOtUsW5Ijzf a5vAnUkUunZg/NBivTzQuz6ng=; b=o547TpqR/o3AodZsH1Y+3mjA9LvejR3RRr +1+5Jd5uVwIDPR/ZVAvmBujqA5W34MWC4Yytm48egAfgeIxc9926HKF7ot804eev 94W+Lv+6TUexOr6vinJ1XYnV+M213M3b/GkILfbV6JGR57YbwPsaYrbxvDHtW4ut FVFbS8eMo++QqPWUPMeJXuNWp9Tg2LDIvG1daSnvKIww5uPM4Jzi9ARO6w0+UzqH FquUr/OxzvfxnqLn7aivYsxjOlP8YN9m0g7iKV/WZUgsUqgRpfRvDkQ5bDtuV2KP U3jNuLz5NTSYCJyU37L8Y9EQBxEmIkFJ8JLSWARUyhIJxdQybqlA== X-ME-Sender: X-Sasl-enc: cNcGPPAhDZ55Ua6kVeY2VvV3D93/AklxHDRtrTPnfboZ 1493579587 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 0BB7324033; Sun, 30 Apr 2017 15:13:07 -0400 (EDT) Date: Sun, 30 Apr 2017 15:13:06 -0400 From: Leo Famulari To: Kei Kebreau Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. Message-ID: <20170430191306.GA26169@jasmine> References: <20170429220942.26880-1-kei@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="EeQfGwPcQSOJBaQU" Content-Disposition: inline In-Reply-To: <20170429220942.26880-1-kei@openmailbox.org> User-Agent: Mutt/1.8.2 (2017-04-18) X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --EeQfGwPcQSOJBaQU Content-Type: text/plain; charset=us-ascii Content-Disposition: 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? --EeQfGwPcQSOJBaQU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlkGN0EACgkQJkb6MLrK fwhpiA//bX2D77bPJ6gGejbk/a7g2kp7o7SeQS9UGtLOxlwQejR9C6YDmLNVqZKJ lMg8FwXkrEm7vDgjZ1cx/Tfkte3MwbpnfcadXk/JgPTiSQw1wiEUUUvNR+VgUyxC v0y61wh+sGMgAcaRMHOm7B3GjOEfU7DyPDVEzYjdjaxYzzyIw6yMiIIo6y/f0Dqg JSGkcXoJ0xYRkmBOHe8SqbmaNINqb2mlTHnTr8P8icQ+9DB1kgaFkmCiVfyWD5Wd Zu+vBzM3FIon0A5ms6AjI39kYeZdWHkSP/BD0Qu59AAWhJvAiNJbVy5nTjUpl7vz KvFegV7OawvWqpqo6hexECFV6N0WX4hQjQQHlOHyVfbmZ2B39UcDvbWhWuWKDmuD 3DTCzhkUSfr25sH4AjU6d7ejasYp8yNsfw1mBCaQr5sD1bThBAjLtTvMaA/55kp1 UArFCjviEuATrjYHpcySny7wjSeXAOnUkQFeRxm759G8YTewL2uPv/g6VzBwA+nV KEYEjHGnQphKpn3OAVCITeYCpt8cHPbe5z47yx4dIhz+0TsrGWYEkO+PwvJiB4bi YCs9jwgu2JMdnOzEbzNY8SXyO0yJBjbm5jQPTtLMJuvC9Km66DD3ZxFDJI1Oj7Cj FwzApUWVwVdkRmstiJIaYVumFhfh1LxtSPqpcjQCHOMBSI3qims= =SwyE -----END PGP SIGNATURE----- --EeQfGwPcQSOJBaQU-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 15:57:42 2017 Received: (at 26713) by debbugs.gnu.org; 30 Apr 2017 19:57:42 +0000 Received: from localhost ([127.0.0.1]:48102 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4uyU-0001Wj-24 for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:57:42 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:58389 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4uyR-0001WT-M0 for 26713@debbugs.gnu.org; Sun, 30 Apr 2017 15:57:40 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 2114B50D873; Sun, 30 Apr 2017 21:57:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493582258; bh=7cL2M/S55mwyZjoSN423Ki1NoRHbF51o5NxUQxzVd70=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=U+KAwA3TVXySGjtQVHrCJK5pl6Ee9rWnGpbodZbs3bjNLbS/1IECnFus4FcsRBUc9 afVm9qNkBIpKKkaF6cHdCZv3bythRO8y5IqQZdEdPzdqEoAzDl6NPIIn7uFM8OyC02 pptnKgh+4ikWKaL7fn1qCudI+Ng3jIuPxyQr5YGA= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493582257; bh=7cL2M/S55mwyZjoSN423Ki1NoRHbF51o5NxUQxzVd70=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=fZiCFHTQOR2nj3ONUB+fh/V4x5kiZZkssmqADbu/3Eo5Q2klChR47jZL/yiiP0E1F rlUT1f+4XQdP4uQrCKWzCVZ0aiNDHxOQKf1OQsU/Cy1U83mI67IA8vZa7rY7SvZmGa 5jR4DoRomhi6SAtaNY248Wi4/tCNr5QD48ywfvA0= To: Leo Famulari Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. References: <20170429220942.26880-1-kei@openmailbox.org> <20170430191306.GA26169@jasmine> Date: Sun, 30 Apr 2017 15:57:32 -0400 In-Reply-To: <20170430191306.GA26169@jasmine> (Leo Famulari's message of "Sun, 30 Apr 2017 15:13:06 -0400") Message-ID: <87shkpoehf.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) --=-=-= Content-Type: text/plain Leo Famulari 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkGQawACgkQ5qXuPBlG eg35+xAAkd7lVBw+djEOV+qdO3jk4rTPkuyKrjNFcaXxS/+w6uFwMa7k5yGrE7nk H41/5bGzZu9ilnbU2IFm/OaLu9nZfneY+hPG+K832EyUEc1B6dPLuxe+YlZVZ56t GU4YTsZJv827pg/SmGyHZcI3pxra6ghEZUO2A3Mv84G21dSAcFUab93eq2QV8Vg/ 5Jq5mRxvB7hKKo2lA1aXNL8XyljqXySJZXfabaLEgLu2wR2//TxdOtqWenRqoWqp AUvjrvuYOmw7/v5ED4Gol97489ieIS9NatvBiErbpdgTAMhs9I68/LoWZSd1ZBFw UZimeWlT6nPgkegmYzX6AJqvcF2f7uXmnkUvnJ0TF3iwzy1doMEPPPFLXK0K+3hi bbFr/p8GAe/oCGMLbHzuM/s305g4NjvRiXhK7d4Mba8I/5xuAnWbgNFAQcFaRnRl KLZkiUrmzwVZfAiIa2eic5q5Bljs6BbePlTDmwkjFcG850/B4X+uCokRTMtgcd6I FDyy6ASNgdCN9FoOlJfizxwEhR52Wy9XyTwa03Ytw/UaI3isH8UoPiLNy7GGA4o6 Ltq2x+SSZECuuIqs4tJshbW4V7Bn6/VfvsAn+lTPOVlENYNiJRBeSHXtPXE3UqYb NG6HcgrSS/k6YaF/hS7xpekMNy9VmukyxEjpNSwGxWEiOmcwSMw= =BHai -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 30 18:17:48 2017 Received: (at 26713) by debbugs.gnu.org; 30 Apr 2017 22:17:48 +0000 Received: from localhost ([127.0.0.1]:48192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4x9x-0004q7-Vo for submit@debbugs.gnu.org; Sun, 30 Apr 2017 18:17:48 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:39728 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4x9v-0004py-Ad for 26713@debbugs.gnu.org; Sun, 30 Apr 2017 18:17:40 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 13BB9507C2F; Mon, 1 May 2017 00:17:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493590658; bh=6D3v6BB/LU4fbYTGtCQ89FJLFJ46i0myApwoIP38Ers=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=mUTiieX9uUcgQcw53ldVsvLKuEDFKsfucEOZQGrW3ZzE1KQwMRvzoSoTewC54OmcX VsJUPItfW1wpSFZpzX0utjfZhLLnfg4wf7qoPxUKf5lAOHzpVHJDPlrWEhkzAysK/l j4whbvixJnJqQoKQNSq6qlV4MrX5u4Jq4i1hY/vc= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ZDZR002 X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=NO_RECEIVED,NO_RELAYS, T_DKIM_INVALID autolearn=disabled version=3.4.0 From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493590657; bh=6D3v6BB/LU4fbYTGtCQ89FJLFJ46i0myApwoIP38Ers=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=UrpKHP/U9mJZ5liv72LJpxhlZypOl+9KW5VfazXeJJWhcNkph3C0clwnyfaP5YzUT mMsE3y+hCfGft9OVDZTvgHNtdNH3bF5ySJ4w0CGd3U7a3hZB6kX24P9qG8bCHvP8qp tS7G7mYNao0s88lQznCOZUZ3oRSzTwqJOgczJKXM= To: Leo Famulari Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. References: <20170429220942.26880-1-kei@openmailbox.org> <20170430191306.GA26169@jasmine> <87shkpoehf.fsf@openmailbox.org> Date: Sun, 30 Apr 2017 18:17:30 -0400 In-Reply-To: <87shkpoehf.fsf@openmailbox.org> (Kei Kebreau's message of "Sun, 30 Apr 2017 15:57:32 -0400") Message-ID: <87o9vdo805.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -2.8 (--) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Kei Kebreau writes: > Leo Famulari 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? --=-=-= 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=2077be2770f571ac7e76783701eb44323cc33cf92a 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. 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. =2D-- 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 =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 ;;; ;;; 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=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+))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 487366b4a..6a4489508 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) @@ -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))) =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----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkGYnoACgkQ5qXuPBlG eg1IBg/+J1dGH/FdsNWrSf2696KMsvrsDoby864uILZBqcF9A/VqQKpKw9bRX3ZE wpR+ouUxqGHs1XF3Jua38GRJf0OlZSw6URNBcxkkcIg3TSHSUGc6PV5rprxH9Qi2 p041lyFS0c7eVM1K617bhcVT/VG/V4BAlpZZKEv+93Ev1/zIQYDAkviRxi1BDRRi lIw7Yd2XhzJ+zoL6nwJVlx1eYriwxtww7ehS+lOB3/CtvBZH5G/3wbTMGKFfA7Q8 0ab73Pee96D3RL3QVdk0vzCBxPWd3l830BVfqy8HFiHmjXxv4WTK+fHpzbmXViIX DR9jhDFwfuqsdo897qXBRP7VVJ3TmqZF+VO9X3iNJXbLDYIlunipH3db4atUBpUt tgvoFdf8aluNRfLCNc5HfGMXEJ3PZSLieQLveo4Zkc6j2uOCgg+x3L3HDRlJPAUU 3VXqiqWC1gT28N0hIlaLsi+Ynja+FMk/EfipihvE97zhFLf2KO3Ax8sfQXE5vvUh cgIpbSBjHmYv05RMTmEJQbsWckkLzXOpbnJUV8qvhXo29pgyx5UCOBhAreMBvv4d 3Q/rWnGzehvijoOs3PToONBJ+C9p9MHhselT4UgADAGXPn3miZbJmign+2zOUq+I egcvmDxpQM1bkrJwKweXZ+CooBK1jMie/q8NYUuUP+R3AYDnaXU= =CLu+ -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 10:52:24 2017 Received: (at 26713) by debbugs.gnu.org; 6 May 2017 14:52:24 +0000 Received: from localhost ([127.0.0.1]:58197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d714K-0001FP-6Y for submit@debbugs.gnu.org; Sat, 06 May 2017 10:52:24 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:50096 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d714J-0001FH-88 for 26713@debbugs.gnu.org; Sat, 06 May 2017 10:52:23 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 2443A50E6E4; Sat, 6 May 2017 16:52:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494082342; bh=fBlSPbEszyhZ03nirLkXk4/kHo3x73GTXx+EVYF0gJA=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=UK/026vW4lWcfLP/bs5PdqIdroe8QdtahhIJdYwJaqGdmz0T08KUknoCligY/ZhHd yhf4F+TR8xmg4ObeO8EXfxh3aU7oFFwCDiWXjxW3dZkxlqQ1nQPJqcsePKcGu9ntBq xrsz5WVZljrhf9P7mBZw4zC7EwOrrEqzbobHVKhQ= From: Kei Kebreau To: Leo Famulari Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. References: <20170429220942.26880-1-kei@openmailbox.org> <20170430191306.GA26169@jasmine> <87shkpoehf.fsf@openmailbox.org> <87o9vdo805.fsf@openmailbox.org> Date: Sat, 06 May 2017 10:51:26 -0400 In-Reply-To: <87o9vdo805.fsf@openmailbox.org> (Kei Kebreau's message of "Sun, 30 Apr 2017 18:17:30 -0400") Message-ID: <87lgqaghsh.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > Kei Kebreau writes: > >> Leo Famulari 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkN4u4ACgkQ5qXuPBlG eg3dPg//VW7p48qBqUkuOVpuJtto8gbaZWeVqf8/cYAesPwdKEhNW0Cse6X3TsAi 6wXbObQ56eVdBcKcQaQbDwfZBZabaLNin0WJwJYWwBc0in8w0zcOfdXouS2ChCcA URaXJXQQeWzcFoY54DLaXfgPruDxmQm3eYTnDeArRjO/HfV483jkxIv/MJDJfr31 abQoI3MpQh/gG5Ze6yPjvHUJHdjl3ld8ejtuukSal6dDk6BhuBV9+6+Qz/+nI28a uc1MOJXuPUf9kuvi+l1Lqdp26sjbexrv4uSPHI3bA4CCicXqoEyB1/Gswecpz+gn vFG+LeoTVT/BNM8DydJRrXyuxK9O9VQu4bUJSjhNOaf/UJfHOJ/RNp04kPeg9o2R cckedtVS32YaIeo2MMT7zwkhqzzIVL5td96RQur7QmsTt5drcfkUEW6SMcmAjq9k S+mnHU4yXia9b99bGjf/Q0OuyaS6aKbS0yIItIHKhiScpbAsQOaCaVeAH0MCjGdH I2oUzvoIqDkoS3TPa9mr2XWBx+K05sb5fFujZhU0tCAwqwzH7jYjKqoE7/qeZwmG jx85KFQV6YvoLfq+ZuvY7ZSzt895llNJf969OgWvRMlQ16JzWHjpQYGxkeZGDn7s nQybNSG4+fuLp/U2J9BruZrlLKNGKrR+VajbCde+OqMIKakN0GQ= =r1n/ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 11:24:21 2017 Received: (at 26713) by debbugs.gnu.org; 6 May 2017 15:24:21 +0000 Received: from localhost ([127.0.0.1]:58212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71ZF-0001yI-6G for submit@debbugs.gnu.org; Sat, 06 May 2017 11:24:21 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60257) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d71ZD-0001yB-CB for 26713@debbugs.gnu.org; Sat, 06 May 2017 11:24:19 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 483A820767; Sat, 6 May 2017 11:24:19 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sat, 06 May 2017 11:24:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=S8nIcEUkTT525iPUqa0tOkT0DgdXO/bupGJG1yNu5 ws=; b=PgRKIL2ISFACVmOjW5A51lO+t4mIkTExZE/vKmem7FSPRpbafyDd7+iMF wd4NdC3M59mWh1kwoCx4VB9KQv3giYSG8co+XExuKfNN4MySqZtoKMTzDmeIf6La aSnB6zu4kPFUDB9YoS6FJ52z07epKnRoVHiMb3YN72tx5yoFz7g1MGpuG4akAbX4 oLEN6sxuJIZXZJYJIgOUKVFzl2ru+mVoVpgqm6ChtIZi+UE1nmwZX11rNSPXQysq J3zvXr82sL09ThyUruCUnjcFvxVE4FRiT2SO5AmdqUHn79DBC0u4bkEC4Nc2tahK OvuBGYO2V7LtEUXEwnlbkPyFSC3yA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=S8nIcEUkTT525iPUqa 0tOkT0DgdXO/bupGJG1yNu5ws=; b=RqySYXp4+dDibDz2sH+q4oYl5IfLvAg5Tj CeqWx3jNCeGoGZmv8Lj+1PD1oVbF9Rv91GrNi//4llxCiSDqc7L7reoVJIAt5lbR uJTlrI/s+tLElnLoc/tsdugE9SUocA70sLDA2Rw8Y6Aomcs+qm7vdhk6OGJjPbqU TWyYwXcjXd+ybO2BqUUGI6i3wcwddimu01f0gL4xsCRqKZFsjaVXsv7Nwx2QOePv trJK+jzIw8OTY4rYqdpXFe3UnN5ukOdvqosgh7TSYtYYrs4jntsruQr67G3kMIfw Iu8GZvU9fccT5BkkYBUn3ojkmHxmnowm0bLbuj0JtKqCSn87gn3A== X-ME-Sender: X-Sasl-enc: xcYbrKsO0azlE/N8VfNuffkARY4VOSN+O5pN7eBCwjbs 1494084258 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id D21CE7E351; Sat, 6 May 2017 11:24:18 -0400 (EDT) From: Marius Bakke To: Kei Kebreau , Leo Famulari Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. In-Reply-To: <87lgqaghsh.fsf@openmailbox.org> References: <20170429220942.26880-1-kei@openmailbox.org> <20170430191306.GA26169@jasmine> <87shkpoehf.fsf@openmailbox.org> <87o9vdo805.fsf@openmailbox.org> <87lgqaghsh.fsf@openmailbox.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 06 May 2017 17:24:17 +0200 Message-ID: <87pofmypni.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > Kei Kebreau writes: > >> Kei Kebreau writes: >> >>> Leo Famulari 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkN6qEACgkQoqBt8qM6 VPovYAgAwG3dlUagjrz3qy/T22Cc/kzvjpSMkE7gbUSqen6j23o0D6UImy3xv7Px 7b1O6EjMdvQPtJ8eBocgfskvqxgm75wol0AgJMm6qhZvH/Tk/TJu/9LkmSkIoJ+G TfE0GwBk9+CMCSlobVjvsOjQI6ZnXB8fDbibQdfM2fdQ3W957kaUVg2FNHFsgPah fsMUW3jzCLfzZGElZC3dpx9ZroPVBw+MaCpqDaqap9PzsISYrJ6HSl36sNj+H280 jor3BRt3XTHfgGtcfbuKPvZAyjb3+nEn/s4ZpZeDHZLujPYW5EaOipo7OHGPcDzE OcgZ5oePAuTpKXJ5Hbr4PFJiJVxwZA== =FjDl -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 12:34:53 2017 Received: (at 26713) by debbugs.gnu.org; 6 May 2017 16:34:53 +0000 Received: from localhost ([127.0.0.1]:58428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d72fP-0003ma-3y for submit@debbugs.gnu.org; Sat, 06 May 2017 12:34:53 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:46606 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d72fM-0003mR-Pg for 26713@debbugs.gnu.org; Sat, 06 May 2017 12:34:45 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id ACFFC5100C2; Sat, 6 May 2017 18:34:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494088483; bh=7XZJRhHnbTMaR+Zr0aaVrvyf/sTJhP0SjRqNfcw873I=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=PvZZrLC96fXBseQLXsxVWP/XfWLil5aI+tsa6vR9QAi5VL+tU/fOtpPkJCfpD83t+ aweQun6AFsW7OsFViJNRr7IhOZyKcA8V4rIzF87wGEEbPfTBFRA/7XWgx8+HDs+309 Z/OII9Q4uahhxwSgj26gydYybDcLLoqF3wocO+Sg= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494088482; bh=7XZJRhHnbTMaR+Zr0aaVrvyf/sTJhP0SjRqNfcw873I=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=jtmX4gAv5G94jNZ3RARFpyHULpT0TDy0dLrnsX6B8NKqFasP+k9K1sGmwqpMzy+2H Lw1dKzPIlb26HPyp0Te1aGE5BiwGsa0mOsMBNWI24Rp/Qsz5zaRZKnjw/6CHDFb9zf VDNEn4iG2meqTDaIK1PbxM9FFdGRkkw4lWKzm0w8= To: Marius Bakke Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. 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> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --==-=-= 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----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 06 13:38:37 2017 Received: (at 26713) by debbugs.gnu.org; 6 May 2017 17:38:37 +0000 Received: from localhost ([127.0.0.1]:58504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d73fB-0002Es-B9 for submit@debbugs.gnu.org; Sat, 06 May 2017 13:38:37 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:40595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d73f9-0002Ek-Bq for 26713@debbugs.gnu.org; Sat, 06 May 2017 13:38:35 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 80FF6207B7; Sat, 6 May 2017 13:38:34 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sat, 06 May 2017 13:38:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=eyI02tWkdR+oz82lj51rs/7RUeM5To6lWcCpMOY7r Yw=; b=ZYkDuTktYqSQ35BqztMemjPjUAdagH47BcvvPdFDnrOXnHRFivKy2l3+i DJh7w9z9KnksyjTcaRpmZOMiJXY3xCdH35ev/To20grEUCYEvMyHidhDUgl4nC/+ UrnE8Y8hdtJJMAC95BM761rcCDLes/92ASfY3ZAjCY+xIL/o+SmSwxtObLC5TY34 XpfPdqpBfpmp/eHw9apT5S5C/niVJ0Ch0/LARp/vSLOPJOXFGx6oZqaoR5k93mQf gxDgd6NA+5tnorKSh3AxrZ+YgILCQaM5y/DstW2OaWgSFjsFGZI7X9Ldtjw1FQ0/ okoJi2kFo924zjr+2xxgbKPqb8eAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=eyI02tWkdR+oz82lj5 1rs/7RUeM5To6lWcCpMOY7rYw=; b=sN70HG4XIkuajQddvMPrf75tZ3WVrRC5/C bSLcn2/hxDEtt1V2rW9qFFfEUYmpJUIkxo//WMFqLTr5OyPbOFjjFO8e5MASbuN7 9bRB4dmRoCBL8vMq7wlOqVUQhlRkD8Ewf/1MWIhtnEWF1ZX1yTJRHYIFLD0Zc2jj xRxm5cvKU/uLdNsgBPaZgR/0+A41Yk1BnzwDzsluGWQAkuTuJq6iAJY9cCG1Mcsw oStXeziSdHA22Q9aAjNmZDCuDLwXJxlu23ggooGdA5UFYIUIBvZ3TwvUVGkaM6lo hCwac+AiQJp0UJnMQtSzPL6TUzdtSpnB7GuunBuZb731R8Pi1FnA== X-ME-Sender: X-Sasl-enc: HxrHJfFmcerQXLR0ZkD/POLvoI1BAlbJwZ4BKP13XVHL 1494092314 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 14C3D7E317; Sat, 6 May 2017 13:38:33 -0400 (EDT) From: Marius Bakke To: Kei Kebreau Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. In-Reply-To: <87h90ygd0j.fsf@openmailbox.org> 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> <87h90ygd0j.fsf@openmailbox.org> User-Agent: Notmuch/0.24.1 (https://notmuchmail.org) Emacs/25.2.1 (x86_64-unknown-linux-gnu) Date: Sat, 06 May 2017 19:38:32 +0200 Message-ID: <87k25tzy07.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Kei Kebreau writes: > Marius Bakke 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlkOChgACgkQoqBt8qM6 VPrkrQf/SZeYLbdXm8J43XuJUtkcJV/CAcx1ph2mmQk1jnovFIQkZHDq2ntvUUd+ 7b1O8emHhtZPZ1oPttumooqGf/eN3cDygInzoXVTTNvR9Nue+3pl+/QvcITxGwu8 UUbe8T6T1ociDKuWPQ93Qx7aDb4scCOY/vRhru9pqMD3ZJOL++Rc9gf+BRmQbMcQ 3ZCaUIxV6dwOZpAlscV3OVEC08/xdVwEfD6YA3tSvAIofD7Q9wkxAs8zNJVVtA2K gdydhImcKvv8JFQAyRqg4mUcStsYmPZlE7KlF/hwWcQgTfNbFZRxGaM92s6ZtZJO Oa67wkq90wyfwFXJWrLZsR0y+nqlPA== =7QQ8 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon May 08 11:17:58 2017 Received: (at 26713) by debbugs.gnu.org; 8 May 2017 15:17:58 +0000 Received: from localhost ([127.0.0.1]:34532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7kQA-0000jI-ME for submit@debbugs.gnu.org; Mon, 08 May 2017 11:17:58 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:46819 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d7kQ8-0000j9-W7 for 26713@debbugs.gnu.org; Mon, 08 May 2017 11:17:57 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id DA87350A606; Mon, 8 May 2017 17:17:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494256675; bh=gqatOWGmev+IlHJ6kDkBzqtizC/NredxE7lrVN6owRY=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=u9rn3r54ERTJTBvZ1tT/JbLELVjOUNZ1tuQapLtr8d+Dm7XaoctXQ5sZAojrOMLyM PgXFasorTXwVqFuInhO9CTgm1wMOeTh3T0hFXi078/ddF3ZGGqAsLkRzLb54DEU83A ScXQk/IzBFfGkf34MA5eSeeMpJPcHf1k28m5YPTs= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494256675; bh=gqatOWGmev+IlHJ6kDkBzqtizC/NredxE7lrVN6owRY=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=u9rn3r54ERTJTBvZ1tT/JbLELVjOUNZ1tuQapLtr8d+Dm7XaoctXQ5sZAojrOMLyM PgXFasorTXwVqFuInhO9CTgm1wMOeTh3T0hFXi078/ddF3ZGGqAsLkRzLb54DEU83A ScXQk/IzBFfGkf34MA5eSeeMpJPcHf1k28m5YPTs= To: Marius Bakke Subject: Re: bug#26713: [PATCH] gnu: Move netsurf to web-browsers.scm. 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> <87h90ygd0j.fsf@openmailbox.org> <87k25tzy07.fsf@fastmail.com> Date: Mon, 08 May 2017 11:17:39 -0400 In-Reply-To: <87k25tzy07.fsf@fastmail.com> (Marius Bakke's message of "Sat, 06 May 2017 19:38:32 +0200") Message-ID: <8737cfxtrg.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26713 Cc: 26713@debbugs.gnu.org, Leo Famulari X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-=-= Content-Type: text/plain Marius Bakke writes: > Kei Kebreau writes: > >> Marius Bakke 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. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJZEIwTAAoJEOal7jwZRnoNyssP/iW6pVsvL2Teec1W1QarDsKS 2kwXNu4V2xER0h0NkpZvR8d+ptyazLZjJRazqoJJg8Cov+dTQBSDnElZnvln2HIv D4LWUjvaRqg4PngnvTs84HjamsQtEzMWC4+LVqZH+acXgBCD5TDXhOinPQxuFJ/6 R3pA/FNwB4MzJhKTSbyZ06TTzeuvt1ytUQIvN4sYuBLyAx9sKQbKe/8Rag+uSx62 qk65M80vSxGEmUQJA84ErQNRNe/ftS/XLsMh+vzu9/112Gvs6o/WOKi+gsZCieqD YgFZgFJ9Q6sm1GFptQeVIvlCE8oDcj09qntKqQHxkSdZJXi8cfAspzRMTnyTqVnH zMxP7IuiYlDUJ8x4vxO/Gt/Q0ZQq+M2/RCV1apdFJR9a3KHirT3gEGg+ZYqVS28L mmAXkneCBtXDoFe52OfsTF/juPysicUL27lgZi4oTrzQX0/fMn+1etfKN2ZbRrd/ xTJWJO+2lZwR4WSb390HYPZbZICLMQx5SK8WdsaZ34Qw7iIeZ8Riq7fDBLFjZKBl MEe3Y9Av0c2bq20jvblpI4Fq1s+oQ2UBKOleGKvydNgL+XW29wPYjuzTg2eYrFxi gZO3u3qV45Ih7XK+TsZ4rpu+bxvmUf5kl5Zh3MbinZOrErjdHhkUNz/l7/hC1Yyd DrK7+y5AIrHQ3ygyehqn =dNSQ -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Sep 07 23:27:24 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 06 Jun 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator