From 762c3a972c61c10f291c50dc5604a742b6f274aa Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Tue, 9 May 2023 23:29:40 +0100 Subject: [PATCH] mapbox-gl-native: fix build Pull request submitted upstream: https://github.com/mapbox/mapbox-gl-native/pull/16666 --- ...x-narrowing-conversion-warning-error.patch | 25 +++++++++++++++++++ .../libraries/mapbox-gl-native/default.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/mapbox-gl-native/0001-Fix-narrowing-conversion-warning-error.patch diff --git a/pkgs/development/libraries/mapbox-gl-native/0001-Fix-narrowing-conversion-warning-error.patch b/pkgs/development/libraries/mapbox-gl-native/0001-Fix-narrowing-conversion-warning-error.patch new file mode 100644 index 000000000000000..0956cf0d37fb40d --- /dev/null +++ b/pkgs/development/libraries/mapbox-gl-native/0001-Fix-narrowing-conversion-warning-error.patch @@ -0,0 +1,25 @@ +From 2955d0e479f57a39a0af4a0fa7ca7683455cca58 Mon Sep 17 00:00:00 2001 +From: Tom Hall +Date: Tue, 9 May 2023 23:17:28 +0100 +Subject: [PATCH] Fix narrowing conversion warning/error + +--- + src/mbgl/layout/symbol_projection.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/mbgl/layout/symbol_projection.cpp b/src/mbgl/layout/symbol_projection.cpp +index eecaced82..fef602aa4 100644 +--- a/src/mbgl/layout/symbol_projection.cpp ++++ b/src/mbgl/layout/symbol_projection.cpp +@@ -95,7 +95,7 @@ namespace mbgl { + PointAndCameraDistance project(const Point& point, const mat4& matrix) { + vec4 pos = {{ point.x, point.y, 0, 1 }}; + matrix::transformMat4(pos, pos, matrix); +- return {{ static_cast(pos[0] / pos[3]), static_cast(pos[1] / pos[3]) }, pos[3] }; ++ return {{ static_cast(pos[0] / pos[3]), static_cast(pos[1] / pos[3]) }, static_cast(pos[3]) }; + } + + float evaluateSizeForFeature(const ZoomEvaluatedSize& zoomEvaluatedSize, const PlacedSymbol& placedSymbol) { +-- +2.39.2 + diff --git a/pkgs/development/libraries/mapbox-gl-native/default.nix b/pkgs/development/libraries/mapbox-gl-native/default.nix index 7b6bf1ddef0e3a5..d3a86a53fecc30d 100644 --- a/pkgs/development/libraries/mapbox-gl-native/default.nix +++ b/pkgs/development/libraries/mapbox-gl-native/default.nix @@ -35,6 +35,7 @@ mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-compilation.patch?h=mapbox-gl-native"; hash = "sha256-KgJHyoIdKdnQo+gedns3C+mEXlaTH/UtyQsaYR1T3iI="; }) + ./0001-Fix-narrowing-conversion-warning-error.patch ]; postPatch = ''