* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2016-02-01 21:41 David Seifert
0 siblings, 0 replies; 25+ messages in thread
From: David Seifert @ 2016-02-01 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 383c52554a26590807989904dc0ac96107f2654d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 1 21:40:53 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 1 21:41:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383c5255
media-sound/musescore: Add dev-qt/qtprintsupport dependency
Gentoo-Bug: 569046
* EAPI=6
* Add USE="mp3" and USE="jack" flags and make them optional
* Fixed QA warnings due to incorrect .desktop file
* Removed hard-coded CXXFLAGS
* Removed setting RELEASE/DEBUG build, use Gentoo build type
Package-Manager: portage-2.2.27
.../files/musescore-2.0.2-fix-buildsystem.patch | 429 +++++++++++++++++++++
media-sound/musescore/musescore-2.0.2-r1.ebuild | 65 ++++
2 files changed, 494 insertions(+)
diff --git a/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
new file mode 100644
index 0000000..aa2749c
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
@@ -0,0 +1,429 @@
+* Remove hardcoded CXXFLAGS, set only necessary options
+* Turn off RPATH linking
+* Fix QA issues caused by wrong "Version" setting in desktop file
+
+--- MuseScore-2.0.2/aeolus/CMakeLists.txt
++++ MuseScore-2.0.2/aeolus/CMakeLists.txt
+@@ -43,7 +43,7 @@
+ set_target_properties (
+ aeolus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ install(DIRECTORY
+--- MuseScore-2.0.2/audiofile/CMakeLists.txt
++++ MuseScore-2.0.2/audiofile/CMakeLists.txt
+@@ -26,7 +26,7 @@
+ set_target_properties (
+ audiofile
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(audiofile all)
+--- MuseScore-2.0.2/awl/CMakeLists.txt
++++ MuseScore-2.0.2/awl/CMakeLists.txt
+@@ -43,7 +43,7 @@
+ set_target_properties (
+ awl
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(awl all)
+--- MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
++++ MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
+@@ -36,7 +36,7 @@
+ set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
+ add_custom_command(
+ OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
+- COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
++ COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
+ DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ VERBATIM
+--- MuseScore-2.0.2/bww2mxml/CMakeLists.txt
++++ MuseScore-2.0.2/bww2mxml/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ set_target_properties (
+ bww2mxml
+ PROPERTIES
+- COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
+ )
+
+ target_link_libraries(bww2mxml
+--- MuseScore-2.0.2/CMakeLists.txt
++++ MuseScore-2.0.2/CMakeLists.txt
+@@ -115,22 +115,10 @@
+ endif()
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++11 -fPIC -fPIE -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+- endif (MINGW)
+-endif(APPLE)
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
+
+ set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
++set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
+ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+
+ # The Mscore version number.
+@@ -398,7 +386,6 @@
+ # set library search path for runtime linker to load the same
+ # qt libraries as we used at compile time
+ #
+- set (CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath=${_qt5Core_install_prefix}/lib")
+ # install desktop file
+ install( FILES build/mscore.desktop DESTINATION share/applications)
+ # compress man pages if gzip is installed (don't on OpenBSD)
+@@ -449,11 +436,7 @@
+ DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+-if (MINGW)
+- set(BUILD_PCH false)
+-else (MINGW)
+- set(BUILD_PCH true)
+-endif(MINGW)
++set(BUILD_PCH false)
+
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
+
+--- MuseScore-2.0.2/effects/CMakeLists.txt
++++ MuseScore-2.0.2/effects/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ set_target_properties (
+ effects
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(effects all)
+--- MuseScore-2.0.2/fluid/CMakeLists.txt
++++ MuseScore-2.0.2/fluid/CMakeLists.txt
+@@ -45,7 +45,7 @@
+ set_target_properties (
+ fluid
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(fluid all)
+--- MuseScore-2.0.2/fonttools/CMakeLists.txt
++++ MuseScore-2.0.2/fonttools/CMakeLists.txt
+@@ -19,5 +19,5 @@
+ )
+
+ target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
+-set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
++set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
+
+--- MuseScore-2.0.2/libmscore/CMakeLists.txt
++++ MuseScore-2.0.2/libmscore/CMakeLists.txt
+@@ -71,8 +71,8 @@
+ set_target_properties (
+ libmscore
+ PROPERTIES
+- COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+-# COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
++# COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
+ )
+
+ xcode_pch(libmscore all)
+--- MuseScore-2.0.2/manual/CMakeLists.txt
++++ MuseScore-2.0.2/manual/CMakeLists.txt
+@@ -36,13 +36,13 @@
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+ )
+ else(APPLE)
+ set_target_properties (
+ genManual
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ )
+ endif(APPLE)
+
+--- MuseScore-2.0.2/midi/CMakeLists.txt
++++ MuseScore-2.0.2/midi/CMakeLists.txt
+@@ -27,7 +27,7 @@
+ set_target_properties (
+ midi
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(midi all)
+--- MuseScore-2.0.2/miditools/CMakeLists.txt
++++ MuseScore-2.0.2/miditools/CMakeLists.txt
+@@ -13,7 +13,7 @@
+ add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
+
+ set_target_properties(smf2xml
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+ )
+ target_link_libraries(smf2xml
+ ${QT_LIBRARIES}
+@@ -23,7 +23,7 @@
+
+ set_target_properties (
+ xml2smf
+- PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
++ PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
+ )
+ target_link_libraries(xml2smf
+ ${QT_LIBRARIES}
+--- MuseScore-2.0.2/mscore/CMakeLists.txt
++++ MuseScore-2.0.2/mscore/CMakeLists.txt
+@@ -367,7 +367,7 @@
+ if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+ set_target_properties( mscore
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
+ LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
+ )
+ else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
+@@ -488,7 +488,7 @@
+ set_target_properties (
+ mscore
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
+ )
+
+ if (OMR)
+--- MuseScore-2.0.2/mstyle/CMakeLists.txt
++++ MuseScore-2.0.2/mstyle/CMakeLists.txt
+@@ -49,7 +49,7 @@
+ set_target_properties (
+ mstyle
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(mstyle all)
+--- MuseScore-2.0.2/mtest/cmake.inc
++++ MuseScore-2.0.2/mtest/cmake.inc
+@@ -56,16 +56,16 @@
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g -stdlib=libc++"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
++ LINK_FLAGS "-stdlib=libc++"
+ )
+ else(APPLE)
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+- LINK_FLAGS "-g"
++ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
++ LINK_FLAGS ""
+ )
+ endif(APPLE)
+
+--- MuseScore-2.0.2/mtest/CMakeLists.txt
++++ MuseScore-2.0.2/mtest/CMakeLists.txt
+@@ -112,20 +112,7 @@
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+-if (APPLE)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=c++0x -fPIC -stdlib=libc++ -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
+-else (APPLE)
+- if (MINGW)
+- # -mno-ms-bitfields see #22048
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -mno-ms-bitfields -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+- else (MINGW)
+- set(CMAKE_CXX_FLAGS_DEBUG "-std=gnu++0x -fPIC -fPIE -g")
+- set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+- endif (MINGW)
+-endif(APPLE)
+-
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
+
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+
+@@ -133,17 +120,17 @@
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
+ )
+ else (APPLE)
+ set_target_properties (
+ testutils
+ PROPERTIES
+- COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++ COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+ )
+ endif(APPLE)
+
+-# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
++# COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
+
+ add_custom_target(report
+ COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
+--- MuseScore-2.0.2/omr/CMakeLists.txt
++++ MuseScore-2.0.2/omr/CMakeLists.txt
+@@ -42,7 +42,7 @@
+ set_target_properties (
+ omr
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(omr all)
+--- MuseScore-2.0.2/synthesizer/CMakeLists.txt
++++ MuseScore-2.0.2/synthesizer/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set_target_properties (
+ synthesizer
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(synthesizer all)
+--- MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
+@@ -14,7 +14,7 @@
+
+ set_target_properties( beatroot
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(beatroot all)
+--- MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ set_target_properties (
+ diff_match_patch
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(diff_match_patch all)
+--- MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@
+ set_target_properties (
+ kqoauth
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(kqoauth all)
+--- MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
+@@ -36,7 +36,7 @@
+ set_target_properties (
+ ofqf
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(ofqf all)
+--- MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set_target_properties (
+ qzip
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qzip all)
+--- MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
+@@ -37,7 +37,7 @@
+
+ set_target_properties( rtf2html
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(rtf2html all)
+--- MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ set_target_properties (
+ qtsingleapp
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(qtsingleapp all)
+--- MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
++++ MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
+@@ -29,7 +29,7 @@
+ set_target_properties (
+ xmlstream
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(xmlstream all)
+--- MuseScore-2.0.2/zerberus/CMakeLists.txt
++++ MuseScore-2.0.2/zerberus/CMakeLists.txt
+@@ -31,7 +31,7 @@
+ set_target_properties (
+ zerberus
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(zerberus all)
+--- MuseScore-2.0.2/build/mscore.desktop
++++ MuseScore-2.0.2/build/mscore.desktop
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=2.0
++Version=1.0
+ Comment=Create, play and print sheet music
+ Comment[ru]=Визуальный редактор нотных партитур
+ Comment[fr]=Gravure de partitions musicales
diff --git a/media-sound/musescore/musescore-2.0.2-r1.ebuild b/media-sound/musescore/musescore-2.0.2-r1.ebuild
new file mode 100644
index 0000000..a5d88c6
--- /dev/null
+++ b/media-sound/musescore/musescore-2.0.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="http://musescore.org/"
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="audiofile debug jack mp3 portaudio pulseaudio"
+
+RDEPEND="
+ >=dev-qt/qtconcurrent-5.3.0:5
+ >=dev-qt/qtcore-5.3.0:5
+ >=dev-qt/qtdeclarative-5.3.0:5
+ >=dev-qt/qtgui-5.3.0:5
+ >=dev-qt/qthelp-5.3.0:5
+ >=dev-qt/qtprintsupport-5.3.0:5
+ >=dev-qt/qtsvg-5.3.0:5
+ >=dev-qt/qtwebkit-5.3.0:5
+ >=dev-qt/qtxmlpatterns-5.3.0:5
+ >=media-libs/alsa-lib-1.0.0
+ >=media-libs/freetype-2.5.2
+ sys-libs/zlib
+ audiofile? (
+ media-libs/audiofile
+ media-libs/libsndfile
+ )
+ jack? ( media-sound/jack-audio-connection-kit )
+ mp3? ( media-sound/lame )
+ portaudio? ( media-libs/portaudio )
+ pulseaudio? ( media-sound/pulseaudio )
+ "
+DEPEND="${RDEPEND}
+ dev-util/cmake
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+ "
+PATCHES=(
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DHAVE_audiofile="$(usex audiofile)"
+ -DBUILD_JACK="$(usex jack)"
+ -DBUILD_LAME="$(usex mp3)"
+ -DUSE_portaudio="$(usex portaudio)"
+ -DUSE_pulseaudio="$(usex pulseaudio)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake-utils_src_make -j1 lrelease manpages
+ cmake-utils_src_compile
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2017-01-30 13:20 Johannes Huber
0 siblings, 0 replies; 25+ messages in thread
From: Johannes Huber @ 2017-01-30 13:20 UTC (permalink / raw
To: gentoo-commits
commit: de9caaa31bc01de9334093493d481253102d4d42
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 13:14:43 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 13:20:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de9caaa3
media-sound/musescore: Remove 1.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-sound/musescore/Manifest | 1 -
.../musescore/files/musescore-1.1-sline.patch | 11 ----
media-sound/musescore/musescore-1.1.ebuild | 60 ----------------------
3 files changed, 72 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 6d795c3..15c0f13 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
-DIST mscore-1.1.tar.bz2 82410619 SHA256 d160b4dabbee5bbe7c0ba6e653e90fd36fae07ab7fffed2c6991b65123fee10c SHA512 8827c8a54969aa0e567e566c9746dc51da014842fbc80f4c2304a76c8fed4aed9b0b6bde84067caeb7f56b3db166342a8f47038727fa56a88c13f7270a91422d WHIRLPOOL 62bfbd0e16bdbb4a61d12c7cfc68ee4d528fe65764e8fd04b6110528d4f11ad772845bee0a0ebf26eefbe2d24771d79a8751bc5649674226b61ef2f2f1a144da
DIST mscore-1.2.tar.bz2 85739954 SHA256 e7f6c6cd705381a4583db267acbfed2dc9ce3985b20ed5407cd9cfe208d74d81 SHA512 aa92520b34d597db9fcf3c0121a56ceb7bfd8008ec5520cb318129da1c127426b0b789aab9d4754526d22c00307cc730d3c1b5a23e4252d5c5ca9e2b6cd95a38 WHIRLPOOL 6abcd260e908a045b43d210d274911cb87acacc1707638bc625aae817ad3791b13b079b6eaf44fb8b600031e7492eae86d88a6d6cb923c6badcdfe1b89314734
DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1
DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
diff --git a/media-sound/musescore/files/musescore-1.1-sline.patch b/media-sound/musescore/files/musescore-1.1-sline.patch
deleted file mode 100644
index 1534580..00000000
--- a/media-sound/musescore/files/musescore-1.1-sline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mscore-1.1/mscore/mscore/exportxml.cpp.orig
-+++ mscore-1.1/mscore/mscore/exportxml.cpp
-@@ -2363,7 +2363,7 @@
- el->userOff().y());
- */
- if (el->type() == HAIRPIN || el->type() == OTTAVA || el->type() == TEXTLINE) {
-- SLine* sl = static_cast<const SLine*>(el);
-+ SLine* sl = static_cast<SLine*>(el);
- // printf("slin segsz=%d", sl->lineSegments().size());
- if (sl->lineSegments().size() > 0) {
- LineSegment* seg = sl->lineSegments().at(0);
diff --git a/media-sound/musescore/musescore-1.1.ebuild b/media-sound/musescore/musescore-1.1.ebuild
deleted file mode 100644
index 627b4af..00000000
--- a/media-sound/musescore/musescore-1.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils eutils font
-
-MY_P="mscore-${PV}"
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="http://mscore.sourceforge.net"
-SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
- >=media-libs/libsndfile-1.0.19
- media-libs/portaudio
- media-sound/fluidsynth
- media-sound/jack-audio-connection-kit
- sys-libs/zlib
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qt3support:4
- dev-qt/qtscript:4
- dev-qt/qtsvg:4
- x11-libs/qtscriptgenerator"
-DEPEND="${RDEPEND}
- dev-texlive/texlive-context
- app-doc/doxygen
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/mscore"
-VARTEXFONTS="${T}/fonts"
-FONT_SUFFIX="ttf"
-FONT_S="${S}/mscore/fonts"
-
-src_prepare() {
- # Fix invalid conversion error
- epatch "${FILESDIR}"/${P}-sline.patch
-
- # Don't build redundant qtscriptgenerator libs
- sed -i -e '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
-}
-
-src_compile() {
- cmake-utils_src_make lupdate
- cmake-utils_src_make lrelease
- cmake-utils_src_make
-}
-
-src_install() {
- cmake-utils_src_install
- font_src_install
- dodoc ChangeLog NEWS README
- doman packaging/mscore.1
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2017-01-30 13:20 Johannes Huber
0 siblings, 0 replies; 25+ messages in thread
From: Johannes Huber @ 2017-01-30 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 82dfbe45ee96151a1f528a14392d83f1487cf503
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 13:15:43 2017 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 13:20:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82dfbe45
media-sound/musescore: Remove 1.2
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-sound/musescore/Manifest | 1 -
.../musescore/files/musescore-1.2-cflags.patch | 64 ----------------------
media-sound/musescore/musescore-1.2.ebuild | 59 --------------------
3 files changed, 124 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 15c0f13..65bc3e1 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
-DIST mscore-1.2.tar.bz2 85739954 SHA256 e7f6c6cd705381a4583db267acbfed2dc9ce3985b20ed5407cd9cfe208d74d81 SHA512 aa92520b34d597db9fcf3c0121a56ceb7bfd8008ec5520cb318129da1c127426b0b789aab9d4754526d22c00307cc730d3c1b5a23e4252d5c5ca9e2b6cd95a38 WHIRLPOOL 6abcd260e908a045b43d210d274911cb87acacc1707638bc625aae817ad3791b13b079b6eaf44fb8b600031e7492eae86d88a6d6cb923c6badcdfe1b89314734
DIST mscore-1.3.tar.bz2 94704857 SHA256 a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683 SHA512 65369cc62f401c059c3452ada8a8861b6dd36df54313f4039f1a8a96771a37926bb40240df88d150b99cee7bc8a4ee8963a4fdb5a162defc8be660810cbc49b4 WHIRLPOOL 89a91da5607ce8163b74f6a787b57f15ef615a32ede154f943a3d87e78f348b145d14e89c487797df1bff577085b36d5e21c6ffb2daf044cf48b01f350538be1
DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
diff --git a/media-sound/musescore/files/musescore-1.2-cflags.patch b/media-sound/musescore/files/musescore-1.2-cflags.patch
deleted file mode 100644
index d3450b8..00000000
--- a/media-sound/musescore/files/musescore-1.2-cflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- mscore-1.2/mscore/al/CMakeLists.txt
-+++ mscore-1.2/mscore/al/CMakeLists.txt
-@@ -42,7 +42,7 @@
-
- set_source_files_properties(
- dsp.cpp xml.cpp tempo.cpp sig.cpp pos.cpp fraction.cpp
-- PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ PROPERTIES COMPILE_FLAGS "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- set_source_files_properties(dspSSE.cpp
---- mscore-1.2/mscore/awl/CMakeLists.txt
-+++ mscore-1.2/mscore/awl/CMakeLists.txt
-@@ -61,7 +61,7 @@
-
- set_target_properties( awl
- PROPERTIES COMPILE_FLAGS
-- "-include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+ "-include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
- )
-
- ADD_DEPENDENCIES(awl mops1)
---- mscore-1.2/mscore/CMakeLists.txt
-+++ mscore-1.2/mscore/CMakeLists.txt
-@@ -253,9 +253,6 @@
- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
- )
-
--set(CMAKE_CXX_FLAGS_DEBUG "")
--set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
--
- if (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
- if (MINGW)
- set(FLAGS -DQT_DEBUG -DQT_DLL)
-@@ -264,9 +261,9 @@
- endif (MINGW)
- else (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
- if (MINGW)
-- set(FLAGS -O2 -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
-+ set(FLAGS -DNDEBUG -DQT_DLL -DQT_NO_DEBUG)
- else (MINGW)
-- set(FLAGS -O2 -DNDEBUG -DQT_NO_DEBUG)
-+ set(FLAGS -DNDEBUG -DQT_NO_DEBUG)
- endif (MINGW)
- endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-
-@@ -276,7 +273,7 @@
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
- COMMAND ${CMAKE_CXX_COMPILER}
-- -x c++-header -g ${FLAGS}
-+ -x c++-header ${FLAGS}
- -I${QT_INCLUDE_DIR}
- -o all.h.pch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
-@@ -287,7 +284,7 @@
- add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
- COMMAND ${CMAKE_CXX_COMPILER}
-- -x c++-header -g ${FLAGS} -m32
-+ -x c++-header ${FLAGS}
- -I${QT_HEADERS_DIR}
- -o all.h.gch all.h
- DEPENDS ${PROJECT_BINARY_DIR}/all.h
diff --git a/media-sound/musescore/musescore-1.2.ebuild b/media-sound/musescore/musescore-1.2.ebuild
deleted file mode 100644
index 75acf32..00000000
--- a/media-sound/musescore/musescore-1.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils eutils font
-
-MY_P="mscore-${PV}"
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="http://mscore.sourceforge.net"
-SRC_URI="mirror://sourceforge/mscore/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
- >=media-libs/libsndfile-1.0.19
- media-libs/portaudio
- media-sound/fluidsynth
- media-sound/jack-audio-connection-kit
- sys-libs/zlib
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qt3support:4
- dev-qt/qtscript:4
- dev-qt/qtsvg:4
- x11-libs/qtscriptgenerator"
-DEPEND="${RDEPEND}
- dev-texlive/texlive-context
- app-doc/doxygen
- virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/mscore"
-VARTEXFONTS="${T}/fonts"
-FONT_SUFFIX="ttf"
-FONT_S="${S}/mscore/fonts"
-
-src_prepare() {
- # Don't build redundant qtscriptgenerator libs
- sed -i -e '/^set(BUILD_SCRIPTGEN/s/TRUE/FALSE/' CMakeLists.txt || die
-
- epatch "${FILESDIR}"/${P}-cflags.patch
-}
-
-src_compile() {
- cmake-utils_src_make lupdate
- cmake-utils_src_make lrelease
- cmake-utils_src_make
-}
-
-src_install() {
- cmake-utils_src_install
- font_src_install
- dodoc ChangeLog NEWS README
- doman packaging/mscore.1
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2018-08-21 21:36 Andreas Sturmlechner
0 siblings, 0 replies; 25+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 56904c25cf34e1dcc2098b34c1a516f88f3776a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 21:34:45 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 21:34:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56904c25
media-sound/musescore: Fix cmake (missing all.h)
Closes: https://bugs.gentoo.org/626618
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../musescore/files/musescore-2.1.0-pch.patch | 31 ++++++++++++++++++++++
media-sound/musescore/musescore-2.1.0-r1.ebuild | 1 +
2 files changed, 32 insertions(+)
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch
new file mode 100644
index 00000000000..d69d1cd2f65
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-pch.patch
@@ -0,0 +1,31 @@
+From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001
+From: mirabilos <tg@debian.org>
+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}
+ )
+
\ No newline at end of file
diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
index 6abacb371c4..60cdd985217 100644
--- a/media-sound/musescore/musescore-2.1.0-r1.ebuild
+++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
"${WORKDIR}/${P}-fix-buildsystem.patch"
"${FILESDIR}/${P}-qt-5.11.patch"
"${FILESDIR}/${P}-qtsingleapplication.patch"
+ "${FILESDIR}/${P}-pch.patch"
)
S="${WORKDIR}/MuseScore-${PV}"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2019-02-01 21:21 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2019-02-01 21:21 UTC (permalink / raw
To: gentoo-commits
commit: d405376b1ffdb0d5666d1ea18c37ca3106b23512
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 1 21:07:10 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 1 21:21:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d405376b
media-sound/musescore-9999: fixed
Closes: https://bugs.gentoo.org/673342
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 1 -
.../musescore/files/musescore-3.0.1-man-pages.patch | 13 +++++++++++++
media-sound/musescore/musescore-9999.ebuild | 18 ++++++++----------
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index e3aa6440e5a..0b989b3ef61 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,3 @@
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
-DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
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
new file mode 100644
index 00000000000..19d28c796c7
--- /dev/null
+++ b/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d337fbab5..bf334121a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -667,7 +667,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)." )
+- 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)
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 051ffdcc6ae..f06329ed93d 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit cmake-utils git-r3 xdg-utils
+inherit git-r3 cmake-utils xdg-utils gnome2-utils
DESCRIPTION="WYSIWYG Music Score Typesetter"
HOMEPAGE="https://musescore.org/"
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
LICENSE="GPL-2"
SLOT="0"
@@ -47,16 +46,13 @@ DEPEND="${RDEPEND}
"
PATCHES=(
- "${WORKDIR}/${P}-fix-buildsystem.patch"
+ "${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+ "${FILESDIR}/${PN}-3.0.1-porttime.patch"
)
-src_unpack() {
- git-r3_src_unpack
- default_src_unpack
-}
-
src_configure() {
local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON
-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-DUSE_SYSTEM_FREETYPE=ON
@@ -67,7 +63,7 @@ src_configure() {
-DBUILD_PORTMIDI="$(usex portmidi)"
-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-DSOUNDFONT3="$(usex vorbis)"
- -DBUILD_WEBEBENGINE="$(usex webengine)"
+ -DBUILD_WEBENGINE="$(usex webengine)"
)
cmake-utils_src_configure
}
@@ -81,9 +77,11 @@ 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
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2019-02-02 21:40 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2019-02-02 21:40 UTC (permalink / raw
To: gentoo-commits
commit: f1704101d916dd7cac6acb51c14025ff1dc4a13e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 2 21:40:11 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 2 21:40:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1704101
media-sound/musescore-{3.0.1-r1,9999}: 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 <fordfrog <AT> 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-9999.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"
+# 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"
@@ -52,9 +55,17 @@ PATCHES=(
S="${WORKDIR}/MuseScore-${PV}"
+src_prepare() {
+ default
+
+ # 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
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index f06329ed93d..c0507e41c3a 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -7,6 +7,9 @@ inherit git-r3 cmake-utils xdg-utils gnome2-utils
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"
LICENSE="GPL-2"
@@ -50,9 +53,22 @@ PATCHES=(
"${FILESDIR}/${PN}-3.0.1-porttime.patch"
)
+src_unpack() {
+ git-r3_src_unpack
+ unpack ${A}
+}
+
+src_prepare() {
+ default
+
+ # 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
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2019-11-28 20:00 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2019-11-28 20:00 UTC (permalink / raw
To: gentoo-commits
commit: ad57807c0216dbecb5854047986237ea8e4a52f7
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 19:59:59 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 19:59:59 2019 +0000
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 <fordfrog <AT> 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..00000000000
--- 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..00000000000
--- 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/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/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
- media-sound/lame
- sys-libs/zlib:=
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- jack? ( virtual/jack )
- 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}/${P}-man-pages.patch"
- "${FILESDIR}/${P}-porttime.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
- -DBUILD_ALSA="$(usex alsa)"
- -DBUILD_JACK="$(usex jack)"
- -DBUILD_LAME=ON # bug 678234
- -DBUILD_PORTAUDIO="$(usex portaudio)"
- -DBUILD_PORTMIDI="$(usex portmidi)"
- -DBUILD_PULSEAUDIO="$(usex pulseaudio)"
- -DSOUNDFONT3="$(usex vorbis)"
- -DBUILD_WEBENGINE="$(usex webengine)"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake-utils_src_make -j1 lrelease manpages
- cmake-utils_src_compile
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2020-10-17 8:09 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2020-10-17 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 989f63e695faaae629007cb5ad3b93e7e88b3ea5
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 07:54:23 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 08:09:36 2020 +0000
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 <fordfrog <AT> 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 d9121f293519934b29bb51c67eeeeb9459269b87b6007ce4cef7d298bc78922605d8d518161d01423a41df03d4f4f0e0f3fc070179b27c75890c8400c4696833 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 00000000000..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 00000000000..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} == "9999" ]]; 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}/${P}-drop-redeclaration.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; 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
+ -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
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2020-12-11 10:10 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2020-12-11 10:10 UTC (permalink / raw
To: gentoo-commits
commit: bf78902d5aa7f8a6b14bf4829d47fb1a458fceb7
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 10:10:37 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 10:10:37 2020 +0000
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 <fordfrog <AT> gentoo.org>
.../files/musescore-9999-lambda-capture-this.patch | 13 -------------
media-sound/musescore/musescore-9999.ebuild | 5 -----
2 files changed, 18 deletions(-)
diff --git a/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
deleted file mode 100644
index 24c33bd2f18..00000000000
--- a/media-sound/musescore/files/musescore-9999-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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index f9ce6bb051b..42039a19c04 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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} == "9999" ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2021-03-02 8:54 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2021-03-02 8:54 UTC (permalink / raw
To: gentoo-commits
commit: 6a5b3bfc47e9e3abd77835f84560a77364aa4e9b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 2 08:54:05 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Mar 2 08:54:21 2021 +0000
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 <fordfrog <AT> 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..00000000000
--- 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..00000000000
--- 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..00000000000
--- 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} == "9999" ]]; 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} == "9999" ]]; 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
- -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
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2023-01-09 13:02 Sam James
0 siblings, 0 replies; 25+ messages in thread
From: Sam James @ 2023-01-09 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 3e34d258d85a79b4ff1723d949e136615bc9bccd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 13:02:08 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 13:02:45 2023 +0000
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 <sam <AT> gentoo.org>
.../files/musescore-9999-missing-qt-includes.patch | 19 +++++++++----------
media-sound/musescore/musescore-9999.ebuild | 18 +++++++++++++-----
2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch b/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
index 2cfa8f2b8fca..b49f2e148f28 100644
--- a/media-sound/musescore/files/musescore-9999-missing-qt-includes.patch
+++ b/media-sound/musescore/files/musescore-9999-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 <memory>
- #include <string>
-+
-+#include <QtCore/qcompilerdetection.h>
-+
- #include "internal/abstractinvoker.h"
- #include "async.h"
-
+
+ #include <memory>
+ #include <string>
++
++#include <QtCore/qcompilerdetection.h>
++
+ #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 <vector>
-
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 06685fa6b24a..f26651950844 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2023-06-06 6:45 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2023-06-06 6:45 UTC (permalink / raw
To: gentoo-commits
commit: fbe6b848d05897ef2bbeeececf22b7be0c33c271
Author: Adrian Schollmeyer <nex+b-g-o <AT> nexadn <DOT> de>
AuthorDate: Sun Mar 12 19:27:24 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 6 06:45:16 2023 +0000
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 <nex+b-g-o <AT> nexadn.de>
Closes: https://github.com/gentoo/gentoo/pull/30081
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 000000000000..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 REQUIRED)
++
+ if (GLOBAL_NO_INTERNAL)
+ set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL)
+ else()
+@@ -184,6 +184,7 @@ set(MODULE_INCLUDE
+ set(MODULE_LINK
+ ${FS_LIB}
+ ${Z_LIB}
++ tinyxml2::tinyxml2
+ )
+
+ if (OS_IS_MAC)
+--- 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 <tinyxml2.h>
+
+ #include "log.h"
+
+--- a/src/framework/global/serialization/xmlstreamreader.cpp
++++ b/src/framework/global/serialization/xmlstreamreader.cpp
+@@ -23,7 +23,7 @@
+
+ #include <cstring>
+
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+
+ #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 REQ
+ target_link_libraries(${MODULE_TEST}
+ Qt5::Core
+ Qt5::Gui
+- gmock
++ GTest::gmock
+ global
+ ${MODULE_TEST_LINK}
+ )
diff --git a/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch
new file mode 100644
index 000000000000..078662a66bdb
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.0.2-uncompressed-man-pages.patch
@@ -0,0 +1,29 @@
+--- a/build/cmake/SetupAppImagePackaging.cmake
++++ b/build/cmake/SetupAppImagePackaging.cmake
+@@ -85,7 +85,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)." )
+- 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)
+@@ -102,7 +102,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")
+@@ -112,7 +112,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/metadata.xml b/media-sound/musescore/metadata.xml
index e2ba1fa20224..c17629b67a33 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,6 +10,7 @@
<remote-id type="github">musescore/MuseScore</remote-id>
</upstream>
<use>
+ <flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag>
<flag name="osc">Enable OSC remote control protocol</flag>
<flag name="omr">Enable PDF import (OMR - optical music recognition)</flag>
<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
diff --git a/media-sound/musescore/musescore-4.0.2.ebuild b/media-sound/musescore/musescore-4.0.2.ebuild
new file mode 100644
index 000000000000..cd79a319f13f
--- /dev/null
+++ b/media-sound/musescore/musescore-4.0.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+#CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+VIRTUALX_REQUIRED="test"
+inherit cmake qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; 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="debug jumbo-build test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+DEPEND="
+ dev-libs/tinyxml2:=
+ 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/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
+ 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:=
+
+ test? (
+ dev-cpp/gtest
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-uncompressed-man-pages.patch"
+ "${FILESDIR}/${P}-unbundle-deps.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; 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"
+
+ # Make sure we don't accidentally use bundled third party deps
+ # for which we want to use system packages instead.
+ rm -r thirdparty/{flac,freetype,googletest,lame,opus,opusenc} \
+ || die "Failed to remove unused thirdparty directories"
+}
+
+src_configure() {
+ # bug #766111
+ export PATH="$(qt5_get_bindir):${PATH}"
+
+ local mycmakeargs=(
+ -DMUSESCORE_BUILD_CONFIG=release
+
+ -DBUILD_CRASHPAD_CLIENT=OFF
+ -DBUILD_AUTOUPDATE=OFF
+ # Jack support has been dropped in 4.0.0,
+ # but its remnants are still in the build system and cause trouble.
+ # https://github.com/musescore/MuseScore/issues/12775
+ -DBUILD_JACK=OFF
+ -DDOWNLOAD_SOUNDFONT=OFF
+ -DSOUNDFONT3=ON
+ -DBUILD_UNIT_TESTS="$(usex test)"
+ -DCMAKE_SKIP_RPATH=ON
+ -DTRY_USE_CCACHE=OFF
+ -DBUILD_UNITY="$(usex jumbo-build)"
+ -DUSE_SYSTEM_FREETYPE=ON
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake_build -j1 lrelease manpages
+ cmake_src_compile
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ # Hack to not install bundled libraries like libogg
+ rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-01-21 0:56 Jason A. Donenfeld
0 siblings, 0 replies; 25+ messages in thread
From: Jason A. Donenfeld @ 2024-01-21 0:56 UTC (permalink / raw
To: gentoo-commits
commit: 899041aa86b131e37fa497b3a5c17889ce9dbe67
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 20 04:34:34 2024 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 00:55:58 2024 +0000
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 <zx2c4 <AT> gentoo.org>
media-sound/musescore/Manifest | 1 +
.../files/musescore-4.2.0-dynamic_cast-crash.patch | 11 ++
| 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 000000000000..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;
+ }
--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 000000000000..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 <QtGlobal>
+
+ namespace mu::ui {
+ class UiConfiguration;
+--- a/src/framework/ui/view/interactiveprovider.h
++++ b/src/framework/ui/view/interactiveprovider.h
+@@ -26,6 +26,7 @@
+ #include <QVariant>
+ #include <QMap>
+ #include <QStack>
++#include <QEventLoop>
+
+ #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 <QPainter>
++
+ 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 <QObject>
++#include <QVariant>
+
+ #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 000000000000..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/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}/serialization/zipwriter.cpp
+@@ -130,6 +128,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()
+@@ -209,6 +209,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 <tinyxml2.h>
+
+ #include "log.h"
+
+--- a/src/framework/global/serialization/xmlstreamreader.cpp
++++ b/src/framework/global/serialization/xmlstreamreader.cpp
+@@ -23,7 +23,7 @@
+
+ #include <cstring>
+
+-#include "thirdparty/tinyxml/tinyxml2.h"
++#include <tinyxml2.h>
+
+ #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/files/musescore-4.2.0-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
new file mode 100644
index 000000000000..12bcb0f2f42b
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
@@ -0,0 +1,29 @@
+--- a/build/cmake/SetupAppImagePackaging.cmake
++++ b/build/cmake/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/metadata.xml b/media-sound/musescore/metadata.xml
index c17629b67a33..bb8981f3fa8a 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -17,5 +17,6 @@
<flag name="sf3">Enable SoundFont 3 support using <pkg>media-libs/libvorbis</pkg></flag>
<flag name="sfz">Enable experimental SFZ sampler</flag>
<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
+ <flag name="video">Support exporting scores as videos using the command line</flag>
</use>
</pkgmetadata>
diff --git a/media-sound/musescore/musescore-4.2.0.ebuild b/media-sound/musescore/musescore-4.2.0.ebuild
new file mode 100644
index 000000000000..8517858ee081
--- /dev/null
+++ b/media-sound/musescore/musescore-4.2.0.ebuild
@@ -0,0 +1,135 @@
+# 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 qmake-utils xdg check-reqs virtualx
+
+if [[ ${PV} == "9999" ]]; 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 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="test video"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+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
+ dev-qt/qtnetwork:5
+ 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
+ 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:=
+ video? ( media-video/ffmpeg )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-uncompressed-man-pages.patch"
+ "${FILESDIR}/${P}-unbundle-deps.patch"
+ "${FILESDIR}/${P}-missing-headers.patch"
+ "${FILESDIR}/${P}-dynamic_cast-crash.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_src_unpack
+ unpack ${A}
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ cmake_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() {
+ # bug #766111
+ export PATH="$(qt5_get_bindir):${PATH}"
+
+ local mycmakeargs=(
+ -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_FREETYPE=ON
+ -DMUE_DOWNLOAD_SOUNDFONT=OFF
+ -DMUSESCORE_BUILD_MODE=release
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cd "${BUILD_DIR}" || die
+ cmake_build lrelease manpages
+ cmake_src_compile
+}
+
+src_test() {
+ virtx cmake_src_test
+}
+
+src_install() {
+ cmake_src_install
+
+ # Hack to not install bundled libraries
+ rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-02-06 19:47 Jason A. Donenfeld
0 siblings, 0 replies; 25+ messages in thread
From: Jason A. Donenfeld @ 2024-02-06 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 178e455e0d340ab8b4b79273a80acde620df6653
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 19:44:25 2024 +0000
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 19:47:00 2024 +0000
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 <zx2c4 <AT> gentoo.org>
| 22 ++++++++++++++++++++++
...e-4.2.1-r1.ebuild => musescore-4.2.1-r2.ebuild} | 2 +-
media-sound/musescore/musescore-9999.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 <QXmlStreamReader>
++
+ using AccidentalType = mu::engraving::AccidentalType;
+ using SymId = mu::engraving::SymId;
+ const static std::map<mu::String, AccidentalType> 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 <unordered_set>
++#include <QList>
++#include <QVariant>
+
+ #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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index cb7e3aaf3288..de9540eac6c5 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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() {
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-02-09 8:08 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2024-02-09 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 5aaa8f5287fef487d369c16d897e0171d01af00b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 9 08:08:01 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 08:08:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aaa8f52
media-sound/musescore: updated live ebuild patches
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/musescore-9999-unbundle-deps.patch | 120 +++++++++++++++++++++
media-sound/musescore/musescore-9999.ebuild | 3 +-
2 files changed, 121 insertions(+), 2 deletions(-)
diff --git a/media-sound/musescore/files/musescore-9999-unbundle-deps.patch b/media-sound/musescore/files/musescore-9999-unbundle-deps.patch
new file mode 100644
index 000000000000..bac09d7eaa82
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-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 <tinyxml2.h>
+
+ #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 <tinyxml2.h>
+
+ #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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 09adc4123499..5ea71c947e32 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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}-9999-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
- "${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-08-04 9:41 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2024-08-04 9:41 UTC (permalink / raw
To: gentoo-commits
commit: e2d981ee75b9d7f857d4c4809d1292684d0a821c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 09:41:05 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 09:41:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2d981ee
media-sound/musescore: updated patch in live ebuild
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../musescore-4.4.0-uncompressed-man-pages.patch | 29 ++++++++++++++++++++++
media-sound/musescore/musescore-9999.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 000000000000..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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 2479f5aa8f21..52aebfbedfc0 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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}-9999-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
)
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-08-04 11:16 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2024-08-04 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 1008ddf5eca0842300237e9127212a07ab126611
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 11:09:53 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 11:16:04 2024 +0000
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 <fordfrog <AT> gentoo.org>
.../files/musescore-4.4.0-unbundle-deps.patch | 26 ++++++++++++++++
media-sound/musescore/musescore-9999.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 000000000000..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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 52aebfbedfc0..8ddeeb119d63 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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}-9999-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
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-08-10 7:52 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2024-08-10 7:52 UTC (permalink / raw
To: gentoo-commits
commit: 792e62986c7be8a0a683cd76a3f5048f723b8d4b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 10 07:52:09 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Aug 10 07:52:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=792e6298
media-sound/musescore: updated live ebuild
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/musescore-4.4.0-unbundle-harfbuzz.patch | 25 ++++++++++++++++++++++
media-sound/musescore/musescore-9999.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 000000000000..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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 5e65d317f42e..06e97196028f 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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
}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-09-06 9:03 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2024-09-06 9:03 UTC (permalink / raw
To: gentoo-commits
commit: fb0b87365d7dd4fc7781c718f720ec069648f8f3
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 6 09:03:22 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Sep 6 09:03:36 2024 +0000
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 <fordfrog <AT> 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-9999.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 000000000000..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 <kbloom@gmail.com>
+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 000000000000..b4a510dddd5b
--- /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 <QClipboard>
++#include <QGuiApplication>
+
+ #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-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 7dc814a8631c..a301de148da8 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.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
@@ -59,9 +60,10 @@ 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"
+ "${FILESDIR}/${PN}-4.5.0-missing-include.patch"
)
src_unpack() {
@@ -97,8 +99,10 @@ 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_COMPILE_USE_SYSTEM_HARFBUZZ=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
-DMUSE_APP_BUILD_MODE="release"
-DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-10-15 7:32 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2024-10-15 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 4cdba4a4237d4575aa2aa043a95d4d57b5ef3242
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 07:31:49 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 07:32:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cdba4a4
media-sound/musescore: updated live
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../musescore/files/musescore-4.5.0-missing-include.patch | 10 ----------
media-sound/musescore/musescore-9999.ebuild | 1 -
2 files changed, 11 deletions(-)
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
deleted file mode 100644
index b4a510dddd5b..000000000000
--- a/media-sound/musescore/files/musescore-4.5.0-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/framework/extensions/devtools/apidumpmodel.cpp
-+++ b/src/framework/extensions/devtools/apidumpmodel.cpp
-@@ -22,6 +22,7 @@
- #include "apidumpmodel.h"
-
- #include <QClipboard>
-+#include <QGuiApplication>
-
- #include "extensions/api/extapi.h"
-
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index adf7424374ee..453e2ca9139c 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -62,7 +62,6 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
"${FILESDIR}/${PN}-4.4.0-include.patch"
- "${FILESDIR}/${PN}-4.5.0-missing-include.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2024-11-23 17:43 Andreas Sturmlechner
0 siblings, 0 replies; 25+ messages in thread
From: Andreas Sturmlechner @ 2024-11-23 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 689f0b7f345de9fc1fcf95a83b0be7f1f14d3661
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 21:15:02 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 17:43:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689f0b7f
media-sound/musescore: drop 3.6.2-r1, 4.3.2
Bug: https://bugs.gentoo.org/926328
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/musescore/Manifest | 2 -
.../files/musescore-3.0.1-man-pages.patch | 29 -----
.../files/musescore-3.6.1-rename-audioitem.patch | 12 --
.../musescore-4.2.0-uncompressed-man-pages.patch | 29 -----
| 63 ---------
.../files/musescore-4.3.2-unbundle-deps.patch | 48 -------
media-sound/musescore/metadata.xml | 6 -
media-sound/musescore/musescore-3.6.2-r1.ebuild | 127 ------------------
media-sound/musescore/musescore-4.3.2.ebuild | 143 ---------------------
9 files changed, 459 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0b06ed1d72dc..062cfadc6e2d 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,2 @@
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.3.tar.gz 143462048 BLAKE2B 98a0a685093dc4f21d263308663ce263f11d9ce3dcf92038f266afebd19f2d9aa125d831aaa5fb805c0eeeca26a869b589c304b1c6004b7adb537ddff263d4e6 SHA512 0eb7e8eaed3397f826449312dfedeceab86c102c83969c8d5e88ccfa08daf27fceff092ad1a96274fcaf815d15d6c4a416940506b6eddb0ade25e1f53119d719
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
deleted file mode 100644
index a9e871f12d77..000000000000
--- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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)." )
-- 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)
-@@ -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/files/musescore-3.6.1-rename-audioitem.patch b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
deleted file mode 100644
index caf9ae67ec70..000000000000
--- a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix misnamed variable causing build failure with USE=-mp3
-https://bugs.gentoo.org/767760
-Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
---- 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/files/musescore-4.2.0-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
deleted file mode 100644
index 12bcb0f2f42b..000000000000
--- a/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/build/cmake/SetupAppImagePackaging.cmake
-+++ b/build/cmake/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/files/musescore-4.2.1-missing-headers.patch b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
deleted file mode 100644
index 56ae1f4fa2d6..000000000000
--- a/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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 <QtGlobal>
-
- namespace mu::ui {
- class UiConfiguration;
---- a/src/framework/ui/view/interactiveprovider.h
-+++ b/src/framework/ui/view/interactiveprovider.h
-@@ -26,6 +26,7 @@
- #include <QVariant>
- #include <QMap>
- #include <QStack>
-+#include <QEventLoop>
-
- #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 <QXmlStreamReader>
-+
- using AccidentalType = mu::engraving::AccidentalType;
- using SymId = mu::engraving::SymId;
- const static std::map<mu::String, AccidentalType> smuflAccidentalTypes {
---- a/src/importexport/videoexport/internal/videowriter.cpp
-+++ b/src/importexport/videoexport/internal/videowriter.cpp
-@@ -32,6 +32,8 @@
-
- #include "log.h"
-
-+#include <QPainter>
-+
- 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 <QObject>
-+#include <QVariant>
-
- #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 <unordered_set>
-+#include <QList>
-+#include <QVariant>
-
- #include "containers.h"
-
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
deleted file mode 100644
index 6a3f44702f27..000000000000
--- a/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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/metadata.xml b/media-sound/musescore/metadata.xml
index bdf3cf8fbc6d..265b53d9c817 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,12 +10,6 @@
<remote-id type="github">musescore/MuseScore</remote-id>
</upstream>
<use>
- <flag name="osc">Enable OSC remote control protocol</flag>
- <flag name="omr">Enable PDF import (OMR - optical music recognition)</flag>
- <flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
- <flag name="sf3">Enable SoundFont 3 support using <pkg>media-libs/libvorbis</pkg></flag>
- <flag name="sfz">Enable experimental SFZ sampler</flag>
- <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
<flag name="video">Support exporting scores as videos using the command line</flag>
</use>
</pkgmetadata>
diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild b/media-sound/musescore/musescore-3.6.2-r1.ebuild
deleted file mode 100644
index 38e0104ea372..000000000000
--- a/media-sound/musescore/musescore-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# 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 flag-o-matic qmake-utils xdg check-reqs
-
-if [[ ${PV} == "9999" ]]; 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} == "9999" ]]; 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() {
- # -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}"
-
- 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=OFF
- -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
-}
diff --git a/media-sound/musescore/musescore-4.3.2.ebuild b/media-sound/musescore/musescore-4.3.2.ebuild
deleted file mode 100644
index b5a97d520654..000000000000
--- a/media-sound/musescore/musescore-4.3.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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} == "9999" ]]; 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 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="jack test video"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- 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
- >=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:=
- 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.2.0-uncompressed-man-pages.patch"
- "${FILESDIR}/${PN}-4.3.2-unbundle-deps.patch"
- "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
- "${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_src_unpack
- unpack ${A}
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_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() {
- # confuses rcc, bug #908808
- filter-lto
-
- # bug #766111
- export PATH="$(qt5_get_bindir):${PATH}"
-
- local mycmakeargs=(
- -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
- -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
- )
- cmake_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake_build lrelease manpages
- cmake_src_compile
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # Hack to not install bundled libraries
- rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2025-01-07 19:29 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2025-01-07 19:29 UTC (permalink / raw
To: gentoo-commits
commit: ff577d6646e5b6f715f5641e2422b6ff8074b734
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 7 19:29:09 2025 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 19:29:17 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff577d66
media-sound/musescore: dropped obsolete versions
Bug: https://bugs.gentoo.org/926328
Closes: https://bugs.gentoo.org/684722
Closes: https://bugs.gentoo.org/937234
Closes: https://bugs.gentoo.org/923217
Closes: https://bugs.gentoo.org/820590
Closes: https://bugs.gentoo.org/937729
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 3 -
.../files/musescore-3.0.1-man-pages.patch | 29 -----
.../files/musescore-3.6.1-rename-audioitem.patch | 12 --
.../musescore-4.2.0-uncompressed-man-pages.patch | 29 -----
| 63 ---------
.../files/musescore-4.3.2-unbundle-deps.patch | 48 -------
media-sound/musescore/metadata.xml | 6 -
media-sound/musescore/musescore-3.6.2-r1.ebuild | 127 ------------------
media-sound/musescore/musescore-4.3.2.ebuild | 143 ---------------------
media-sound/musescore/musescore-4.4.3.ebuild | 134 -------------------
10 files changed, 594 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f431e400c378..a24e97eb7593 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,5 +1,2 @@
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.3.tar.gz 143462048 BLAKE2B 98a0a685093dc4f21d263308663ce263f11d9ce3dcf92038f266afebd19f2d9aa125d831aaa5fb805c0eeeca26a869b589c304b1c6004b7adb537ddff263d4e6 SHA512 0eb7e8eaed3397f826449312dfedeceab86c102c83969c8d5e88ccfa08daf27fceff092ad1a96274fcaf815d15d6c4a416940506b6eddb0ade25e1f53119d719
DIST musescore-4.4.4.tar.gz 143607247 BLAKE2B 934b95d51bb667be57101ebc7528dbb04cbb9a10501da7e8a5aea11e34fd45817b55072a1094bf1731aab4a9b1765a8582fa997502c1f1ca90097d492e120bfa SHA512 1e1d3f9018cb5f30e2e76a98673c03097ae3d0982e14a25df3b3b8a8f5d191968c470ba548e05afb6c5fbc6dce8b4c8a3112b99a70341fb285ced257d5df0ee8
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
deleted file mode 100644
index a9e871f12d77..000000000000
--- a/media-sound/musescore/files/musescore-3.0.1-man-pages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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)." )
-- 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)
-@@ -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/files/musescore-3.6.1-rename-audioitem.patch b/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
deleted file mode 100644
index caf9ae67ec70..000000000000
--- a/media-sound/musescore/files/musescore-3.6.1-rename-audioitem.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Fix misnamed variable causing build failure with USE=-mp3
-https://bugs.gentoo.org/767760
-Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
---- 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/files/musescore-4.2.0-uncompressed-man-pages.patch b/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
deleted file mode 100644
index 12bcb0f2f42b..000000000000
--- a/media-sound/musescore/files/musescore-4.2.0-uncompressed-man-pages.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/build/cmake/SetupAppImagePackaging.cmake
-+++ b/build/cmake/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/files/musescore-4.2.1-missing-headers.patch b/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
deleted file mode 100644
index 56ae1f4fa2d6..000000000000
--- a/media-sound/musescore/files/musescore-4.2.1-missing-headers.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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 <QtGlobal>
-
- namespace mu::ui {
- class UiConfiguration;
---- a/src/framework/ui/view/interactiveprovider.h
-+++ b/src/framework/ui/view/interactiveprovider.h
-@@ -26,6 +26,7 @@
- #include <QVariant>
- #include <QMap>
- #include <QStack>
-+#include <QEventLoop>
-
- #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 <QXmlStreamReader>
-+
- using AccidentalType = mu::engraving::AccidentalType;
- using SymId = mu::engraving::SymId;
- const static std::map<mu::String, AccidentalType> smuflAccidentalTypes {
---- a/src/importexport/videoexport/internal/videowriter.cpp
-+++ b/src/importexport/videoexport/internal/videowriter.cpp
-@@ -32,6 +32,8 @@
-
- #include "log.h"
-
-+#include <QPainter>
-+
- 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 <QObject>
-+#include <QVariant>
-
- #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 <unordered_set>
-+#include <QList>
-+#include <QVariant>
-
- #include "containers.h"
-
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
deleted file mode 100644
index 6a3f44702f27..000000000000
--- a/media-sound/musescore/files/musescore-4.3.2-unbundle-deps.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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/metadata.xml b/media-sound/musescore/metadata.xml
index bdf3cf8fbc6d..265b53d9c817 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,12 +10,6 @@
<remote-id type="github">musescore/MuseScore</remote-id>
</upstream>
<use>
- <flag name="osc">Enable OSC remote control protocol</flag>
- <flag name="omr">Enable PDF import (OMR - optical music recognition)</flag>
- <flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
- <flag name="sf3">Enable SoundFont 3 support using <pkg>media-libs/libvorbis</pkg></flag>
- <flag name="sfz">Enable experimental SFZ sampler</flag>
- <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
<flag name="video">Support exporting scores as videos using the command line</flag>
</use>
</pkgmetadata>
diff --git a/media-sound/musescore/musescore-3.6.2-r1.ebuild b/media-sound/musescore/musescore-3.6.2-r1.ebuild
deleted file mode 100644
index b2eef0476732..000000000000
--- a/media-sound/musescore/musescore-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2025 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 flag-o-matic qmake-utils xdg check-reqs
-
-if [[ ${PV} == "9999" ]]; 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} == "9999" ]]; 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() {
- # -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}"
-
- 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=OFF
- -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
-}
diff --git a/media-sound/musescore/musescore-4.3.2.ebuild b/media-sound/musescore/musescore-4.3.2.ebuild
deleted file mode 100644
index b5a97d520654..000000000000
--- a/media-sound/musescore/musescore-4.3.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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} == "9999" ]]; 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 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="jack test video"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- 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
- >=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:=
- 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.2.0-uncompressed-man-pages.patch"
- "${FILESDIR}/${PN}-4.3.2-unbundle-deps.patch"
- "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
- "${FILESDIR}/${PN}-4.2.1-missing-headers.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_src_unpack
- unpack ${A}
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_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() {
- # confuses rcc, bug #908808
- filter-lto
-
- # bug #766111
- export PATH="$(qt5_get_bindir):${PATH}"
-
- local mycmakeargs=(
- -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
- -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
- )
- cmake_src_configure
-}
-
-src_compile() {
- cd "${BUILD_DIR}" || die
- cmake_build lrelease manpages
- cmake_src_compile
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # Hack to not install bundled libraries
- rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
diff --git a/media-sound/musescore/musescore-4.4.3.ebuild b/media-sound/musescore/musescore-4.4.3.ebuild
deleted file mode 100644
index 453e2ca9139c..000000000000
--- a/media-sound/musescore/musescore-4.4.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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} == "9999" ]]; 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 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="jack test video"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- dev-qt/qttools:6[linguist]
- virtual/pkgconfig
-"
-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
- 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
- media-libs/libopusenc
- media-libs/libsndfile
- media-libs/opus
- media-sound/lame
- sys-libs/zlib:=
- jack? ( virtual/jack )
- video? ( media-video/ffmpeg )
-"
-DEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
- "${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
- "${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
- "${FILESDIR}/${PN}-4.4.0-include.patch"
-)
-
-src_unpack() {
- if [[ ${PV} == "9999" ]]; then
- git-r3_src_unpack
- unpack ${A}
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # Move soundfonts to the correct directory
- mv -v "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
- # confuses rcc, bug #908808
- filter-lto
-
- # bug #766111
- 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_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_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)"
- -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
- cmake_src_compile
-}
-
-src_test() {
- virtx cmake_src_test
-}
-
-src_install() {
- cmake_src_install
-
- # Hack to not install bundled libraries
- rm -rf "${ED}/usr/include" "${ED}/usr/$(get_libdir)" || die
-}
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2025-05-18 9:12 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2025-05-18 9:12 UTC (permalink / raw
To: gentoo-commits
commit: af324607d03c9e2ff5ad60301572d826097946b5
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun May 18 08:32:34 2025 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 18 09:12:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af324607
media-sound/musescore: updated live ebuild
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/musescore-4.6.0-qjsonvalue.patch | 36 ----------------------
media-sound/musescore/musescore-9999.ebuild | 1 -
2 files changed, 37 deletions(-)
diff --git a/media-sound/musescore/files/musescore-4.6.0-qjsonvalue.patch b/media-sound/musescore/files/musescore-4.6.0-qjsonvalue.patch
deleted file mode 100644
index d8ac6e9263a7..000000000000
--- a/media-sound/musescore/files/musescore-4.6.0-qjsonvalue.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/converter/internal/compat/backendapi.cpp
-+++ b/src/converter/internal/compat/backendapi.cpp
-@@ -268,11 +268,11 @@ QVariantMap BackendApi::readBeatsColors(const muse::io::path_t& filePath)
-
- QVariantMap result;
-
-- for (const QJsonValueRef colorObj: colors) {
-+ for (const QJsonValue &colorObj: colors) {
- const QJsonArray beatsIndexes = colorObj[u"beats"].toArray();
- const QColor beatsColor = QColor(colorObj[u"color"].toString());
-
-- for (const QJsonValueRef index: beatsIndexes) {
-+ for (const QJsonValue &index: beatsIndexes) {
- result[index.toString()] = beatsColor;
- }
- }
---- a/src/converter/internal/convertercontroller.cpp
-+++ b/src/converter/internal/convertercontroller.cpp
-@@ -258,7 +258,7 @@ RetVal<ConverterController::BatchJob> ConverterController::parseBatchJob(const m
- return io::Dir::fromNativeSeparators(path).toQString();
- };
-
-- for (const QJsonValueRef obj : arr) {
-+ for (const QJsonValue &obj : arr) {
- Job job;
- job.in = correctUserInputPath(obj[u"in"].toString());
-
-@@ -278,7 +278,7 @@ RetVal<ConverterController::BatchJob> ConverterController::parseBatchJob(const m
- rv.val.push_back(std::move(job));
- } else if (outValue.isArray()) {
- const QJsonArray outArray = outValue.toArray();
-- for (const QJsonValueRef outItem : outArray) {
-+ for (const QJsonValue &outItem : outArray) {
- Job partJob = job; // Copy the input path
- if (outItem.isString()) {
- partJob.out = correctUserInputPath(outItem.toString());
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 9daa4e07cf3f..beb2078f4b5a 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -63,7 +63,6 @@ PATCHES=(
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
"${FILESDIR}/${PN}-4.4.0-include.patch"
"${FILESDIR}/${PN}-4.5.0-missing-includes.patch"
- "${FILESDIR}/${PN}-4.6.0-qjsonvalue.patch"
)
src_unpack() {
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2025-07-19 15:17 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2025-07-19 15:17 UTC (permalink / raw
To: gentoo-commits
commit: bd78e30326ce49e267129d7a069523d11b632c41
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 19 15:17:11 2025 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 19 15:17:21 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd78e303
media-sound/musescore: fixed live ebuild
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/musescore-4.6.0-missing-includes.patch | 22 ++++++++++++++++++++++
media-sound/musescore/musescore-9999.ebuild | 2 ++
2 files changed, 24 insertions(+)
diff --git a/media-sound/musescore/files/musescore-4.6.0-missing-includes.patch b/media-sound/musescore/files/musescore-4.6.0-missing-includes.patch
new file mode 100644
index 000000000000..fbc7f03ef53d
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.6.0-missing-includes.patch
@@ -0,0 +1,22 @@
+--- a/src/framework/ui/view/internal/widgetdialogadapter.h
++++ b/src/framework/ui/view/internal/widgetdialogadapter.h
+@@ -22,6 +22,8 @@
+ #pragma once
+
+ #include <QObject>
++#include <QDialog>
++#include <QWindow>
+
+ namespace muse::ui {
+ class WidgetDialogAdapter : public QObject
+--- a/src/notation/internal/notationactioncontroller.cpp
++++ b/src/notation/internal/notationactioncontroller.cpp
+@@ -34,6 +34,8 @@
+ #include "translation.h"
+ #include "log.h"
+
++#include <QGuiApplication>
++
+ using namespace mu;
+ using namespace muse;
+ using namespace muse::io;
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 2cccab04bde9..0e600bbad7d8 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
"${FILESDIR}/${PN}-4.4.0-include.patch"
"${FILESDIR}/${PN}-4.5.0-missing-includes.patch"
+ "${FILESDIR}/${PN}-4.6.0-missing-includes.patch"
)
src_unpack() {
@@ -89,6 +90,7 @@ src_configure() {
export PATH="$(qt5_get_bindir):${PATH}"
local mycmakeargs=(
+ -DCMAKE_POSITION_INDEPENDENT_CODE=ON # https://github.com/musescore/MuseScore/issues/28797
-DCMAKE_BUILD_TYPE="release"
-DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}"
-DCMAKE_C_FLAGS_RELEASE="${CFLAGS}"
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/
@ 2025-10-16 13:12 Miroslav Šulc
0 siblings, 0 replies; 25+ messages in thread
From: Miroslav Šulc @ 2025-10-16 13:12 UTC (permalink / raw
To: gentoo-commits
commit: bd25f8f370ed297c233d2a2e7f6867f648409b12
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri Oct 10 12:57:13 2025 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 16 12:59:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd25f8f3
media-sound/musescore: sync live, unbundle lame/pugixml
skip CMAKE_QA, one file from fluidsynth (3rd party), unused
deps :
add optional support for pipewire
add optional support for websockets (qtwebsockets)
add utfcpp (unbundled)
xml is now handled by pugixml (unbundled) instead of tinyxml
libsndfile is no longer required
add qtbase:6[X] because upstream forces X11 (see PR 28461).
wayland still could be forced with MU_QT_QPA_PLATFORM=wayland
cmake options :
disable PCH
conditional pipewire
conditional websockets
skip more tests
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/44140
Closes: https://github.com/gentoo/gentoo/pull/44140
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/musescore-4.7-unbundle-gtest.patch | 70 ++++++++++++++++++++++
.../files/musescore-4.7-unbundle-lame.patch | 15 +++++
.../files/musescore-4.7-unbundle-pugixml.patch | 26 ++++++++
.../files/musescore-4.7-unbundle-utfcpp.patch | 52 ++++++++++++++++
media-sound/musescore/metadata.xml | 2 +
media-sound/musescore/musescore-9999.ebuild | 66 ++++++++++++++++----
6 files changed, 220 insertions(+), 11 deletions(-)
diff --git a/media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch b/media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch
new file mode 100644
index 000000000000..c7396f9885cd
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.7-unbundle-gtest.patch
@@ -0,0 +1,70 @@
+unbundle gmock/gtest
+--- a/buildscripts/cmake/DeclareModuleSetup.cmake
++++ b/buildscripts/cmake/DeclareModuleSetup.cmake
+@@ -182,13 +182,11 @@ macro(setup_module)
+ ${MUSE_FRAMEWORK_PATH}
+ ${MUSE_FRAMEWORK_PATH}/framework
+ ${MUSE_FRAMEWORK_PATH}/framework/global
+- ${MUSE_FRAMEWORK_PATH}/framework/testing/thirdparty/googletest/googletest/include
+
+ # compat
+ ${MUSE_FRAMEWORK_PATH}/src
+ ${MUSE_FRAMEWORK_PATH}/src/framework
+ ${MUSE_FRAMEWORK_PATH}/src/framework/global
+- ${MUSE_FRAMEWORK_PATH}/src/framework/testing/thirdparty/googletest/googletest/include
+ # end compat
+
+ ${MODULE_INCLUDE_PRIVATE}
+--- a/src/framework/CMakeLists.txt
++++ b/src/framework/CMakeLists.txt
+@@ -124,7 +124,6 @@ if (MUSE_ENABLE_UNIT_TESTS)
+ )
+
+ set(INSTALL_GTEST OFF)
+- add_subdirectory(testing/thirdparty/googletest)
+ endif()
+
+ # Stubs
+--- a/src/framework/testing/gtest.cmake
++++ b/src/framework/testing/gtest.cmake
+@@ -31,9 +31,6 @@
+
+ message(STATUS "Configuring ${MODULE_TEST}")
+
+-get_property(gmock_LIBS GLOBAL PROPERTY gmock_LIBS)
+-get_property(gmock_INCLUDE_DIRS GLOBAL PROPERTY gmock_INCLUDE_DIRS)
+-
+ add_executable(${MODULE_TEST}
+ ${CMAKE_CURRENT_LIST_DIR}/gmain.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/environment.cpp
+@@ -50,13 +47,11 @@ target_include_directories(${MODULE_TEST} PRIVATE
+ ${MUSE_FRAMEWORK_PATH}
+ ${MUSE_FRAMEWORK_PATH}/framework
+ ${MUSE_FRAMEWORK_PATH}/framework/global
+- ${MUSE_FRAMEWORK_PATH}/framework/testing/thirdparty/googletest/googletest/include
+
+ # compat
+ ${MUSE_FRAMEWORK_PATH}/src
+ ${MUSE_FRAMEWORK_PATH}/src/framework
+ ${MUSE_FRAMEWORK_PATH}/src/framework/global
+- ${MUSE_FRAMEWORK_PATH}/src/framework/testing/thirdparty/googletest/googletest/include
+ # end compat
+
+ ${MODULE_TEST_INCLUDE}
+@@ -74,11 +69,15 @@ endif()
+
+ find_package(Qt6Core REQUIRED)
+ find_package(Qt6Gui REQUIRED)
++pkg_check_modules(gtest REQUIRED IMPORTED_TARGET gtest)
++pkg_check_modules(gmock REQUIRED IMPORTED_TARGET gmock)
++list(APPEND MODULE_TEST_INCLUDE ${gtest_INCLUDE_DIRS} ${gmock_INCLUDE_DIRS})
+
+ target_link_libraries(${MODULE_TEST}
+ Qt6::Core
+ Qt6::Gui
+- gmock
++ PkgConfig::gmock
++ PkgConfig::gtest
+ muse_global
+ ${MODULE_TEST_LINK}
+ ${COVERAGE_FLAGS}
diff --git a/media-sound/musescore/files/musescore-4.7-unbundle-lame.patch b/media-sound/musescore/files/musescore-4.7-unbundle-lame.patch
new file mode 100644
index 000000000000..407489f9ef45
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.7-unbundle-lame.patch
@@ -0,0 +1,15 @@
+unbundle lame
+--- a/src/framework/audio/engine/audio_engine.cmake
++++ b/src/framework/audio/engine/audio_engine.cmake
+@@ -185,8 +185,9 @@ if (MUSE_MODULE_AUDIO_EXPORT)
+ ${CMAKE_CURRENT_LIST_DIR}/internal/export/wavencoder.h
+ )
+
+- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../thirdparty/lame lame EXCLUDE_FROM_ALL)
+- list(APPEND AUDIO_ENGINE_LINK lame)
++ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
++ list(APPEND AUDIO_ENGINE_LINK PkgConfig::lame)
++ list(APPEND MODULE_INCLUDE_PRIVATE ${lame_INCLUDE_DIRS})
+
+ include(${CMAKE_CURRENT_LIST_DIR}/../cmake/SetupOpusEnc.cmake)
+ list(APPEND AUDIO_ENGINE_LINK ${LIBOPUSENC_TARGETS})
diff --git a/media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch b/media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch
new file mode 100644
index 000000000000..09fbd5ee670b
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.7-unbundle-pugixml.patch
@@ -0,0 +1,26 @@
+unbundle pugixml
+--- a/src/framework/global/CMakeLists.txt
++++ b/src/framework/global/CMakeLists.txt
+@@ -150,9 +150,6 @@ set(MODULE_SRC
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmldom.cpp
+ ${CMAKE_CURRENT_LIST_DIR}/serialization/xmldom.h
+-
+- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml/pugixml.hpp
+- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml/pugixml.cpp
+ )
+
+ if (MUSE_THREADS_SUPPORT)
+@@ -274,9 +271,9 @@ else ()
+ set(Z_LIB z)
+ endif ()
+
+-list(APPEND MODULE_INCLUDE_PRIVATE
+- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml
+-)
++pkg_check_modules(pugixml REQUIRED IMPORTED_TARGET pugixml)
++list(APPEND MODULE_LINK PkgConfig::pugixml)
++list(APPEND MODULE_INCLUDE_PRIVATE ${pugixml_INCLUDE_DIRS})
+
+ list(APPEND MODULE_INCLUDE_PRIVATE ${Z_INCLUDE})
+ list(APPEND MODULE_LINK ${Z_LIB})
diff --git a/media-sound/musescore/files/musescore-4.7-unbundle-utfcpp.patch b/media-sound/musescore/files/musescore-4.7-unbundle-utfcpp.patch
new file mode 100644
index 000000000000..127ed7a1799d
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.7-unbundle-utfcpp.patch
@@ -0,0 +1,52 @@
+unbundle utfcpp
+--- a/src/framework/global/CMakeLists.txt
++++ b/src/framework/global/CMakeLists.txt
+@@ -25,7 +25,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/async/async.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_logger/logger.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_profiler/profiler/profiler.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_modularity/modularity/modularity.cmake)
+-include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/utfcpp/utfcpp.cmake)
+
+ find_package(TinyXml REQUIRED)
+ set(MODULE_SRC
+@@ -33,7 +32,6 @@ set(MODULE_SRC
+ ${ASYNC_SRC}
+ ${KORS_LOGGER_SRC}
+ ${KORS_PROFILER_SRC}
+- ${UTFCPP_SRC}
+ ${CMAKE_CURRENT_LIST_DIR}/globaltypes.h
+ ${CMAKE_CURRENT_LIST_DIR}/iapplication.h
+ ${CMAKE_CURRENT_LIST_DIR}/iinteractive.h
+@@ -268,6 +266,10 @@ list(APPEND MODULE_LINK ${Z_LIB})
+ list(APPEND MODULE_LINK ${TINYXML_MODULE_LINK})
+ set(MODULE_DEF ${TINYXML_MODULE_DEF})
+
++find_package(utf8cpp REQUIRED CONFIG)
++get_target_property(UTFCPP_INC utf8::cpp INTERFACE_INCLUDE_DIRECTORIES)
++list(APPEND MODULE_INCLUDE_PRIVATE ${UTFCPP_INC})
++
+ if (QT_SUPPORT)
+ # These are needed by so many modules, that we make them public here,
+ # so that other modules get them transitively.
+--- a/src/framework/global/serialization/xmlstreamwriter.cpp
++++ b/src/framework/global/serialization/xmlstreamwriter.cpp
+@@ -23,7 +23,7 @@
+
+ #include <list>
+
+-#include <global/thirdparty/utfcpp/utf8.h>
++#include <utf8.h>
+
+ #include "global/containers.h"
+ #include "textstream.h"
+--- a/src/framework/global/types/string.cpp
++++ b/src/framework/global/types/string.cpp
+@@ -32,7 +32,7 @@
+ #include <sstream>
+ #include <utility>
+
+-#include "global/thirdparty/utfcpp/utf8.h"
++#include <utf8.h>
+
+ #include "bytearray.h"
+
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index 265b53d9c817..01182644c4d0 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -10,6 +10,8 @@
<remote-id type="github">musescore/MuseScore</remote-id>
</upstream>
<use>
+ <flag name="pipewire">Enable PipeWire audio support (upstream's default)</flag>
<flag name="video">Support exporting scores as videos using the command line</flag>
+ <flag name="websockets">Enable websockets support</flag>
</use>
</pkgmetadata>
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 81d62e7f2473..b52803e02549 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -3,6 +3,9 @@
EAPI=8
+# https://bugs.gentoo.org/958256, bundled fluidsynth:
+# src/framework/audio/thirdparty/fluidsynth/fluidsynth-2.3.3/src/gentables/CMakeLists.txt
+CMAKE_QA_COMPAT_SKIP=yes
CHECKREQS_DISK_BUILD=3500M
inherit cmake flag-o-matic xdg check-reqs
@@ -25,7 +28,8 @@ SRC_URI+=" https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.2.0.ta
LICENSE="GPL-2"
SLOT="0"
-IUSE="jack test video"
+IUSE="jack pipewire test video websockets"
+REQUIRED_USE="?? ( jack pipewire )"
RESTRICT="!test? ( test )"
BDEPEND="
@@ -33,8 +37,8 @@ BDEPEND="
virtual/pkgconfig
"
RDEPEND="
- dev-libs/tinyxml2:=
- dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,widgets,xml]
+ dev-libs/pugixml
+ dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl,widgets,xml,X]
dev-qt/qt5compat:6[qml]
dev-qt/qtdeclarative:6
dev-qt/qtnetworkauth:6
@@ -45,21 +49,25 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libopusenc
- media-libs/libsndfile
media-libs/opus
media-sound/lame
sys-libs/zlib:=
jack? ( virtual/jack )
+ pipewire? ( media-video/pipewire:= )
video? ( media-video/ffmpeg:= )
+ websockets? ( dev-qt/qtwebsockets:6 )
"
DEPEND="${RDEPEND}
+ dev-libs/utfcpp
test? ( dev-cpp/gtest )
"
PATCHES=(
- "${FILESDIR}/${PN}-4.5.0-unbundle-deps.patch"
- "${FILESDIR}/${PN}-4.6.0-unbundle-gtest.patch"
- "${FILESDIR}/${PN}-4.6.0-missing-includes.patch"
+ # unbundle 3rd libs
+ "${FILESDIR}/${PN}-4.7-unbundle-gtest.patch"
+ "${FILESDIR}/${PN}-4.7-unbundle-lame.patch"
+ "${FILESDIR}/${PN}-4.7-unbundle-pugixml.patch"
+ "${FILESDIR}/${PN}-4.7-unbundle-utfcpp.patch"
)
src_unpack() {
@@ -72,6 +80,27 @@ src_unpack() {
}
src_prepare() {
+ # see https://github.com/musescore/MuseScore/issues/11572
+ # keep global/thirdparty/picojson, upstream is inactive
+ # keep dockwindow/thirdparty/KDDockWidgets, using priv headers
+ # keep audio/thirdparty/fluidsynth, using priv headers
+ # keep audio/thirdparty/stb, one file, same as miniaudio
+ local rm_deps=(
+ audio/thirdparty/flac
+ audio/thirdparty/lame
+ audio/thirdparty/opus
+ audio/thirdparty/opusenc
+ draw/thirdparty/freetype
+ global/thirdparty/pugixml
+ global/thirdparty/utfcpp
+ testing/thirdparty/googletest
+ )
+
+ local bundle
+ for bundle in "${rm_deps[@]}"; do
+ rm -r src/framework/"${bundle}" || die
+ done
+
cmake_src_prepare
# Move soundfonts to the correct directory
@@ -94,17 +123,20 @@ src_configure() {
-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_COMPILE_USE_SYSTEM_HARFBUZZ=ON
-DMUE_DOWNLOAD_SOUNDFONT=OFF
-DMUSE_APP_BUILD_MODE="release"
-DMUSE_COMPILE_USE_COMPILER_CACHE=OFF
+ -DMUSE_COMPILE_USE_PCH=OFF
-DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
-DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF
+ -DMUSE_MODULE_NETWORK_WEBSOCKET="$(usex websockets)"
-DMUSE_MODULE_UPDATE=OFF
+ -DMUSE_PIPEWIRE_AUDIO_DRIVER="$(usex pipewire)"
# tests
-DMUSE_ENABLE_UNIT_TESTS="$(usex test)"
-DMUE_BUILD_BRAILLE_TESTS="$(usex test)"
+ -DMUE_BUILD_CONVERTER_TESTS="$(usex test)"
-DMUE_BUILD_ENGRAVING_TESTS="$(usex test)"
-DMUE_BUILD_IMPORTEXPORT_TESTS="$(usex test)"
-DMUE_BUILD_NOTATION_TESTS="$(usex test)"
@@ -116,11 +148,23 @@ src_configure() {
src_test() {
CMAKE_SKIP_TESTS=(
- # bug #950450
- iex_musicxml_tests
- # it fails with gcc only, to investigate
+ # see https://github.com/musescore/MuseScore/issues/30434
+ # Global_AllocatorTests* fail with gcc only, to investigate
muse_global_tests
+ # segfault
+ muse_audio_tests
+ # see bug #950450 too
+ iex_musicxml_tests
)
QT_QPA_PLATFORM=offscreen cmake_src_test
}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if has_version "media-sound/musescore" || ! use pipewire; then
+ ewarn "PipeWire support is disabled but it's the default audio driver anyway!"
+ ewarn "Check your configuration."
+ fi
+}
^ permalink raw reply related [flat|nested] 25+ messages in thread
end of thread, other threads:[~2025-10-16 13:12 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-18 9:12 [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/, media-sound/musescore/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2025-10-16 13:12 Miroslav Šulc
2025-07-19 15:17 Miroslav Šulc
2025-01-07 19:29 Miroslav Šulc
2024-11-23 17:43 Andreas Sturmlechner
2024-10-15 7:32 Miroslav Šulc
2024-09-06 9:03 Miroslav Šulc
2024-08-10 7:52 Miroslav Šulc
2024-08-04 11:16 Miroslav Šulc
2024-08-04 9:41 Miroslav Šulc
2024-02-09 8:08 Miroslav Šulc
2024-02-06 19:47 Jason A. Donenfeld
2024-01-21 0:56 Jason A. Donenfeld
2023-06-06 6:45 Miroslav Šulc
2023-01-09 13:02 Sam James
2021-03-02 8:54 Miroslav Šulc
2020-12-11 10:10 Miroslav Šulc
2020-10-17 8:09 Miroslav Šulc
2019-11-28 20:00 Miroslav Šulc
2019-02-02 21:40 Miroslav Šulc
2019-02-01 21:21 Miroslav Šulc
2018-08-21 21:36 Andreas Sturmlechner
2017-01-30 13:20 Johannes Huber
2017-01-30 13:20 Johannes Huber
2016-02-01 21:41 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox