Unverified Commit 5cd1238b authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

comaps: 2025.08.13-8 -> 2025.08.31-15 (#439132)

parents ec20ae4d 0554d301
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
diff --git a/libs/editor/CMakeLists.txt b/libs/editor/CMakeLists.txt
index c96cf4c6..9fc2a210 100644
--- a/libs/editor/CMakeLists.txt
+++ b/libs/editor/CMakeLists.txt
@@ -35,6 +35,11 @@ set(SRC
   yes_no_unknown.hpp
 )

+if (NOT (SKIP_TOOLS AND SKIP_TESTS))
+  # Used in both tests and some tools.
+  add_subdirectory(editor_tests_support)
+endif()
+
 omim_add_library(${PROJECT_NAME} ${SRC})

 target_link_libraries(${PROJECT_NAME}
+8 −5
Original line number Diff line number Diff line
@@ -15,34 +15,37 @@
  nix-update-script,
}:
let
  mapRev = 250804;
  mapRev = 250822;

  worldMap = fetchurl {
    url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
    hash = "sha256-xYMH3y0Y6sSXYUTpy+A5YCyb+n5YChOXhyDvUFqXxZ0=";
    hash = "sha256-OksUAix8yw0WQiJUwfMrjOCd/OwuRjdCOUjjGpnG2S8=";
  };

  worldCoasts = fetchurl {
    url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
    hash = "sha256-2vc4kkNX9bRTqXYlALfwVwOlvr122kvUk7pUyM91vjc=";
    hash = "sha256-1OvKZJ3T/YJu6t/qTYliIVkwsT8toBSqGHUpDEk9i2k=";
  };
in
organicmaps.overrideAttrs (oldAttrs: rec {
  pname = "comaps";
  version = "2025.08.13-8";
  version = "2025.08.31-15";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "comaps";
    repo = "comaps";
    tag = "v${version}";
    hash = "sha256-kvE3H+siV/8v4WgsG1Ifd4gMMwGLqz28oXf1hB9gQ2Q=";
    hash = "sha256-uRShcyMevNb/UE5+l8UabiGSr9TccVWp5xVoqI7+Oh8=";
    fetchSubmodules = true;
  };

  patches = [
    ./remove-lto.patch
    ./use-vendored-protobuf.patch

    # Include missing editor_tests_support.
    ./fix-editor-tests.patch
  ];

  postPatch = (oldAttrs.postPatch or "") + ''