Unverified Commit 59bf97c4 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

lomiri.geonames: 0.3.1 -> 0.3.2 (#502576)

parents 8acc568b 5779cdd6

pkgs/desktops/lomiri/development/geonames/1001-geonames-cmake4-compat.patch

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
From 3dea0cc91b579de5e2c9db811f2e9e34079d3733 Mon Sep 17 00:00:00 2001

From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

Date: Mon, 1 Sep 2025 13:22:26 +0200

Subject: [PATCH] {CMakeLists.txt,cmake/GtkDocScanGObjWrapper.cmake}: Bump

 cmake_minimum_required() to version 3.10.



---

 CMakeLists.txt                    | 2 +-

 cmake/GtkDocScanGObjWrapper.cmake | 2 +-

 2 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/CMakeLists.txt b/CMakeLists.txt

index 5fbff8a..e7b863e 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -1,4 +1,4 @@

-cmake_minimum_required(VERSION 3.0)

+cmake_minimum_required(VERSION 3.10)

 project(geonames VERSION 0.3.1 LANGUAGES C)

 

 include(GNUInstallDirs)

diff --git a/cmake/GtkDocScanGObjWrapper.cmake b/cmake/GtkDocScanGObjWrapper.cmake

index b187ebb..b026ed0 100644

--- a/cmake/GtkDocScanGObjWrapper.cmake

+++ b/cmake/GtkDocScanGObjWrapper.cmake

@@ -20,7 +20,7 @@

 

 # This is needed for find_package(PkgConfig) to work correctly --

 # CMAKE_MINIMUM_REQUIRED_VERSION needs to be defined.

-cmake_minimum_required(VERSION 3.2)

+cmake_minimum_required(VERSION 3.10)

 

 if(NOT APPLE)

     # We use pkg-config to find glib et al

-- 

GitLab

pkgs/desktops/lomiri/development/geonames/default.nix

+9 −11
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "geonames";

  version = "0.3.1";

  version = "0.3.2";



  src = fetchFromGitLab {

    owner = "ubports";

    repo = "development/core/geonames";

    rev = finalAttrs.version;

    hash = "sha256-AhRnUoku17kVY0UciHQXFDa6eCH6HQ4ZGIOobCaGTKQ=";

    tag = finalAttrs.version;

    hash = "sha256-jXjhhCrY0tURd4N4D5weCJEckS5cctUfBgpGLTkC2cI=";

  };



  outputs = [
@@ -42,12 +42,6 @@ stdenv.mkDerivation (finalAttrs: { 
    "devdoc"

  ];



  patches = [

    # Fix compat with CMake 4

    # Remove when https://gitlab.com/ubports/development/core/geonames/-/merge_requests/4 merged & in release

    ./1001-geonames-cmake4-compat.patch

  ];



  postPatch = ''

    patchShebangs src/generate-locales.sh tests/setup-test-env.sh

  '';
@@ -105,7 +99,10 @@ stdenv.mkDerivation (finalAttrs: { 
  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;



  passthru = {

    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

    tests.pkg-config = testers.hasPkgConfigModules {

      package = finalAttrs.finalPackage;

      versionCheck = true;

    };

    updateScript = gitUpdater { };

  };
@@ -120,7 +117,8 @@ stdenv.mkDerivation (finalAttrs: { 
    # Cross requires hostPlatform emulation during build

    # https://gitlab.com/ubports/development/core/geonames/-/issues/1

    broken =

      stdenv.buildPlatform != stdenv.hostPlatform && !stdenv.hostPlatform.emulatorAvailable buildPackages;

      !lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform

      && !stdenv.hostPlatform.emulatorAvailable buildPackages;

    pkgConfigModules = [

      "geonames"

    ];