gnu: gnucash: Disable the stress-options-test using a phase.
[jackhill/guix/guix.git] / gnu / packages / patches / netsurf-system-utf8proc.patch
CommitLineData
710806b5
EB
1Use upstream utf8proc package, as suggested in
2http://source.netsurf-browser.org/libutf8proc.git/commit/?id=770e329cceaf0620c7b482589a9b17ed1d19c16d
3
4Work around upstream's lack of a pkg-config file and update API.
5
6--- netsurf-3.6/Makefile
7+++ netsurf-3.6/Makefile
8@@ -527,10 +527,9 @@
9 $(eval $(call pkg_config_find_and_add,libcss,CSS))
10 $(eval $(call pkg_config_find_and_add,libdom,DOM))
11 $(eval $(call pkg_config_find_and_add,libnsutils,nsutils))
12-$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc))
13
14 # Common libraries without pkg-config support
15-LDFLAGS += -lz
16+LDFLAGS += -lz -lutf8proc
17
18 # Optional libraries with pkgconfig
19
f9e140a2
EB
20--- netsurf-3.8/utils/idna.c
21+++ netsurf-3.8/utils/idna.c
22@@ -27,7 +27,7 @@
710806b5
EB
23 #include <stdlib.h>
24 #include <string.h>
f9e140a2 25 #include <sys/types.h>
710806b5
EB
26-#include <libutf8proc/utf8proc.h>
27+#include <utf8proc.h>
28
f9e140a2
EB
29 #include "netsurf/inttypes.h"
30
31--- netsurf-3.8/test/Makefile
32+++ netsurf-3.8/test/Makefile
33@@ -142,14 +142,15 @@
d8799bd0
EB
34 -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \
35 -Dnsgtk \
f9e140a2 36 $(SAN_FLAGS) \
d8799bd0
EB
37- $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \
38+ $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \
39 $(LIB_CFLAGS)
40 TESTCFLAGS := $(BASE_TESTCFLAGS) \
41 $(COV_CFLAGS) \
42 $(COV_CPPFLAGS)
43
44 TESTLDFLAGS := -L$(TESTROOT) \
45- $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \
f9e140a2
EB
46+ $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \
47+ $(LDFLAGS) \
48 $(SAN_FLAGS) \
d8799bd0
EB
49 $(LIB_LDFLAGS)\
50 $(COV_LDFLAGS)