From nobody Sun Apr 27 03:12:50 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZlWq674vtz5vB3R; Sun, 27 Apr 2025 03:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZlWq65H4xz442b; Sun, 27 Apr 2025 03:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745723570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59HkAPak2nRIZmGmvjjYGQfjkl0f2OEtHDGGD+P/1LI=; b=ByWv0WVbtgzlchRGqPEYlVbDkKiYoYD71h9vEWHDUX8zSbYxH7muXMJHfNfIGpzp5NbdUF +UeLP3pZamlVMNCRZuvtlXeCQenRD/5zNGpMq//0D2q4hIuc5gxR0YOn5UpEWDF7nfoHuR kx+rh6luolD/5J2VrnFc+pDlOlaY4ywlFvWFDlR/x7S0mJzKjf6mu25gV+DTB9uHVreTqy 1eeWz2NoVRoWETNg/wA7ipt/HTnilRL86n61Dq1pLEf/e37Yiw8hHCafvl+/BSPXOBKneT LKtFBby/NWZSLD/mNTFIfXoIY4jBT1MNNGzpLpL1Ma8F2sX0Gtth+mCXKlOJ5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745723570; a=rsa-sha256; cv=none; b=F2SyfBanJeQFrsT6NX0D5MIaWtnKE1Chw6bDQ+vYBIoaFt8Y/OQ/Y2PC/i2pZO/jpJ5hk8 9SVeIAGladi4j3GsX83oDhYX7ulZUKSlpe+hThsDsdmC3n/cGOVDZAfRz4QlPvavV7/qb8 hY3kaYvTQqFDE7RKeFYiw0HRMDmglaMTqoYKPHgHft5Pti3lLIY+fqEbyDEhVn60Z2rhYy aj+bLTZ4zOMOoA/rKlkziwb9HHqJfe8gcB8wz9l17YJZkm+WkFXsb/6VzmnMlC3YKmvg9l lkFyaSiGbU1AyggTMW7EQtg5U4Ci/bhWlvQBYBOC1KtXk9qApmN2TbJrrdghzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745723570; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59HkAPak2nRIZmGmvjjYGQfjkl0f2OEtHDGGD+P/1LI=; b=UYqgSeGUA9f8qJA2PSHFGk7COg3FIP3/RA9AjF3LEcQtha/Q13arPQ//gWgsoFyM+lbC3a cIgerDDmsanSF9WwqrKhdSZZmeOpTLUP6xnkG6sD0h4dyRYuOPE5JaJv+IKMpiNJyTPe7Q fCtLaWIEzi8u36TcV/nTepL2wnka+sZkdNnTboUm1ZHPC78/ydUG5SpzkuYyFrLHWowReT DjshS1hzqIPxzUn9UGoCIWKvMlG8gpsapvLlSteYjoGtKYKGVBHtEoFdalcGEXbGVxbCk2 Xlt8i65pOTBAfqutg9BEJP4vRsCQnZMK5uULqcufo+VcQ6qp2N7RcYxBliwpyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZlWq64QrQzpl7; Sun, 27 Apr 2025 03:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53R3CosI094113; Sun, 27 Apr 2025 03:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53R3Cowf094110; Sun, 27 Apr 2025 03:12:50 GMT (envelope-from git) Date: Sun, 27 Apr 2025 03:12:50 GMT Message-Id: <202504270312.53R3Cowf094110@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: e08d7fba8f0c - main - audio/musescore: Fix build with Qt 6.9 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e08d7fba8f0cb9139c8d0cb5f2246fe82c313d5d Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=e08d7fba8f0cb9139c8d0cb5f2246fe82c313d5d commit e08d7fba8f0cb9139c8d0cb5f2246fe82c313d5d Author: Jason E. Hale AuthorDate: 2025-04-27 02:50:22 +0000 Commit: Jason E. Hale CommitDate: 2025-04-27 03:09:34 +0000 audio/musescore: Fix build with Qt 6.9 With hat: kde@ PR: 286051 --- audio/musescore/Makefile | 3 +++ audio/musescore/distinfo | 2 ++ ...rc_palette_view_widgets_specialcharactersdialog.cpp | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+) diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile index dc119dfa74fb..39b2a3887458 100644 --- a/audio/musescore/Makefile +++ b/audio/musescore/Makefile @@ -3,6 +3,9 @@ DISTVERSIONPREFIX= v DISTVERSION= 4.5.1 CATEGORIES= audio +PATCH_SITES= https://github.com/musescore/MuseScore/commit/ +PATCHFILES+= 05056ed19520060c3912a09a3adfa0927057f956.patch:-p1 # Fix build with Qt >= 6.9.0 + MAINTAINER= adridg@FreeBSD.org COMMENT= Free music composition & notation software WWW= https://musescore.org/ \ diff --git a/audio/musescore/distinfo b/audio/musescore/distinfo index 8c86984c3555..772f4fb39788 100644 --- a/audio/musescore/distinfo +++ b/audio/musescore/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1743123988 SHA256 (musescore-MuseScore-v4.5.1-v4.5_GH0.tar.gz) = 13807e7970bb7506d1e06ce32798b020609409c96f4f0b9ff3b41ced596e74fd SIZE (musescore-MuseScore-v4.5.1-v4.5_GH0.tar.gz) = 144425720 +SHA256 (05056ed19520060c3912a09a3adfa0927057f956.patch) = 8f8b1d947562ccb78875c00f50ece2ba32cb2ff38ef9da6350fc1eae4eac734a +SIZE (05056ed19520060c3912a09a3adfa0927057f956.patch) = 3471 diff --git a/audio/musescore/files/patch-src_palette_view_widgets_specialcharactersdialog.cpp b/audio/musescore/files/patch-src_palette_view_widgets_specialcharactersdialog.cpp new file mode 100644 index 000000000000..5c7526072218 --- /dev/null +++ b/audio/musescore/files/patch-src_palette_view_widgets_specialcharactersdialog.cpp @@ -0,0 +1,18 @@ +Fix build with Qt >= 6.9.0 + +/wrkdirs/usr/ports/audio/musescore/work/MuseScore-4.5/src/palette/view/widgets/specialcharactersdialog.cpp:715:55: +error: no matching member function for call to 'arg' + 715 | m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QChar('0'))); + | ~~~~~~~~~~~~~~~~^~~ + +--- src/palette/view/widgets/specialcharactersdialog.cpp.orig 2025-03-13 18:44:57 UTC ++++ src/palette/view/widgets/specialcharactersdialog.cpp +@@ -712,7 +712,7 @@ void SpecialCharactersDialog::populateUnicode() + std::shared_ptr fs = std::make_shared(gpaletteScore->dummy()); + fs->setCode(code); + fs->setFont(m_font); +- m_pUnicode->appendElement(fs, QString("0x%1").arg(code, 5, 16, QLatin1Char('0'))); ++ m_pUnicode->appendElement(fs, QString("0x%1").arg(static_cast(code), 5, 16, QLatin1Char('0'))); + } + } +