diff options
| author | Kerstin Humm <kerstin@erictapen.name> | 2021-11-13 22:27:29 +0100 |
|---|---|---|
| committer | Robert Schütz <nix@dotlambda.de> | 2022-10-29 10:36:50 -0700 |
| commit | d35077ae8bfeba5004438046bffd9515fef33214 (patch) | |
| tree | 687a81ec5331c1f28b6c2b74651a25baaeafea36 /pkgs/development/libraries/mapnik/cmake-harfbuzz.patch | |
| parent | 7c224b3e127ad37b27f31aaa71ae5959320bd492 (diff) | |
mapnik: 3.1.0 -> unstable-2022-04-14
- use CMake. I just didn't got it to work with SCons. - patch cmake to find harfbuzz - prefetch catch2 for enabling tests - add erictapen as maintainer - build mapnik-config with scons, as it isn't build by cmake - use python3 exclusively - build with harfbuzz-icu - change license to lgpl21Plus - use PROJ 8 - use latest scons, but use cmake for everything but mapnik-config - don't make postgresql optional Co-Authored-by: Robert Schütz <nix@dotlambda.de>
Diffstat (limited to 'pkgs/development/libraries/mapnik/cmake-harfbuzz.patch')
| -rw-r--r-- | pkgs/development/libraries/mapnik/cmake-harfbuzz.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch b/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch new file mode 100644 index 0000000000000..f44b879b592f7 --- /dev/null +++ b/pkgs/development/libraries/mapnik/cmake-harfbuzz.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2dc1f02d..739b8ae99 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -153,19 +153,8 @@ endif() + + mapnik_find_package(Freetype REQUIRED) + +-# try to find harfbuzz with the native configuration and fallback to our "own" FindHarfBuzz +-mapnik_find_package(harfbuzz CONFIG QUIET) +-if(harfbuzz_FOUND) +- message(STATUS "Found harfbuzz native cmake") +- list(APPEND MAPNIK_OPTIONAL_LIBS harfbuzz::harfbuzz) +-else() +- # Use pkg-config when harfbuzz is not found. +- # It might be possible that in future version harfbuzz could only be found via pkg-config. +- # harfbuzz related discussion: https://github.com/harfbuzz/harfbuzz/issues/2653 +- message(STATUS "harfbuzz not found via cmake. Searching via pkg-config...") +- pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz>=${HARFBUZZ_MIN_VERSION}) +- list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz) +-endif() ++pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz) ++list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::harfbuzz) + + if(USE_EXTERNAL_MAPBOX_GEOMETRY) + # this is used to provide a way to specify include dirs with CACHE VARIABLES |