movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

mapnik: drop cmake-harfbuzz.patch

Browse source
This commit is contained in:
Nikolay Korotkiy 2025-06-07 23:50:27 +04:00
parent 04ee58b617
commit 38839a0aba
No known key found for this signature in database
GPG key ID: D1DE6D7F693663A5
2 changed files with 2 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pkgs/by-name/ma/mapnik/cmake-harfbuzz.patch
View file

@ -1,26 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffb86d4ac..1775b986f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,19 +177,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...")
- mapnik_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

8
pkgs/by-name/ma/mapnik/package.nix
View file

@ -55,12 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" ]; outputs = [ "out" ];
patches = [ patches = [
# The lib/cmake/harfbuzz/harfbuzz-config.cmake file in harfbuzz.dev is faulty,
# as it provides the wrong libdir. The workaround is to just rely on
# pkg-config to locate harfbuzz shared object files.
# Upstream HarfBuzz wants to drop CMake support anyway.
# See discussion: https://github.com/mapnik/mapnik/issues/4265
./cmake-harfbuzz.patch
# Account for full paths when generating libmapnik.pc # Account for full paths when generating libmapnik.pc
./export-pkg-config-full-paths.patch ./export-pkg-config-full-paths.patch
# Use 'sparsehash' package. # Use 'sparsehash' package.
@ -99,6 +93,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "BUILD_DEMO_CPP" false) (lib.cmakeBool "BUILD_DEMO_CPP" false)
## Would require QT otherwise. ## Would require QT otherwise.
(lib.cmakeBool "BUILD_DEMO_VIEWER" false) (lib.cmakeBool "BUILD_DEMO_VIEWER" false)
# disable the find_package call and force pkg-config, see https://github.com/mapnik/mapnik/pull/4270
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_harfbuzz" true)
# Use 'protozero' package. # Use 'protozero' package.
(lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true) (lib.cmakeBool "USE_EXTERNAL_MAPBOX_PROTOZERO" true)
# macOS builds fail when using memory mapped file cache. # macOS builds fail when using memory mapped file cache.