From b674e5194ead5edeafe60ab0af6e742d9ee7461f Mon Sep 17 00:00:00 2001 From: Benoit Pierre Date: Sun, 28 Jul 2024 03:59:52 +0200 Subject: [PATCH] ci: stop linting with nanosvg support enabled - this generate a lot of warnings with clang-tidy & cppcheck in nanosvg & stb headers - it does not match our default configuration on koreader anyway (where lunasvg is used) --- .github/workflows/build.yml | 2 -- utils/lint.mk | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e1edea9a..aea256409 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,8 +40,6 @@ jobs: libfribidi-dev libharfbuzz-dev libjpeg-turbo8-dev - libnanosvg-dev - libstb-dev libunibreak-dev libutf8proc-dev libxml2-utils diff --git a/utils/lint.mk b/utils/lint.mk index 189e8a9d2..8fd428f07 100644 --- a/utils/lint.mk +++ b/utils/lint.mk @@ -198,7 +198,7 @@ define CPPFLAGS+= -DUSE_FRIBIDI=1 -DUSE_HARFBUZZ=1 -DUSE_LIBUNIBREAK=1 --DUSE_NANOSVG=1 +-DUSE_NANOSVG=0 -DUSE_UTF8PROC=1 -DUSE_ZSTD=1 endef @@ -224,8 +224,6 @@ libutf8proc endef CPPFLAGS += $(shell echo 'pkg-config!' >>log; pkg-config --cflags $(strip $(PACKAGES))) define CPPFLAGS+= --I/usr/include/nanosvg --I/usr/include/stb -Ithirdparty/antiword -Ithirdparty/chmlib/src -Icrengine/include