aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Bavier <bavier@member.fsf.org>2017-02-12 12:39:57 -0600
committerEric Bavier <bavier@member.fsf.org>2017-02-13 20:59:19 -0600
commit57c211cd714f5e82fcdfc8c8655deb6941cebe2c (patch)
treee88b158c05b75371e21ac2b919bd8fa29a249f69
parentfaa9ba465316f3f9398a477abc517469a073e749 (diff)
downloadguix-57c211cd714f5e82fcdfc8c8655deb6941cebe2c.tar
guix-57c211cd714f5e82fcdfc8c8655deb6941cebe2c.tar.gz
gnu: netsurf: Upgrade to 3.6.
* gnu/packages/web.scm (netsurf): Upgrade to 3.6. [source]: 'https' -> 'http'. Remove modules, snippet, and patches. [home-page]: 'https' -> 'http'. [arguments]: Adjust source directories. * gnu/packages/patches/netsurf-about.patch: Delete patch. * gnu/local.mk (dist_patch_DATA): Remove it.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/netsurf-about.patch26
-rw-r--r--gnu/packages/web.scm24
3 files changed, 7 insertions, 44 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 0e8d901104..fcc7eb0094 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -771,7 +771,6 @@ dist_patch_DATA = \
%D%/packages/patches/net-tools-bitrot.patch \
%D%/packages/patches/netcdf-date-time.patch \
%D%/packages/patches/netcdf-tst_h_par.patch \
- %D%/packages/patches/netsurf-about.patch \
%D%/packages/patches/ngircd-handle-zombies.patch \
%D%/packages/patches/ngircd-no-dns-in-tests.patch \
%D%/packages/patches/ninja-tests.patch \
diff --git a/gnu/packages/patches/netsurf-about.patch b/gnu/packages/patches/netsurf-about.patch
deleted file mode 100644
index 1fb8eae824..0000000000
--- a/gnu/packages/patches/netsurf-about.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- netsurf-all-3.5/netsurf/gtk/about.c
-+++ netsurf-all-3.5/netsurf/gtk/about.c
-@@ -79,11 +79,11 @@
- switch (response_id) {
-
- case ABOUT_RESPONSE_ID_LICENCE:
-- about_open("about:credits");
-+ about_open("about:licence");
- break;
-
- case ABOUT_RESPONSE_ID_CREDITS:
-- about_open("about:licence");
-+ about_open("about:credits");
- break;
- }
-
---- netsurf-all-3.5/netsurf/desktop/version.c
-+++ netsurf-all-3.5/netsurf/desktop/version.c
-@@ -20,6 +20,6 @@
-
- #include "desktop/version.h"
-
--const char * const netsurf_version = "3.5 (6th April 1016)";
-+const char * const netsurf_version = "3.5 (6th April 2016)";
- const int netsurf_version_major = 3;
- const int netsurf_version_minor = 5;
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4d138b79fc..d26a208d91 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3730,26 +3730,16 @@ tools they trust (e.g. wget).")
(define-public netsurf
(package
(name "netsurf")
- (version "3.5")
+ (version "3.6")
(source
(origin
(method url-fetch)
- (uri (string-append "https://download.netsurf-browser.org/"
+ (uri (string-append "http://download.netsurf-browser.org/"
"netsurf/releases/source-full/netsurf-all-"
version ".tar.gz"))
(sha256
(base32
- "1vdldzcv42wykajmw8vbql0f1yd44gbx30kywfrrh2x3064ly609"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (substitute* "Makefile"
- ;; Do not clobber PKG_CONFIG_PATH from the environment
- (("PKG_CONFIG_PATH = \\$")
- "PKG_CONFIG_PATH := $(PKG_CONFIG_PATH):$")
- ;; Honor make variables
- (("shell cc") "shell $(CC)"))))
- (patches (search-patches "netsurf-about.patch"))))
+ "1cgq9n4nvkpih93sfpdadv3666ycsx9bnp8kwalbs8h232mr7ppx"))))
(build-system glib-or-gtk-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
@@ -3788,7 +3778,7 @@ tools they trust (e.g. wget).")
(add-after 'build 'adjust-welcome
(lambda _
;; First, fix some unended tags and simple substitutions
- (substitute* "netsurf/gtk/res/welcome.html"
+ (substitute* "netsurf/frontends/gtk/res/welcome.html"
(("<(img|input)([^>]*)>" _ tag contents)
(string-append "<" tag contents " />"))
(("Licence") "License") ;prefer GNU spelling
@@ -3799,7 +3789,7 @@ tools they trust (e.g. wget).")
(("Google Search") "DuckDuckGo Search")
(("name=\"btnG\"") ""))
;; Remove default links so it doesn't seem we're endorsing them
- (with-atomic-file-replacement "netsurf/gtk/res/welcome.html"
+ (with-atomic-file-replacement "netsurf/frontends/gtk/res/welcome.html"
(lambda (in out)
;; Leave the DOCTYPE header as is
(display (read-line in 'concat) out)
@@ -3821,7 +3811,7 @@ tools they trust (e.g. wget).")
(desktop (string-append out "/share/applications/"
"netsurf.desktop")))
(mkdir-p (dirname desktop))
- (copy-file "netsurf/gtk/res/netsurf-gtk.desktop"
+ (copy-file "netsurf/frontends/gtk/res/netsurf-gtk.desktop"
desktop)
(substitute* desktop
(("netsurf-gtk") (string-append out "/bin/netsurf"))
@@ -3830,7 +3820,7 @@ tools they trust (e.g. wget).")
(install-file "netsurf/Docs/netsurf-gtk.1"
(string-append out "/share/man/man1/"))
#t))))))
- (home-page "https://www.netsurf-browser.org")
+ (home-page "http://www.netsurf-browser.org")
(synopsis "Web browser")
(description
"NetSurf is a lightweight web browser that has its own layout and