From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 2L9NGuZnfmc9XQEAe85BDQ:P1 (envelope-from ) for ; Wed, 08 Jan 2025 11:56:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2L9NGuZnfmc9XQEAe85BDQ (envelope-from ) for ; Wed, 08 Jan 2025 12:56:22 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Di5JVY4v; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=YZNnAfSq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1736337382; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=huOHeFLKv7QC69EtD7cvmeDe8WbXM6p//fFLjyQtjYg=; b=jf/U3DM0NSzhl9SNfHOYBSVo0wyfYVpLqUSHIFRJyDvb0iR5MWfcAadyOE1Oigm23w+jYd Qv+VCTub+8ORjU5wrJDFN4EeNPrDzDCbOTNg/6z6Y+MTbcTCvbU1wpEqTmDjfV2t4eSOaH pOLh8JDoeZjpor2110XExbocDLwU/IxvlXuT/oMRJABPGpHu30WEXoWFV2Re+sTwSpD6YK 20kNukzi4/7H3dM6e0zeFrAeuL+G/81UU32eJCacE1aJ/ygB98/3GggPkF1e3Q+10pDlcv 7l7OgUcnQIa5j8cDV8efQR+cjdlw/sz7+67M7ZIU+8X4dMcVSOpiW8qsmjIqkg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=Di5JVY4v; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=YZNnAfSq; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1736337382; a=rsa-sha256; cv=none; b=sSFcJI+ds4tvnlMJq8SS7Ds+x0saHcg7FfhK9nilkAaEwf5CJLBWPiNYNR+DNC7qyJMwH4 veE/8XYAwt1dqBDELy4t5mQkjI4K6M+96OyXF1+6L0Gtw/vfzjnzD5sAve2/Cq35OZwyjX Z0SDhosVURfVpyMmOEgJulaqY81ZD6iqIPOeAjeKljWtdWd4eeetNH94yBotQ/JB30a9gn 9z+o6FMApGpwb+4+ZnGYYllO4kUgjU8itxFhVBIB8TpgvzA5n4hqhJ8bFDZexY0CMkMK5L 2hJslxWJecay4QVzQ4laUbvrCIvnMykh58Q7uor97ftTJVyRk7wUs5S88xWRGQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F0A185287D for ; Wed, 08 Jan 2025 12:56:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVUeS-00006E-OR; Wed, 08 Jan 2025 06:55:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tVUeP-0008Ib-2U for guix-patches@gnu.org; Wed, 08 Jan 2025 06:55:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tVUeO-0002ZB-Nm for guix-patches@gnu.org; Wed, 08 Jan 2025 06:55:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=huOHeFLKv7QC69EtD7cvmeDe8WbXM6p//fFLjyQtjYg=; b=Di5JVY4v9lqRFaE9SmeE/stllV7XuhNf12jhnxgNjdfoLKySMvLcFDqVOxRkJjrUiU9ZxLWypmcpx+ILWh8CeVXATXKLpCaKc8AnFAdp2mwfu8uSjy3WgM+rub4ZUeR0jawSapaDhdRzbYrOqHNpoBaWMhjcug8CuoR0ycU2gVAZ3CGydDhfqQaRTWgCIWX0FJ64uoxena5SNCc7kJrCiroWrkfZAxNlHMa9F/elnN+0G1Ts0ShscKcyuJ27TOxNATx2KupCN5i3ieL2CpKO3QCUlurlgBdawhy5x2yAmt36QC7YyNun2bbxWUqXGJEuA2VDzXsGYl0YgBC+nexVew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVUeM-0006w6-NI; Wed, 08 Jan 2025 06:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75037] [PATCH gnome-team v2 2/2] gnu: musescore: Update to 4.4.4. Resent-From: Rovanion Luckey Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Wed, 08 Jan 2025 11:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 75037@debbugs.gnu.org Cc: Rovanion Luckey , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 75037-submit@debbugs.gnu.org id=B75037.173633729926638 (code B ref 75037); Wed, 08 Jan 2025 11:55:02 +0000 Received: (at 75037) by debbugs.gnu.org; 8 Jan 2025 11:54:59 +0000 Received: from localhost ([127.0.0.1]:46215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVUeI-0006vZ-EK for submit@debbugs.gnu.org; Wed, 08 Jan 2025 06:54:58 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50491) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tVUeC-0006v6-DO for 75037@debbugs.gnu.org; Wed, 08 Jan 2025 06:54:54 -0500 Received: by mail-wm1-x341.google.com with SMTP id 5b1f17b1804b1-436a39e4891so63344555e9.1 for <75037@debbugs.gnu.org>; Wed, 08 Jan 2025 03:54:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736337286; x=1736942086; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:references:in-reply-to:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=huOHeFLKv7QC69EtD7cvmeDe8WbXM6p//fFLjyQtjYg=; b=YZNnAfSqrEzU4LrhtHOkm2uqL4TH1c1nW/8+jeeFiBOXLrK16DfDMYwD1IRKzZ4TmO /WPFvqpOm9SCrt5d2L9VLg3Q5HEW5bG6z5XF/8v2Pqc84Np2g/UJRYPElGXwSGCMdOGH P9H1dPF7cmnXJ16OrjLfd/RYaU4o0LZIzLZUk2r47vONqJ3Giqo1P1VD6YQvYHwTLMn/ ESBFU9kA+tntmkA5IEhbAy4QEg7C0MoGop4IsGxUDKZw+BJNz5eu1I6g5RZWlPZRckdY JPtXJxlFfo2lc1ZefQvfT4ckTmi8WjLHa9B4Q0GpWYeJbv2hhDPpNloeQ7BV2ZERvvjM ZJPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736337286; x=1736942086; h=mime-version:cc:to:subject:date:references:in-reply-to:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=huOHeFLKv7QC69EtD7cvmeDe8WbXM6p//fFLjyQtjYg=; b=W72xNaxnYa75WLR958pamqjAQtWnTpkNVqzMHMvk5wXnsQN1bO2V2vrGZ1wpySzXhJ YXsMRAsJisCgXJt54P3ISI8Nh/BhHRKywxWt0kOeQLxgzs9/QMam2B8MuslkepALpiqG 4PWmH501/Ryy57xkUpdIIN3VxHkOrfw82DOT6njGJ9sv8inQjIrSUkJCanyP7maxmwRg 1y0sLbhW/wDutN2wNxpbsxlMXwLgkUAQBoeuyVU86kXQhQwhUDqTP/EIvVGhc/iGlwoK OltQAgfbzxgeG9Vm1c23LxFwZE3YXbSi9khKW04AgTbIn7ouX9VXprZLMS29BBosb371 ARVw== X-Gm-Message-State: AOJu0YwWsJeWgy5I4cyM2UIoFQa67FC3qOhiN8c3axWdifHWia7WIuKn nFM/Cd385tWlXawFIGtVUCDmuAPlfjxuKWLCDux4MgiwPrrvWy8qySkGLQ7X X-Gm-Gg: ASbGncufitPkjULtMHYZqwz+vMDrz2u3u43bzqXzpuM8+5Z8nKVgCdAA4Xfq8rcXAJ6 G+9Exe+aSpmRlbcbMwsgf22Q3YpuWWbmZTLaZIg8+rczkiUzYWQ0hMGr3LqXij2up9Kpxk42YgA SjUQMHZwqwmpd52cDeUZdBKY7Pq4hpVbMkc9f/acVIaGRcX8iSIGRVGR1S7UfMSyieRGCLoh3Gr HXag8DlzHjXWiGie/qZN8VWMW1nMn9PUj2edQ8kuYexTEqAyy0qzW6yAAZmrYEQeTif/5/Loc98 SL8mxA27h6YcOkD+r/VMal+hiMfUw9WF X-Google-Smtp-Source: AGHT+IGkY10EJdNIQhQDsKoJRjkJ+t1sVYGqXk0Cf3bMqvEE56yrTyHZrv5VmovHM9Pl5ZYAZYFm1g== X-Received: by 2002:a05:600c:3ca0:b0:434:ff9d:a3a1 with SMTP id 5b1f17b1804b1-436e266e818mr20411125e9.2.1736337285967; Wed, 08 Jan 2025 03:54:45 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e2da66d9sm18562035e9.1.2025.01.08.03.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 03:54:45 -0800 (PST) From: Rovanion Luckey X-Google-Original-From: Rovanion Luckey Message-ID: In-Reply-To: <02df420e622b5e1fb5a59964fc8076b62a5cd636.1736336958.git.liliana.prikler@gmail.com> References: <02df420e622b5e1fb5a59964fc8076b62a5cd636.1736336958.git.liliana.prikler@gmail.com> Date: Wed, 1 Jan 2025 19:37:57 +0100 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: F0A185287D X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: 3.13 X-Spam-Score: 3.13 X-TUID: eLwpzYsXTwRK * gnu/packages/music.scm (musescore): Update to 4.4.4. This update was a major one as it upgraded Qt from 5 to 6. Change-Id: Ib5da630b73889625054f88b1e86af1e9666e6e93 Signed-off-by: Liliana Marie Prikler --- gnu/packages/music.scm | 63 +++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fc6e774eda..7fe78484fd 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Frank Pursel -;;; Copyright © 2021 Rovanion Luckey +;;; Copyright © 2021, 2024, 2025 Rovanion Luckey ;;; Copyright © 2021 Justin Veilleux ;;; Copyright © 2021, 2022, 2023 Felix Gruber ;;; Copyright © 2021 Simon Streit @@ -5370,7 +5370,7 @@ (define-public sfizz (define-public musescore (package (name "musescore") - (version "4.3.2") + (version "4.4.4") (source (origin (method git-fetch) @@ -5379,21 +5379,31 @@ (define-public musescore (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hx0l6d7avyfbh88hwn01h9q51mgd9zix91q2kgg1ax73pqxhfs2")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete precompiled binaries. - (delete-file-recursively "src/diagnostics/crashpad_handler") - (substitute* "src/diagnostics/CMakeLists.txt" - (("install") "#install")))))) + (base32 "0cjp1sp50pwmrgvpxjxg849s0vsvk2vcb66ym617nvlj761h0ngz")) + (modules '((guix build utils))))) (build-system qt-build-system) (arguments - `(#:configure-flags - `("-DDOWNLOAD_SOUNDFONT=OFF" - "-DBUILD_DIAGNOSTICS=OFF" - "-DMUSESCORE_BUILD_CONFIG=release" - "-DUSE_SYSTEM_FREETYPE=ON") + `(#:qtbase ,qtbase + #:configure-flags + `("-DMUSE_APP_BUILD_MODE=release" + ;; Disable the build and usage of the `/bin/crashpad_handler` utility - + ;; it does automatic crash reporting and is distributed as a + ;; pre-compiled binary in the source-tree of MuseScore: + ;; https://github.com/musescore/MuseScore/issues/15571 + ;; Renamed from MUE_BUILD_CRASHPAD_CLIENT, MUE_BUILD_DIAGNOSTICS_MODULE + ;; https://github.com/musescore/MuseScore/commit/6f269e8b072cca36cb76eb016cb60c1c1c2b9906 + "-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF" + ;; Use Guix' versions of system libraries. + "-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON" + "-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON" + "-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON" + "-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON" ; Ipmlies -DMUE_COMPILE_USE_SYSTEM_OPUS=ON + "-DMUE_COMPILE_USE_SYSTEM_FLAC=ON" + ;; Disable download of soundfont during build. + "-DDOWNLOAD_SOUNDFONT=OFF" + ;; Don't bundle Qt QML files, relevant really only for Darwin. + ;; "-DMUE_COMPILE_INSTALL_QTQML_FILES=OFF" + ) ;; There are tests, but no simple target to run. The command used to ;; run them is: ;; @@ -5404,30 +5414,31 @@ (define-public musescore ;; So we simply skip them. #:tests? #f)) (native-inputs - (list git-minimal pkg-config qttools-5)) + (list git-minimal pkg-config qttools)) (inputs (list alsa-lib freetype `(,gtk+ "bin") ;for gtk-update-icon-cache + harfbuzz-meson jack-1 lame libogg + libopusenc libsndfile libvorbis portaudio portmidi pulseaudio python - qtbase-5 - qtdeclarative-5 - qtgraphicaleffects - qtnetworkauth-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtscript - qtsvg-5 - qtx11extras - qtxmlpatterns)) + qt5compat + qtbase + qtdeclarative + qtnetworkauth + qtscxml + qtshadertools + qtsvg + qtwayland + tinyxml2)) (propagated-inputs (list `(,alsa-plugins "pulseaudio"))) ;for libasound_module_conf_pulse.so (synopsis "Music composition and notation software") -- 2.47.1