ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: netsurf: Update to 3.7.

Browse source 
For compatibility, dependents must be updated at the same time.

* gnu/packages/web.scm (libcss): Update to 0.7.0
(nsgenbind): Update to 0.5.
(netsurf): Update to 3.7.
[arguments]: Fix binary name in .desktop.  Adjust "docs" directory name.
* gnu/packages/patches/netsurf-system-utf8proc.patch: Adjust to new source.
This commit is contained in:
Eric Bavier 2017-11-05 11:56:59 -06:00
parent 772588bd22
commit d8799bd0df
No known key found for this signature in database
GPG key ID: FD73CAC719D32566
2 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gnu/packages/patches/netsurf-system-utf8proc.patch
View file

@ -28,37 +28,22 @@ Work around upstream's lack of a pkg-config file and update API.
#include "utils/errors.h" #include "utils/errors.h"
#include "utils/idna.h" #include "utils/idna.h"
@@ -250,7 +250,7 @@ --- netsurf-3.7/test/Makefile 2017-10-15 08:39:24.000000000 -0500
return NSERROR_NOMEM; +++ netsurf-3.7/test/Makefile 2017-11-05 11:14:46.219013218 -0600
} @@ -139,14 +139,14 @@
- nfc_size = utf8proc_normalise(nfc_label, nfc_size,
+ nfc_size = utf8proc_normalize_utf32(nfc_label, nfc_size,
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if (nfc_size < 0) {
return NSERROR_NOMEM;
@@ -565,7 +565,7 @@
}
/* Perform NFC normalisation */
- ucs4_len = utf8proc_normalise(ucs4, u_ucs4_len,
+ ucs4_len = utf8proc_normalize_utf32(ucs4, u_ucs4_len,
UTF8PROC_STABLE | UTF8PROC_COMPOSE);
if (ucs4_len < 0) {
free(ucs4);
--- netsurf-3.6/test/Makefile
+++ netsurf-3.6/test/Makefile
@@ -112,11 +112,11 @@
-D_XOPEN_SOURCE=600 \ -D_XOPEN_SOURCE=600 \
-Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \ -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \
-Dnsgtk \ -Dnsgtk \
- $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc libidn) \ - $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \
+ $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libidn) \ + $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \
$(LIB_CFLAGS) \ $(LIB_CFLAGS)
$(COV_CFLAGS) TESTCFLAGS := $(BASE_TESTCFLAGS) \
$(COV_CFLAGS) \
$(COV_CPPFLAGS)
-TESTLDFLAGS := $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc libidn) -lz \ TESTLDFLAGS := -L$(TESTROOT) \
+TESTLDFLAGS := $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libidn) -lz -lutf8proc \ - $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \
+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) -lz -lutf8proc \
$(LIB_LDFLAGS)\ $(LIB_LDFLAGS)\
$(COV_LDFLAGS) $(COV_LDFLAGS)

16
gnu/packages/web.scm
View file

@ -4340,7 +4340,7 @@ (define-public libwapcaplet
(define-public libcss (define-public libcss
(package (package
(name "libcss") (name "libcss")
(version "0.6.0") (version "0.7.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4348,7 +4348,7 @@ (define-public libcss
name "-" version "-src.tar.gz")) name "-" version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"0qp4p1q1dwgdra4pkrzd081zjzisxkgwx650ijx323j8bj725daf")))) "16mns3h8vj7iw8myvgnw58q84irvbjlvfkxh8mdw6fbkjvaa7cnz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem) `(("netsurf-buildsystem" ,netsurf-buildsystem)
@ -4527,7 +4527,7 @@ (define-public libnspsl
(define-public nsgenbind (define-public nsgenbind
(package (package
(name "nsgenbind") (name "nsgenbind")
(version "0.4") (version "0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4535,7 +4535,7 @@ (define-public nsgenbind
name "-" version "-src.tar.gz")) name "-" version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"078gpbfcs96bgcba0ygha0ph9jzqr6ry5s3a8p6sl61px2908s66")))) "1iwjpdaan0njlhb9ir6a2q5vpxfmkqfldkvnqszqdz50b44vd1jv"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("netsurf-buildsystem" ,netsurf-buildsystem) `(("netsurf-buildsystem" ,netsurf-buildsystem)
@ -4555,7 +4555,7 @@ (define-public nsgenbind
(define-public netsurf (define-public netsurf
(package (package
(name "netsurf") (name "netsurf")
(version "3.6") (version "3.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -4563,7 +4563,7 @@ (define-public netsurf
"releases/source/netsurf-" version "-src.tar.gz")) "releases/source/netsurf-" version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"174sjx0566agckwmlj4w2cip5qbxdiafyhlp185a1qprxx84pbjr")) "05kynfzzwd4fc03vbqdjpghh5xnk2yrh43w7vikak89vla30mhpg"))
(patches (search-patches "netsurf-system-utf8proc.patch" (patches (search-patches "netsurf-system-utf8proc.patch"
"netsurf-y2038-tests.patch" "netsurf-y2038-tests.patch"
"netsurf-longer-test-timeout.patch")))) "netsurf-longer-test-timeout.patch"))))
@ -4652,10 +4652,10 @@ (define-public netsurf
(copy-file "frontends/gtk/res/netsurf-gtk.desktop" (copy-file "frontends/gtk/res/netsurf-gtk.desktop"
desktop) desktop)
(substitute* desktop (substitute* desktop
(("netsurf-gtk") (string-append out "/bin/netsurf")) (("netsurf-gtk") (string-append out "/bin/netsurf-gtk"))
(("netsurf.png") (string-append out "/share/netsurf/" (("netsurf.png") (string-append out "/share/netsurf/"
"netsurf.xpm"))) "netsurf.xpm")))
(install-file "Docs/netsurf-gtk.1" (install-file "docs/netsurf-gtk.1"
(string-append out "/share/man/man1/")) (string-append out "/share/man/man1/"))
#t)))))) #t))))))
(home-page "http://www.netsurf-browser.org") (home-page "http://www.netsurf-browser.org")