Unverified Commit 67b29519 authored by Cosima Neidahl's avatar Cosima Neidahl Committed by GitHub
Browse files

lomiri.lomiri-music-app: 3.2.2 -> 3.3.0 (#407331)

parents 79cec564 b05fd940

nixos/tests/lomiri-music-app.nix

+8 −2
Original line number Diff line number Diff line 
{ lib, ... }:

let

  ocrContent = "Music Test";

  musicFile = "test.mp3";

  musicFileName = "Example";

  musicFile = "${musicFileName}.mp3";



  ocrPauseColor = "#FF00FF";

  ocrStartColor = "#00FFFF";
@@ -136,6 +137,7 @@ in 


    with subtest("lomiri music launches"):

        machine.succeed("lomiri-music-app >&2 &")

        machine.wait_for_console_text("Queue is empty")

        machine.sleep(10)

        machine.send_key("alt-f10")

        machine.sleep(2)
@@ -144,11 +146,14 @@ in 


    with subtest("lomiri music plays music"):

        machine.succeed("xdotool mousemove 30 720 click 1") # Skip intro

        machine.sleep(2)

        machine.wait_for_text("Albums")

        machine.succeed("xdotool mousemove 25 45 click 1") # Open categories

        machine.sleep(2)

        machine.wait_for_text("Tracks")

        machine.succeed("xdotool mousemove 25 240 click 1") # Switch to Tracks category

        machine.wait_for_text("test") # the test file

        machine.sleep(2)

        machine.wait_for_text("${musicFileName}") # the test file

        machine.screenshot("lomiri-music_listing")



        # Ensure pause colours isn't present already
@@ -185,6 +190,7 @@ in 


    with subtest("lomiri music localisation works"):

        machine.succeed("env LANG=de_DE.UTF-8 lomiri-music-app .mp4 >&2 &")

        machine.wait_for_console_text("Restoring library queue")

        machine.sleep(10)

        machine.send_key("alt-f10")

        machine.sleep(2)

pkgs/desktops/lomiri/applications/lomiri-music-app/default.nix

+8 −21
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  stdenv,

  lib,

  fetchFromGitLab,

  fetchpatch,

  gitUpdater,

  nixosTests,

  cmake,
@@ -12,6 +11,7 @@ 
  lomiri-content-hub,

  lomiri-thumbnailer,

  lomiri-ui-toolkit,

  mediascanner2,

  qtbase,

  qtdeclarative,

  qtmultimedia,
@@ -22,31 +22,15 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "lomiri-music-app";

  version = "3.2.2";

  version = "3.3.0";



  src = fetchFromGitLab {

    owner = "ubports";

    repo = "development/apps/lomiri-music-app";

    rev = "refs/tags/v${finalAttrs.version}";

    hash = "sha256-tHCbZF+7i/gYs8WqM5jDBhhKmM4ZeUbG3DYBdQAiUT8=";

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

    hash = "sha256-lCpRt0SeNszlCsmJOZvnzoDmHV7xCGKdmIZBJTlBQDo=";

  };



  patches = [

    # Remove when version > 3.2.2

    (fetchpatch {

      name = "0001-lomiri-music-app-Fix-GNUInstallDirs-usage.patch";

      url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/32591f2332aa204b9ee2857992e50594db0e6ff2.patch";

      hash = "sha256-SXn+7jItzi1Q0xK0iK57+W3SpEdSCx1dKSfeghOCePg=";

    })



    # Remove when version > 3.2.2

    (fetchpatch {

      name = "0002-lomiri-music-app-bindtextdomain.patch";

      url = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/commit/4e950521a67e201f3d02b3b71c6bb1ddce8ef2b2.patch";

      hash = "sha256-HgGKk44FU+IXRVx2NK3iGSo/wPJce1T2k/vP8nZtewQ=";

    })

  ];



  postPatch = ''

    # We don't want absolute paths in desktop files

    substituteInPlace CMakeLists.txt \
@@ -73,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { 
      lomiri-content-hub

      lomiri-thumbnailer

      lomiri-ui-toolkit

      mediascanner2

      qtmultimedia

      qtsystems

    ]
@@ -113,7 +98,9 @@ stdenv.mkDerivation (finalAttrs: { 
  meta = {

    description = "Default Music application for Ubuntu devices";

    homepage = "https://gitlab.com/ubports/development/apps/lomiri-music-app";

    changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/v${finalAttrs.version}/ChangeLog";

    changelog = "https://gitlab.com/ubports/development/apps/lomiri-music-app/-/blob/${

      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev

    }/ChangeLog";

    license = with lib.licenses; [

      gpl3Only

    ];