diff options
| author | Michael Forney <mforney@mforney.org> | 2017-06-11 17:18:52 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-06-11 17:30:49 -0700 |
| commit | 290b40f0ba7c9e7a1c5aba06ca3d9849925c6106 (patch) | |
| tree | 3d96ec1a69e6893732e96b58e8a93cfb9a168bda /pkg | |
| parent | 84501688201fe1e1f7724c700e8edab441cf96d5 (diff) | |
netsurf: Build with upstream utf8proc
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/netsurf/gen.rc | 9 | ||||
| -rw-r--r-- | pkg/netsurf/libutf8proc/gen.rc | 3 | ||||
| -rw-r--r-- | pkg/netsurf/libutf8proc/rev | 1 | ||||
| m--------- | pkg/netsurf/libutf8proc/src | 0 | ||||
| m--------- | pkg/netsurf/src | 0 |
5 files changed, 4 insertions, 9 deletions
diff --git a/pkg/netsurf/gen.rc b/pkg/netsurf/gen.rc index afafebba..c006a8a5 100644 --- a/pkg/netsurf/gen.rc +++ b/pkg/netsurf/gen.rc @@ -7,7 +7,6 @@ subgen libnsbmp subgen libnsgif subgen libnsutils subgen libparserutils -subgen libutf8proc subgen libwapcaplet subgen nsgenbind @@ -35,11 +34,11 @@ cflags\ -isystem '$dir'/libnsgif/src/include\ -isystem '$dir'/libnsutils/src/include\ -isystem '$dir'/libparserutils/src/include\ - -isystem '$dir'/libutf8proc/src/include\ -isystem '$dir'/libwapcaplet/src/include\ -isystem pkg/freetype/src/include\ -isystem pkg/libxkbcommon/src\ -isystem pkg/openbsd/include\ + -isystem pkg/utf8proc/src\ -I '$dir' \ -I '$srcdir' \ -I '$srcdir'/include\ @@ -58,9 +57,9 @@ build $"nsgenbind_srcs nsgenbind '$srcdir'/content/handlers/javascript/duktape/n phony deps '$outdir'/duktape/binding.c\ '$outdir'/^(\ libcss libdom libhubbub libnsbmp libnsgif libparserutils\ - libutf8proc libwapcaplet libnsutils\ + libwapcaplet libnsutils\ )^/fetch.stamp\ - '$builddir'/pkg/^(freetype libxkbcommon)^/fetch.stamp\ + '$builddir'/pkg/^(freetype libxkbcommon utf8proc)^/fetch.stamp\ ('$dir'/libdom pkg/^(curl libjpeg-turbo libpng libressl zlib))^/headers exe netsurf -d '$dir'/deps\ @@ -128,7 +127,6 @@ exe netsurf -d '$dir'/deps\ libnsbmp/libnsbmp.a\ libnsgif/libnsgif.a\ libnsutils/libnsutils.a\ - libutf8proc/libutf8proc.a\ )\ '$builddir'/pkg/^(\ curl/libcurl.a.d\ @@ -137,6 +135,7 @@ exe netsurf -d '$dir'/deps\ libpng/libpng.a\ libxkbcommon/libxkbcommon.a\ pixman/libpixman.a\ + utf8proc/libutf8proc.a\ wayland/^(libwayland-client.a.d libwayland-cursor.a)\ zlib/libz.a\ \ diff --git a/pkg/netsurf/libutf8proc/gen.rc b/pkg/netsurf/libutf8proc/gen.rc deleted file mode 100644 index 12b83488..00000000 --- a/pkg/netsurf/libutf8proc/gen.rc +++ /dev/null @@ -1,3 +0,0 @@ -cflags -I '$srcdir'/include/libutf8proc -lib libutf8proc.a src/utf8proc.c -fetch git diff --git a/pkg/netsurf/libutf8proc/rev b/pkg/netsurf/libutf8proc/rev deleted file mode 100644 index 0cfbf088..00000000 --- a/pkg/netsurf/libutf8proc/rev +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/pkg/netsurf/libutf8proc/src b/pkg/netsurf/libutf8proc/src deleted file mode 160000 -Subproject 770e329cceaf0620c7b482589a9b17ed1d19c16 diff --git a/pkg/netsurf/src b/pkg/netsurf/src -Subproject cf9be0d7cf0f2e1e76d870d662386c9b0d0714b +Subproject 8ec472ae2f5cda0a44341966408ee2a36445c6a |