media-sound/lmms: treeclean

Closes: https://bugs.gentoo.org/957460 (pkgremoved)
Closes: https://bugs.gentoo.org/339725 (pkgremoved)
Closes: https://bugs.gentoo.org/670722 (pkgremoved)
Closes: https://bugs.gentoo.org/774453 (pkgremoved)
Closes: https://bugs.gentoo.org/939545 (pkgremoved)
Closes: https://bugs.gentoo.org/948975 (pkgremoved)
Closes: https://bugs.gentoo.org/962605 (pkgremoved)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2025-11-10 22:42:25 +01:00
parent 45f445a50a
commit b9b7107021
13 changed files with 0 additions and 500 deletions

View File

@@ -1 +0,0 @@
DIST lmms_1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028

View File

@@ -1,75 +0,0 @@
This patch removes an outdated workaround that causes a segfault when a recent
version of kwidgetsaddon is installed. It has been merged upstream, so there is
no need to use this beyond version 1.2.2.
https://github.com/LMMS/lmms/issues/6587#issuecomment-1399220056
https://github.com/LMMS/lmms/pull/6612
diff --git a/src/gui/MainApplication.cpp b/src/gui/MainApplication.cpp
index 994ae2771..9afa20a71 100644
--- a/src/gui/MainApplication.cpp
+++ b/src/gui/MainApplication.cpp
@@ -35,6 +35,19 @@ MainApplication::MainApplication(int& argc, char** argv) :
QApplication(argc, argv),
m_queuedFile()
{
+#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000
+ // Work around a bug of KXmlGui < 5.55
+ // which breaks the recent files menu
+ // https://bugs.kde.org/show_bug.cgi?id=337491
+ for (auto child : children())
+ {
+ if (child->inherits("KCheckAcceleratorsInitializer"))
+ {
+ delete child;
+ }
+ }
+#endif
+
#if defined(LMMS_BUILD_WIN32) && QT_VERSION >= 0x050000
installNativeEventFilter(this);
#endif
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index e6971f96d..26532eb5b 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -33,7 +33,6 @@
#include <QMenuBar>
#include <QMessageBox>
#include <QShortcut>
-#include <QLibrary>
#include <QSplitter>
#include <QUrl>
#include <QWhatsThis>
@@ -65,21 +64,6 @@
#include "lmmsversion.h"
-#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000
-//Work around an issue on KDE5 as per https://bugs.kde.org/show_bug.cgi?id=337491#c21
-void disableAutoKeyAccelerators(QWidget* mainWindow)
-{
- using DisablerFunc = void(*)(QWidget*);
- QLibrary kf5WidgetsAddon("KF5WidgetsAddons", 5);
- DisablerFunc setNoAccelerators =
- reinterpret_cast<DisablerFunc>(kf5WidgetsAddon.resolve("_ZN19KAcceleratorManager10setNoAccelEP7QWidget"));
- if(setNoAccelerators)
- {
- setNoAccelerators(mainWindow);
- }
- kf5WidgetsAddon.unload();
-}
-#endif
MainWindow::MainWindow() :
@@ -92,9 +76,6 @@ MainWindow::MainWindow() :
m_metronomeToggle( 0 ),
m_session( Normal )
{
-#if !defined(LMMS_BUILD_WIN32) && !defined(LMMS_BUILD_APPLE) && !defined(LMMS_BUILD_HAIKU) && QT_VERSION >= 0x050000
- disableAutoKeyAccelerators(this);
-#endif
setAttribute( Qt::WA_DeleteOnClose );
QWidget * main_widget = new QWidget( this );

View File

@@ -1,37 +0,0 @@
--- lmms/CMakeLists.txt
+++ lmms/CMakeLists.txt
@@ -575,15 +575,6 @@
# post-install tasks
ADD_SUBDIRECTORY(cmake/postinstall)
-ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
- COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
- DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
- COMMENT "Generating lmms.1.gz"
- VERBATIM)
-
-
-ADD_CUSTOM_TARGET(manpage ALL
- DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
# install headers
--- lmms/src/CMakeLists.txt
+++ lmms/src/CMakeLists.txt
@@ -113,7 +113,7 @@
)
ENDIF()
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz")
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${LMMS_UI_OUT} lmmsconfig.h lmms.1")
IF(LMMS_BUILD_WIN32)
SET(EXTRA_LIBRARIES "-lwinmm")
@@ -258,6 +258,6 @@
ENDIF(NOT LMMS_BUILD_APPLE)
INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
- INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
ENDIF(LMMS_BUILD_WIN32)

View File

@@ -1,26 +0,0 @@
https://bugs.gentoo.org/907285
https://github.com/LMMS/lmms/issues/5884
https://src.fedoraproject.org/rpms/lmms/blob/rawhide/f/lmms-1.2.2_lib_suffix.patch
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -564,6 +564,9 @@ IF(USE_CCACHE)
ENDIF()
ENDIF()
+# pass LIB_SUFFIX
+add_definitions(-DLIB_SUFFIX="${LIB_SUFFIX}")
+
# make sub-directories
ADD_SUBDIRECTORY(cmake)
ADD_SUBDIRECTORY(src)
--- a/src/core/PluginFactory.cpp
+++ b/src/core/PluginFactory.cpp
@@ -64,7 +64,7 @@ PluginFactory::PluginFactory()
// plugins at "C:/Program Files/LMMS/plugins/"
#ifndef LMMS_BUILD_WIN32
- addRelativeIfExists("../lib/lmms"); // Installed
+ addRelativeIfExists("../lib" LIB_SUFFIX "/lmms"); // Installed
#endif
addRelativeIfExists("plugins"); // Portable
#ifdef PLUGIN_DIR // We may also have received a relative directory via a define

View File

@@ -1,48 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -756,7 +756,7 @@
ADD_SUBDIRECTORY(cmake/install)
FIND_PACKAGE(UnixCommands)
-IF(GZIP)
+IF(FALSE)
ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz"
COMMAND ${GZIP} -c ${CMAKE_SOURCE_DIR}/doc/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz
DEPENDS "${CMAKE_SOURCE_DIR}/doc/lmms.1"
@@ -767,7 +767,6 @@
ADD_CUSTOM_TARGET(manpage ALL
DEPENDS "${CMAKE_BINARY_DIR}/lmms.1.gz")
ELSEIF(UNIX)
- MESSAGE(FATAL_ERROR "Can't find gzip required for generating lmms.1.gz")
ENDIF()
# install headers
@@ -785,7 +784,7 @@
#
ADD_CUSTOM_TARGET(distclean
COMMAND make clean
- COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1.gz)
+ COMMAND rm -rf `find -name cmake_install.cmake` `find -name Makefile` `find -type d -name CMakeFiles` CMakeCache.txt lmmsconfig.h lmms.1)
#
# add tarball-target
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -132,7 +132,7 @@
SET_PROPERTY(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lmms)
ENDIF()
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} lmmsconfig.h lmms.1.gz")
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} lmmsconfig.h lmms.1")
IF(LMMS_BUILD_WIN32)
SET(EXTRA_LIBRARIES "winmm")
@@ -218,7 +218,7 @@
ELSE(CMAKE_INSTALL_MANDIR)
SET(INSTALL_MANDIR ${CMAKE_INSTALL_PREFIX}/share/man)
ENDIF(CMAKE_INSTALL_MANDIR)
- INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz"
+ INSTALL(FILES "${CMAKE_SOURCE_DIR}/doc/lmms.1"
DESTINATION "${INSTALL_MANDIR}/man1/"
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
ENDIF()

View File

@@ -1,26 +0,0 @@
https://bugs.gentoo.org/907285
https://github.com/LMMS/lmms/issues/5884
https://src.fedoraproject.org/rpms/lmms/blob/rawhide/f/lmms-1.2.2_lib_suffix.patch
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -657,6 +657,9 @@ ENDIF()
# use ccache
include(CompileCache)
+# pass LIB_SUFFIX
+add_definitions(-DLIB_SUFFIX="${LIB_SUFFIX}")
+
# make sub-directories
ADD_SUBDIRECTORY(cmake)
ADD_SUBDIRECTORY(src)
--- a/src/core/PluginFactory.cpp
+++ b/src/core/PluginFactory.cpp
@@ -78,7 +78,7 @@ void PluginFactory::setupSearchPaths()
// plugins at "C:/Program Files/LMMS/plugins/"
#ifndef LMMS_BUILD_WIN32
- addRelativeIfExists("../lib/lmms"); // Installed
+ addRelativeIfExists("../lib" LIB_SUFFIX "/lmms"); // Installed
#endif
addRelativeIfExists("plugins"); // Portable
#ifdef PLUGIN_DIR // We may also have received a relative directory via a define

View File

@@ -1,130 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake flag-o-matic xdg
DESCRIPTION="Cross-platform music production software"
HOMEPAGE="https://lmms.io"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
inherit git-r3
else
SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz"
KEYWORDS="amd64 x86"
S="${WORKDIR}/${P/_/-}"
fi
S="${WORKDIR}/${PN}"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk test vst"
# FAIL! : AutomatableModelTest::LinkTests() 'm1Changed' returned FALSE. ()
#
# Did not previously pass, did not previously run. Maintain status quo.
# Fixed upstream in git.
RESTRICT="test"
COMMON_DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
>=media-libs/libsamplerate-0.1.8
>=media-libs/libsndfile-1.0.11
sci-libs/fftw:3.0
virtual/zlib:=
x11-libs/fltk:1=
alsa? ( media-libs/alsa-lib )
fluidsynth? ( media-sound/fluidsynth )
jack? ( virtual/jack )
libgig? ( media-libs/libgig )
mp3? ( media-sound/lame )
ogg? (
media-libs/libogg
media-libs/libvorbis
)
portaudio? ( >=media-libs/portaudio-19_pre )
pulseaudio? ( media-libs/libpulse )
sdl? (
media-libs/libsdl
>=media-libs/sdl-sound-1.0.1
)
soundio? ( media-libs/libsoundio )
stk? ( media-libs/stk )
vst? ( virtual/wine )
"
DEPEND="${COMMON_DEPEND}
dev-qt/qtx11extras:5
test? ( dev-qt/qttest:5 )
"
BDEPEND="
dev-qt/linguist-tools:5
"
RDEPEND="${COMMON_DEPEND}
media-plugins/calf
media-plugins/caps-plugins
media-plugins/cmt-plugins
media-plugins/swh-plugins
media-plugins/tap-plugins
"
DOCS=( README.md doc/AUTHORS )
PATCHES=(
"${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284
"${FILESDIR}/${PN}-1.2.2-plugin-path.patch" #907285
"${FILESDIR}/${PN}-1.2.2-kwidgetsaddons.patch"
)
src_prepare() {
cmake_src_prepare
if use !test; then
sed -i '/ADD_SUBDIRECTORY(tests)/d' CMakeLists.txt || die
fi
}
src_configure() {
# -Werror=odr
# https://bugs.gentoo.org/860867
# https://github.com/LMMS/lmms/pull/6174
#
# Fixed upstream, remove whenever they finally release a new version.
filter-lto
local mycmakeargs=(
-DUSE_WERROR=FALSE
-DWANT_CAPS=FALSE
-DWANT_TAP=FALSE
-DWANT_SWH=FALSE
-DWANT_CMT=FALSE
-DWANT_CALF=FALSE
-DWANT_QT5=TRUE
-DWANT_ALSA=$(usex alsa)
-DWANT_JACK=$(usex jack)
-DWANT_GIG=$(usex libgig)
-DWANT_MP3LAME=$(usex mp3)
-DWANT_OGGVORBIS=$(usex ogg)
-DWANT_PORTAUDIO=$(usex portaudio)
-DWANT_PULSEAUDIO=$(usex pulseaudio)
-DWANT_SDL=$(usex sdl)
-DWANT_SOUNDIO=$(usex soundio)
-DWANT_STK=$(usex stk)
-DWANT_VST=$(usex vst)
-DWANT_SF2=$(usex fluidsynth)
)
cmake_src_configure
}
src_test() {
# does not use ctest
cmake_build tests/tests
"${BUILD_DIR}"/tests/tests || die
}

View File

@@ -1,115 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit cmake xdg
DESCRIPTION="Cross-platform music production software"
HOMEPAGE="https://lmms.io"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
inherit git-r3
else
SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz"
S="${WORKDIR}/${PN}"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="GPL-2 LGPL-2"
SLOT="0"
IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk test vst"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
>=media-libs/libsamplerate-0.1.8
>=media-libs/libsndfile-1.0.11
sci-libs/fftw:3.0
virtual/zlib:=
x11-libs/fltk:1=
alsa? ( media-libs/alsa-lib )
fluidsynth? ( media-sound/fluidsynth )
jack? ( virtual/jack )
libgig? ( media-libs/libgig )
mp3? ( media-sound/lame )
ogg? (
media-libs/libogg
media-libs/libvorbis
)
portaudio? ( >=media-libs/portaudio-19_pre )
pulseaudio? ( media-libs/libpulse )
sdl? (
media-libs/libsdl
>=media-libs/sdl-sound-1.0.1
)
soundio? ( media-libs/libsoundio )
stk? ( media-libs/stk )
vst? ( virtual/wine )
"
DEPEND="${COMMON_DEPEND}
dev-qt/qtx11extras:5
test? ( dev-qt/qttest:5 )
"
BDEPEND="
dev-qt/linguist-tools:5
"
RDEPEND="${COMMON_DEPEND}
media-plugins/calf
media-plugins/caps-plugins
media-plugins/cmt-plugins
media-plugins/swh-plugins
media-plugins/tap-plugins
"
DOCS=( README.md doc/AUTHORS )
PATCHES=(
"${FILESDIR}/${PN}-9999-no_compress_man.patch" #733284
"${FILESDIR}/${PN}-9999-plugin-path.patch" #907285
)
src_prepare() {
cmake_src_prepare
if use !test; then
sed -i '/ADD_SUBDIRECTORY(tests)/d' CMakeLists.txt || die
fi
}
src_configure() {
local mycmakeargs=(
-DUSE_WERROR=FALSE
-DWANT_CAPS=FALSE
-DWANT_TAP=FALSE
-DWANT_SWH=FALSE
-DWANT_CMT=FALSE
-DWANT_CALF=FALSE
-DWANT_ALSA=$(usex alsa)
-DWANT_JACK=$(usex jack)
-DWANT_GIG=$(usex libgig)
-DWANT_MP3LAME=$(usex mp3)
-DWANT_OGGVORBIS=$(usex ogg)
-DWANT_PORTAUDIO=$(usex portaudio)
-DWANT_PULSEAUDIO=$(usex pulseaudio)
-DWANT_SDL=$(usex sdl)
-DWANT_SOUNDIO=$(usex soundio)
-DWANT_STK=$(usex stk)
-DWANT_VST=$(usex vst)
-DWANT_SF2=$(usex fluidsynth)
)
cmake_src_configure
}
src_test() {
# tests are hidden inside a subdir and ctest does not detect them without
# running inside that subdir
local BUILD_DIR="${BUILD_DIR}/tests"
cmake_src_test
}

View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
<maintainer type="project">
<email>proaudio@gentoo.org</email>
<name>Gentoo ProAudio Project</name>
</maintainer>
<use>
<flag name="libgig">Enables GIG player plugin.</flag>
<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</flag>
<flag name="soundio">Enables libsoundio support.</flag>
<flag name="stk">Enables STK Mallet plugin.</flag>
<flag name="vst">Enables the VeSTige plugin to run VST plugins through Wine.</flag>
</use>
<upstream>
<remote-id type="github">LMMS/lmms</remote-id>
<remote-id type="sourceforge">lmms</remote-id>
</upstream>
</pkgmetadata>

View File

@@ -31,7 +31,3 @@ dev-embedded/urjtag ftd2xx
# Yixun Lan <dlan@gentoo.org> (2017-07-12)
# GLEP 73 Immutability, USE=ovmf requires hvm
app-emulation/xen-tools ovmf
# Alexis Ballier <aballier@gentoo.org> (2009-08-13)
# Requires wine
media-sound/lmms vst

View File

@@ -461,10 +461,6 @@ sys-kernel/installkernel systemd-boot ukify uki
# Mask bdplus support and unmask on arches where libbdplus is keyworded.
media-libs/libbluray bdplus
# Lars Wendler <polynomial-c@gentoo.org> (2014-04-23)
# Not working on 64bit systems
media-sound/lmms vst
# Andreas K. Huettel <dilfridge@gentoo.org> (2014-01-04)
# Mask until dependencies are keyworded (bug 497068)
dev-vcs/git mediawiki

View File

@@ -479,10 +479,6 @@ sys-kernel/installkernel -systemd-boot -ukify -uki
# media-libs/libbdplus is keyworded on x86, so unmask the useflag
media-libs/libbluray -bdplus
# Lars Wendler <polynomial-c@gentoo.org> (2014-04-23)
# Works on 32bit x86
media-sound/lmms -vst
# Samuli Suominen <ssuominen@gentoo.org> (2014-02-16)
# Still considered experimental by upstream:
# https://sourceforge.net/p/mikmod/bugs/16/#17ea

View File

@@ -157,13 +157,6 @@ net-libs/NativeThread
=dev-python/pymongo-4.15.3
=dev-python/pymongo-4.15.2
# Sam James <sam@gentoo.org> (2025-10-05)
# Fails to build with to-be-stabled CMake 4, Qt 5, no upstream release in
# 5 years (despite much activity), and a bunch of other open bugs in need
# of attention.
# Removal on 2025-11-04. Bug #957460.
media-sound/lmms
# Lukas Schmelting <lschmelting@posteo.com> (2025-10-03)
# Breaks e.g. in combination with gnome-shell-48.4, gettext/gjs (bug #963815)
>=dev-libs/glib-2.86.0