Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/7e74d498b5bc3194c485a4dd7afed70b1de5a690
...commit
http://git.netsurf-browser.org/netsurf.git/commit/7e74d498b5bc3194c485a4dd7afed70b1de5a690
...tree
http://git.netsurf-browser.org/netsurf.git/tree/7e74d498b5bc3194c485a4dd7afed70b1de5a690
The branch, master has been updated
via 7e74d498b5bc3194c485a4dd7afed70b1de5a690 (commit)
from 1467e8d610eb3e72d15264cac0f746129753bb17 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7e74d498b5bc3194c485a4dd7afed70b1de5a690
commit 7e74d498b5bc3194c485a4dd7afed70b1de5a690
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
env: Use upstream utf8proc
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4aeac684c..82ef86cc8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -44,6 +44,7 @@ jobs:
libjpeg-dev
libpng-dev
librsvg2-dev
+ libutf8proc-dev
llvm
pkg-config
wbritish # Needed for `/usr/share/dict/words`, used by test
diff --git a/.github/workflows/monkey-test.yaml
b/.github/workflows/monkey-test.yaml
index b098fb0dc..60b65bf38 100644
--- a/.github/workflows/monkey-test.yaml
+++ b/.github/workflows/monkey-test.yaml
@@ -35,6 +35,7 @@ jobs:
libjpeg-dev
libpng-dev
librsvg2-dev
+ libutf8proc-dev
llvm
pkg-config
python3-pyasyncore
diff --git a/.github/workflows/static-analysis.yaml
b/.github/workflows/static-analysis.yaml
index 548b547cf..5b49c9958 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -33,6 +33,7 @@ jobs:
libjpeg-dev
libpng-dev
librsvg2-dev
+ libutf8proc-dev
pkg-config
- name: ccache
diff --git a/docs/env.sh b/docs/env.sh
index 00f88c78e..60e5a76ce 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -32,7 +32,7 @@
# apt get commandline to install necessary dev packages
ns_apt_get_install()
{
- NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev
libexpat1-dev libpng-dev libjpeg-dev"
+ NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev
libexpat1-dev libpng-dev libjpeg-dev libutf8proc-dev"
LIBCURL_OPENSSL_CONFLICTS="$(/usr/bin/apt-cache show libcurl4-openssl-dev
| grep Conflicts | grep -o libssl1.0-dev)"
if [ "x${LIBCURL_OPENSSL_CONFLICTS}" != "x" ]; then
NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
@@ -173,7 +173,7 @@ ns_freebsdpkg_install()
# generic for help text
ns_generic_install()
{
- NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, libcurl,
perl, perl MD5 digest, libjpeg library, libpng library"
+ NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, libcurl,
libutf8proc, perl, perl MD5 digest, libjpeg library, libpng library"
NS_TOOL_GEN="flex tool, bison tool"
@@ -350,7 +350,7 @@ case "$BUILD_TARGET" in
netsurf)
# internal libraries all frontends require (order is important)
- NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss
libnsgif libnsbmp libutf8proc libnsutils libnspsl libnslog"
+ NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss
libnsgif libnsbmp libnsutils libnspsl libnslog"
# add target specific libraries
case "${HOST}" in
diff --git a/utils/idna.c b/utils/idna.c
index 6ac1a8772..f975c42d0 100644
--- a/utils/idna.c
+++ b/utils/idna.c
@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
#ifdef WITH_UTF8PROC
-#include <libutf8proc/utf8proc.h>
+#include <utf8proc.h>
int32_t idna_contexto[] = {
/* CONTEXTO codepoints which have a rule defined */
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/build.yaml | 1 +
.github/workflows/monkey-test.yaml | 1 +
.github/workflows/static-analysis.yaml | 1 +
docs/env.sh | 6 +++---
utils/idna.c | 2 +-
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4aeac684c..82ef86cc8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -44,6 +44,7 @@ jobs:
libjpeg-dev
libpng-dev
librsvg2-dev
+ libutf8proc-dev
llvm
pkg-config
wbritish # Needed for `/usr/share/dict/words`, used by test
diff --git a/.github/workflows/monkey-test.yaml
b/.github/workflows/monkey-test.yaml
index b098fb0dc..60b65bf38 100644
--- a/.github/workflows/monkey-test.yaml
+++ b/.github/workflows/monkey-test.yaml
@@ -35,6 +35,7 @@ jobs:
libjpeg-dev
libpng-dev
librsvg2-dev
+ libutf8proc-dev
llvm
pkg-config
python3-pyasyncore
diff --git a/.github/workflows/static-analysis.yaml
b/.github/workflows/static-analysis.yaml
index 548b547cf..5b49c9958 100644
--- a/.github/workflows/static-analysis.yaml
+++ b/.github/workflows/static-analysis.yaml
@@ -33,6 +33,7 @@ jobs:
libjpeg-dev
libpng-dev
librsvg2-dev
+ libutf8proc-dev
pkg-config
- name: ccache
diff --git a/docs/env.sh b/docs/env.sh
index 00f88c78e..60e5a76ce 100644
--- a/docs/env.sh
+++ b/docs/env.sh
@@ -32,7 +32,7 @@
# apt get commandline to install necessary dev packages
ns_apt_get_install()
{
- NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev
libexpat1-dev libpng-dev libjpeg-dev"
+ NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev
libexpat1-dev libpng-dev libjpeg-dev libutf8proc-dev"
LIBCURL_OPENSSL_CONFLICTS="$(/usr/bin/apt-cache show libcurl4-openssl-dev
| grep Conflicts | grep -o libssl1.0-dev)"
if [ "x${LIBCURL_OPENSSL_CONFLICTS}" != "x" ]; then
NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
@@ -173,7 +173,7 @@ ns_freebsdpkg_install()
# generic for help text
ns_generic_install()
{
- NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, libcurl,
perl, perl MD5 digest, libjpeg library, libpng library"
+ NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, libcurl,
libutf8proc, perl, perl MD5 digest, libjpeg library, libpng library"
NS_TOOL_GEN="flex tool, bison tool"
@@ -350,7 +350,7 @@ case "$BUILD_TARGET" in
netsurf)
# internal libraries all frontends require (order is important)
- NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss
libnsgif libnsbmp libutf8proc libnsutils libnspsl libnslog"
+ NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss
libnsgif libnsbmp libnsutils libnspsl libnslog"
# add target specific libraries
case "${HOST}" in
diff --git a/utils/idna.c b/utils/idna.c
index 6ac1a8772..f975c42d0 100644
--- a/utils/idna.c
+++ b/utils/idna.c
@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
#ifdef WITH_UTF8PROC
-#include <libutf8proc/utf8proc.h>
+#include <utf8proc.h>
int32_t idna_contexto[] = {
/* CONTEXTO codepoints which have a rule defined */
--
NetSurf Browser
