Unverified Commit 0efcce57 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

lomiri.teleports: 1.21 -> 1.22 (#511200)

parents 0bb580ca 7063cb6a

pkgs/desktops/lomiri/applications/teleports/1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch

+3 −3
Original line number Diff line number Diff line 
From f9dfacc4b92faa7b60ae37489aa58520b4da95d7 Mon Sep 17 00:00:00 2001

From cb4a928db740de48d84d47c21705786bb141af02 Mon Sep 17 00:00:00 2001

From: OPNA2608 <opna2608@protonmail.com>

Date: Sun, 5 Oct 2025 14:34:43 +0200

Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie
@@ -11,7 +11,7 @@ Subject: [PATCH] app/CMakeLists.txt: Drop explicit dependency on rlottie 
 1 file changed, 1 deletion(-)



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

index c1f0b85..7a59db5 100644

index c1f0b852..7a59db59 100644

--- a/app/CMakeLists.txt

+++ b/app/CMakeLists.txt

@@ -1,7 +1,6 @@
@@ -23,5 +23,5 @@ index c1f0b85..7a59db5 100644 
 

 #"qtdclient.cpp" "qtdthread.cpp" "qml.qrc"

-- 

2.51.0

2.51.2

pkgs/desktops/lomiri/applications/teleports/default.nix

+2 −15
Original line number Diff line number Diff line
@@ -49,13 +49,13 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "teleports";

  version = "1.21";

  version = "1.22";



  src = fetchFromGitLab {

    owner = "ubports";

    repo = "development/apps/teleports";

    rev = "v${finalAttrs.version}";

    hash = "sha256-V9yOQbVXtZGxdiieggPwHd17ilRZ0xMEI2yphgjx188=";

    hash = "sha256-y0oXlhu2cvOGYZCEHfL6DcyStCQcIz7JtIpR4Tygm/4=";

  };



  patches = [
@@ -66,19 +66,6 @@ stdenv.mkDerivation (finalAttrs: { 
      hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U=";

    })



    # Fix CMake 4 compatibility

    # Remove when version > 1.21

    (fetchpatch {

      name = "0002-teleports-CMakeLists.txt-Support-building-with-CMake-4.patch";

      url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/ffb4e745889a473a208a86a29b7e439129930b01.patch";

      hash = "sha256-EdcCHH/0Zq8wcF6UPyvy16wntDeSqTV9LWQat91LNRo=";

    })

    (fetchpatch {

      name = "0003-teleports-libs-qtdlib-CMakeLists.txt-Support-building-with-CMake-4.patch";

      url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/fe7f0cb304ddaefae9f97917d3edc89de5f21b1f.patch";

      hash = "sha256-yIc/l6iHb5qWI0QZOx8Hhd0lgEYyPozL+AjrmF2L89k=";

    })



    # Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/586 merged & in release

    ./1001-app-CMakeLists.txt-Drop-explicit-dependency-on-rlottie.patch

  ];