Unverified Commit 45933551 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #315555 from doronbehar/pkg/musescore 

musescore: 4.3.0 -> 4.3.1
parents 8359a1c6 138ad7b7

nixos/tests/musescore.nix

+12 −22
Original line number Diff line number Diff line
@@ -43,13 +43,10 @@ in 
    )



    # Start MuseScore window

    machine.execute("DISPLAY=:0.0 mscore >&2 &")

    machine.execute("env XDG_RUNTIME_DIR=$PWD DISPLAY=:0.0 mscore >&2 &")



    # Wait until MuseScore has launched

    machine.wait_for_window("MuseScore 4")



    # Wait until the window has completely initialised

    machine.wait_for_text("MuseScore 4")

    machine.wait_for_window("MuseScore Studio")



    machine.screenshot("MuseScore0")
@@ -75,29 +72,22 @@ in 
    machine.screenshot("MuseScore2")



    # Go to the export dialogue and create a PDF

    machine.send_key("alt-f")

    machine.sleep(1)

    machine.send_key("e")



    # Wait until the export dialogue appears.

    machine.wait_for_text("Export")

    machine.send_key("ctrl-p")



    machine.screenshot("MuseScore3")

    # Wait until the Print dialogue appears.

    machine.wait_for_window("Print")



    machine.send_key("shift-tab")

    machine.sleep(1)

    machine.send_key("ret")

    machine.screenshot("MuseScore4")

    machine.send_key("alt-p")

    machine.sleep(1)

    machine.send_key("ret")



    machine.screenshot("MuseScore4")

    machine.screenshot("MuseScore5")



    # Wait until PDF is exported

    machine.wait_for_file('"/root/Documents/MuseScore4/Scores/Untitled score.pdf"')

    machine.wait_for_file('"/root/Untitled score.pdf"')



    # Check that it contains the title of the score

    machine.succeed('pdfgrep "Untitled score" "/root/Documents/MuseScore4/Scores/Untitled score.pdf"')



    machine.screenshot("MuseScore5")

    ## Check that it contains the title of the score

    machine.succeed('pdfgrep "Untitled score" "/root/Untitled score.pdf"')

    machine.copy_from_vm("/root/Untitled score.pdf")

  '';

})

pkgs/applications/audio/musescore/default.nix

+13 −3
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
, qtdeclarative

, qtgraphicaleffects

, flac

, libopusenc

, libopus

, tinyxml-2

, qtquickcontrols

, qtquickcontrols2

, qtscript
@@ -47,13 +50,13 @@ let 
  } else portaudio;

in stdenv'.mkDerivation (finalAttrs: {

  pname = "musescore";

  version = "4.3.0";

  version = "4.3.1";



  src = fetchFromGitHub {

    owner = "musescore";

    repo = "MuseScore";

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

    sha256 = "sha256-X3zvrIf5DOC5PWcnuw0aClm++IWUED1ZzAyjnp7Mo+g=";

    sha256 = "sha256-EqPofl2l+UBkmuzym4bL0EyFx+SOxVy0EXtxbw9Sqiw=";

  };



  cmakeFlags = [
@@ -62,8 +65,12 @@ in stdenv'.mkDerivation (finalAttrs: { 
    # not useful on NixOS, see:

    # https://github.com/musescore/MuseScore/issues/15571

    "-DMUE_BUILD_CRASHPAD_CLIENT=OFF"

    # Use our freetype

    # Use our versions of system libraries

    "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON"

    "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON"

    # Implies also -DMUE_COMPILE_USE_SYSTEM_OPUS=ON

    "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON"

    "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON"

    # From some reason, in $src/build/cmake/SetupBuildEnvironment.cmake,

    # upstream defaults to compiling to x86_64 only, unless this cmake flag is

    # set
@@ -102,6 +109,9 @@ in stdenv'.mkDerivation (finalAttrs: { 
    portaudio'

    portmidi

    flac

    libopusenc

    libopus

    tinyxml-2

    qtbase

    qtdeclarative

    qtgraphicaleffects