[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: c3a97562654b5ee9cd9f80793993735089d8cd87
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Sep 16 09:01:15 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Sep 16 09:01:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a97562

media-sound/musescore: bump to 4.4.2, dropped 4.4.1

Bug: https://bugs.gentoo.org/938968
Bug: https://bugs.gentoo.org/926328
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest  | 2 +-
 .../musescore/{musescore-4.4.1.ebuild => musescore-4.4.2.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index a6de463cbe3c..a2f1fa884d31 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 
02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970
 SHA512 
9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
-DIST musescore-4.4.1.tar.gz 144734281 BLAKE2B 
97ba6dab964e5eb87984aa60381134dbd8dc687700b90001df6943a86b5bdf7df63fe026854800dfa16b329c71afd13f86569b494174a8dc22bac5bfc7162acc
 SHA512 
54cd782be642e1da7e7c3bf2362a207c44aa103cf3cc2d33f63e25fea914753c886a691dfb823737f29c100fb592e91741524bc564abc1c975722174951ddf38
+DIST musescore-4.4.2.tar.gz 144781022 BLAKE2B 
31f3984d63bed5a6a1019c56f3db606f6beacb16f7b96457f04e0542b886e1462bce3ad2a69bb9e98212f8ec1735d5f90d03df04652636faffd78ddb2473bf92
 SHA512 
13b82f3e457b431b1c33937fe205b31d2c54ea321708aeb3d0b3459e4eda60fb1a53de3cd5e77955efa226171e96000a0772892055dc9d01e2986cd1e40bcfb0

diff --git a/media-sound/musescore/musescore-4.4.1.ebuild 
b/media-sound/musescore/musescore-4.4.2.ebuild
similarity index 100%
rename from media-sound/musescore/musescore-4.4.1.ebuild
rename to media-sound/musescore/musescore-4.4.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: c52ace2ab7cd12caf0e82f1e7f7817cf2400040d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep  6 09:21:04 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep  6 09:21:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52ace2a

media-sound/musescore: bump to 4.4.1, dropped 4.4.0-r1

Bug: https://bugs.gentoo.org/938968
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest  | 2 +-
 .../musescore/{musescore-4.4.0-r1.ebuild => musescore-4.4.1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index af7db4280db2..a6de463cbe3c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 
02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970
 SHA512 
9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
-DIST musescore-4.4.0.tar.gz 144645529 BLAKE2B 
477c6799fd253b1cf888ac3695fb60edf9e7612250ce66abad6a84dac44c088de96ba9af5c4c656e5fb6b247f57ba4c5156ebb6f9078ddb8ab928a1999e0c67b
 SHA512 
70413d50bb00cfc1a5399dfab185aacca42b087ac6097d74da80129052e9e1489fc659a167e2e282edd08ae77b6fdbea2f4765ad1a575a50df26618f4a70ec5a
+DIST musescore-4.4.1.tar.gz 144734281 BLAKE2B 
97ba6dab964e5eb87984aa60381134dbd8dc687700b90001df6943a86b5bdf7df63fe026854800dfa16b329c71afd13f86569b494174a8dc22bac5bfc7162acc
 SHA512 
54cd782be642e1da7e7c3bf2362a207c44aa103cf3cc2d33f63e25fea914753c886a691dfb823737f29c100fb592e91741524bc564abc1c975722174951ddf38

diff --git a/media-sound/musescore/musescore-4.4.0-r1.ebuild 
b/media-sound/musescore/musescore-4.4.1.ebuild
similarity index 98%
rename from media-sound/musescore/musescore-4.4.0-r1.ebuild
rename to media-sound/musescore/musescore-4.4.1.ebuild
index b25aa78b2e6c..288ff6994663 100644
--- a/media-sound/musescore/musescore-4.4.0-r1.ebuild
+++ b/media-sound/musescore/musescore-4.4.1.ebuild
@@ -60,7 +60,6 @@ DEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
-   "${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
"${FILESDIR}/${PN}-4.4.0-include.patch"
"${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.patch"
@@ -102,6 +101,7 @@ src_configure() {
-DMUE_COMPILE_USE_SYSTEM_OPUS=ON
-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
+   -DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
-DMUSE_APP_BUILD_MODE="release"
-DMUSE_MODULE_AUDIO_JACK="$(usex jack)"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: fb0b87365d7dd4fc7781c718f720ec069648f8f3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep  6 09:03:22 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep  6 09:03:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0b8736

media-sound/musescore: fixed some issues in 4.4.0 + updated live

added missing dep
added patch for missing main toolbar and menubar
added MUE_COMPILE_USE_SYSTEM_OPUS
live: added missing inlcude
live: added MUE_COMPILE_USE_SYSTEM_HARFBUZZ

Closes: https://bugs.gentoo.org/938586
Closes: https://bugs.gentoo.org/938970
Bug: https://bugs.gentoo.org/938968
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...escore-4.4.0-fix-main-toolbar-and-menubar.patch | 38 ++
 .../files/musescore-4.5.0-missing-include.patch| 10 ++
 ...core-4.4.0.ebuild => musescore-4.4.0-r1.ebuild} |  3 ++
 media-sound/musescore/musescore-.ebuild|  6 +++-
 4 files changed, 56 insertions(+), 1 deletion(-)

diff --git 
a/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch
 
b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch
new file mode 100644
index ..6abc9e4fbd95
--- /dev/null
+++ 
b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch
@@ -0,0 +1,38 @@
+From b274f13311ad0b2bce339634a006ba22fbd3379e Mon Sep 17 00:00:00 2001
+From: Ken Bloom 
+Date: Fri, 30 Aug 2024 09:17:27 -0400
+Subject: [PATCH] Fix MainToolbar, and AppMenuBar in Qt 6.5+
+
+The problem was that a ListView lazily creates delegates as needed to
+actually display them. If the size of the ListView is 0, then it doesn't
+need to display anything, so it may not create any of the delegates. If
+it doesn't create any delegates, then we can't make it size itself to
+fit its contents. By setting a minimum size of 1, we force the ListView
+to create a delegate that we can then use to determine the ListView's
+actual size.
+
+Fixes: #24097
+--- a/src/appshell/qml/MainToolBar.qml
 b/src/appshell/qml/MainToolBar.qml
+@@ -70,8 +70,8 @@ Item {
+ 
+ model: toolBarModel
+ 
+-width: contentItem.childrenRect.width
+-height: contentItem.childrenRect.height
++width: Math.max(1, contentItem.childrenRect.width)
++height: Math.max(1, contentItem.childrenRect.height)
+ 
+ delegate: PageTabButton {
+ id: radioButtonDelegate
+--- a/src/appshell/qml/platform/AppMenuBar.qml
 b/src/appshell/qml/platform/AppMenuBar.qml
+@@ -28,7 +28,7 @@ import MuseScore.AppShell 1.0
+ ListView {
+ id: root
+ 
+-height: contentItem.childrenRect.height
++height: Math.max(1,contentItem.childrenRect.height)
+ width: contentWidth
+ 
+ property alias appWindow: appMenuModel.appWindow

diff --git a/media-sound/musescore/files/musescore-4.5.0-missing-include.patch 
b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch
new file mode 100644
index ..b4a5105b
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/framework/extensions/devtools/apidumpmodel.cpp
 b/src/framework/extensions/devtools/apidumpmodel.cpp
+@@ -22,6 +22,7 @@
+ #include "apidumpmodel.h"
+ 
+ #include 
++#include 
+ 
+ #include "extensions/api/extapi.h"
+ 

diff --git a/media-sound/musescore/musescore-4.4.0.ebuild 
b/media-sound/musescore/musescore-4.4.0-r1.ebuild
similarity index 96%
rename from media-sound/musescore/musescore-4.4.0.ebuild
rename to media-sound/musescore/musescore-4.4.0-r1.ebuild
index 7dc814a8631c..b25aa78b2e6c 100644
--- a/media-sound/musescore/musescore-4.4.0.ebuild
+++ b/media-sound/musescore/musescore-4.4.0-r1.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 RDEPEND="
dev-libs/tinyxml2:=
dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml]
+   dev-qt/qt5compat:6[qml]
dev-qt/qtdeclarative:6
dev-qt/qtnetworkauth:6
dev-qt/qtscxml:6
@@ -62,6 +63,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
"${FILESDIR}/${PN}-4.4.0-include.patch"
+   "${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.patch"
 )
 
 src_unpack() {
@@ -97,6 +99,7 @@ src_configure() {
-DMUE_COMPILE_USE_CCACHE=OFF
-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+   -DMUE_COMPILE_USE_SYSTEM_OPUS=ON
-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 7dc814a8631c..a301de148da8 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 RDEPEND="
dev-libs/tinyxml2:=
dev-qt/qtbase

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/

[Joonas Niilola]

commit: 302c23d4976a3d12e5385fee424c28a0d5bc34a8
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Aug 28 07:15:19 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug 28 07:25:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=302c23d4

media-sound/musescore: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/musescore--unbundle-deps.patch   | 120 -
 1 file changed, 120 deletions(-)

diff --git a/media-sound/musescore/files/musescore--unbundle-deps.patch 
b/media-sound/musescore/files/musescore--unbundle-deps.patch
deleted file mode 100644
index bac09d7eaa82..
--- a/media-sound/musescore/files/musescore--unbundle-deps.patch
+++ /dev/null
@@ -1,120 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,7 +206,7 @@ if (MUE_BUILD_UNIT_TESTS)
- FULL_DOCS "List XML files outputted by google test."
- )
- 
--add_subdirectory(thirdparty/googletest)
-+find_package(GTest REQUIRED)
- endif(MUE_BUILD_UNIT_TESTS)
- 
- add_subdirectory(share)
 a/src/framework/audio/CMakeLists.txt
-+++ b/src/framework/audio/CMakeLists.txt
-@@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
- ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
- )
- 
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
-+pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
-+pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
-+pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
-+pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
- 
--set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
-+set(MODULE_LINK
-+${MODULE_LINK}
-+PkgConfig::lame
-+PkgConfig::libopusenc
-+PkgConfig::flac
-+PkgConfig::flacpp
-+)
- endif()
- 
- if (ARCH_IS_X86_64)
 a/src/framework/audio/internal/encoders/mp3encoder.cpp
-+++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "mp3encoder.h"
- 
--#include "lame.h"
-+#include "lame/lame.h"
- 
- using namespace mu;
- using namespace mu::audio;
 a/src/framework/audio/internal/encoders/oggencoder.cpp
-+++ b/src/framework/audio/internal/encoders/oggencoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "oggencoder.h"
- 
--#include "opusenc.h"
-+#include "opus/opusenc.h"
- 
- #include "log.h"
- 
 a/src/framework/global/CMakeLists.txt
-+++ b/src/framework/global/CMakeLists.txt
-@@ -112,9 +112,6 @@ set(MODULE_SRC
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
--${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.cpp
--${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.h
--${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/mu_patch.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
-@@ -132,6 +129,8 @@ set(MODULE_SRC
- ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
- )
- 
-+find_package(tinyxml2 REQUIRED)
-+
- if (GLOBAL_NO_INTERNAL)
- set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
- else()
-@@ -213,6 +212,7 @@ list(APPEND MODULE_INCLUDE
- list(APPEND MODULE_LINK
- ${FS_LIB}
- ${Z_LIB}
-+tinyxml2::tinyxml2
- )
- 
- if (MUE_ENABLE_CUSTOM_ALLOCATOR)
 a/src/framework/global/serialization/xmldom.cpp
-+++ b/src/framework/global/serialization/xmldom.cpp
-@@ -21,7 +21,7 @@
-  */
- #include "xmldom.h"
- 
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include 
- 
- #include "log.h"
- 
 a/src/framework/global/serialization/xmlstreamreader.cpp
-+++ b/src/framework/global/serialization/xmlstreamreader.cpp
-@@ -25,7 +25,7 @@
- 
- #include "global/types/string.h"
- 
--#include "thirdparty/tinyxml/tinyxml2.h"
-+#include 
- 
- #include "log.h"
- 
 a/src/framework/testing/gtest.cmake
-+++ b/src/framework/testing/gtest.cmake
-@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
- target_link_libraries(${MODULE_TEST}
- Qt5::Core
- Qt5::Gui
--gmock
-+GTest::gmock
- global
- ${MODULE_TEST_LINK}
- )

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: 3c5013cb5f32ff38db883fe4dc27a127db09487d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug 27 09:12:40 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug 27 09:12:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5013cb

media-sound/musescore: bump to 4.4.0 + updated live

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest|  1 +
 media-sound/musescore/files/musescore-4.4.0-include.patch | 11 +++
 .../{musescore-.ebuild => musescore-4.4.0.ebuild} |  1 +
 media-sound/musescore/musescore-.ebuild   |  1 +
 4 files changed, 14 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0c1a8f18e1b7..af7db4280db2 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 
02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970
 SHA512 
9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
+DIST musescore-4.4.0.tar.gz 144645529 BLAKE2B 
477c6799fd253b1cf888ac3695fb60edf9e7612250ce66abad6a84dac44c088de96ba9af5c4c656e5fb6b247f57ba4c5156ebb6f9078ddb8ab928a1999e0c67b
 SHA512 
70413d50bb00cfc1a5399dfab185aacca42b087ac6097d74da80129052e9e1489fc659a167e2e282edd08ae77b6fdbea2f4765ad1a575a50df26618f4a70ec5a

diff --git a/media-sound/musescore/files/musescore-4.4.0-include.patch 
b/media-sound/musescore/files/musescore-4.4.0-include.patch
new file mode 100644
index ..75257dffcf9c
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-include.patch
@@ -0,0 +1,11 @@
+--- a/src/framework/audio/internal/fx/reverb/vectorops.h
 b/src/framework/audio/internal/fx/reverb/vectorops.h
+@@ -27,6 +27,8 @@
+ 
+ #include 
+ 
++#include 
++
+ //
+ // This header is provided for convenience, to easily wrap vector operations 
around
+ // their platform-specific optimised libraries (e.g. IPP, vDSP), if desired.

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-4.4.0.ebuild
similarity index 98%
copy from media-sound/musescore/musescore-.ebuild
copy to media-sound/musescore/musescore-4.4.0.ebuild
index 06e97196028f..7dc814a8631c 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-4.4.0.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+   "${FILESDIR}/${PN}-4.4.0-include.patch"
 )
 
 src_unpack() {

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 06e97196028f..7dc814a8631c 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+   "${FILESDIR}/${PN}-4.4.0-include.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: 792e62986c7be8a0a683cd76a3f5048f723b8d4b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Aug 10 07:52:09 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Aug 10 07:52:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792e6298

media-sound/musescore: updated live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/musescore-4.4.0-unbundle-harfbuzz.patch  | 25 ++
 media-sound/musescore/musescore-.ebuild| 19 ++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git 
a/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch 
b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
new file mode 100644
index ..b9a1247a78c1
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-unbundle-harfbuzz.patch
@@ -0,0 +1,25 @@
+--- a/src/framework/draw/CMakeLists.txt
 b/src/framework/draw/CMakeLists.txt
+@@ -123,20 +123,14 @@ else()
+ include(${local_path}/harfbuzz.cmake)
+ 
+ # func from ${name}.cmake)
+-cmake_language(CALL harfbuzz_Populate ${remote_url} ${local_path} 
"source" "" "")
+ 
+-add_subdirectory(_deps/harfbuzz/harfbuzz)
+-target_no_warning(harfbuzz -Wno-conversion)
+-target_no_warning(harfbuzz -Wno-unused-parameter)
+-target_no_warning(harfbuzz -Wno-unused-variable)
+-target_no_warning(harfbuzz -WMSVC-no-hides-previous)
+-target_no_warning(harfbuzz -WMSVC-no-unreachable)
++pkg_check_modules(harfbuzz REQUIRED IMPORTED_TARGET harfbuzz)
+ 
+ #add_subdirectory(thirdparty/msdfgen)
+ 
+ set(MODULE_INCLUDE
+ ${FREETYPE_INCLUDE_DIRS}
+-${CMAKE_CURRENT_LIST_DIR}/_deps/harfbuzz/harfbuzz/harfbuzz/src
++  /usr/include/harfbuzz
+ #${CMAKE_CURRENT_LIST_DIR}/thirdparty/msdfgen/msdfgen-1.4
+ )
+ 

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 5e65d317f42e..06e97196028f 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -59,6 +59,7 @@ DEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
+   "${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 )
 
@@ -86,13 +87,11 @@ src_configure() {
export PATH="$(qt5_get_bindir):${PATH}"
 
local mycmakeargs=(
+   -DCMAKE_BUILD_TYPE="release"
-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
-DCMAKE_INSTALL_PREFIX=/usr
-DCMAKE_SKIP_RPATH=TRUE
-   -DMUE_BUILD_CRASHPAD_CLIENT=OFF
-   -DMUE_BUILD_UNIT_TESTS="$(usex test)"
-   -DMUE_BUILD_UPDATE_MODULE=OFF
-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
-DMUE_COMPILE_USE_CCACHE=OFF
-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
@@ -100,15 +99,23 @@ src_configure() {
-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
-   -DMUE_ENABLE_AUDIO_JACK=$(usex jack)
-   -DMUSESCORE_BUILD_MODE=release
+   -DMUSE_APP_BUILD_MODE="release"
+   -DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
+   -DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF
+   # tests
+   -DMUE_BUILD_BRAILLE_TESTS="$(usex test)"
+   -DMUE_BUILD_ENGRAVING_TESTS="$(usex test)"
+   -DMUE_BUILD_IMPORTEXPORT_TESTS="$(usex test)"
+   -DMUE_BUILD_NOTATION_TESTS="$(usex test)"
+   -DMUE_BUILD_PLAYBACK_TESTS="$(usex test)"
+   -DMUE_BUILD_PROJECT_TESTS="$(usex test)"
)
cmake_src_configure
 }
 
 src_compile() {
cd "${BUILD_DIR}" || die
-   cmake_build lrelease manpages
+   cmake_build
cmake_src_compile
 }
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Eli Schwartz]

commit: cd563cd1f55d614a7d6a2bed02e6845ac26a4893
Author: Eli Schwartz  gentoo  org>
AuthorDate: Mon Aug  5 03:33:19 2024 +
Commit: Eli Schwartz  gentoo  org>
CommitDate: Mon Aug  5 03:35:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd563cd1

media-sound/musescore: mark as LTO-unsafe

Only for an old version. Conveniently, the newer releases have an
entirely different LTO error, but are also already filtered. So let's
complete the set so we can close a bug in stable keywords...

Closes: https://bugs.gentoo.org/860885
Signed-off-by: Eli Schwartz  gentoo.org>

 media-sound/musescore/musescore-3.6.2-r1.ebuild | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild 
b/media-sound/musescore/musescore-3.6.2-r1.ebuild
index c5afad3d5f44..38e0104ea372 100644
--- a/media-sound/musescore/musescore-3.6.2-r1.ebuild
+++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake qmake-utils xdg check-reqs
+inherit cmake flag-o-matic qmake-utils xdg check-reqs
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -83,6 +83,12 @@ src_prepare() {
 }
 
 src_configure() {
+   # -Werror=odr
+   # https://bugs.gentoo.org/860885
+   #
+   # The relevant code no longer exists in later releases.
+   filter-lto
+
# bug #766111
export PATH="$(qt5_get_bindir):${PATH}"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: f895a6c52e021e2c0a60681fa8d3e9a4e6219504
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  4 11:59:10 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  4 11:59:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f895a6c5

media-sound/musescore: added missing dep in live

Closes: https://bugs.gentoo.org/937284
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 8ddeeb119d63..5e65d317f42e 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml]
dev-qt/qtdeclarative:6
dev-qt/qtnetworkauth:6
+   dev-qt/qtscxml:6
dev-qt/qtsvg:6
dev-qt/qttools:6[assistant]
>=media-libs/alsa-lib-1.0.0

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: 79e1d8024e0c4da90c68a43fc09395663426741f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  4 11:24:30 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  4 11:24:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e1d802

media-sound/musescore: dropped obsolete 4.2.1-r2

Bug: https://bugs.gentoo.org/937234
Closes: https://bugs.gentoo.org/927888
Bug: https://bugs.gentoo.org/926328
Bug: https://bugs.gentoo.org/923217
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |   1 -
 .../files/musescore-4.2.0-unbundle-deps.patch  | 119 --
 media-sound/musescore/metadata.xml |   1 -
 media-sound/musescore/musescore-4.2.1-r2.ebuild| 140 -
 4 files changed, 261 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 3175279d6972..0c1a8f18e1b7 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 
4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482
 SHA512 
db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
 DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 
02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970
 SHA512 
9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5

diff --git a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch 
b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
deleted file mode 100644
index 50b388814680..
--- a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
+++ /dev/null
@@ -1,119 +0,0 @@
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -185,7 +185,7 @@ if (MUE_BUILD_UNIT_TESTS)
- FULL_DOCS "List XML files outputted by google test."
- )
- 
--add_subdirectory(thirdparty/googletest)
-+find_package(GTest REQUIRED)
- endif(MUE_BUILD_UNIT_TESTS)
- 
- add_subdirectory(share)
 a/src/framework/audio/CMakeLists.txt
-+++ b/src/framework/audio/CMakeLists.txt
-@@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
- ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
- )
- 
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
-+pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
-+pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
-+pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
-+pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
- 
--set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
-+set(MODULE_LINK
-+${MODULE_LINK}
-+PkgConfig::lame
-+PkgConfig::libopusenc
-+PkgConfig::flac
-+PkgConfig::flacpp
-+)
- endif()
- 
- if (ARCH_IS_X86_64)
 a/src/framework/audio/internal/encoders/mp3encoder.cpp
-+++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "mp3encoder.h"
- 
--#include "lame.h"
-+#include "lame/lame.h"
- 
- using namespace mu;
- using namespace mu::audio;
 a/src/framework/audio/internal/encoders/oggencoder.cpp
-+++ b/src/framework/audio/internal/encoders/oggencoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "oggencoder.h"
- 
--#include "opusenc.h"
-+#include "opus/opusenc.h"
- 
- #include "log.h"
- 
 a/src/framework/global/CMakeLists.txt
-+++ b/src/framework/global/CMakeLists.txt
-@@ -111,8 +111,6 @@ set(MODULE_SRC
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
--${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp
--${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
- ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
- ${CMAKE_CURRENT_LIST_DIR}/serial

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: 1008ddf5eca0842300237e9127212a07ab126611
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  4 11:09:53 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  4 11:16:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1008ddf5

media-sound/musescore: partially updated live ebuild - doesn't configure yet

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/musescore-4.4.0-unbundle-deps.patch  | 26 
 media-sound/musescore/musescore-.ebuild| 36 ++
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/media-sound/musescore/files/musescore-4.4.0-unbundle-deps.patch 
b/media-sound/musescore/files/musescore-4.4.0-unbundle-deps.patch
new file mode 100644
index ..be611875e6a7
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-unbundle-deps.patch
@@ -0,0 +1,26 @@
+--- a/src/framework/audio/CMakeLists.txt
 b/src/framework/audio/CMakeLists.txt
+@@ -275,10 +275,10 @@ if (MUSE_MODULE_AUDIO_EXPORT)
+ ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+ )
+ 
+-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/thirdparty/lame lame)
++pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
+ set(MODULE_LINK
+ ${MODULE_LINK}
+-lame
++PkgConfig::lame
+ )
+ 
+ include(cmake/SetupOpusEnc.cmake)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
 b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ #include "log.h"
+ 

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 52aebfbedfc0..8ddeeb119d63 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -30,28 +30,16 @@ IUSE="jack test video"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
-   dev-qt/linguist-tools:5
+   dev-qt/qttools:6[linguist]
virtual/pkgconfig
 "
 RDEPEND="
dev-libs/tinyxml2:=
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtnetworkauth:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols:5
-   dev-qt/qtquickcontrols2:5[widgets]
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-   dev-qt/qtsvg:5
-   dev-qt/qtx11extras:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
+   dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml]
+   dev-qt/qtdeclarative:6
+   dev-qt/qtnetworkauth:6
+   dev-qt/qtsvg:6
+   dev-qt/qttools:6[assistant]
>=media-libs/alsa-lib-1.0.0
media-libs/flac:=
>=media-libs/freetype-2.5.2
@@ -63,15 +51,13 @@ RDEPEND="
jack? ( virtual/jack )
video? ( media-video/ffmpeg )
 "
-# dev-cpp/gtest is required even when tests are disabled!
 DEPEND="
${RDEPEND}
-   dev-cpp/gtest
 "
 
 PATCHES=(
"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
-   "${FILESDIR}/${PN}--unbundle-deps.patch"
+   "${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 )
 
@@ -89,11 +75,6 @@ src_prepare() {
 
# Move soundfonts to the correct directory
mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-
-   # Make sure we don't accidentally use bundled third party deps
-   # for which we want to use system packages instead.
-   rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
-   || die "Failed to remove unused thirdparty directories"
 }
 
 src_configure() {
@@ -113,7 +94,10 @@ src_configure() {
-DMUE_BUILD_UPDATE_MODULE=OFF
-DMUE_BUILD_VIDEOEXPORT_MODULE="$(usex video)"
-DMUE_COMPILE_USE_CCACHE=OFF
+   -DMUE_COMPILE_USE_SYSTEM_FLAC=ON
-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+   -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
+   -DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
-DMUE_ENABLE_AUDIO_JACK=$(usex jack)
-DMUSESCORE_BUILD_MODE=release

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: 8ca909496214ef0f4b7bc78eee1876100fc61caf
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  4 11:15:47 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  4 11:16:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ca90949

media-sound/musescore: dropped obsolete 4.0.2-r1

Closes: https://bugs.gentoo.org/922327
Closes: https://bugs.gentoo.org/922098
Closes: https://bugs.gentoo.org/921963
Closes: https://bugs.gentoo.org/909150
Closes: https://bugs.gentoo.org/908480
Closes: https://bugs.gentoo.org/908481
Closes: https://bugs.gentoo.org/908482
Closes: https://bugs.gentoo.org/907956
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |   1 -
 .../files/musescore-4.0.2-unbundle-deps.patch  | 121 --
 .../musescore-4.0.2-uncompressed-man-pages.patch   |  29 -
 media-sound/musescore/musescore-4.0.2-r1.ebuild| 139 -
 4 files changed, 290 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 249ebeb79d4d..3175279d6972 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,5 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B 
aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e
 SHA512 
fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
 DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 
4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482
 SHA512 
db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
 DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 
02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970
 SHA512 
9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5

diff --git a/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch 
b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
deleted file mode 100644
index 6c299d90da67..
--- a/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Unbundling of all dependencies which are currently available as system packages
-and have not been modified (to our knowledge) by MuseScore.
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -206,7 +206,7 @@ if (BUILD_UNIT_TESTS)
- FULL_DOCS "List XML files outputted by google test."
- )
- 
--add_subdirectory(thirdparty/googletest)
-+find_package(GTest REQUIRED)
- endif(BUILD_UNIT_TESTS)
- 
- add_subdirectory(share)
 a/src/framework/audio/CMakeLists.txt
-+++ b/src/framework/audio/CMakeLists.txt
-@@ -216,11 +216,18 @@ if (ENABLE_AUDIO_EXPORT)
- ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
- )
- 
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
--add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
-+pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
-+pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
-+pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
-+pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
- 
--set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
-+set(MODULE_LINK
-+${MODULE_LINK}
-+PkgConfig::lame
-+PkgConfig::libopusenc
-+PkgConfig::flac
-+PkgConfig::flacpp
-+)
- endif()
- 
- if (OS_IS_MAC)
 a/src/framework/audio/internal/encoders/mp3encoder.cpp
-+++ b/src/framework/audio/internal/encoders/mp3encoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "mp3encoder.h"
- 
--#include "lame.h"
-+#include "lame/lame.h"
- 
- using namespace mu;
- using namespace mu::audio;
 a/src/framework/audio/internal/encoders/oggencoder.cpp
-+++ b/src/framework/audio/internal/encoders/oggencoder.cpp
-@@ -22,7 +22,7 @@
- 
- #include "oggencoder.h"
- 
--#include "opusenc.h"
-+#include "opus/opusenc.h"
- 
- #include "l

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: 5de7b085ed9ca4babd3f0f9891b99a9d9338cc5a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  4 10:13:47 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  4 10:14:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de7b085

media-sound/musescore: bump to 4.3.2

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |   1 +
 .../files/musescore-4.3.2-unbundle-deps.patch  |  48 +++
 media-sound/musescore/musescore-4.3.2.ebuild   | 143 +
 3 files changed, 192 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 64ea10b591d3..249ebeb79d4d 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,3 +2,4 @@ DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B 
aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e
 SHA512 
fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
 DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 
4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482
 SHA512 
db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d
+DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 
02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970
 SHA512 
9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5

diff --git a/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch 
b/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
new file mode 100644
index ..6a3f44702f27
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
@@ -0,0 +1,48 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -188,7 +188,7 @@ if (MUE_BUILD_UNIT_TESTS)
+ FULL_DOCS "List XML files outputted by google test."
+ )
+ 
+-add_subdirectory(thirdparty/googletest)
++find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
 b/src/framework/audio/CMakeLists.txt
+@@ -268,10 +268,10 @@ if (MUE_ENABLE_AUDIO_EXPORT)
+ ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+ )
+ 
+-add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
++pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
+ set(MODULE_LINK
+ ${MODULE_LINK}
+-lame
++PkgConfig::lame
+ )
+ if (MUE_COMPILE_USE_SYSTEM_OPUSENC)
+ pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
 b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/testing/gtest.cmake
 b/src/framework/testing/gtest.cmake
+@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+ target_link_libraries(${MODULE_TEST}
+ Qt5::Core
+ Qt5::Gui
+-gmock
++GTest::gmock
+ global
+ ${MODULE_TEST_LINK}
+ )

diff --git a/media-sound/musescore/musescore-4.3.2.ebuild 
b/media-sound/musescore/musescore-4.3.2.ebuild
new file mode 100644
index ..b5a97d520654
--- /dev/null
+++ b/media-sound/musescore/musescore-4.3.2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/musescore/MuseScore.git";
+else
+   SRC_URI="
+   https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   "
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/";
+# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version 
can 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: e2d981ee75b9d7f857d4c4809d1292684d0a821c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  4 09:41:05 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  4 09:41:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d981ee

media-sound/musescore: updated patch in live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../musescore-4.4.0-uncompressed-man-pages.patch   | 29 ++
 media-sound/musescore/musescore-.ebuild|  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git 
a/media-sound/musescore/files/musescore-4.4.0-uncompressed-man-pages.patch 
b/media-sound/musescore/files/musescore-4.4.0-uncompressed-man-pages.patch
new file mode 100644
index ..7749ed7aa8b9
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-uncompressed-man-pages.patch
@@ -0,0 +1,29 @@
+--- a/buildscripts/packaging/Linux+BSD/SetupAppImagePackaging.cmake
 b/buildscripts/packaging/Linux+BSD/SetupAppImagePackaging.cmake
+@@ -99,7 +99,7 @@ configure_file(${MAN_TARGET} ${MAN_BUILD})
+ # Note: Compressing man pages is normal on Linux but not OpenBSD
+ find_program(GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages 
(optional).")
+ 
+-if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+ message(STATUS "Found 'gzip'. Man pages will be compressed.")
+ set(MAN_TARGET ${MAN_BUILD})
+ set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
+@@ -116,7 +116,7 @@ if(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES 
"OpenBSD")
+ COMMAND echo "Man pages have been compressed ready for installation."
+ VERBATIM
+ )
+-else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+ if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ message(STATUS "System is OpenBSD: Man pages will not be compressed.")
+ else(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -127,7 +127,7 @@ else(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES 
"OpenBSD")
+ COMMAND echo "Man pages will be installed uncompressed."
+ VERBATIM
+ )
+-endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++endif(GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND false)
+ 
+ # Install man pages in either compressed or uncompressed form
+ install(FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 2479f5aa8f21..52aebfbedfc0 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -70,7 +70,7 @@ DEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+   "${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
"${FILESDIR}/${PN}--unbundle-deps.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 )

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 18f631b08c0403ce11e6cbf59daf1ce47f6a9392
Author: Violet Purcell  inventati  org>
AuthorDate: Fri Apr 12 13:58:44 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr 13 07:27:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f631b0

media-sound/musescore: filter LTO

Closes: https://bugs.gentoo.org/908808
Signed-off-by: Violet Purcell  inventati.org>
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-4.0.2-r1.ebuild | 5 -
 media-sound/musescore/musescore-4.2.1-r2.ebuild | 5 -
 media-sound/musescore/musescore-.ebuild | 5 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/media-sound/musescore/musescore-4.0.2-r1.ebuild 
b/media-sound/musescore/musescore-4.0.2-r1.ebuild
index 306c6bf08537..b2186e4cc9ea 100644
--- a/media-sound/musescore/musescore-4.0.2-r1.ebuild
+++ b/media-sound/musescore/musescore-4.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 #CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
 VIRTUALX_REQUIRED="test"
-inherit cmake qmake-utils xdg check-reqs virtualx
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -95,6 +95,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # confuses rcc, bug #908808
+   filter-lto
+
# bug #766111
export PATH="$(qt5_get_bindir):${PATH}"
 

diff --git a/media-sound/musescore/musescore-4.2.1-r2.ebuild 
b/media-sound/musescore/musescore-4.2.1-r2.ebuild
index 09adc4123499..5ae8b777d43e 100644
--- a/media-sound/musescore/musescore-4.2.1-r2.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 CHECKREQS_DISK_BUILD=3500M
 VIRTUALX_REQUIRED="test"
-inherit cmake qmake-utils xdg check-reqs virtualx
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -97,6 +97,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # confuses rcc, bug #908808
+   filter-lto
+
# bug #766111
export PATH="$(qt5_get_bindir):${PATH}"
 

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 5ea71c947e32..33a1e7e042aa 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 CHECKREQS_DISK_BUILD=3500M
 VIRTUALX_REQUIRED="test"
-inherit cmake qmake-utils xdg check-reqs virtualx
+inherit cmake flag-o-matic qmake-utils xdg check-reqs virtualx
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -96,6 +96,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # confuses rcc, bug #908808
+   filter-lto
+
# bug #766111
export PATH="$(qt5_get_bindir):${PATH}"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 8d9464cb6477b35c364d0f8ab15fafb7c090e43c
Author: Violet Purcell  inventati  org>
AuthorDate: Fri Apr 12 14:00:05 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr 13 07:27:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9464cb

media-sound/musescore: unconditionally BDEPEND on dev-cpp/gtest

This was the case in 4.0.2-r1, but for some reason got dropped during
the 4.2.1 bump.

Closes: https://bugs.gentoo.org/922748
Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/36226
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-4.2.1-r2.ebuild | 3 ++-
 media-sound/musescore/musescore-.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/musescore-4.2.1-r2.ebuild 
b/media-sound/musescore/musescore-4.2.1-r2.ebuild
index 5ae8b777d43e..9e3eb5ad3fc8 100644
--- a/media-sound/musescore/musescore-4.2.1-r2.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild
@@ -63,9 +63,10 @@ RDEPEND="
jack? ( virtual/jack )
video? ( media-video/ffmpeg )
 "
+# dev-cpp/gtest is required even when tests are disabled!
 DEPEND="
${RDEPEND}
-   test? ( dev-cpp/gtest )
+   dev-cpp/gtest
 "
 
 PATCHES=(

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 33a1e7e042aa..2479f5aa8f21 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -63,9 +63,10 @@ RDEPEND="
jack? ( virtual/jack )
video? ( media-video/ffmpeg )
 "
+# dev-cpp/gtest is required even when tests are disabled!
 DEPEND="
${RDEPEND}
-   test? ( dev-cpp/gtest )
+   dev-cpp/gtest
 "
 
 PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: 5aaa8f5287fef487d369c16d897e0171d01af00b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Feb  9 08:08:01 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb  9 08:08:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aaa8f52

media-sound/musescore: updated live ebuild patches

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/musescore--unbundle-deps.patch   | 120 +
 media-sound/musescore/musescore-.ebuild|   3 +-
 2 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/files/musescore--unbundle-deps.patch 
b/media-sound/musescore/files/musescore--unbundle-deps.patch
new file mode 100644
index ..bac09d7eaa82
--- /dev/null
+++ b/media-sound/musescore/files/musescore--unbundle-deps.patch
@@ -0,0 +1,120 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -206,7 +206,7 @@ if (MUE_BUILD_UNIT_TESTS)
+ FULL_DOCS "List XML files outputted by google test."
+ )
+ 
+-add_subdirectory(thirdparty/googletest)
++find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
 b/src/framework/audio/CMakeLists.txt
+@@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT)
+ ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+ )
+ 
+-add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
++pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
++pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
++pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
++pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
+ 
+-set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
++set(MODULE_LINK
++${MODULE_LINK}
++PkgConfig::lame
++PkgConfig::libopusenc
++PkgConfig::flac
++PkgConfig::flacpp
++)
+ endif()
+ 
+ if (ARCH_IS_X86_64)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
 b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/audio/internal/encoders/oggencoder.cpp
 b/src/framework/audio/internal/encoders/oggencoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "oggencoder.h"
+ 
+-#include "opusenc.h"
++#include "opus/opusenc.h"
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/CMakeLists.txt
 b/src/framework/global/CMakeLists.txt
+@@ -112,9 +112,6 @@ set(MODULE_SRC
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
+-${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.cpp
+-${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/tinyxml2.h
+-${CMAKE_CURRENT_LIST_DIR}/thirdparty/tinyxml/mu_patch.h
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
+@@ -132,6 +129,8 @@ set(MODULE_SRC
+ ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
+ )
+ 
++find_package(tinyxml2 REQUIRED)
++
+ if (GLOBAL_NO_INTERNAL)
+ set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
+ else()
+@@ -213,6 +212,7 @@ list(APPEND MODULE_INCLUDE
+ list(APPEND MODULE_LINK
+ ${FS_LIB}
+ ${Z_LIB}
++tinyxml2::tinyxml2
+ )
+ 
+ if (MUE_ENABLE_CUSTOM_ALLOCATOR)
+--- a/src/framework/global/serialization/xmldom.cpp
 b/src/framework/global/serialization/xmldom.cpp
+@@ -21,7 +21,7 @@
+  */
+ #include "xmldom.h"
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include 
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/serialization/xmlstreamreader.cpp
 b/src/framework/global/serialization/xmlstreamreader.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include "global/types/string.h"
+ 
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include 
+ 
+ #include "log.h"
+ 
+--- a/src/framework/testing/gtest.cmake
 b/src/framework/testing/gtest.cmake
+@@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED)
+ target_link_libraries(${MODULE_TEST}
+ Qt5::Core
+ Qt5::Gui
+-gmock
++GTest::gmock
+ global
+ ${MODULE_TEST_LINK}
+ )

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 09adc4123499..5ea71c947e32 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -70,9 +70,8 @@ DEPEND="
 
 PATCHES=(
"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
-   "${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
+   "${FILESDIR}/${PN}--unbundle-deps.patch"
"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 86e5d52b17665ffd68c1d3be036bc7addf4bf37b
Author: Violet Purcell  inventati  org>
AuthorDate: Thu Feb  8 15:16:02 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb  9 08:08:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e5d52b

media-sound/musescore: add jack use flag

Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/35230
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index de9540eac6c5..09adc4123499 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="test video"
+IUSE="jack test video"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
media-libs/opus
media-sound/lame
sys-libs/zlib:=
+   jack? ( virtual/jack )
video? ( media-video/ffmpeg )
 "
 DEPEND="
@@ -111,6 +112,7 @@ src_configure() {
-DMUE_COMPILE_USE_CCACHE=OFF
-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
+   -DMUE_ENABLE_AUDIO_JACK=$(usex jack)
-DMUSESCORE_BUILD_MODE=release
)
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 867db0682e14752f4f2ff1ead7c1fe6dcb96e9c1
Author: Violet Purcell  inventati  org>
AuthorDate: Thu Feb  8 15:16:02 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb  9 08:08:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867db068

media-sound/musescore: add jack use flag

Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/35230
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-4.2.1-r2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-4.2.1-r2.ebuild 
b/media-sound/musescore/musescore-4.2.1-r2.ebuild
index de9540eac6c5..09adc4123499 100644
--- a/media-sound/musescore/musescore-4.2.1-r2.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild
@@ -26,7 +26,7 @@ SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="test video"
+IUSE="jack test video"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -60,6 +60,7 @@ RDEPEND="
media-libs/opus
media-sound/lame
sys-libs/zlib:=
+   jack? ( virtual/jack )
video? ( media-video/ffmpeg )
 "
 DEPEND="
@@ -111,6 +112,7 @@ src_configure() {
-DMUE_COMPILE_USE_CCACHE=OFF
-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
+   -DMUE_ENABLE_AUDIO_JACK=$(usex jack)
-DMUSESCORE_BUILD_MODE=release
)
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Jason A. Donenfeld]

commit: 178e455e0d340ab8b4b79273a80acde620df6653
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Tue Feb  6 19:44:25 2024 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Tue Feb  6 19:47:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=178e455e

media-sound/musescore: update missing headers patch for 4.2.1

Signed-off-by: Jason A. Donenfeld  gentoo.org>

 ...patch => musescore-4.2.1-missing-headers.patch} | 22 ++
 ...e-4.2.1-r1.ebuild => musescore-4.2.1-r2.ebuild} |  2 +-
 media-sound/musescore/musescore-.ebuild|  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch 
b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
similarity index 61%
rename from media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
rename to media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
index 2a40ccc00c35..56ae1f4fa2d6 100644
--- a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
+++ b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
@@ -18,6 +18,17 @@
  
  #include "modularity/ioc.h"
  #include "../iinteractiveprovider.h"
+--- a/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
 b/src/importexport/musicxml/internal/musicxml/musicxmlsupport.cpp
+@@ -34,6 +34,8 @@
+ 
+ #include "log.h"
+ 
++#include 
++
+ using AccidentalType = mu::engraving::AccidentalType;
+ using SymId = mu::engraving::SymId;
+ const static std::map smuflAccidentalTypes {
 --- a/src/importexport/videoexport/internal/videowriter.cpp
 +++ b/src/importexport/videoexport/internal/videowriter.cpp
 @@ -32,6 +32,8 @@
@@ -39,3 +50,14 @@
  
  #include "async/asyncable.h"
  
+--- a/src/project/internal/exporttype.h
 b/src/project/internal/exporttype.h
+@@ -23,6 +23,8 @@
+ #define MU_PROJECT_EXPORTTYPE_H
+ 
+ #include 
++#include 
++#include 
+ 
+ #include "containers.h"
+ 

diff --git a/media-sound/musescore/musescore-4.2.1-r1.ebuild 
b/media-sound/musescore/musescore-4.2.1-r2.ebuild
similarity index 98%
rename from media-sound/musescore/musescore-4.2.1-r1.ebuild
rename to media-sound/musescore/musescore-4.2.1-r2.ebuild
index cb7e3aaf3288..de9540eac6c5 100644
--- a/media-sound/musescore/musescore-4.2.1-r1.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r2.ebuild
@@ -70,8 +70,8 @@ DEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
-   "${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+   "${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
 )
 
 src_unpack() {

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index cb7e3aaf3288..de9540eac6c5 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -70,8 +70,8 @@ DEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
"${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
-   "${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+   "${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 3b3bfc07477a9f2f4f18e20bea8287584c6e41a5
Author: Violet Purcell  inventati  org>
AuthorDate: Thu Jan 25 01:02:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 25 01:14:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3bfc07

media-sound/musescore: remove stale dev-qt/designer dependency

Closes: https://bugs.gentoo.org/917352
Signed-off-by: Violet Purcell  inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/34999
Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-4.0.2-r1.ebuild | 1 -
 media-sound/musescore/musescore-4.2.1-r1.ebuild | 1 -
 media-sound/musescore/musescore-.ebuild | 1 -
 3 files changed, 3 deletions(-)

diff --git a/media-sound/musescore/musescore-4.0.2-r1.ebuild 
b/media-sound/musescore/musescore-4.0.2-r1.ebuild
index 9354cdefb72b..306c6bf08537 100644
--- a/media-sound/musescore/musescore-4.0.2-r1.ebuild
+++ b/media-sound/musescore/musescore-4.0.2-r1.ebuild
@@ -36,7 +36,6 @@ BDEPEND="
 "
 RDEPEND="
dev-libs/tinyxml2:=
-   dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdeclarative:5

diff --git a/media-sound/musescore/musescore-4.2.1-r1.ebuild 
b/media-sound/musescore/musescore-4.2.1-r1.ebuild
index e3b430850d93..cb7e3aaf3288 100644
--- a/media-sound/musescore/musescore-4.2.1-r1.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r1.ebuild
@@ -35,7 +35,6 @@ BDEPEND="
 "
 RDEPEND="
dev-libs/tinyxml2:=
-   dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index e3b430850d93..cb7e3aaf3288 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -35,7 +35,6 @@ BDEPEND="
 "
 RDEPEND="
dev-libs/tinyxml2:=
-   dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtdbus:5

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 214b0bb1bbceeef27431280524ba4316d5c56d75
Author: Violet Purcell  inventati  org>
AuthorDate: Thu Jan 25 01:00:45 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan 25 01:14:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214b0bb1

media-sound/musescore: add missing qtquickcontrols2[widgets] usedep

Signed-off-by: Violet Purcell  inventati.org>
Signed-off-by: Sam James  gentoo.org>

 .../musescore/{musescore-4.0.2.ebuild => musescore-4.0.2-r1.ebuild}   | 4 ++--
 .../musescore/{musescore-4.2.1.ebuild => musescore-4.2.1-r1.ebuild}   | 2 +-
 media-sound/musescore/musescore-.ebuild   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/musescore/musescore-4.0.2.ebuild 
b/media-sound/musescore/musescore-4.0.2-r1.ebuild
similarity index 97%
rename from media-sound/musescore/musescore-4.0.2.ebuild
rename to media-sound/musescore/musescore-4.0.2-r1.ebuild
index 2d93d60af02b..9354cdefb72b 100644
--- a/media-sound/musescore/musescore-4.0.2.ebuild
+++ b/media-sound/musescore/musescore-4.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -47,7 +47,7 @@ RDEPEND="
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols:5
-   dev-qt/qtquickcontrols2:5
+   dev-qt/qtquickcontrols2:5[widgets]
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
dev-qt/qtx11extras:5

diff --git a/media-sound/musescore/musescore-4.2.1.ebuild 
b/media-sound/musescore/musescore-4.2.1-r1.ebuild
similarity index 98%
rename from media-sound/musescore/musescore-4.2.1.ebuild
rename to media-sound/musescore/musescore-4.2.1-r1.ebuild
index d6842c473993..e3b430850d93 100644
--- a/media-sound/musescore/musescore-4.2.1.ebuild
+++ b/media-sound/musescore/musescore-4.2.1-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols:5
-   dev-qt/qtquickcontrols2:5
+   dev-qt/qtquickcontrols2:5[widgets]
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
dev-qt/qtx11extras:5

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index d6842c473993..e3b430850d93 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols:5
-   dev-qt/qtquickcontrols2:5
+   dev-qt/qtquickcontrols2:5[widgets]
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
dev-qt/qtx11extras:5

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 0d645bfe488afce7e1e02a9921d3f908dab95d29
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Jan 24 09:18:55 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 24 09:18:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d645bfe

media-sound/musescore: bump to 4.2.1, dropped 4.2.0

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest| 2 +-
 .../musescore/{musescore-4.2.0.ebuild => musescore-4.2.1.ebuild}  | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index c7794297ac84..64ea10b591d3 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B 
aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e
 SHA512 
fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
-DIST musescore-4.2.0.tar.gz 135490976 BLAKE2B 
518b26a5263fc6da520cead315bbb6bf4e6a471e6bd68063a765355cef264f20722b8ad7e4207ecf58ec416240632744d70c3c1d5d58b245ce46c001a1898e72
 SHA512 
5494cc643e0d0bf104ed335b54f12955ce0041da93ceb81596ffdbf862b355056ca2011e3bc4ba31aa6ade08034e33fa5ad5a3b7a54bce991812894efb7f76aa
+DIST musescore-4.2.1.tar.gz 136655690 BLAKE2B 
4f4ef46eb2460e546caf28666905d3ca940a0d098f0f59005db17a63c7818ec17cd0273a1c1e80745ba1acf0a50c8bcd51170e08bc0b0c3644ac4b27dbbb7482
 SHA512 
db19f90190abc22f2ea81b65e82f544eb9b51799ea781dfc765119ca64689e5e825b3e4135c45823718b686cabcb94dfc36f5d6731fa4a11939d45aa80ae868d

diff --git a/media-sound/musescore/musescore-4.2.0.ebuild 
b/media-sound/musescore/musescore-4.2.1.ebuild
similarity index 93%
rename from media-sound/musescore/musescore-4.2.0.ebuild
rename to media-sound/musescore/musescore-4.2.1.ebuild
index 8517858ee081..d6842c473993 100644
--- a/media-sound/musescore/musescore-4.2.0.ebuild
+++ b/media-sound/musescore/musescore-4.2.1.ebuild
@@ -69,10 +69,10 @@ DEPEND="
 "
 
 PATCHES=(
-   "${FILESDIR}/${P}-uncompressed-man-pages.patch"
-   "${FILESDIR}/${P}-unbundle-deps.patch"
-   "${FILESDIR}/${P}-missing-headers.patch"
-   "${FILESDIR}/${P}-dynamic_cast-crash.patch"
+   "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+   "${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
+   "${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
+   "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 7abb83f9a0ce31daa1e7144b1df94215dbac8f06
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 22 06:05:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 22 06:06:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7abb83f9

media-sound/musescore: sync live

Bug: https://bugs.gentoo.org/913160
Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 98 -
 1 file changed, 53 insertions(+), 45 deletions(-)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 42ab0eae69b0..d6842c473993 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-#CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake qmake-utils xdg check-reqs
+VIRTUALX_REQUIRED="test"
+inherit cmake qmake-utils xdg check-reqs virtualx
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+   EGIT_REPO_URI="https://github.com/musescore/MuseScore.git";
 else
-   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   SRC_URI="
+   https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   "
KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
@@ -24,18 +26,19 @@ SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz test 
webengine"
+IUSE="test video"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
 "
-DEPEND="
+RDEPEND="
+   dev-libs/tinyxml2:=
dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
+   dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qthelp:5
@@ -47,22 +50,30 @@ DEPEND="
dev-qt/qtquickcontrols2:5
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
+   dev-qt/qtx11extras:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
+   >=media-libs/alsa-lib-1.0.0
+   media-libs/flac:=
>=media-libs/freetype-2.5.2
+   media-libs/libopusenc
media-libs/libsndfile
+   media-libs/opus
+   media-sound/lame
sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   omr? ( app-text/poppler )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-libs/libpulse )
-   sf3? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
+   video? ( media-video/ffmpeg )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-cpp/gtest )
 "
-RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-4.2.0-uncompressed-man-pages.patch"
+   "${FILESDIR}/${PN}-4.2.0-unbundle-deps.patch"
+   "${FILESDIR}/${PN}-4.2.0-missing-headers.patch"
+   "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
+)
 
 src_unpack() {
if [[ ${PV} == "" ]]; then
@@ -77,7 +88,12 @@ src_prepare() {
cmake_src_prepare
 
# Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
+   mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
+
+   # Make sure we don't accidentally use bundled third party deps
+   # for which we want to use system packages instead.
+   rm -r thirdparty/{flac,googletest,lame,opus,opusenc} \
+   || die "Failed to remove unused thirdparty directories"
 }
 
 src_configure() {
@@ -85,43 +101,35 @@ src_configure() {
export PATH="$(qt5_get_bindir):${PATH}"
 
local mycmakeargs=(
-   -DAEOLUS=OFF # does not compile
-   -DBUILD_ALSA="$(usex alsa)"
-   -DBUILD_CRASHPAD_CLIENT=OFF
-   -DBUILD_JACK="$(usex jack)"
-   -DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=OFF
-   -DBUILD_PORTAUDIO="$(usex portaudio)"
-   -DBUILD_PORTMIDI="$(usex portmidi)"
-   -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-   -DBUILD_TELEMETRY_MODULE=ON
-   -DBUILD_UNIT_TESTS=$(usex test)
-   -DBUILD_WEBENGINE="$(usex webengine)"
-   -DCMAKE_SKIP_RPATH=ON
-   -DDOWNLOAD_SOUNDFONT=OFF
-   -DHAS_AUDIOFILE=ON
-   -DOCR=OFF
-   -DOMR="$(usex omr)"
-   -DSOUNDFONT3=ON
-   -DTRY_USE_CCAC

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Jason A. Donenfeld]

commit: 899041aa86b131e37fa497b3a5c17889ce9dbe67
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Sat Jan 20 04:34:34 2024 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Sun Jan 21 00:55:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899041aa

media-sound/musescore: add 4.2.0

Closes: https://bugs.gentoo.org/913160
Signed-off-by: Jason A. Donenfeld  gentoo.org>

 media-sound/musescore/Manifest |   1 +
 .../files/musescore-4.2.0-dynamic_cast-crash.patch |  11 ++
 .../files/musescore-4.2.0-missing-headers.patch|  41 +++
 .../files/musescore-4.2.0-unbundle-deps.patch  | 119 ++
 .../musescore-4.2.0-uncompressed-man-pages.patch   |  29 +
 media-sound/musescore/metadata.xml |   1 +
 media-sound/musescore/musescore-4.2.0.ebuild   | 135 +
 7 files changed, 337 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 66f132cab519..c7794297ac84 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B 
aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e
 SHA512 
fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616
+DIST musescore-4.2.0.tar.gz 135490976 BLAKE2B 
518b26a5263fc6da520cead315bbb6bf4e6a471e6bd68063a765355cef264f20722b8ad7e4207ecf58ec416240632744d70c3c1d5d58b245ce46c001a1898e72
 SHA512 
5494cc643e0d0bf104ed335b54f12955ce0041da93ceb81596ffdbf862b355056ca2011e3bc4ba31aa6ade08034e33fa5ad5a3b7a54bce991812894efb7f76aa

diff --git 
a/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch 
b/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch
new file mode 100644
index ..0c9c43d11877
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-dynamic_cast-crash.patch
@@ -0,0 +1,11 @@
+--- a/src/engraving/style/style.cpp
 b/src/engraving/style/style.cpp
+@@ -42,7 +42,7 @@ using namespace mu::engraving;
+ 
+ const PropertyValue& MStyle::value(Sid idx) const
+ {
+-if (idx == Sid::NOSTYLE) {
++if (idx == Sid::NOSTYLE || size_t(idx) >= m_values.size()) {
+ static PropertyValue dummy;
+ return dummy;
+ }

diff --git a/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch 
b/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
new file mode 100644
index ..2a40ccc00c35
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-missing-headers.patch
@@ -0,0 +1,41 @@
+--- a/src/framework/ui/uimodule.h
 b/src/framework/ui/uimodule.h
+@@ -24,6 +24,7 @@
+ #define MU_UI_UIMODULE_H
+ 
+ #include "modularity/imodulesetup.h"
++#include 
+ 
+ namespace mu::ui {
+ class UiConfiguration;
+--- a/src/framework/ui/view/interactiveprovider.h
 b/src/framework/ui/view/interactiveprovider.h
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "modularity/ioc.h"
+ #include "../iinteractiveprovider.h"
+--- a/src/importexport/videoexport/internal/videowriter.cpp
 b/src/importexport/videoexport/internal/videowriter.cpp
+@@ -32,6 +32,8 @@
+ 
+ #include "log.h"
+ 
++#include 
++
+ using namespace mu::iex::videoexport;
+ using namespace mu::project;
+ using namespace mu::notation;
+--- a/src/learn/view/learnpagemodel.h
 b/src/learn/view/learnpagemodel.h
+@@ -23,6 +23,7 @@
+ #define MU_LEARN_LEARNPAGEMODEL_H
+ 
+ #include 
++#include 
+ 
+ #include "async/asyncable.h"
+ 

diff --git a/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch 
b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
new file mode 100644
index ..50b388814680
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-unbundle-deps.patch
@@ -0,0 +1,119 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -185,7 +185,7 @@ if (MUE_BUILD_UNIT_TESTS)
+ FULL_DOCS "List XML files outputted by google test."
+ )
+ 
+-add_subdirectory(thirdparty/googletest)
++find_package(GTest REQUIRED)
+ endif(MUE_BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
 b/src/framework/audio/CMak

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: c107ae48fcfef42a48bb6945037a7d9287415c4b
Author: Adrian Schollmeyer  nexadn  de>
AuthorDate: Tue Jun 13 16:29:37 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jun 13 17:15:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c107ae48

media-sound/musescore: add missing dependencies

The dependency on GTest seems to be only at build time, probably due to
a few macros to make the code easier to test. The software is not linked
against GTest, so it can be safely removed after installation.

Closes: https://bugs.gentoo.org/907955
Closes: https://bugs.gentoo.org/907945
Signed-off-by: Adrian Schollmeyer  nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/31421
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-4.0.2.ebuild | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/media-sound/musescore/musescore-4.0.2.ebuild 
b/media-sound/musescore/musescore-4.0.2.ebuild
index cd79a319f13f..2d93d60af02b 100644
--- a/media-sound/musescore/musescore-4.0.2.ebuild
+++ b/media-sound/musescore/musescore-4.0.2.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
 "
-DEPEND="
+RDEPEND="
dev-libs/tinyxml2:=
dev-qt/designer:5
dev-qt/qtconcurrent:5
@@ -50,6 +50,7 @@ DEPEND="
dev-qt/qtquickcontrols2:5
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
+   dev-qt/qtx11extras:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
>=media-libs/alsa-lib-1.0.0
@@ -60,12 +61,13 @@ DEPEND="
media-libs/opus
media-sound/lame
sys-libs/zlib:=
+"
+# dev-cpp/gtest is required even when tests are disabled!
+DEPEND="
+   ${RDEPEND}
 
-   test? (
-   dev-cpp/gtest
-   )
+   dev-cpp/gtest
 "
-RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-uncompressed-man-pages.patch"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: fbe6b848d05897ef2bbeeececf22b7be0c33c271
Author: Adrian Schollmeyer  nexadn  de>
AuthorDate: Sun Mar 12 19:27:24 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jun  6 06:45:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe6b848

media-sound/musescore: add 4.0.2

Closes: https://bugs.gentoo.org/887289
Signed-off-by: Adrian Schollmeyer  nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/30081
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |   1 +
 .../files/musescore-4.0.2-unbundle-deps.patch  | 121 ++
 .../musescore-4.0.2-uncompressed-man-pages.patch   |  29 +
 media-sound/musescore/metadata.xml |   1 +
 media-sound/musescore/musescore-4.0.2.ebuild   | 135 +
 5 files changed, 287 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 04c98330a4d2..66f132cab519 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,3 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
+DIST musescore-4.0.2.tar.gz 123962958 BLAKE2B 
aa31b5346a4c5cfc44f66cf266724c8439d03b449336c16a960df21201d460c21a9b645654584876cc8f20f96f7e95cc24980cda85544a2338ddb8523874fe5e
 SHA512 
fda63124281c4e19160482dff5472889b8753f2389e3d115b2b8e23f3edb976df0912a4e554334a4fc7cc4f9a6945165a07e781fcc2eec46db373e298d9f3616

diff --git a/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch 
b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
new file mode 100644
index ..6c299d90da67
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.0.2-unbundle-deps.patch
@@ -0,0 +1,121 @@
+Unbundling of all dependencies which are currently available as system packages
+and have not been modified (to our knowledge) by MuseScore.
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -206,7 +206,7 @@ if (BUILD_UNIT_TESTS)
+ FULL_DOCS "List XML files outputted by google test."
+ )
+ 
+-add_subdirectory(thirdparty/googletest)
++find_package(GTest REQUIRED)
+ endif(BUILD_UNIT_TESTS)
+ 
+ add_subdirectory(share)
+--- a/src/framework/audio/CMakeLists.txt
 b/src/framework/audio/CMakeLists.txt
+@@ -216,11 +216,18 @@ if (ENABLE_AUDIO_EXPORT)
+ ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h
+ )
+ 
+-add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc)
+-add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac)
++pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
++pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc)
++pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac)
++pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++)
+ 
+-set(MODULE_LINK ${MODULE_LINK} lame opusenc flac)
++set(MODULE_LINK
++${MODULE_LINK}
++PkgConfig::lame
++PkgConfig::libopusenc
++PkgConfig::flac
++PkgConfig::flacpp
++)
+ endif()
+ 
+ if (OS_IS_MAC)
+--- a/src/framework/audio/internal/encoders/mp3encoder.cpp
 b/src/framework/audio/internal/encoders/mp3encoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "mp3encoder.h"
+ 
+-#include "lame.h"
++#include "lame/lame.h"
+ 
+ using namespace mu;
+ using namespace mu::audio;
+--- a/src/framework/audio/internal/encoders/oggencoder.cpp
 b/src/framework/audio/internal/encoders/oggencoder.cpp
+@@ -22,7 +22,7 @@
+ 
+ #include "oggencoder.h"
+ 
+-#include "opusenc.h"
++#include "opus/opusenc.h"
+ 
+ #include "log.h"
+ 
+--- a/src/framework/global/CMakeLists.txt
 b/src/framework/global/CMakeLists.txt
+@@ -105,8 +105,6 @@ set(MODULE_SRC
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
+-${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp
+-${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp
+@@ -124,6 +122,8 @@ set(MODULE_SRC
+ ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
+ )
+ 
++find_package(tinyxml2 RE

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/

[Miroslav Šulc]

commit: 7ff12abe917314513dce9915fe7d41b0f0c2b1c8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Jun  6 06:32:26 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jun  6 06:45:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff12abe

media-sound/musescore: scrubbed a patch

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/files/musescore-3.0.1-man-pages.patch | 2 --
 1 file changed, 2 deletions(-)

diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch 
b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
index fd5ade55ed42..a9e871f12d77 100644
--- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
+++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
@@ -1,5 +1,3 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6437963..2a173b9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -660,7 +660,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Andreas Sturmlechner]

commit: 18e9b70877c3f04d391f31516598b392372f9a9a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon May 29 09:28:24 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon May 29 13:10:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18e9b708

media-sound/musescore: Switch IUSE=pulseaudio to media-libs/libpulse

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 5690f140a41f..42ab0eae69b0 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -58,7 +58,7 @@ DEPEND="
omr? ( app-text/poppler )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
+   pulseaudio? ( media-libs/libpulse )
sf3? ( media-libs/libvorbis )
webengine? ( dev-qt/qtwebengine:5[widgets] )
 "

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: c2bb9b802badbc5eb08c2c1f9846dc2dc7245c96
Author: tepidjuice  gmail  com>
AuthorDate: Thu Jan 12 05:47:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 14 19:13:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bb9b80

media-sound/musescore: add qtquickcontrols dependency to live

Add dependency on 'dev-qt/qtquickcontrols:5' as needs 'QtQuick.Dialogs'.

Closes: https://github.com/gentoo/gentoo/pull/29073
Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 2cfc1a6e6ba3..5690f140a41f 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -43,6 +43,7 @@ DEPEND="
dev-qt/qtnetworkauth:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols:5
dev-qt/qtquickcontrols2:5
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Sam James]

commit: 625de16ac98fd0b589e4fe77cd481d78dab48611
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 15:06:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  9 15:07:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625de16a

media-sound/musescore: drop upstreamed musescore--missing-qt-includes.patch

Signed-off-by: Sam James  gentoo.org>

 .../files/musescore--missing-qt-includes.patch | 216 -
 media-sound/musescore/musescore-.ebuild|   4 -
 2 files changed, 220 deletions(-)

diff --git 
a/media-sound/musescore/files/musescore--missing-qt-includes.patch 
b/media-sound/musescore/files/musescore--missing-qt-includes.patch
deleted file mode 100644
index b49f2e148f28..
--- a/media-sound/musescore/files/musescore--missing-qt-includes.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-https://github.com/musescore/MuseScore/pull/15775
-
-From 6f3168324d265b4df262c0c3a37bebdb056b6671 Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Mon, 9 Jan 2023 11:55:35 +
-Subject: [PATCH] Add missing includes (mostly Qt)
-
 a/src/appshell/iapplicationactioncontroller.h
-+++ b/src/appshell/iapplicationactioncontroller.h
-@@ -22,6 +22,9 @@
- #ifndef MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
- #define MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
- 
-+#include 
-+#include 
-+#include 
- #include 
- 
- #include "modularity/imoduleexport.h"
 a/src/autobot/internal/api/interactiveapi.cpp
-+++ b/src/autobot/internal/api/interactiveapi.cpp
-@@ -19,6 +19,8 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see .
-  */
-+#include 
-+
- #include "interactiveapi.h"
- 
- using namespace mu::api;
 a/src/autobot/internal/jsmoduleloader.cpp
-+++ b/src/autobot/internal/jsmoduleloader.cpp
-@@ -19,6 +19,8 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see .
-  */
-+#include 
-+
- #include "jsmoduleloader.h"
- 
- #include "scriptengine.h"
 a/src/framework/audio/internal/worker/playback.cpp
-+++ b/src/framework/audio/internal/worker/playback.cpp
-@@ -19,6 +19,9 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see .
-  */
-+
-+#include 
-+
- #include "playback.h"
- 
- #include "log.h"
 a/src/framework/global/thirdparty/deto_async/async/promise.h
-+++ b/src/framework/global/thirdparty/deto_async/async/promise.h
-@@ -3,6 +3,9 @@
- 
- #include 
- #include 
-+
-+#include 
-+
- #include "internal/abstractinvoker.h"
- #include "async.h"
- 
 a/src/framework/ui/view/uitheme.h
-+++ b/src/framework/ui/view/uitheme.h
-@@ -24,6 +24,7 @@
- #define MU_UI_UITHEME_H
- 
- #include 
-+#include 
- #include 
- 
- #include "modularity/ioc.h"
 a/src/importexport/bb/internal/bb.cpp
-+++ b/src/importexport/bb/internal/bb.cpp
-@@ -20,6 +20,9 @@
-  * along with this program.  If not, see .
-  */
- 
-+#include 
-+#include 
-+
- #include "bb.h"
- 
- #include "engravingerrors.h"
 a/src/importexport/imagesexport/internal/svggenerator.cpp
-+++ b/src/importexport/imagesexport/internal/svggenerator.cpp
-@@ -22,6 +22,7 @@
- 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
 a/src/importexport/midi/internal/midiimport/importmidi_model.h
-+++ b/src/importexport/midi/internal/midiimport/importmidi_model.h
-@@ -26,6 +26,8 @@
- 
- #include 
- 
-+#include 
-+
- namespace mu::iex::midi {
- class TracksModel : public QAbstractTableModel
- {
 a/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
-+++ b/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
-@@ -21,6 +21,7 @@
-  */
- #include "importmidi_operations.h"
- 
-+#include 
- #include 
- 
- #include "log.h"
 a/src/importexport/musedata/internal/musedatareader.cpp
-+++ b/src/importexport/musedata/internal/musedatareader.cpp
-@@ -19,6 +19,9 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see .
-  */
-+
-+#include 
-+
- #include "musedatareader.h"
- 
- #include "musedata.h"
 a/src/multiinstances/internal/ipc/ipc.cpp
-+++ b/src/multiinstances/internal/ipc/ipc.cpp
-@@ -21,6 +21,8 @@
-  */
- #include "ipc.h"
- 
-+#include 
-+
- #include 
- #include 
- #include 
 a/src/notation/view/notationnavigator.h
-+++ b/src/notation/view/notationnavigator.h
-@@ -23,6 +23,8 @@
- #define MU_NOTATION_NOTATIONNAVIGATOR_H
- 
- #include 
-+#include 
-+#include 
- #include 
- 
- #include "modularity/ioc.h"
 a/src/notation/view/notationviewinputcontroller.cpp
-+++ b/src/notation/view/notationviewinputcontroller.cpp
-@@ -21,6 +21,7 @@
-  */
- #include "notationviewinputcontroller.h"
- 
-+#include 
- #include 
- #include 
- #include 
--

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Sam James]

commit: 3e34d258d85a79b4ff1723d949e136615bc9bccd
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 13:02:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  9 13:02:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e34d258

media-sound/musescore: hack to avoid collision from bundled libs

Signed-off-by: Sam James  gentoo.org>

 .../files/musescore--missing-qt-includes.patch| 19 +--
 media-sound/musescore/musescore-.ebuild   | 18 +-
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git 
a/media-sound/musescore/files/musescore--missing-qt-includes.patch 
b/media-sound/musescore/files/musescore--missing-qt-includes.patch
index 2cfa8f2b8fca..b49f2e148f28 100644
--- a/media-sound/musescore/files/musescore--missing-qt-includes.patch
+++ b/media-sound/musescore/files/musescore--missing-qt-includes.patch
@@ -54,15 +54,15 @@ Subject: [PATCH] Add missing includes (mostly Qt)
 --- a/src/framework/global/thirdparty/deto_async/async/promise.h
 +++ b/src/framework/global/thirdparty/deto_async/async/promise.h
 @@ -3,6 +3,9 @@
- 
- #include 
- #include 
-+
-+#include 
-+
- #include "internal/abstractinvoker.h"
- #include "async.h"
- 
+ 
+ #include 
+ #include 
++
++#include 
++
+ #include "internal/abstractinvoker.h"
+ #include "async.h"
+ 
 --- a/src/framework/ui/view/uitheme.h
 +++ b/src/framework/ui/view/uitheme.h
 @@ -24,6 +24,7 @@
@@ -214,4 +214,3 @@ Subject: [PATCH] Add missing includes (mostly Qt)
  #include 
  
  
-

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 06685fa6b24a..f26651950844 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="emake"
+#CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
 inherit cmake qmake-utils xdg check-reqs
 
@@ -24,7 +24,8 @@ SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz test 
webengine"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -89,15 +90,15 @@ src_configure() {
local mycmakeargs=(
-DAEOLUS=OFF # does not compile
-DBUILD_ALSA="$(usex alsa)"
-   -DBUILD_CRASH_REPORTER=OFF
+   -DBUILD_CRASHPAD_CLIENT=OFF
-DBUILD_JACK="$(usex jack)"
-DBUILD_LAME="$(usex mp3)"
-DBUILD_PCH=OFF
-DBUILD_PORTAUDIO="$(usex portaudio)"
-DBUILD_PORTMIDI="$(usex portmidi)"
-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-   -DBUILD_SHARED_LIBS=ON
-DBUILD_TELEMETRY_MODULE=ON
+   -DBUILD_UNIT_TESTS=$(usex test)
-DBUILD_WEBENGINE="$(usex webengine)"
-DCMAKE_SKIP_RPATH=ON
-DDOWNLOAD_SOUNDFONT=OFF
@@ -120,3 +121,10 @@ src_compile() {
cmake_build -j1 lrelease manpages
cmake_src_compile
 }
+
+src_install() {
+   cmake_src_install
+
+   # Hack to not install bundled libraries like libogg
+   rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Sam James]

commit: c1ae317df122aeeed663423681fc75a55738752f
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 12:02:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  9 12:03:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ae317d

media-sound/musescore: fix build for 

Signed-off-by: Sam James  gentoo.org>

 .../files/musescore--missing-qt-includes.patch | 217 +
 media-sound/musescore/musescore-.ebuild|   6 +-
 2 files changed, 222 insertions(+), 1 deletion(-)

diff --git 
a/media-sound/musescore/files/musescore--missing-qt-includes.patch 
b/media-sound/musescore/files/musescore--missing-qt-includes.patch
new file mode 100644
index ..2cfa8f2b8fca
--- /dev/null
+++ b/media-sound/musescore/files/musescore--missing-qt-includes.patch
@@ -0,0 +1,217 @@
+https://github.com/musescore/MuseScore/pull/15775
+
+From 6f3168324d265b4df262c0c3a37bebdb056b6671 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Mon, 9 Jan 2023 11:55:35 +
+Subject: [PATCH] Add missing includes (mostly Qt)
+
+--- a/src/appshell/iapplicationactioncontroller.h
 b/src/appshell/iapplicationactioncontroller.h
+@@ -22,6 +22,9 @@
+ #ifndef MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
+ #define MU_APPSHELL_IAPPLICATIONACTIONCONTROLLER_H
+ 
++#include 
++#include 
++#include 
+ #include 
+ 
+ #include "modularity/imoduleexport.h"
+--- a/src/autobot/internal/api/interactiveapi.cpp
 b/src/autobot/internal/api/interactiveapi.cpp
+@@ -19,6 +19,8 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see .
+  */
++#include 
++
+ #include "interactiveapi.h"
+ 
+ using namespace mu::api;
+--- a/src/autobot/internal/jsmoduleloader.cpp
 b/src/autobot/internal/jsmoduleloader.cpp
+@@ -19,6 +19,8 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see .
+  */
++#include 
++
+ #include "jsmoduleloader.h"
+ 
+ #include "scriptengine.h"
+--- a/src/framework/audio/internal/worker/playback.cpp
 b/src/framework/audio/internal/worker/playback.cpp
+@@ -19,6 +19,9 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see .
+  */
++
++#include 
++
+ #include "playback.h"
+ 
+ #include "log.h"
+--- a/src/framework/global/thirdparty/deto_async/async/promise.h
 b/src/framework/global/thirdparty/deto_async/async/promise.h
+@@ -3,6 +3,9 @@
+ 
+ #include 
+ #include 
++
++#include 
++
+ #include "internal/abstractinvoker.h"
+ #include "async.h"
+ 
+--- a/src/framework/ui/view/uitheme.h
 b/src/framework/ui/view/uitheme.h
+@@ -24,6 +24,7 @@
+ #define MU_UI_UITHEME_H
+ 
+ #include 
++#include 
+ #include 
+ 
+ #include "modularity/ioc.h"
+--- a/src/importexport/bb/internal/bb.cpp
 b/src/importexport/bb/internal/bb.cpp
+@@ -20,6 +20,9 @@
+  * along with this program.  If not, see .
+  */
+ 
++#include 
++#include 
++
+ #include "bb.h"
+ 
+ #include "engravingerrors.h"
+--- a/src/importexport/imagesexport/internal/svggenerator.cpp
 b/src/importexport/imagesexport/internal/svggenerator.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+--- a/src/importexport/midi/internal/midiimport/importmidi_model.h
 b/src/importexport/midi/internal/midiimport/importmidi_model.h
+@@ -26,6 +26,8 @@
+ 
+ #include 
+ 
++#include 
++
+ namespace mu::iex::midi {
+ class TracksModel : public QAbstractTableModel
+ {
+--- a/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
 b/src/importexport/midi/internal/midiimport/importmidi_operations.cpp
+@@ -21,6 +21,7 @@
+  */
+ #include "importmidi_operations.h"
+ 
++#include 
+ #include 
+ 
+ #include "log.h"
+--- a/src/importexport/musedata/internal/musedatareader.cpp
 b/src/importexport/musedata/internal/musedatareader.cpp
+@@ -19,6 +19,9 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see .
+  */
++
++#include 
++
+ #include "musedatareader.h"
+ 
+ #include "musedata.h"
+--- a/src/multiinstances/internal/ipc/ipc.cpp
 b/src/multiinstances/internal/ipc/ipc.cpp
+@@ -21,6 +21,8 @@
+  */
+ #include "ipc.h"
+ 
++#include 
++
+ #include 
+ #include 
+ #include 
+--- a/src/notation/view/notationnavigator.h
 b/src/notation/view/notationnavigator.h
+@@ -23,6 +23,8 @@
+ #define MU_NOTATION_NOTATIONNAVIGATOR_H
+ 
+ #include 
++#include 
++#include 
+ #include 
+ 
+ #include "modularity/ioc.h"
+--- a/src/notation/view/notationviewinputcontroller.cpp
 b/src/notation/view/notationviewinputcontroller.cpp
+@@ -21,6 +21,7 @@
+  */
+ #include "notationviewinputcontroller.h"
+ 
++#include 
+ #include 
+ #include 
+ #include 
+--- a/src/palette/view/wid

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: dccf8971c83f5ffb00079032e194c674a4cde632
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Jul  3 03:55:11 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Jul  3 03:55:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccf8971

media-sound/musescore: removed obsolete 3.6.2

Bug: https://bugs.gentoo.org/855623
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.6.2.ebuild | 121 ---
 1 file changed, 121 deletions(-)

diff --git a/media-sound/musescore/musescore-3.6.2.ebuild 
b/media-sound/musescore/musescore-3.6.2.ebuild
deleted file mode 100644
index 5cc3b579f8cd..
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake qmake-utils xdg check-reqs
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-else
-   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-   S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   omr? ( app-text/poppler )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   sf3? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
-)
-
-src_unpack() {
-   if [[ ${PV} == "" ]]; then
-   git-r3_src_unpack
-   unpack ${A}
-   else
-   default
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-}
-
-src_configure() {
-   # bug #766111
-   export PATH="$(qt5_get_bindir):${PATH}"
-
-   local mycmakeargs=(
-   -DAEOLUS=OFF # does not compile
-   -DBUILD_ALSA="$(usex alsa)"
-   -DBUILD_CRASH_REPORTER=OFF
-   -DBUILD_JACK="$(usex jack)"
-   -DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=ON
-   -DBUILD_PORTAUDIO="$(usex portaudio)"
-   -DBUILD_PORTMIDI="$(usex portmidi)"
-   -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-   -DBUILD_SHARED_LIBS=ON
-   -DBUILD_TELEMETRY_MODULE=ON
-   -DBUILD_WEBENGINE="$(usex webengine)"
-   -DCMAKE_SKIP_RPATH=ON
-   -DDOWNLOAD_SOUNDFONT=OFF
-   -DHAS_AUDIOFILE=ON
-   -DOCR=OFF
-   -DOMR="$(usex omr)"
-   -DSOUNDFONT3=ON
-   -DZERBERUS="$(usex sfz)"
-   -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-   -DUSE_SYSTEM_FREETYPE=ON
-   -DUSE_SYSTEM_POPPLER=ON
-   -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-   )
-   cmake_src_configure
-}
-
-src_compile() {
-   cd "${BUILD_DIR}" || die
-   cmake_build -j1 lrelease manpages
-   cmake_src_compile
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: ade05e2fcd35c4159c9d5c8812392435f077add1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul  2 12:23:13 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul  2 12:23:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade05e2f

media-sound/musescore: x86 stable wrt bug #855623

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild 
b/media-sound/musescore/musescore-3.6.2-r1.ebuild
index 7095d5646381..c5afad3d5f44 100644
--- a/media-sound/musescore/musescore-3.6.2-r1.ebuild
+++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: a9aa338a2d25d11f89c2767ac36382640ed4207c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul  2 12:19:17 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul  2 12:20:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9aa338a

media-sound/musescore: amd64 stable wrt bug #855623

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.6.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild 
b/media-sound/musescore/musescore-3.6.2-r1.ebuild
index d9fdbd5e6e56..7095d5646381 100644
--- a/media-sound/musescore/musescore-3.6.2-r1.ebuild
+++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 7a461f04217706838471b36a5dc8233f2ed6853b
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  2 02:45:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  2 02:59:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a461f04

media-sound/musescore: fix finding qmake

Upstream need to fix their Qt handling but w/e.

Closes: https://bugs.gentoo.org/766111
Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.6.2.ebuild | 7 +--
 media-sound/musescore/musescore-.ebuild  | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/media-sound/musescore/musescore-3.6.2.ebuild 
b/media-sound/musescore/musescore-3.6.2.ebuild
index 96f936a41a63..5cc3b579f8cd 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+inherit cmake qmake-utils xdg check-reqs
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -83,6 +83,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # bug #766111
+   export PATH="$(qt5_get_bindir):${PATH}"
+
local mycmakeargs=(
-DAEOLUS=OFF # does not compile
-DBUILD_ALSA="$(usex alsa)"

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 01dcab44b226..c7f38acd5608 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
+inherit cmake qmake-utils xdg check-reqs
 
 if [[ ${PV} == "" ]]; then
inherit git-r3
@@ -79,6 +79,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # bug #766111
+   export PATH="$(qt5_get_bindir):${PATH}"
+
local mycmakeargs=(
-DAEOLUS=OFF # does not compile
-DBUILD_ALSA="$(usex alsa)"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: da2fd474f20d6540338e651e1ea7f17196bff974
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  2 02:52:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  2 02:59:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2fd474

media-sound/musescore: disable PCH (and ccache automagic in live)

PCH is buggy and we disable it where possible in Gentoo. As for ccache, 
automagic
usage isn't correct, and users can enable it properly via e.g. FEATURES.

Signed-off-by: Sam James  gentoo.org>

 .../{musescore-.ebuild => musescore-3.6.2-r1.ebuild}  | 8 ++--
 media-sound/musescore/musescore-.ebuild   | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-3.6.2-r1.ebuild
similarity index 95%
copy from media-sound/musescore/musescore-.ebuild
copy to media-sound/musescore/musescore-3.6.2-r1.ebuild
index c7f38acd5608..d9fdbd5e6e56 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-3.6.2-r1.ebuild
@@ -39,7 +39,6 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qthelp:5
dev-qt/qtnetwork:5
-   dev-qt/qtnetworkauth:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5
@@ -62,6 +61,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+   "${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
+)
+
 src_unpack() {
if [[ ${PV} == "" ]]; then
git-r3_src_unpack
@@ -88,7 +92,7 @@ src_configure() {
-DBUILD_CRASH_REPORTER=OFF
-DBUILD_JACK="$(usex jack)"
-DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=ON
+   -DBUILD_PCH=OFF
-DBUILD_PORTAUDIO="$(usex portaudio)"
-DBUILD_PORTMIDI="$(usex portmidi)"
-DBUILD_PULSEAUDIO="$(usex pulseaudio)"

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index c7f38acd5608..d2e8794771d9 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -88,7 +88,7 @@ src_configure() {
-DBUILD_CRASH_REPORTER=OFF
-DBUILD_JACK="$(usex jack)"
-DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=ON
+   -DBUILD_PCH=OFF
-DBUILD_PORTAUDIO="$(usex portaudio)"
-DBUILD_PORTMIDI="$(usex portmidi)"
-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
@@ -101,6 +101,7 @@ src_configure() {
-DOCR=OFF
-DOMR="$(usex omr)"
-DSOUNDFONT3=ON
+   -DTRY_USE_CCACHE=OFF
-DZERBERUS="$(usex sfz)"
-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-DUSE_SYSTEM_FREETYPE=ON

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: a69843306159e9aa147ee88fe7821c542ca28c7f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jun 18 10:45:13 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jun 18 10:45:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6984330

media-sound/musescore: added new dep to live

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 12a85f60de3..01dcab44b22 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -39,6 +39,7 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qthelp:5
dev-qt/qtnetwork:5
+   dev-qt/qtnetworkauth:5
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 0697d32117e331a3692812930cf3f389bb40921f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Mar 11 08:14:59 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar 11 08:15:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0697d321

media-sound/musescore: removed obsolete 3.6.1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 -
 media-sound/musescore/musescore-3.6.1.ebuild | 118 ---
 2 files changed, 119 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 33839d6ed5f..04c98330a4d 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,2 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 
81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad
 SHA512 
8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e

diff --git a/media-sound/musescore/musescore-3.6.1.ebuild 
b/media-sound/musescore/musescore-3.6.1.ebuild
deleted file mode 100644
index db51b9d0df1..000
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-else
-   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-   S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   omr? ( app-text/poppler )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   sf3? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/${P}-rename-audioitem.patch"
-)
-
-src_unpack() {
-   if [[ ${PV} == "" ]]; then
-   git-r3_src_unpack
-   unpack ${A}
-   else
-   default
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DAEOLUS=OFF # does not compile
-   -DBUILD_ALSA="$(usex alsa)"
-   -DBUILD_CRASH_REPORTER=OFF
-   -DBUILD_JACK="$(usex jack)"
-   -DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=ON
-   -DBUILD_PORTAUDIO="$(usex portaudio)"
-   -DBUILD_PORTMIDI="$(usex portmidi)"
-   -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
- 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 18227fb4ed39a1c40e2142d4a020c866f029a0cb
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 11 02:35:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 11 02:35:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18227fb4

media-sound/musescore: Stabilize 3.6.2 amd64, #774957

Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.6.2.ebuild 
b/media-sound/musescore/musescore-3.6.2.ebuild
index f13e37f5c3a..96f936a41a6 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 53bc44943d3d79d1d9bdb9bfdeb96b715d2f54f1
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  9 10:47:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  9 10:47:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53bc4494

media-sound/musescore: Stabilize 3.6.2 x86, #774957

Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.6.2.ebuild 
b/media-sound/musescore/musescore-3.6.2.ebuild
index d5a19eb9bdc..f13e37f5c3a 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: 6a5b3bfc47e9e3abd77835f84560a77364aa4e9b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Mar  2 08:54:05 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar  2 08:54:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5b3bfc

media-sound/musescore: removed obsolete 3.5.2

Closes: https://bugs.gentoo.org/766111
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |   1 -
 .../files/musescore-3.5-lambda-capture-this.patch  |  13 ---
 ...usescore-3.5-remove-duplicite-declaration.patch |  12 ---
 media-sound/musescore/musescore-3.5.2.ebuild   | 118 -
 4 files changed, 144 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 1451929632d..33839d6ed5f 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 
6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb
 SHA512 
4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
 DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 
81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad
 SHA512 
8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e

diff --git 
a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch 
b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
deleted file mode 100644
index 283ffdc92e2..000
--- a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index 94b1aef..6a7b4e8 100644
 a/mscore/scoreview.cpp
-+++ b/mscore/scoreview.cpp
-@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
-   cv->updateGrips();
-   }},
-   #ifdef OMR
--{{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
-+{{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
-   if (cv->score()->masterScore()->omr())
- showOmr(!_score->masterScore()->showOmr());
-   }},

diff --git 
a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch 
b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
deleted file mode 100644
index b4e1ad0baf5..000
--- 
a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/omr/pattern.h b/omr/pattern.h
-index b040497..1b8e0c4 100644
 a/omr/pattern.h
-+++ b/omr/pattern.h
-@@ -24,7 +24,6 @@
- 
- namespace Ms {
- 
--enum class SymId;
- class Sym;
- 
- //-

diff --git a/media-sound/musescore/musescore-3.5.2.ebuild 
b/media-sound/musescore/musescore-3.5.2.ebuild
deleted file mode 100644
index b8137e72faf..000
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-else
-   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-   S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
weben

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: ca908e14092e991cc3f173c0d952bb587fb17a71
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  2 01:57:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  2 01:57:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca908e14

media-sound/musescore: Stabilize 3.6.1 amd64, #773409

Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.6.1.ebuild 
b/media-sound/musescore/musescore-3.6.1.ebuild
index f0dc7b36006..db51b9d0df1 100644
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 322db58159303d96c263c23580089ed2e1cd2d0f
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 28 15:59:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 28 15:59:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=322db581

media-sound/musescore: Stabilize 3.6.1 x86, #773409

Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.6.1.ebuild 
b/media-sound/musescore/musescore-3.6.1.ebuild
index 9ef3d3c075b..f0dc7b36006 100644
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: 21c0d85046b22c455258b27c65c2d34537a13d87
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb 28 11:46:45 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb 28 11:47:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21c0d850

media-sound/musescore: fixed compilation with -mp3

thanks to Ionen Wolkens  gmail.com> for the patch

Closes: https://bugs.gentoo.org/767760
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../musescore/files/musescore-3.6.1-rename-audioitem.patch   | 12 
 media-sound/musescore/musescore-3.6.1.ebuild |  1 +
 media-sound/musescore/musescore-3.6.2.ebuild |  1 +
 3 files changed, 14 insertions(+)

diff --git a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch 
b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
new file mode 100644
index 000..caf9ae67ec7
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
@@ -0,0 +1,12 @@
+Fix misnamed variable causing build failure with USE=-mp3
+https://bugs.gentoo.org/767760
+Signed-off-by: Ionen Wolkens 
+--- a/mscore/exportdialog.cpp
 b/mscore/exportdialog.cpp
+@@ -77,5 +77,5 @@
+   // Disable .mp3 option if unavailable
+   QStandardItem* mp3Item = fileTypeComboBoxModel->item(3);
+-  mp3Item->setFlags(audioItem->flags() & ~Qt::ItemIsEnabled);
++  mp3Item->setFlags(mp3Item->flags() & ~Qt::ItemIsEnabled);
+ # endif
+ # ifndef HAS_AUDIOFILE

diff --git a/media-sound/musescore/musescore-3.6.1.ebuild 
b/media-sound/musescore/musescore-3.6.1.ebuild
index bb23b9e040e..9ef3d3c075b 100644
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+   "${FILESDIR}/${P}-rename-audioitem.patch"
 )
 
 src_unpack() {

diff --git a/media-sound/musescore/musescore-3.6.2.ebuild 
b/media-sound/musescore/musescore-3.6.2.ebuild
index bb23b9e040e..d5a19eb9bdc 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -63,6 +63,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+   "${FILESDIR}/${PN}-3.6.1-rename-audioitem.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 8f4fe8ef1db61a59821a05bc1cc5113414a2dd9d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Feb  9 10:49:50 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Feb  9 10:50:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f4fe8ef

media-sound/musescore: bump to 3.6.2

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 +
 media-sound/musescore/musescore-3.6.2.ebuild | 117 +++
 2 files changed, 118 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index af34b2febde..1451929632d 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 
6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb
 SHA512 
4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
 DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 
81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad
 SHA512 
8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
+DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 
4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8
 SHA512 
04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e

diff --git a/media-sound/musescore/musescore-3.6.2.ebuild 
b/media-sound/musescore/musescore-3.6.2.ebuild
new file mode 100644
index 000..bb23b9e040e
--- /dev/null
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+else
+   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/";
+# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
+SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+   dev-qt/qtsvg:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   >=media-libs/freetype-2.5.2
+   media-libs/libsndfile
+   sys-libs/zlib:=
+   alsa? ( >=media-libs/alsa-lib-1.0.0 )
+   jack? ( virtual/jack )
+   mp3? ( media-sound/lame )
+   omr? ( app-text/poppler )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   sf3? ( media-libs/libvorbis )
+   webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+src_unpack() {
+   if [[ ${PV} == "" ]]; then
+   git-r3_src_unpack
+   unpack ${A}
+   else
+   default
+   fi
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # Move soundfonts to the correct directory
+   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DAEOLUS=OFF # does not compile
+   -DBUILD_ALSA="$(usex alsa)"
+   -DBUILD_CRASH_REPORTER=OFF
+   -DBUILD_JACK="$(

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: b81aadb2d997984c1d20f7af95e3517e8f3e5a84
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Jan 28 13:38:33 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jan 28 13:38:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81aadb2

media-sound/musescore: added missing dep to 3.6.1 and live

Closes: https://bugs.gentoo.org/767757
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.6.1.ebuild | 1 +
 media-sound/musescore/musescore-.ebuild  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.6.1.ebuild 
b/media-sound/musescore/musescore-3.6.1.ebuild
index 16ab7cc85a7..bb23b9e040e 100644
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -39,6 +39,7 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qthelp:5
dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 42039a19c04..12a85f60de3 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,7 @@ DEPEND="
dev-qt/qtgui:5
dev-qt/qthelp:5
dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5
>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 3fb57f4406f39d217b7fc5ca63e6c8b29bc93b60
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Jan 28 11:32:21 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jan 28 11:32:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb57f44

media-sound/musescore: bump to 3.6.1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 +
 media-sound/musescore/musescore-3.6.1.ebuild | 116 +++
 2 files changed, 117 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index b9d6b81186b..af34b2febde 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,3 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 
6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb
 SHA512 
4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
+DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 
81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad
 SHA512 
8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d

diff --git a/media-sound/musescore/musescore-3.6.1.ebuild 
b/media-sound/musescore/musescore-3.6.1.ebuild
new file mode 100644
index 000..16ab7cc85a7
--- /dev/null
+++ b/media-sound/musescore/musescore-3.6.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+else
+   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/";
+# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
+SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+   dev-qt/qtsvg:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   >=media-libs/freetype-2.5.2
+   media-libs/libsndfile
+   sys-libs/zlib:=
+   alsa? ( >=media-libs/alsa-lib-1.0.0 )
+   jack? ( virtual/jack )
+   mp3? ( media-sound/lame )
+   omr? ( app-text/poppler )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   sf3? ( media-libs/libvorbis )
+   webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+src_unpack() {
+   if [[ ${PV} == "" ]]; then
+   git-r3_src_unpack
+   unpack ${A}
+   else
+   default
+   fi
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # Move soundfonts to the correct directory
+   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DAEOLUS=OFF # does not compile
+   -DBUILD_ALSA="$(usex alsa)"
+   -DBUILD_CRASH_REPORTER=OFF
+   -DBUILD_JACK="$(usex jack)"
+   -DBUILD_LAME="$(usex mp3)"
+   -DBUILD_PCH=ON
+   -DBUILD_PORTAUDIO="$(usex portaudio)"
+   -DBUILD_PORTMIDI="$(usex portmidi)"
+   -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+   -DBUILD_SHARED_LIBS=ON
+   -DBUILD_TELEMETRY_MODULE=ON
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: bf78902d5aa7f8a6b14bf4829d47fb1a458fceb7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Dec 11 10:10:37 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec 11 10:10:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf78902d

media-sound/musescore: removed obsolete patches from live

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/musescore--lambda-capture-this.patch  | 13 -
 media-sound/musescore/musescore-.ebuild |  5 -
 2 files changed, 18 deletions(-)

diff --git 
a/media-sound/musescore/files/musescore--lambda-capture-this.patch 
b/media-sound/musescore/files/musescore--lambda-capture-this.patch
deleted file mode 100644
index 24c33bd2f18..000
--- a/media-sound/musescore/files/musescore--lambda-capture-this.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index f3fe9ce8b..3957f90c6 100644
 a/mscore/scoreview.cpp
-+++ b/mscore/scoreview.cpp
-@@ -2649,7 +2649,7 @@ void ScoreView::cmd(const char* s)
- cv->updateGrips();
- } },
-   #ifdef OMR
--{ { "show-omr" }, [](ScoreView* cv, const QByteArray&) {
-+{ { "show-omr" }, [&](ScoreView* cv, const QByteArray&) {
- if (cv->score()->masterScore()->omr()) {
- showOmr(!_score->masterScore()->showOmr());
- }

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index f9ce6bb051b..42039a19c04 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -60,11 +60,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/${P}-lambda-capture-this.patch"
-)
-
 src_unpack() {
if [[ ${PV} == "" ]]; then
git-r3_src_unpack

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 991a0bc2ad9dc38fe6b8662215473acc6815ebf4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Nov 18 08:57:03 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Nov 18 08:57:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991a0bc2

media-sound/musescore: removed obsolete 3.5.1

Closes: https://bugs.gentoo.org/754765
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 -
 media-sound/musescore/musescore-3.5.1.ebuild | 118 ---
 2 files changed, 119 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 416db5f5697..b9d6b81186b 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,2 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.5.1.tar.gz 66952759 BLAKE2B 
74907cc3a7c2305f26a763c12d5bba63a42d720bf97103c366e8d51ca513f8e77e3e950c6674c1c68f71b6e73deaf75dc35de82ee509df632ba3752a34486122
 SHA512 
ae3907f0cc39f0855fe5069a21d87c5c6ddc31811def36ebf9e069be773693363569fb6b7ad35ff9bf2a64c771133b7c68d50636af9e0733743dd365bc86f654
 DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 
6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb
 SHA512 
4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38

diff --git a/media-sound/musescore/musescore-3.5.1.ebuild 
b/media-sound/musescore/musescore-3.5.1.ebuild
deleted file mode 100644
index b8137e72faf..000
--- a/media-sound/musescore/musescore-3.5.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-else
-   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-   S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   omr? ( app-text/poppler )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   sf3? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
-   "${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
-)
-
-src_unpack() {
-   if [[ ${PV} == "" ]]; then
-   git-r3_src_unpack
-   unpack ${A}
-   else
-   default
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DAEOLUS=OFF # does not compile
-   -DBUILD_ALSA="$(usex alsa)"
-   -DBUILD_CRASH_REPORTER=OFF
-   -DBUILD_JACK="$(usex jack)"
-   -DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=ON
-   -DBUILD_PORTAUDIO="$(usex portaudio)"
-   -DBUILD_POR

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: fb304c73aad3586b2239d80e68716899e5ffcc4f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 18 06:52:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 18 06:52:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb304c73

media-sound/musescore: amd64 stable wrt bug #754882

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.5.2.ebuild 
b/media-sound/musescore/musescore-3.5.2.ebuild
index a1d345341b9..b8137e72faf 100644
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ b/media-sound/musescore/musescore-3.5.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: 00db6fb21bd6dec858b3aaaf556c496056e50d86
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Nov 17 19:16:16 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Nov 17 19:16:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00db6fb2

media-sound/musescore: x86 stable wrt bug #754882

Package-Manager: Portage-3.0.8, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.5.2.ebuild 
b/media-sound/musescore/musescore-3.5.2.ebuild
index 59c8b43c79b..a1d345341b9 100644
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ b/media-sound/musescore/musescore-3.5.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: ce9c558de6192bf6396c04955dd719132c4277ad
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Nov 15 08:46:33 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov 15 08:46:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce9c558d

media-sound/musescore: removed obsolete 3.5

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |   1 -
 media-sound/musescore/musescore-3.5.ebuild | 118 -
 2 files changed, 119 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index bca12ef1b12..416db5f5697 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.1.tar.gz 66952759 BLAKE2B 
74907cc3a7c2305f26a763c12d5bba63a42d720bf97103c366e8d51ca513f8e77e3e950c6674c1c68f71b6e73deaf75dc35de82ee509df632ba3752a34486122
 SHA512 
ae3907f0cc39f0855fe5069a21d87c5c6ddc31811def36ebf9e069be773693363569fb6b7ad35ff9bf2a64c771133b7c68d50636af9e0733743dd365bc86f654
 DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 
6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb
 SHA512 
4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
-DIST musescore-3.5.tar.gz 66798006 BLAKE2B 
dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907
 SHA512 
db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96

diff --git a/media-sound/musescore/musescore-3.5.ebuild 
b/media-sound/musescore/musescore-3.5.ebuild
deleted file mode 100644
index d3027a0f4a7..000
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "" ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-else
-   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 x86"
-   S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   omr? ( app-text/poppler )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   sf3? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/${P}-lambda-capture-this.patch"
-   "${FILESDIR}/${P}-remove-duplicite-declaration.patch"
-)
-
-src_unpack() {
-   if [[ ${PV} == "" ]]; then
-   git-r3_src_unpack
-   unpack ${A}
-   else
-   default
-   fi
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DAEOLUS=OFF # does not compile
-   -DBUILD_ALSA="$(u

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 1c971857dc9767704d8fc0199339ddf9d804190a
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov 14 20:28:03 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 14 20:28:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c971857

media-sound/musescore: Stabilize 3.5.1 amd64, #753452

Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.5.1.ebuild 
b/media-sound/musescore/musescore-3.5.1.ebuild
index a1d345341b9..b8137e72faf 100644
--- a/media-sound/musescore/musescore-3.5.1.ebuild
+++ b/media-sound/musescore/musescore-3.5.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Thomas Deutschmann]

commit: 016692528c55f53f42ab238956f683dfffe420d3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Nov 12 20:58:47 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Nov 12 21:02:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01669252

media-sound/musescore: x86 stable (bug #753452)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/musescore/musescore-3.5.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.5.1.ebuild 
b/media-sound/musescore/musescore-3.5.1.ebuild
index 59c8b43c79b..a1d345341b9 100644
--- a/media-sound/musescore/musescore-3.5.1.ebuild
+++ b/media-sound/musescore/musescore-3.5.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: e27c2a849820e2dd70f9b5a400bcdcca12dd12a4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Oct 17 13:16:53 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Oct 17 13:17:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e27c2a84

media-sound/musescore: redigested 3.5.2

Closes: https://bugs.gentoo.org/749717
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 8b9b9e42dbd..bca12ef1b12 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.1.tar.gz 66952759 BLAKE2B 
74907cc3a7c2305f26a763c12d5bba63a42d720bf97103c366e8d51ca513f8e77e3e950c6674c1c68f71b6e73deaf75dc35de82ee509df632ba3752a34486122
 SHA512 
ae3907f0cc39f0855fe5069a21d87c5c6ddc31811def36ebf9e069be773693363569fb6b7ad35ff9bf2a64c771133b7c68d50636af9e0733743dd365bc86f654
-DIST musescore-3.5.2.tar.gz 66323693 BLAKE2B 
d9121f293519934b29bb51c67b9459269b87b6007ce4cef7d298bc78922605d8d518161d01423a41df03d4f4f0e0f3fc070179b27c75890c8400c4696833
 SHA512 
957e58e537f8b0419bc74dae775c0c320893d0cc1e038381bab660acd0a90ddf90708e306470133ebc61825373905a115a8a1da5a296a01580db9d2cb1a1b3f7
+DIST musescore-3.5.2.tar.gz 66326638 BLAKE2B 
6f4f10c40c2c9c84a1cf07b45ce1badf14a74c834315a1e7768ffbf6738fafb550937105be9e8fd0c7deb79721691fbf40621135e0e2a7354129c00e3623c6fb
 SHA512 
4e98bebaa43abcb692969bd3272c64b6a8ff8e794c54ca8d4ed7dcb8059f4adbe498491f21b3b6d90e6495d4f44166747e1c1869617eba82af6db1aea6b06d38
 DIST musescore-3.5.tar.gz 66798006 BLAKE2B 
dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907
 SHA512 
db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: 8e1c8d3a4f3c790be8d7443c1f908b51e04605fe
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Oct 17 09:06:42 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Oct 17 09:07:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1c8d3a

media-sound/musescore: removed duplicate patch

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../musescore/files/musescore-3.5.2-drop-redeclaration.patch | 12 
 media-sound/musescore/musescore-3.5.2.ebuild |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git 
a/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch 
b/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch
deleted file mode 100644
index b4e1ad0baf5..000
--- a/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/omr/pattern.h b/omr/pattern.h
-index b040497..1b8e0c4 100644
 a/omr/pattern.h
-+++ b/omr/pattern.h
-@@ -24,7 +24,6 @@
- 
- namespace Ms {
- 
--enum class SymId;
- class Sym;
- 
- //-

diff --git a/media-sound/musescore/musescore-3.5.2.ebuild 
b/media-sound/musescore/musescore-3.5.2.ebuild
index 0a71087360a..59c8b43c79b 100644
--- a/media-sound/musescore/musescore-3.5.2.ebuild
+++ b/media-sound/musescore/musescore-3.5.2.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
"${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
-   "${FILESDIR}/${P}-drop-redeclaration.patch"
+   "${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: 989f63e695faaae629007cb5ad3b93e7e88b3ea5
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Oct 17 07:54:23 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Oct 17 08:09:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=989f63e6

media-sound/musescore: bump to 3.5.2

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |   1 +
 .../files/musescore-3.5.2-drop-redeclaration.patch |  12 +++
 media-sound/musescore/musescore-3.5.2.ebuild   | 118 +
 3 files changed, 131 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 65fc474cb64..8b9b9e42dbd 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.5.1.tar.gz 66952759 BLAKE2B 
74907cc3a7c2305f26a763c12d5bba63a42d720bf97103c366e8d51ca513f8e77e3e950c6674c1c68f71b6e73deaf75dc35de82ee509df632ba3752a34486122
 SHA512 
ae3907f0cc39f0855fe5069a21d87c5c6ddc31811def36ebf9e069be773693363569fb6b7ad35ff9bf2a64c771133b7c68d50636af9e0733743dd365bc86f654
+DIST musescore-3.5.2.tar.gz 66323693 BLAKE2B 
d9121f293519934b29bb51c67b9459269b87b6007ce4cef7d298bc78922605d8d518161d01423a41df03d4f4f0e0f3fc070179b27c75890c8400c4696833
 SHA512 
957e58e537f8b0419bc74dae775c0c320893d0cc1e038381bab660acd0a90ddf90708e306470133ebc61825373905a115a8a1da5a296a01580db9d2cb1a1b3f7
 DIST musescore-3.5.tar.gz 66798006 BLAKE2B 
dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907
 SHA512 
db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96

diff --git 
a/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch 
b/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch
new file mode 100644
index 000..b4e1ad0baf5
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.5.2-drop-redeclaration.patch
@@ -0,0 +1,12 @@
+diff --git a/omr/pattern.h b/omr/pattern.h
+index b040497..1b8e0c4 100644
+--- a/omr/pattern.h
 b/omr/pattern.h
+@@ -24,7 +24,6 @@
+ 
+ namespace Ms {
+ 
+-enum class SymId;
+ class Sym;
+ 
+ //-

diff --git a/media-sound/musescore/musescore-3.5.2.ebuild 
b/media-sound/musescore/musescore-3.5.2.ebuild
new file mode 100644
index 000..0a71087360a
--- /dev/null
+++ b/media-sound/musescore/musescore-3.5.2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+else
+   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/";
+# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
+SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+   dev-qt/qtsvg:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   >=media-libs/freetype-2.5.2
+   media-libs/libsndfile
+   sys-libs/zlib:=
+   alsa? ( >=media-libs/alsa-lib-1.0.0 )
+   jack? ( virtual/jack )
+   mp3? ( media-sound/lame )
+   omr? ( app-text/poppler )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   sf3? ( media-libs/libvorbis )
+   webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 3ccdd950fc1b5aaeb0fc64207103f686c708e018
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct  7 07:54:00 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct  7 07:54:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ccdd950

media-sound/musescore: bump to 3.5.1

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 +
 media-sound/musescore/musescore-3.5.1.ebuild | 118 +++
 2 files changed, 119 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index ab4d5cc6f7e..65fc474cb64 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,3 @@
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
+DIST musescore-3.5.1.tar.gz 66952759 BLAKE2B 
74907cc3a7c2305f26a763c12d5bba63a42d720bf97103c366e8d51ca513f8e77e3e950c6674c1c68f71b6e73deaf75dc35de82ee509df632ba3752a34486122
 SHA512 
ae3907f0cc39f0855fe5069a21d87c5c6ddc31811def36ebf9e069be773693363569fb6b7ad35ff9bf2a64c771133b7c68d50636af9e0733743dd365bc86f654
 DIST musescore-3.5.tar.gz 66798006 BLAKE2B 
dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907
 SHA512 
db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96

diff --git a/media-sound/musescore/musescore-3.5.1.ebuild 
b/media-sound/musescore/musescore-3.5.1.ebuild
new file mode 100644
index 000..59c8b43c79b
--- /dev/null
+++ b/media-sound/musescore/musescore-3.5.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+else
+   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/MuseScore-${PV}"
+fi
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/";
+# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
+SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
+   dev-qt/qtsvg:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   >=media-libs/freetype-2.5.2
+   media-libs/libsndfile
+   sys-libs/zlib:=
+   alsa? ( >=media-libs/alsa-lib-1.0.0 )
+   jack? ( virtual/jack )
+   mp3? ( media-sound/lame )
+   omr? ( app-text/poppler )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   sf3? ( media-libs/libvorbis )
+   webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+   "${FILESDIR}/${PN}-3.5-lambda-capture-this.patch"
+   "${FILESDIR}/${PN}-3.5-remove-duplicite-declaration.patch"
+)
+
+src_unpack() {
+   if [[ ${PV} == "" ]]; then
+   git-r3_src_unpack
+   unpack ${A}
+   else
+   default
+   fi
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   # Move soundfonts to the correct directory
+   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DAEOLUS=OFF # does not compile
+   -DBUILD_ALSA="$(usex alsa)"
+   -DBUILD_CRASH_REPORTER=OFF
+   -DBUILD_JACK="$(usex jack)"
+   -DBUILD_LAME="$(usex mp3)"
+   -DBUILD_PCH=ON
+   -DBUILD_PORTAUDIO="$(usex portaudio)"
+   -DBUILD_PORTMIDI="$(usex portmidi)"
+   -DBUILD_PU

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: e42f056921e3cc2779022a317bc81c190ce938c7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Sep  9 09:40:52 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Sep  9 09:40:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42f0569

media-sound/musescore: removed obsolete 3.4.2

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   2 -
 media-sound/musescore/musescore-3.4.2.ebuild | 102 ---
 2 files changed, 104 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 558cc4a8edc..ab4d5cc6f7e 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,2 @@
-DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B 
be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f
 SHA512 
d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
 DIST musescore-3.5.tar.gz 66798006 BLAKE2B 
dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907
 SHA512 
db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96

diff --git a/media-sound/musescore/musescore-3.4.2.ebuild 
b/media-sound/musescore/musescore-3.4.2.ebuild
deleted file mode 100644
index b151f2bf5ca..000
--- a/media-sound/musescore/musescore-3.4.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   omr? ( app-text/poppler )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   sf3? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DAEOLUS=OFF # does not compile
-   -DBUILD_ALSA="$(usex alsa)"
-   -DBUILD_CRASH_REPORTER=OFF
-   -DBUILD_JACK="$(usex jack)"
-   -DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=ON
-   -DBUILD_PORTAUDIO="$(usex portaudio)"
-   -DBUILD_PORTMIDI="$(usex portmidi)"
-   -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-   -DBUILD_SHARED_LIBS=ON
-   -DBUILD_TELEMETRY_MODULE=ON

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: f1cbbaf99175e76b0ea969973b71c03d074b4a74
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Sep  8 17:47:19 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Sep  8 17:47:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1cbbaf9

media-sound/musescore: cleaned up keywords mess

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.5.ebuild  | 3 +--
 media-sound/musescore/musescore-.ebuild | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-sound/musescore/musescore-3.5.ebuild 
b/media-sound/musescore/musescore-3.5.ebuild
index 09ee4e4f016..d3027a0f4a7 100644
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -10,10 +10,9 @@ inherit cmake xdg check-reqs
 if [[ ${PV} == "" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-   KEYWORDS="amd64 x86"
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 x86"
+   KEYWORDS="amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 48f8be78880..f9ce6bb051b 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -10,7 +10,6 @@ inherit cmake xdg check-reqs
 if [[ ${PV} == "" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-   KEYWORDS=""
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 8e3ebe1c53960899e9b44a9375c142b6e00e783d
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  6 00:30:15 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  6 00:30:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e3ebe1c

media-sound/musescore: Stabilize 3.5 amd64, #740548

Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.5.ebuild 
b/media-sound/musescore/musescore-3.5.ebuild
index 9a241448a74..09ee4e4f016 100644
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -10,7 +10,7 @@ inherit cmake xdg check-reqs
 if [[ ${PV} == "" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-   KEYWORDS="x86"
+   KEYWORDS="amd64 x86"
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 x86"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Thomas Deutschmann]

commit: 84bac23d927b7c188599e70c27447a6d94a89089
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  5 21:16:32 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  5 21:16:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84bac23d

media-sound/musescore: x86 stable (bug #740548)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann  gentoo.org>

 media-sound/musescore/musescore-3.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/musescore-3.5.ebuild 
b/media-sound/musescore/musescore-3.5.ebuild
index 45b259953d4..9a241448a74 100644
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -10,10 +10,10 @@ inherit cmake xdg check-reqs
 if [[ ${PV} == "" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
-   KEYWORDS=""
+   KEYWORDS="x86"
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm64 x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: d8720701be44965d267db0a69fcfd24d041ab760
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Sep  5 18:37:33 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Sep  5 18:37:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8720701

media-sound/musescore: fixed keywords for 3.5

Bug: https://bugs.gentoo.org/740548
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.5.ebuild  | 3 ++-
 media-sound/musescore/musescore-.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/musescore/musescore-3.5.ebuild 
b/media-sound/musescore/musescore-3.5.ebuild
index d56a9bca792..45b259953d4 100644
--- a/media-sound/musescore/musescore-3.5.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -10,8 +10,10 @@ inherit cmake xdg check-reqs
 if [[ ${PV} == "" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+   KEYWORDS=""
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 
@@ -23,7 +25,6 @@ SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 51e4cf8aa99..48f8be78880 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -10,8 +10,10 @@ inherit cmake xdg check-reqs
 if [[ ${PV} == "" ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+   KEYWORDS=""
 else
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
S="${WORKDIR}/MuseScore-${PV}"
 fi
 
@@ -23,7 +25,6 @@ SRC_URI+=" 
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: fee3a7887e5b7abbb31782464d8793e2594573b8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Aug  6 13:24:38 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Aug  6 13:28:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee3a788

media-sound/musescore: bump to 3.5 + updated 

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |  2 ++
 .../files/musescore-3.5-lambda-capture-this.patch  | 13 
 ...usescore-3.5-remove-duplicite-declaration.patch | 12 +++
 ...{musescore-.ebuild => musescore-3.5.ebuild} | 24 --
 media-sound/musescore/musescore-.ebuild| 23 +++--
 5 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index b3547c30c63..558cc4a8edc 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,4 @@
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
+DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 
7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184
 SHA512 
69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B 
be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f
 SHA512 
d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
+DIST musescore-3.5.tar.gz 66798006 BLAKE2B 
dc3a30d187d22124216023597e98b80d13bc7a47181b65978b2a3c91c419e2783d6fa499b6bed6dcb122155a0b6f72a3ec89d0c9be4355e7afe10bc4fca1a907
 SHA512 
db2d22abf1b53e37ea5e3b2f367dc945afa3bab7fb4c5b3b5c172498060170a3b0a96767584c0959b29c412729eb059917b98058c6b11e30f54ec4047a775e96

diff --git 
a/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch 
b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
new file mode 100644
index 000..283ffdc92e2
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.5-lambda-capture-this.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
+index 94b1aef..6a7b4e8 100644
+--- a/mscore/scoreview.cpp
 b/mscore/scoreview.cpp
+@@ -2661,7 +2661,7 @@ void ScoreView::cmd(const char* s)
+   cv->updateGrips();
+   }},
+   #ifdef OMR
+-{{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
++{{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
+   if (cv->score()->masterScore()->omr())
+ showOmr(!_score->masterScore()->showOmr());
+   }},

diff --git 
a/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch 
b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
new file mode 100644
index 000..b4e1ad0baf5
--- /dev/null
+++ 
b/media-sound/musescore/files/musescore-3.5-remove-duplicite-declaration.patch
@@ -0,0 +1,12 @@
+diff --git a/omr/pattern.h b/omr/pattern.h
+index b040497..1b8e0c4 100644
+--- a/omr/pattern.h
 b/omr/pattern.h
+@@ -24,7 +24,6 @@
+ 
+ namespace Ms {
+ 
+-enum class SymId;
+ class Sym;
+ 
+ //-

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-3.5.ebuild
similarity index 80%
copy from media-sound/musescore/musescore-.ebuild
copy to media-sound/musescore/musescore-3.5.ebuild
index d6ea4938d86..d56a9bca792 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-3.5.ebuild
@@ -5,14 +5,21 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake xdg check-reqs
+inherit cmake xdg check-reqs
+
+if [[ ${PV} == "" ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+else
+   SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+   S="${WORKDIR}/MuseScore-${PV}"
+fi
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# MuseScore_General-*.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 # It has to be repackaged because the files are not versioned, current version 
can be found 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Sam James]

commit: 9248e25ca55a4d240ff62beaae22b332c5a66109
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 21 00:25:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 21 00:25:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9248e25c

media-sound/musescore: arm64 keyworded (bug #730410)

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 media-sound/musescore/musescore-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.4.2.ebuild 
b/media-sound/musescore/musescore-3.4.2.ebuild
index cadf43ff2d6..b151f2bf5ca 100644
--- a/media-sound/musescore/musescore-3.4.2.ebuild
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/

[Miroslav Šulc]

commit: 67c3343e1737cac41a1685f8ba12c7bc785ac1dd
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 13 08:32:30 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 13 08:32:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c3343e

media-sound/musescore: updated patch for 

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/musescore--lambda-capture-this.patch | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/media-sound/musescore/files/musescore--lambda-capture-this.patch 
b/media-sound/musescore/files/musescore--lambda-capture-this.patch
index c0bb7083324..24c33bd2f18 100644
--- a/media-sound/musescore/files/musescore--lambda-capture-this.patch
+++ b/media-sound/musescore/files/musescore--lambda-capture-this.patch
@@ -1,13 +1,13 @@
 diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
-index 9804e1f32..83e0c0e47 100644
+index f3fe9ce8b..3957f90c6 100644
 --- a/mscore/scoreview.cpp
 +++ b/mscore/scoreview.cpp
-@@ -2405,7 +2405,7 @@ void ScoreView::cmd(const char* s)
-   cv->updateGrips();
-   }},
+@@ -2649,7 +2649,7 @@ void ScoreView::cmd(const char* s)
+ cv->updateGrips();
+ } },
#ifdef OMR
--{{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
-+{{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
-   if (cv->score()->masterScore()->omr())
- showOmr(!_score->masterScore()->showOmr());
-   }},
+-{ { "show-omr" }, [](ScoreView* cv, const QByteArray&) {
++{ { "show-omr" }, [&](ScoreView* cv, const QByteArray&) {
+ if (cv->score()->masterScore()->omr()) {
+ showOmr(!_score->masterScore()->showOmr());
+ }

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: 5c1b9f407d0ac6513c4215dd8ab43e041b5f4069
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Apr  2 12:59:15 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Apr  2 12:59:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1b9f40

media-sound/musescore: fixed compilation for 

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/musescore--lambda-capture-this.patch  | 13 +
 media-sound/musescore/musescore-.ebuild |  1 +
 2 files changed, 14 insertions(+)

diff --git 
a/media-sound/musescore/files/musescore--lambda-capture-this.patch 
b/media-sound/musescore/files/musescore--lambda-capture-this.patch
new file mode 100644
index 000..c0bb7083324
--- /dev/null
+++ b/media-sound/musescore/files/musescore--lambda-capture-this.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
+index 9804e1f32..83e0c0e47 100644
+--- a/mscore/scoreview.cpp
 b/mscore/scoreview.cpp
+@@ -2405,7 +2405,7 @@ void ScoreView::cmd(const char* s)
+   cv->updateGrips();
+   }},
+   #ifdef OMR
+-{{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
++{{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
+   if (cv->score()->masterScore()->omr())
+ showOmr(!_score->masterScore()->showOmr());
+   }},

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 89e66d393cf..d6ea4938d86 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -55,6 +55,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+   "${FILESDIR}/${P}-lambda-capture-this.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: c7154a07003eee2ab6db8b7eaca6709f24d1171b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Mar  8 17:08:25 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Mar  8 17:08:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7154a07

media-sound/musescore: removed obsolete 3.4.1

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 -
 media-sound/musescore/musescore-3.4.1.ebuild | 102 ---
 2 files changed, 103 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 98b47a3123e..b3547c30c63 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,2 @@
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B 
fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178
 SHA512 
4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
 DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B 
be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f
 SHA512 
d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4

diff --git a/media-sound/musescore/musescore-3.4.1.ebuild 
b/media-sound/musescore/musescore-3.4.1.ebuild
deleted file mode 100644
index cadf43ff2d6..000
--- a/media-sound/musescore/musescore-3.4.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   omr? ( app-text/poppler )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   sf3? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DAEOLUS=OFF # does not compile
-   -DBUILD_ALSA="$(usex alsa)"
-   -DBUILD_CRASH_REPORTER=OFF
-   -DBUILD_JACK="$(usex jack)"
-   -DBUILD_LAME="$(usex mp3)"
-   -DBUILD_PCH=ON
-   -DBUILD_PORTAUDIO="$(usex portaudio)"
-   -DBUILD_PORTMIDI="$(usex portmidi)"
-   -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-   -DBUILD_SHARED_LIBS=ON
-   -DBUILD_TELEMETRY_MODULE=ON
-   -DBUILD_WEBENGINE="$(usex webengine)"
-   -DCMAKE_SKIP_RPATH=ON
-   -DDOWNLOAD_SOUNDFONT=OFF
-   -DHAS_AUDIOFILE=ON
-   -DOCR=OFF
-   -DOMR="$(usex omr)"
-   -DSOUNDFONT3=ON
-   -DZERBERUS="$(usex sfz)"
-   -DUSE_P

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: 0220fa3b4d2b5e251996ba0bbf3017b5d6019187
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  8 10:41:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  8 10:41:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0220fa3b

media-sound/musescore: amd64 stable wrt bug #711828

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.4.2.ebuild 
b/media-sound/musescore/musescore-3.4.2.ebuild
index 89ed53b3cb8..cadf43ff2d6 100644
--- a/media-sound/musescore/musescore-3.4.2.ebuild
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: ef0fef2b5c9e5a76107f04fe3ec87d0b777eccfb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  8 10:37:26 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  8 10:37:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0fef2b

media-sound/musescore: x86 stable wrt bug #711828

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.4.2.ebuild 
b/media-sound/musescore/musescore-3.4.2.ebuild
index 09675a17455..89ed53b3cb8 100644
--- a/media-sound/musescore/musescore-3.4.2.ebuild
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: a3ef499d0a877a3932a1ff7cc2a720b381c0492c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Mar  4 16:19:17 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Mar  4 16:19:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ef499d

media-sound/musescore: removed obsolete 3.3.4

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 -
 media-sound/musescore/files/5583.patch   | 212 ---
 media-sound/musescore/musescore-3.3.4.ebuild |  92 
 3 files changed, 305 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 3b2ea273841..98b47a3123e 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 
55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329
 SHA512 
c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B 
fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178
 SHA512 
4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
 DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B 
be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f
 SHA512 
d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4

diff --git a/media-sound/musescore/files/5583.patch 
b/media-sound/musescore/files/5583.patch
deleted file mode 100644
index da4d0c52d04..000
--- a/media-sound/musescore/files/5583.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 09d138946aad53962ce23298093747f0ce52304f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= 
-Date: Tue, 31 Dec 2019 17:39:34 +0100
-Subject: [PATCH 1/2] Specializes template routines.
-
-Qt 5.14 introduces serialisation/deserialisation for enum classes,
-this results in ambiguous templates between qdatastream.h and preferences.h.
-we specialize everything to workaround this.

- mscore/preferences.h | 41 -
- 1 file changed, 36 insertions(+), 5 deletions(-)
-
-diff --git a/mscore/preferences.h b/mscore/preferences.h
-index bef3df8536..8c3ac9b0ed 100644
 a/mscore/preferences.h
-+++ b/mscore/preferences.h
-@@ -233,21 +233,52 @@ extern Preferences preferences;
- 
- // Stream operators for enum classes
- // enum classes don't play well with QSettings without custom serialization
--template::value>::type* = 
nullptr>
--inline QDataStream &operator<<(QDataStream &out, const T &val)
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MuseScoreStyleType &val)
- {
- return out << static_cast(val);
- }
- 
--template::value>::type* = 
nullptr>
--inline QDataStream &operator>>(QDataStream &in, T &val)
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MuseScoreStyleType &val)
- {
- int tmp;
- in >> tmp;
--val = static_cast(tmp);
-+val = static_cast(tmp);
- return in;
- }
- 
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::SessionStart &val)
-+{
-+return out << static_cast(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::SessionStart &val)
-+{
-+int tmp;
-+in >> tmp;
-+val = static_cast(tmp);
-+return in;
-+}
-+
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MusicxmlExportBreaks &val)
-+{
-+return out << static_cast(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MusicxmlExportBreaks &val)
-+{
-+int tmp;
-+in >> tmp;
-+val = static_cast(tmp);
-+return in;
-+}
-+
-+
- class PreferenceVisitor {
-public:
-   virtual void visit(QString key, IntPreference*) = 0;
-
-From 6b759bb5ee7b83fd8a82429e4cdb74279c5d33b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= 
-Date: Tue, 31 Dec 2019 17:42:04 +0100
-Subject: [PATCH 2/2] fix warnings: replace QString::null, with QString()
-

- mscore/capella.cpp   |  2 +-
- mscore/importmidi/importmidi.cpp |  2 +-
- mscore/instrdialog.cpp   |  2 +-
- mscore/musescore.cpp | 12 ++--
- mscore/musescore.h   |  2 +-
- mscore/network/loginmanager.cpp  |  2 +-
- 6 files changed, 1

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: 383f1526fa5129d2ba4e15d3175e1cad89c5d6ab
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar  4 13:03:13 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar  4 13:03:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383f1526

media-sound/musescore: x86 stable wrt bug #711426

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.4.1.ebuild 
b/media-sound/musescore/musescore-3.4.1.ebuild
index ae4cc9f9b6a..cadf43ff2d6 100644
--- a/media-sound/musescore/musescore-3.4.1.ebuild
+++ b/media-sound/musescore/musescore-3.4.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: b9aec03c2f003ac45d25f6085d9ab159daa3ca46
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar  3 16:21:35 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar  3 16:21:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9aec03c

media-sound/musescore: amd64 stable wrt bug #711426

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.4.1.ebuild 
b/media-sound/musescore/musescore-3.4.1.ebuild
index 09675a17455..ae4cc9f9b6a 100644
--- a/media-sound/musescore/musescore-3.4.1.ebuild
+++ b/media-sound/musescore/musescore-3.4.1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 0c8aeb252c23138bcebbc0e8a5cbb247bd08273e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Mar  3 14:14:00 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar  3 14:14:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8aeb25

media-sound/musescore: fixed qtsingleapplication dep use flags

Closes: https://bugs.gentoo.org/709838
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.3.4.ebuild | 2 +-
 media-sound/musescore/musescore-3.4.1.ebuild | 2 +-
 media-sound/musescore/musescore-3.4.2.ebuild | 2 +-
 media-sound/musescore/musescore-.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/musescore/musescore-3.3.4.ebuild 
b/media-sound/musescore/musescore-3.3.4.ebuild
index d2084f031d1..ae841455ad3 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -34,7 +34,7 @@ DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5

diff --git a/media-sound/musescore/musescore-3.4.1.ebuild 
b/media-sound/musescore/musescore-3.4.1.ebuild
index fb4ff90af18..09675a17455 100644
--- a/media-sound/musescore/musescore-3.4.1.ebuild
+++ b/media-sound/musescore/musescore-3.4.1.ebuild
@@ -34,7 +34,7 @@ DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5

diff --git a/media-sound/musescore/musescore-3.4.2.ebuild 
b/media-sound/musescore/musescore-3.4.2.ebuild
index fb4ff90af18..09675a17455 100644
--- a/media-sound/musescore/musescore-3.4.2.ebuild
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -34,7 +34,7 @@ DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 6157b14ce4a..89e66d393cf 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -34,7 +34,7 @@ DEPEND="
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
dev-qt/qtsvg:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 9a46c013337d7ab6d2a6d9d982a1ca6b2faa5ed3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Feb 10 11:07:17 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Feb 10 11:07:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a46c013

media-sound/musescore: removed obsolete 3.3

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |  2 -
 media-sound/musescore/musescore-3.3.ebuild | 91 --
 2 files changed, 93 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 766a6fd7e1a..3b2ea273841 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,6 +1,4 @@
-DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 
62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d
 SHA512 
81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 
55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329
 SHA512 
c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
-DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
 DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B 
fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178
 SHA512 
4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
 DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B 
be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f
 SHA512 
d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4

diff --git a/media-sound/musescore/musescore-3.3.ebuild 
b/media-sound/musescore/musescore-3.3.ebuild
deleted file mode 100644
index f697f370677..000
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   vorbis? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
so

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: 6641e25122194b19f1061102b0dcb6c85e10e593
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb 10 08:17:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb 10 08:17:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6641e251

media-sound/musescore: x86 stable wrt bug #708666

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.3.4.ebuild 
b/media-sound/musescore/musescore-3.3.4.ebuild
index e149c88acbe..d2084f031d1 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: b82478e514e21da0d5d87b8b02eae17f6340908c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Feb  9 10:31:20 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Feb  9 10:31:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b82478e5

media-sound/musescore: amd64 stable wrt bug #708666

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.3.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.3.4.ebuild 
b/media-sound/musescore/musescore-3.3.4.ebuild
index 917b4d62c93..e149c88acbe 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: bd81fcd5b63fd0fc170a50751b78c8439bb73815
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Feb  8 00:10:12 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb  8 00:42:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd81fcd5

media-sound/musescore: renamed use flag in 3.3.4

renamed use flag vorbis to sf3 to make obvious the purpose
of it and make it default to be able to load bundled sf3 file

Bug: https://bugs.gentoo.org/708666
Closes: https://bugs.gentoo.org/704916
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.3.4.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/musescore/musescore-3.3.4.ebuild 
b/media-sound/musescore/musescore-3.3.4.ebuild
index e0e03cdcb56..917b4d62c93 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -47,7 +47,7 @@ DEPEND="
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
-   vorbis? ( media-libs/libvorbis )
+   sf3? ( media-libs/libvorbis )
webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
 RDEPEND="${DEPEND}"
@@ -79,7 +79,7 @@ src_configure() {
-DBUILD_PORTAUDIO="$(usex portaudio)"
-DBUILD_PORTMIDI="$(usex portmidi)"
-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-   -DSOUNDFONT3="$(usex vorbis)"
+   -DSOUNDFONT3="$(usex sf3)"
-DBUILD_WEBENGINE="$(usex webengine)"
)
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 3b5eba82dcb411018882763bd49fdb85a97291a0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Feb  7 22:09:18 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb  7 22:09:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b5eba82

media-sound/musescore: bump to 3.4.2

Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |   1 +
 media-sound/musescore/musescore-3.4.2.ebuild | 102 +++
 2 files changed, 103 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index eeefb7ac66b..766a6fd7e1a 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -3,3 +3,4 @@ DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 
55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329
 SHA512 
c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
 DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B 
fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178
 SHA512 
4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
+DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B 
be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f
 SHA512 
d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4

diff --git a/media-sound/musescore/musescore-3.4.2.ebuild 
b/media-sound/musescore/musescore-3.4.2.ebuild
new file mode 100644
index 000..fb4ff90af18
--- /dev/null
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake xdg check-reqs
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/";
+# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024
+   dev-qt/qtsvg:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   >=media-libs/freetype-2.5.2
+   media-libs/libsndfile
+   sys-libs/zlib:=
+   alsa? ( >=media-libs/alsa-lib-1.0.0 )
+   jack? ( virtual/jack )
+   mp3? ( media-sound/lame )
+   omr? ( app-text/poppler )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   sf3? ( media-libs/libvorbis )
+   webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_prepare() {
+   cmake_src_prepare
+
+   # Move soundfonts to the correct directory
+   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DAEOLUS=OFF # does not compile
+   -DBUILD_ALSA="$(usex alsa)"
+   -DBUILD_CRASH_REPORTER=OFF
+   -DBUILD_JACK="$(usex jack)"
+   -DBUILD_LAME="$(usex mp3)"
+   -DBUILD_PCH=ON
+   -DBUILD_PORTAUDIO="$(usex portaudio)"
+   -DBUILD_PORTMIDI="$(usex portmidi)"
+   -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+   -DBUILD_SHARED_LIBS=O

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 1a2fd37eedb243cf3235a7b7b64242d680f0b3fa
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Feb  1 10:41:14 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb  1 10:41:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2fd37e

media-sound/musescore: 3.4.1 bump +  sync

1) updated use flags (added osc, omr, sfz, vorbis changed to +sf3)
2) sorted and added config args

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |  1 +
 media-sound/musescore/metadata.xml |  5 ++-
 ...usescore-.ebuild => musescore-3.4.1.ebuild} | 40 +-
 media-sound/musescore/musescore-.ebuild| 27 ++-
 4 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 609f0dccd45..eeefb7ac66b 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -2,3 +2,4 @@ DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 
62a22e50d4c10ab08f0affd728
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 
55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329
 SHA512 
c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
+DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B 
fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178
 SHA512 
4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861

diff --git a/media-sound/musescore/metadata.xml 
b/media-sound/musescore/metadata.xml
index f0d90452cf3..0a529296792 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,8 +10,11 @@
musescore/MuseScore


+   Enable OSC remote control protocol
+   Enable PDF import (OMR - optical music 
recognition)
Enable support for building against 
media-libs/portmidi
-   Enable SoundFont support using  
media-libs/libvorbis
+   Enable SoundFont 3 support using  
media-libs/libvorbis
+   Enable experimental SFZ sampler
Use dev-qt/qtwebengine for 
embedded web browser

 

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-3.4.1.ebuild
similarity index 75%
copy from media-sound/musescore/musescore-.ebuild
copy to media-sound/musescore/musescore-3.4.1.ebuild
index 5d3ba673cd3..fb4ff90af18 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-3.4.1.ebuild
@@ -5,19 +5,19 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
 # MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 # It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz 
webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -44,10 +44,11 @@ DEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.0 )
jack? ( virtual/jack )
mp3? ( media-sound/lame )
+   omr? ( app-text/poppler )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
-   vorbis? ( media-libs/libvorbis )
+   sf3? ( media-libs/libvorbis )
webengine? ( de

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: eb8ad6cd6910158aaaf51bb1adf3c9a3e27effdc
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jan 10 11:30:15 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jan 10 16:31:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8ad6cd

media-sound/musescore: fixed patching in 

removed patch applied by upstream

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index cbaf17ea641..5d3ba673cd3 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -54,7 +54,6 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/5583.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: c18e00c4604df48616792cf4aa6640c07e26166b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jan  4 18:22:23 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jan  4 18:22:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18e00c4

media-sound/musescore: removed 3.3.3 (overshadowed by 3.3.4)

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |  1 -
 media-sound/musescore/musescore-3.3.3.ebuild | 92 
 2 files changed, 93 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0b72c6ef314..609f0dccd45 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,5 +1,4 @@
 DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 
62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d
 SHA512 
81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.3.3.tar.gz 62820760 BLAKE2B 
e6daf1ba4ea62dc04598461ca31290548ef14d0252084ddfd6a9945d0850cf8700fc1eadea683a67415fe5a71a61310cd7bf08640b354e8e4d60967ad8ca0605
 SHA512 
ed2b29e450ca8440e8073b9f7b1c3ae2c373d6f26963bd3bf5032156f6ed30100f4993c4c6637e292b6939c69cd592ec2d2f008d37b917f6af3bcc640ccf2910
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 
55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329
 SHA512 
c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea

diff --git a/media-sound/musescore/musescore-3.3.3.ebuild 
b/media-sound/musescore/musescore-3.3.3.ebuild
deleted file mode 100644
index e0e03cdcb56..000
--- a/media-sound/musescore/musescore-3.3.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcurrent:5
-   dev-qt/qtcore:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtquickcontrols2:5
-   >=dev-qt/qtsingleapplication-2.6.1_p20171024
-   dev-qt/qtsvg:5
-   dev-qt/qtxml:5
-   dev-qt/qtxmlpatterns:5
-   >=media-libs/freetype-2.5.2
-   media-libs/libsndfile
-   sys-libs/zlib:=
-   alsa? ( >=media-libs/alsa-lib-1.0.0 )
-   jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
-   portaudio? ( media-libs/portaudio )
-   portmidi? ( media-libs/portmidi )
-   pulseaudio? ( media-sound/pulseaudio )
-   vorbis? ( media-libs/libvorbis )
-   webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/5583.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-   cmake_src_prepare
-
-   # Move soundfonts to the correct directory
-   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DCMAKE_SKIP_RPATH=ON
-   -DDOWNLOAD_SOUNDFONT=OFF
-   -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-   -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Miroslav Šulc]

commit: cbcd81d0463012d030b33ed6adc50ec87e5f0c03
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jan  4 14:58:14 2020 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jan  4 14:58:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbcd81d0

media-sound/musescore: fixed compilation against qt 5.14

Closes: https://bugs.gentoo.org/703706
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/files/5583.patch   | 212 +++
 media-sound/musescore/musescore-3.3.3.ebuild |   3 +-
 media-sound/musescore/musescore-3.3.4.ebuild |   3 +-
 media-sound/musescore/musescore-.ebuild  |   3 +-
 4 files changed, 218 insertions(+), 3 deletions(-)

diff --git a/media-sound/musescore/files/5583.patch 
b/media-sound/musescore/files/5583.patch
new file mode 100644
index 000..da4d0c52d04
--- /dev/null
+++ b/media-sound/musescore/files/5583.patch
@@ -0,0 +1,212 @@
+From 09d138946aad53962ce23298093747f0ce52304f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= 
+Date: Tue, 31 Dec 2019 17:39:34 +0100
+Subject: [PATCH 1/2] Specializes template routines.
+
+Qt 5.14 introduces serialisation/deserialisation for enum classes,
+this results in ambiguous templates between qdatastream.h and preferences.h.
+we specialize everything to workaround this.
+---
+ mscore/preferences.h | 41 -
+ 1 file changed, 36 insertions(+), 5 deletions(-)
+
+diff --git a/mscore/preferences.h b/mscore/preferences.h
+index bef3df8536..8c3ac9b0ed 100644
+--- a/mscore/preferences.h
 b/mscore/preferences.h
+@@ -233,21 +233,52 @@ extern Preferences preferences;
+ 
+ // Stream operators for enum classes
+ // enum classes don't play well with QSettings without custom serialization
+-template::value>::type* = 
nullptr>
+-inline QDataStream &operator<<(QDataStream &out, const T &val)
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::MuseScoreStyleType &val)
+ {
+ return out << static_cast(val);
+ }
+ 
+-template::value>::type* = 
nullptr>
+-inline QDataStream &operator>>(QDataStream &in, T &val)
++inline QDataStream&
++operator>>(QDataStream &in, Ms::MuseScoreStyleType &val)
+ {
+ int tmp;
+ in >> tmp;
+-val = static_cast(tmp);
++val = static_cast(tmp);
+ return in;
+ }
+ 
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::SessionStart &val)
++{
++return out << static_cast(val);
++}
++
++inline QDataStream&
++operator>>(QDataStream &in, Ms::SessionStart &val)
++{
++int tmp;
++in >> tmp;
++val = static_cast(tmp);
++return in;
++}
++
++inline QDataStream&
++operator<<(QDataStream &out, const Ms::MusicxmlExportBreaks &val)
++{
++return out << static_cast(val);
++}
++
++inline QDataStream&
++operator>>(QDataStream &in, Ms::MusicxmlExportBreaks &val)
++{
++int tmp;
++in >> tmp;
++val = static_cast(tmp);
++return in;
++}
++
++
+ class PreferenceVisitor {
+public:
+   virtual void visit(QString key, IntPreference*) = 0;
+
+From 6b759bb5ee7b83fd8a82429e4cdb74279c5d33b6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= 
+Date: Tue, 31 Dec 2019 17:42:04 +0100
+Subject: [PATCH 2/2] fix warnings: replace QString::null, with QString()
+
+---
+ mscore/capella.cpp   |  2 +-
+ mscore/importmidi/importmidi.cpp |  2 +-
+ mscore/instrdialog.cpp   |  2 +-
+ mscore/musescore.cpp | 12 ++--
+ mscore/musescore.h   |  2 +-
+ mscore/network/loginmanager.cpp  |  2 +-
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/mscore/capella.cpp b/mscore/capella.cpp
+index 7144414e32..6243c8cca6 100644
+--- a/mscore/capella.cpp
 b/mscore/capella.cpp
+@@ -2708,7 +2708,7 @@ Score::FileError importCapella(MasterScore* score, const 
QString& name)
+   QMessageBox::warning(0,
+  QWidget::tr("Import Capella"),
+  QWidget::tr("Load failed: %1").arg(cf.error(errNo)),
+- QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
++ QString(), QWidget::tr("Quit"), QString(), 0, 1);
+   }
+ fp.close();
+ // avoid another error message box
+diff --git a/mscore/importmidi/importmidi.cpp 
b/mscore/importmidi/importmidi.cpp
+index a5d8894686..8091a83369 100644
+--- a/mscore/importmidi/importmidi.cpp
 b/mscore/importmidi/importmidi.cpp
+@@ -1200,7 +1200,7 @@ Score::FileError importMidi(MasterScore *score, const 
QString &name)
+ QMessageBox::warning(0,
+QWidget::tr("Load MIDI"),
+QWidget::tr("Load failed: %1").arg(errorText),
+-   QString::null, QWidget::tr("Quit"), QString::null, 
0, 1);
++   QString(), QWidget::tr("Quit"), QString(), 0, 1);
+ 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 3fa98decc8062b3297824ddb04aaca6a35f6e0f4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Dec 13 10:00:35 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Dec 13 10:01:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa98dec

media-sound/musescore-3.3.4: bump

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest   |  1 +
 media-sound/musescore/musescore-3.3.4.ebuild | 91 
 2 files changed, 92 insertions(+)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f5e517de2c2..0b72c6ef314 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,5 @@
 DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 
62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d
 SHA512 
81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST musescore-3.3.3.tar.gz 62820760 BLAKE2B 
e6daf1ba4ea62dc04598461ca31290548ef14d0252084ddfd6a9945d0850cf8700fc1eadea683a67415fe5a71a61310cd7bf08640b354e8e4d60967ad8ca0605
 SHA512 
ed2b29e450ca8440e8073b9f7b1c3ae2c373d6f26963bd3bf5032156f6ed30100f4993c4c6637e292b6939c69cd592ec2d2f008d37b917f6af3bcc640ccf2910
+DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 
55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329
 SHA512 
c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea

diff --git a/media-sound/musescore/musescore-3.3.4.ebuild 
b/media-sound/musescore/musescore-3.3.4.ebuild
new file mode 100644
index 000..3055267da6e
--- /dev/null
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake-utils xdg check-reqs
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/";
+# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
+   dev-qt/designer:5
+   dev-qt/qtconcurrent:5
+   dev-qt/qtcore:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
+   >=dev-qt/qtsingleapplication-2.6.1_p20171024
+   dev-qt/qtsvg:5
+   dev-qt/qtxml:5
+   dev-qt/qtxmlpatterns:5
+   >=media-libs/freetype-2.5.2
+   media-libs/libsndfile
+   sys-libs/zlib:=
+   alsa? ( >=media-libs/alsa-lib-1.0.0 )
+   jack? ( virtual/jack )
+   mp3? ( media-sound/lame )
+   portaudio? ( media-libs/portaudio )
+   portmidi? ( media-libs/portmidi )
+   pulseaudio? ( media-sound/pulseaudio )
+   vorbis? ( media-libs/libvorbis )
+   webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # Move soundfonts to the correct directory
+   mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_SKIP_RPATH=ON
+   -DDOWNLOAD_SOUNDFONT=OFF
+   -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+   -DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+   -DUSE_SYSTEM_FREETYPE=ON
+  

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: 948ed1d1465a54e728b622fa01ed38588b5de4fb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Dec 13 07:35:43 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Dec 13 07:35:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948ed1d1

media-sound/musescore: x86 stable wrt bug #701750

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.3.ebuild 
b/media-sound/musescore/musescore-3.3.ebuild
index 25847005c1b..0533ecb9ffb 100644
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Agostino Sarubbo]

commit: 08974142f7cd449a32eac3a5aace0a202097a061
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec  3 10:03:02 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec  3 10:03:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08974142

media-sound/musescore: amd64 stable wrt bug #701750

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/musescore/musescore-3.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/musescore/musescore-3.3.ebuild 
b/media-sound/musescore/musescore-3.3.ebuild
index b90af42633a..25847005c1b 100644
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: ad57807c0216dbecb5854047986237ea8e4a52f7
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Nov 28 19:59:59 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Nov 28 19:59:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad57807c

media-sound/musescore-3.0.1-r1: removed

Closes: https://bugs.gentoo.org/692156
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |  2 -
 .../musescore/files/musescore-3.0.1-porttime.patch | 13 
 media-sound/musescore/musescore-3.0.1-r1.ebuild| 91 --
 3 files changed, 106 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 772bcb72e42..f5e517de2c2 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,6 +1,4 @@
-DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 
88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5
 SHA512 
91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
 DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 
62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d
 SHA512 
81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 
8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9
 SHA512 
d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
 DIST musescore-3.3.3.tar.gz 62820760 BLAKE2B 
e6daf1ba4ea62dc04598461ca31290548ef14d0252084ddfd6a9945d0850cf8700fc1eadea683a67415fe5a71a61310cd7bf08640b354e8e4d60967ad8ca0605
 SHA512 
ed2b29e450ca8440e8073b9f7b1c3ae2c373d6f26963bd3bf5032156f6ed30100f4993c4c6637e292b6939c69cd592ec2d2f008d37b917f6af3bcc640ccf2910
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea

diff --git a/media-sound/musescore/files/musescore-3.0.1-porttime.patch 
b/media-sound/musescore/files/musescore-3.0.1-porttime.patch
deleted file mode 100644
index b9bddf1d9d9..000
--- a/media-sound/musescore/files/musescore-3.0.1-porttime.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index fcf9332..59db47a 100644
 a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -715,7 +715,7 @@ else (MINGW)
-if (APPLE)
-set(PORTMIDI_LIB portmidi)
-else (APPLE)
--   set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on 
RPM-based systems where PortTime is part of PortMidi.
-+   set(PORTMIDI_LIB -lportmidi) # Remove -lporttime on RPM-based 
systems where PortTime is part of PortMidi.
-endif (APPLE)
-target_link_libraries(mscore ${PORTMIDI_LIB})
-endif (USE_PORTMIDI)

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
deleted file mode 100644
index 379a593d84d..000
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MIN_VERSION="3.11"
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils xdg
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/";
-# MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
-DEPEND="
-   dev-qt/designer:5
-   dev-qt/qtconcur

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 1f68c19cd22b85aadb92775e6e3926f2a4a3f7ac
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Nov 28 19:56:12 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Nov 28 19:56:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f68c19c

media-sound/musescore-3.3.3: bump + updated 

updated MuseScore_General to version 0.1.8

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest  |  2 ++
 .../{musescore-.ebuild => musescore-3.3.3.ebuild}   | 13 +
 media-sound/musescore/musescore-.ebuild |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 8add901541c..772bcb72e42 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,6 @@
 DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 
88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5
 SHA512 
91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
 DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 
62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d
 SHA512 
81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
+DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 
65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32
 SHA512 
bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 
8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9
 SHA512 
d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
+DIST musescore-3.3.3.tar.gz 62820760 BLAKE2B 
e6daf1ba4ea62dc04598461ca31290548ef14d0252084ddfd6a9945d0850cf8700fc1eadea683a67415fe5a71a61310cd7bf08640b354e8e4d60967ad8ca0605
 SHA512 
ed2b29e450ca8440e8073b9f7b1c3ae2c373d6f26963bd3bf5032156f6ed30100f4993c4c6637e292b6939c69cd592ec2d2f008d37b917f6af3bcc640ccf2910
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-3.3.3.ebuild
similarity index 89%
copy from media-sound/musescore/musescore-.ebuild
copy to media-sound/musescore/musescore-3.3.3.ebuild
index f05413268b4..3055267da6e 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-3.3.3.ebuild
@@ -5,18 +5,18 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake-utils xdg check-reqs
+inherit cmake-utils xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
 # MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 # It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2";
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
@@ -56,10 +56,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
 )
 
-src_unpack() {
-   git-r3_src_unpack
-   unpack ${A}
-}
+S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
cmake-utils_src_prepare

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index f05413268b4..f55fab5973b 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
 # MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 # It has to be repackaged because the files are not versioned, current version 
can be f

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 58d0f7ef3b02de15866f781c52e2d415f46b6e2d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Nov 28 19:27:32 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Nov 28 19:27:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d0f7ef

media-sound/musescore-{3.3,}: fixes

1) added missing dep on dev-qt/qtquickcontrols2:5
2) switched from xdg-utils to xdg

Closes: https://bugs.gentoo.org/701400
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.3.ebuild  | 15 ++-
 media-sound/musescore/musescore-.ebuild | 15 ++-
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/media-sound/musescore/musescore-3.3.ebuild 
b/media-sound/musescore/musescore-3.3.ebuild
index 436f8021bc1..b90af42633a 100644
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake-utils xdg-utils check-reqs
+inherit cmake-utils xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
@@ -33,6 +33,7 @@ DEPEND="
dev-qt/qthelp:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
>=dev-qt/qtsingleapplication-2.6.1_p20171024
dev-qt/qtsvg:5
dev-qt/qtxml:5
@@ -88,15 +89,3 @@ src_compile() {
cmake-utils_src_make -j1 lrelease manpages
cmake-utils_src_compile
 }
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-}

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 15619c44fed..f05413268b4 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake-utils xdg-utils check-reqs
+inherit git-r3 cmake-utils xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
@@ -33,6 +33,7 @@ DEPEND="
dev-qt/qthelp:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
+   dev-qt/qtquickcontrols2:5
>=dev-qt/qtsingleapplication-2.6.1_p20171024
dev-qt/qtsvg:5
dev-qt/qtxml:5
@@ -91,15 +92,3 @@ src_compile() {
cmake-utils_src_make -j1 lrelease manpages
cmake-utils_src_compile
 }
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   xdg_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 64a4d821185c9753a018610f20c613408747b767
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Oct 31 17:47:06 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Oct 31 17:47:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a4d821

media-sound/musescore-{3.3,}: bump + updates

1) ported changes from 3.0.1-r1 to 
2) dropped -CMAKE_MIN_VERSION
3) added CHECKREQS_DISK_BUILD
4) updated MuseScore_General to 0.1.6
5) fixed icon cache update

Closes: https://bugs.gentoo.org/688678
Closes: https://bugs.gentoo.org/694006
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |  2 ++
 ...{musescore-.ebuild => musescore-3.3.ebuild} | 33 +++---
 media-sound/musescore/musescore-.ebuild| 24 
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0c4c655eec0..8add901541c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,4 @@
 DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 
88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5
 SHA512 
91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
+DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 
62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d
 SHA512 
81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 
8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9
 SHA512 
d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
+DIST musescore-3.3.tar.gz 64453809 BLAKE2B 
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
 SHA512 
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-3.3.ebuild
similarity index 84%
copy from media-sound/musescore/musescore-.ebuild
copy to media-sound/musescore/musescore-3.3.ebuild
index 54404ac316e..436f8021bc1 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -1,25 +1,30 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-CMAKE_MIN_VERSION="3.11"
-inherit git-r3 cmake-utils xdg-utils gnome2-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake-utils xdg-utils check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
 # MuseScore_General-0.1.3.tar.bz2 packaged from 
https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 # It has to be repackaged because the files are not versioned, current version 
can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2";
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+   
https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
-RDEPEND="
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -44,19 +49,13 @@ RDEPEND="
vorbis? ( media-libs/libvorbis )
webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
 )
 
-src_unpack() {
-   git-r3_src_unpack
-   unpack ${A}
-}
+S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
cmake-utils_src_prepare
@@ -93,11 +92,11 @@ src_compile() {
 pkg_postinst() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }
 
 pkg_postrm() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.e

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: b86ec15038f00258094f65871fc843e26f4ce727
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Sep  1 13:51:02 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Sep  1 13:51:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b86ec150

media-sound/musescore-: removed portmidi patch

not needed anymore

Package-Manager: Portage-2.3.74, Repoman-2.3.17
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index cd2dec78e2d..54404ac316e 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -51,7 +51,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-   "${FILESDIR}/${PN}-3.0.1-porttime.patch"
 )
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Ben Kohler]

commit: eb1b7ca24533c275a369d10d959002c2218fa6c4
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed May  1 15:19:26 2019 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed May  1 15:20:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb1b7ca2

media-sound/musescore: use emake generator to work around ninja failure

Force CMAKE_MAKEFILE_GENERATOR="emake" to work around bug 684722.  Ok'd
by asturm.

Bug: https://bugs.gentoo.org/684722
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Ben Kohler  gentoo.org>

 media-sound/musescore/musescore-3.0.1-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index fcc7993200d..379a593d84d 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 CMAKE_MIN_VERSION="3.11"
+CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake-utils xdg
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Andreas Sturmlechner]

commit: 4aa1ff27f7f3f3feefcb091b7405f82b70ba204d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 28 23:34:21 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 28 23:45:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa1ff27

media-sound/musescore: EAPI-7 bump, switch to xdg.eclass

Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/musescore/musescore-3.0.1-r1.ebuild | 27 -
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index a433e8b6636..b4a8145d3c9 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MIN_VERSION="3.11"
-inherit cmake-utils xdg-utils gnome2-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
@@ -19,7 +19,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
-RDEPEND="
+BDEPEND="
+   dev-qt/linguist-tools:5
+   virtual/pkgconfig
+"
+DEPEND="
dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -44,10 +48,7 @@ RDEPEND="
vorbis? ( media-libs/libvorbis )
webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
"${FILESDIR}/${P}-man-pages.patch"
@@ -87,15 +88,3 @@ src_compile() {
cmake-utils_src_make -j1 lrelease manpages
cmake-utils_src_compile
 }
-
-pkg_postinst() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/files/, media-sound/musescore/

[Andreas Sturmlechner]

commit: 9ff9ffa0c86ac6ab87dfadf08ed49a57fdeafd79
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 28 23:38:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 28 23:45:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff9ffa0

media-sound/musescore: Drop 2.1.0-r1

Closes: https://bugs.gentoo.org/630372
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/musescore/Manifest |  2 -
 .../musescore/files/musescore-2.1.0-pch.patch  | 31 
 .../musescore/files/musescore-2.1.0-qt-5.11.patch  | 21 -
 .../musescore/files/musescore-2.1.0-qt-5.12.patch  | 48 
 .../musescore-2.1.0-qtsingleapplication.patch  | 28 ---
 media-sound/musescore/musescore-2.1.0-r1.ebuild| 89 --
 6 files changed, 219 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index e0820b82051..0c4c655eec0 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,2 @@
 DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 
88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5
 SHA512 
91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
-DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B 
da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a
 SHA512 
5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
-DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 
208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852
 SHA512 
c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 
8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9
 SHA512 
d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d

diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch 
b/media-sound/musescore/files/musescore-2.1.0-pch.patch
deleted file mode 100644
index 6cce1bd81cf..000
--- a/media-sound/musescore/files/musescore-2.1.0-pch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001
-From: mirabilos 
-Date: Sun, 4 Mar 2018 16:38:21 +0100
-Subject: [PATCH] Fix numerous reports of missing all.h during compilation
-
-When disabling PCH, the all.h copying code is no longer run before
-AUTOMOC=caused *_autogen targets, so we must run it earlier.
-
-From Debian

- CMakeLists.txt | 7 ++-
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 66b0ddfce8..7fdfffcc9b 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -553,11 +553,8 @@ endif (NOT MINGW AND NOT APPLE)
- #
- 
- # all.h is expected in PROJECT_BINARY_DIR by subdirs
--add_custom_command(
--OUTPUT ${PROJECT_BINARY_DIR}/all.h
--COMMAND ${CMAKE_COMMAND}
--ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
--DEPENDS ${PROJECT_SOURCE_DIR}/all.h
-+execute_process(
-+COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h 
${PROJECT_BINARY_DIR}/all.h
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
- 

diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch 
b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
deleted file mode 100644
index 2fa6afd9395..000
--- a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
-From: Orcan Ogetbil 
-Date: Thu, 31 May 2018 21:04:51 -0400
-Subject: [PATCH] added missing #include  required by qt >= 5.11
-

- all.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/all.h b/all.h
-index 72db72b0ec..2ee0e8e807 100644
 a/all.h
-+++ b/all.h
-@@ -131,6 +131,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 

diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch 
b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
deleted file mode 100644
index 9d9a1cca7ef..000
--- a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
-From: Joachim Schmitz 
-Date: Tue, 18 Sep 2018 14:42:43 +0200
-Subject: [PATCH] changes needed for MuseScore to build with Qt 5.12 (Alpha)
-
-One needed for MSVC only 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Andreas Sturmlechner]

commit: 05f19e6eabc1242972c91aac0ded12289fa87a8d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 28 23:37:18 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 28 23:45:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f19e6e

media-sound/musescore: Drop USE mp3 to fix build failure w/ !mp3

Reported-by: Michael Hofmann  ubhofmann.de>
Closes: https://bugs.gentoo.org/678234
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-sound/musescore/musescore-3.0.1-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index b4a8145d3c9..fcc7993200d 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -38,10 +38,10 @@ DEPEND="
dev-qt/qtxmlpatterns:5
>=media-libs/freetype-2.5.2
media-libs/libsndfile
+   media-sound/lame
sys-libs/zlib:=
alsa? ( >=media-libs/alsa-lib-1.0.0 )
jack? ( virtual/jack )
-   mp3? ( media-sound/lame )
portaudio? ( media-libs/portaudio )
portmidi? ( media-libs/portmidi )
pulseaudio? ( media-sound/pulseaudio )
@@ -73,7 +73,7 @@ src_configure() {
-DUSE_SYSTEM_FREETYPE=ON
-DBUILD_ALSA="$(usex alsa)"
-DBUILD_JACK="$(usex jack)"
-   -DBUILD_LAME="$(usex mp3)"
+   -DBUILD_LAME=ON # bug 678234
-DBUILD_PORTAUDIO="$(usex portaudio)"
-DBUILD_PORTMIDI="$(usex portmidi)"
-DBUILD_PULSEAUDIO="$(usex pulseaudio)"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 5226c8c9815ba2e4cf385adaf978d397c034fc24
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb  3 14:48:25 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb  3 14:48:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5226c8c9

media-sound/musescore-{3.0.1-r1,}: fixes

1) fixed cmake restriction implementation
2) src_prepare: replaced default with cmake-utils_src_prepare

Bug: https://bugs.gentoo.org/677080
Closes: https://bugs.gentoo.org/677156
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.0.1-r1.ebuild | 4 ++--
 media-sound/musescore/musescore-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index 5da73687b8b..a433e8b6636 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+CMAKE_MIN_VERSION="3.11"
 inherit cmake-utils xdg-utils gnome2-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
@@ -45,7 +46,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
-   >=dev-util/cmake-3.11
virtual/pkgconfig
 "
 
@@ -57,7 +57,7 @@ PATCHES=(
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-   default
+   cmake-utils_src_prepare
 
# Move soundfonts to the correct directory
mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index 0a701e5405a..cd2dec78e2d 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+CMAKE_MIN_VERSION="3.11"
 inherit git-r3 cmake-utils xdg-utils gnome2-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
@@ -45,7 +46,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
-   >=dev-util/cmake-3.11
virtual/pkgconfig
 "
 
@@ -60,7 +60,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   default
+   cmake-utils_src_prepare
 
# Move soundfonts to the correct directory
mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move 
soundfont files"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: 2d564b5cdbe9d0aee98a2a0178552bd2ac468ff6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Feb  3 09:30:10 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Feb  3 09:30:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d564b5c

media-sound/musescore-{3.0.1-r1,}: requires newer cmake

Closes: https://bugs.gentoo.org/677080
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/musescore-3.0.1-r1.ebuild | 1 +
 media-sound/musescore/musescore-.ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index 5134768cf3d..5da73687b8b 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -45,6 +45,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
+   >=dev-util/cmake-3.11
virtual/pkgconfig
 "
 

diff --git a/media-sound/musescore/musescore-.ebuild 
b/media-sound/musescore/musescore-.ebuild
index c0507e41c3a..0a701e5405a 100644
--- a/media-sound/musescore/musescore-.ebuild
+++ b/media-sound/musescore/musescore-.ebuild
@@ -45,6 +45,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
+   >=dev-util/cmake-3.11
virtual/pkgconfig
 "
 

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/

[Miroslav Šulc]

commit: f1704101d916dd7cac6acb51c14025ff1dc4a13e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Feb  2 21:40:11 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Feb  2 21:40:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1704101

media-sound/musescore-{3.0.1-r1,}: fixes

1) fixed man pages patch
2) disabled download of soundfonts during configure phase

Bug: https://bugs.gentoo.org/677080
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-sound/musescore/Manifest |  1 +
 .../files/musescore-3.0.1-man-pages.patch  | 22 --
 media-sound/musescore/musescore-3.0.1-r1.ebuild| 13 -
 media-sound/musescore/musescore-.ebuild| 16 
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0b989b3ef61..e0820b82051 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,3 +1,4 @@
+DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 
88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5
 SHA512 
91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
 DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B 
da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a
 SHA512 
5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
 DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 
208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852
 SHA512 
c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 
8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9
 SHA512 
d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d

diff --git a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch 
b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
index 19d28c796c7..fd5ade55ed4 100644
--- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
+++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d337fbab5..bf334121a 100644
+index 6437963..2a173b9 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -667,7 +667,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+@@ -660,7 +660,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
  # Compress man pages if gzip is installed (don't on OpenBSD)
  # Note: Compressing man pages is normal on Linux but not OpenBSD
  find_program( GZIP_EXECUTABLE gzip DOC "A tool for compressing manpages 
(optional)." )
@@ -11,3 +11,21 @@ index d337fbab5..bf334121a 100644
  message(STATUS "Found 'gzip'. Man pages will be compressed.")
  set(MAN_TARGET ${MAN_BUILD})
  set(MAN_EXTENSION ${MAN_EXTENSION}.gz)
+@@ -677,7 +677,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+ COMMAND echo "Man pages have been compressed ready for 
installation."
+ VERBATIM
+ )
+-else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++else (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND 
false)
+ if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+ message(STATUS "System is OpenBSD: Man pages will not be 
compressed.")
+ else (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
+@@ -687,7 +687,7 @@ if (NOT MINGW AND NOT MSVC AND NOT APPLE)
+ COMMAND echo "Man pages will be installed uncompressed."
+ VERBATIM
+ )
+-endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
++endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD" AND 
false)
+ # Install man pages in either compressed or uncompressed form
+ install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc)
+ # Create symlink alias for man pages so `man musescore` = `man mscore`

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index 3f20ceb225b..5134768cf3d 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -7,7 +7,10 @@ inherit cmake-utils xdg-utils gnome2-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/";
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> 
${P}.tar.gz"

[gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/

[Miroslav Šulc]

commit: eb6f51b4b8e87359d6114c6a8122e4d3806fb05f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Feb  1 21:13:46 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Feb  1 21:21:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6f51b4

media-sound/musescore-3.0.1-r1: fixed installation of man pages

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../{musescore-3.0.1.ebuild => musescore-3.0.1-r1.ebuild}| 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/media-sound/musescore/musescore-3.0.1.ebuild 
b/media-sound/musescore/musescore-3.0.1-r1.ebuild
similarity index 89%
rename from media-sound/musescore/musescore-3.0.1.ebuild
rename to media-sound/musescore/musescore-3.0.1-r1.ebuild
index bbb6c5744c7..3f20ceb225b 100644
--- a/media-sound/musescore/musescore-3.0.1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
+   "${FILESDIR}/${P}-man-pages.patch"
"${FILESDIR}/${P}-porttime.patch"
 )
 
@@ -75,14 +76,6 @@ src_compile() {
cmake-utils_src_compile
 }
 
-src_install() {
-   cmake-utils_src_install
-
-   # Fix man page symlink
-   rm "${D}"/usr/share/man/man1/musescore.1.gz || die "Failed to remove 
man broken symlink"
-   dosym ${PN}.1.bz2 /usr/share/man/man1/mscore.1.bz2 || die "Failed to 
create man symlink"
-}
-
 pkg_postinst() {
xdg_mimeinfo_database_update
xdg_desktop_database_update