Use upstream utf8proc package, as suggested in http://source.netsurf-browser.org/libutf8proc.git/commit/?id=770e329cceaf0620c7b482589a9b17ed1d19c16d Work around upstream's lack of a pkg-config file and update API. --- netsurf-3.6/Makefile +++ netsurf-3.6/Makefile @@ -527,10 +527,9 @@ $(eval $(call pkg_config_find_and_add,libcss,CSS)) $(eval $(call pkg_config_find_and_add,libdom,DOM)) $(eval $(call pkg_config_find_and_add,libnsutils,nsutils)) -$(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) # Common libraries without pkg-config support -LDFLAGS += -lz +LDFLAGS += -lz -lutf8proc # Optional libraries with pkgconfig --- netsurf-3.8/utils/idna.c +++ netsurf-3.8/utils/idna.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "netsurf/inttypes.h" --- netsurf-3.8/test/Makefile +++ netsurf-3.8/test/Makefile @@ -142,14 +142,15 @@ -Itest -Iinclude -Icontent/handlers -Ifrontends -I. -I.. \ -Dnsgtk \ $(SAN_FLAGS) \ - $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) \ + $(shell pkg-config --cflags libcurl libparserutils libwapcaplet libdom libnsutils) \ $(LIB_CFLAGS) TESTCFLAGS := $(BASE_TESTCFLAGS) \ $(COV_CFLAGS) \ $(COV_CPPFLAGS) TESTLDFLAGS := -L$(TESTROOT) \ - $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils libutf8proc) -lz \ + $(shell pkg-config --libs libcurl libparserutils libwapcaplet libdom libnsutils) \ + $(LDFLAGS) \ $(SAN_FLAGS) \ $(LIB_LDFLAGS)\ $(COV_LDFLAGS) og/gnu/packages/cyrus-sasl.scm'>
AgeCommit message (Expand)Author
2022-07-23gnu: cyrus-sasl: Do not propagate Kerberos....* gnu/packages/cyrus-sasl.scm (cyrus-sasl)[propagated-inputs]: Move MIT-KRB5 ... [inputs]: ... here. * gnu/packages/openldap.scm (openldap)[arguments]: Don't add krb5 linker arguments. Marius Bakke
2022-07-23gnu: cyrus-sasl: Fix indentation....* gnu/packages/cyrus-sasl.scm (cyrus-sasl): Reindent. Marius Bakke
2022-07-23gnu: cyrus-sasl: Update to 2.1.28....* gnu/packages/cyrus-sasl.scm (cyrus-sasl): Update to 2.1.28. [source](uri): Use new download location. [source](patches): Remove. [native-inputs]: Remove. [arguments]: Remove #:phases. Use G-expression. * gnu/packages/patches/cyrus-sasl-CVE-2019-19906.patch, gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Marius Bakke
2021-12-13gnu: Simplify package inputs....This commit was obtained by running: ./pre-inst-env guix style without any additional argument. Ludovic Courtès