Skip to content

Commit 504704f

Browse files
committed
env: Use upstream utf8proc
1 parent 1467e8d commit 504704f

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
libjpeg-dev
4545
libpng-dev
4646
librsvg2-dev
47+
libutf8proc-dev
4748
llvm
4849
pkg-config
4950
wbritish # Needed for `/usr/share/dict/words`, used by test

.github/workflows/monkey-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
libjpeg-dev
3636
libpng-dev
3737
librsvg2-dev
38+
libutf8proc-dev
3839
llvm
3940
pkg-config
4041
python3-pyasyncore

.github/workflows/static-analysis.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
libjpeg-dev
3434
libpng-dev
3535
librsvg2-dev
36+
libutf8proc-dev
3637
pkg-config
3738

3839
- name: ccache

docs/env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
# apt get commandline to install necessary dev packages
3333
ns_apt_get_install()
3434
{
35-
NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libexpat1-dev libpng-dev libjpeg-dev"
35+
NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libexpat1-dev libpng-dev libjpeg-dev libutf8proc-dev"
3636
LIBCURL_OPENSSL_CONFLICTS="$(/usr/bin/apt-cache show libcurl4-openssl-dev | grep Conflicts | grep -o libssl1.0-dev)"
3737
if [ "x${LIBCURL_OPENSSL_CONFLICTS}" != "x" ]; then
3838
NS_DEV_DEB="${NS_DEV_DEB} libssl-dev"
@@ -173,7 +173,7 @@ ns_freebsdpkg_install()
173173
# generic for help text
174174
ns_generic_install()
175175
{
176-
NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, libcurl, perl, perl MD5 digest, libjpeg library, libpng library"
176+
NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, libcurl, libutf8proc, perl, perl MD5 digest, libjpeg library, libpng library"
177177

178178
NS_TOOL_GEN="flex tool, bison tool"
179179

@@ -350,7 +350,7 @@ case "$BUILD_TARGET" in
350350

351351
netsurf)
352352
# internal libraries all frontends require (order is important)
353-
NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libutf8proc libnsutils libnspsl libnslog"
353+
NS_INTERNAL_LIBS="libwapcaplet libparserutils libhubbub libdom libcss libnsgif libnsbmp libnsutils libnspsl libnslog"
354354

355355
# add target specific libraries
356356
case "${HOST}" in

utils/idna.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ idna__ace_to_ucs4(const char *ace_label,
167167

168168
#ifdef WITH_UTF8PROC
169169

170-
#include <libutf8proc/utf8proc.h>
170+
#include <utf8proc.h>
171171

172172
int32_t idna_contexto[] = {
173173
/* CONTEXTO codepoints which have a rule defined */

0 commit comments

Comments
 (0)