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

comaps: 2025.11.07-2 -> 2026.03.23-5 (#504172)

parents bdb3d570 02ab4a03

pkgs/by-name/co/comaps/package.nix

+9 −8
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  fetchurl,

  fetchFromCodeberg,

  boost,

  expat,

  gtest,

  glm,

  gflags,
@@ -16,16 +17,16 @@ 
}:

let

  # https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt

  mapRev = 250906;

  mapRev = 260321;



  worldMap = fetchurl {

    url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";

    hash = "sha256-0LjCDVk3vShmn+yHc/SvfJzrj170pO52CqbdKWqTsI4=";

    hash = "sha256-pMmzPcWbS9drQzJCfiac2dfSMihiHDfhFyG5ux0pG54=";

  };



  worldCoasts = fetchurl {

    url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";

    hash = "sha256-2BP6ET8DM3v0KMlzYx+lS0l26WSONQpb4fCMri8Aj2o=";

    hash = "sha256-5LI6itC6LhprVfgGbT/HYy1lzZLZLUe2QoSil0/7kIc=";

  };



  pythonEnv = python3.withPackages (
@@ -36,18 +37,17 @@ let 
in

organicmaps.overrideAttrs (oldAttrs: rec {

  pname = "comaps";

  version = "2025.11.07-2";

  version = "2026.03.23-5";



  src = fetchFromCodeberg {

    owner = "comaps";

    repo = "comaps";

    tag = "v${version}";

    hash = "sha256-m1YOA24Avoia6YMXKcsuCdPwzxdn7Qc3kZLXGsWjTbs=";

    hash = "sha256-1bD0QiEZu6nB7wwBpfpEf+WypqbOd9XuXbq7FDTL7bw=";

    fetchSubmodules = true;

  };



  patches = [

    ./remove-lto.patch

    ./use-vendored-protobuf.patch



    # Include missing editor_tests_support.
@@ -59,8 +59,8 @@ organicmaps.overrideAttrs (oldAttrs: rec { 
    substituteInPlace configure.sh \

      --replace-fail "git submodule update --init --recursive --depth 1" ""



    patchShebangs tools/unix/generate_categories.sh

    substituteInPlace tools/python/categories/json_to_txt.py \

    patchShebangs tools/unix/*

    substituteInPlace tools/python/{categories/json_to_txt.py,generate_desktop_ui_strings.py} \

      --replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}"

  '';
@@ -71,6 +71,7 @@ organicmaps.overrideAttrs (oldAttrs: rec { 


  buildInputs = (oldAttrs.buildInputs or [ ]) ++ [

    boost

    expat

    gtest

    gflags

    glm

pkgs/by-name/co/comaps/remove-lto.patch

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 3ba193a9..01e696e3 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -104,7 +104,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")

 elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")

   add_definitions(-DRELEASE)

   if (NOT MSVC)

-    add_compile_options(-O3 $<$<CXX_COMPILER_ID:GNU>:-flto=auto>)

+    add_compile_options(-O3)

   endif()

 else()

   message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})

@@ -114,19 +114,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")

   add_compile_options(-fno-omit-frame-pointer)

 endif()

 

-# Linux GCC LTO plugin fix.

-if (PLATFORM_LINUX AND (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_BUILD_TYPE MATCHES "^Rel"))

-  # To force errors if LTO was not enabled.

-  add_compile_options(-fno-fat-lto-objects)

-  # To fix ar and ranlib "plugin needed to handle lto object".

-  string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})

-  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}*/liblto_plugin.so)

-  set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")

-  set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")

-  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")

-  set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")

-endif()

-

 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})

 

 if (PLATFORM_LINUX OR PLATFORM_ANDROID)