public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
@ 2015-11-06  7:09 Alexis Ballier
  0 siblings, 0 replies; 7+ messages in thread
From: Alexis Ballier @ 2015-11-06  7:09 UTC (permalink / raw
  To: gentoo-commits

commit:     71641b70c6c22d1985d59caaec63c98914864ce6
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 07:08:59 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 07:09:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71641b70

media-sound/lmms: fix build with gcc 5.2

Package-Manager: portage-2.2.24
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 media-sound/lmms/files/gcc52.patch | 25 +++++++++++++++++++++++++
 media-sound/lmms/lmms-1.1.3.ebuild |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/media-sound/lmms/files/gcc52.patch b/media-sound/lmms/files/gcc52.patch
new file mode 100644
index 0000000..60892a7
--- /dev/null
+++ b/media-sound/lmms/files/gcc52.patch
@@ -0,0 +1,25 @@
+commit 317b2f02a829f694a66c760fc6de7df1db99b006
+Author: Tobias Doerffel <tobias.doerffel@gmail.com>
+Date:   Mon Feb 16 18:22:49 2015 +0100
+
+    AutomatableModel: fix wrong comparison logic
+    
+    We must not negate the float but instead test for inequality in order to
+    determine whether the linked model has to be updated.
+    
+    Closes #1761.
+
+diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
+index 6c7501c..bf56285 100644
+--- a/src/core/AutomatableModel.cpp
++++ b/src/core/AutomatableModel.cpp
+@@ -318,8 +318,7 @@ void AutomatableModel::setAutomatedValue( const float value )
+ 									it != m_linkedModels.end(); ++it )
+ 		{
+ 			if( (*it)->m_setValueDepth < 1 &&
+-				!(*it)->fittedValue( m_value ) !=
+-							 (*it)->m_value )
++				(*it)->fittedValue( m_value ) != (*it)->m_value )
+ 			{
+ 				(*it)->setAutomatedValue( value );
+ 			}

diff --git a/media-sound/lmms/lmms-1.1.3.ebuild b/media-sound/lmms/lmms-1.1.3.ebuild
index db9a506..8167c4c 100644
--- a/media-sound/lmms/lmms-1.1.3.ebuild
+++ b/media-sound/lmms/lmms-1.1.3.ebuild
@@ -44,6 +44,8 @@ RDEPEND="${RDEPEND}
 
 DOCS="README AUTHORS TODO"
 
+PATCHES=( "${FILESDIR}/gcc52.patch" )
+
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DWANT_SYSTEM_SR=TRUE


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
@ 2017-09-26  0:54 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-09-26  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     210e6d2420f60febd04e2a539593905ebce33808
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 00:46:35 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 00:50:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210e6d24

media-sound/lmms: Drop old

Gentoo-bug: 631906
Package-Manager: Portage-2.3.10, Repoman-2.3.3

 media-sound/lmms/Manifest                      |  3 --
 media-sound/lmms/files/gcc52.patch             | 25 ---------
 media-sound/lmms/files/lmms-1.1.3-Werror.patch | 12 -----
 media-sound/lmms/lmms-1.0.2.ebuild             | 65 ------------------------
 media-sound/lmms/lmms-1.0.3.ebuild             | 65 ------------------------
 media-sound/lmms/lmms-1.1.3.ebuild             | 70 --------------------------
 6 files changed, 240 deletions(-)

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index ab1ae948e49..d5fa9d70bb9 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,4 +1 @@
-DIST lmms-1.0.2-src.tar.bz2 12273540 SHA256 62fe46ecfa486ed046a551e366ec6cc7d17f53bda9843a5ddce690f59d919cd7 SHA512 14742689ec21b108153daf264ba190e9cab98bfe95fa969e1ab2df609a8bbb0d9762cca128837ad947acaa6faf61c990f97764036fc3026eabb7b56aaee033d4 WHIRLPOOL 2e6639a618fc7dddfbb3f9e995930d0503ebf18e7dced5046872e514181dec78e3bc3216c6821824c3cce0198d7d8ad01bdc1239e12b128ae31868d24def6911
-DIST lmms-1.0.3-src.tar.bz2 12461138 SHA256 22e045403201946d39a2f1074c64d6875f68cfd0ad47e7088b1a534062ea512d SHA512 1cf390ac36a18ceb23dd180497c8bff458541bd43c1fc70a0c239ae3352edd6053a93f13f8b7086315f121d9108912b6819d65724cb86b1762c269299b09ba92 WHIRLPOOL 34e937bae271093b1618d826a0991628129ade311ff7dbbb8cef52b0d026272655165b0bdfd556437c81ad30e4d5ea904223a67f1835e5d3575f895391e2d5e2
-DIST lmms-1.1.3.tar.gz 16843533 SHA256 59338e7b90e02fe18db73114aefe479c0e6d1e0e366185d71ea5c1a1e0f9e6bc SHA512 55a7a57bfe30efa85a281ca8c2ca2cb64a4b834b0338dbd3be7c2c78beb695999ba801264b45c39a5c0d87a0915890997ad3be1ab0da8b28432c4fd97d7cff3e WHIRLPOOL a06d7b13d9c87c129cfb0d389a776022ebac1a21b5dc9c786e729fa9f1a2b11b12134a043987d14b5afdfe62002dd3de8533762d54a4bc7073bc23d3ea839372
 DIST lmms-1.1.90.tar.gz 16580373 SHA256 007a4b7a6c7c09bd9e4262af0f03aafb8f0e4a627d88cfa80b845202f675cc4b SHA512 4e8bc4ec70c613b69ff14e463860e6f86236cb7b238529d41c4e9cc1b9642590110d1d07f87b9e2a4e139454c3a1f851f95a5eaef12e95660b50dd6ea17aa486 WHIRLPOOL 495de690f69d2e00c7d2f99e81384e189bf235aec6911f94029be984552856be3aa19f1a5f66293e97deadacc22dbd3cbbc0d2d7a42e7111484edf9d65c196fa

diff --git a/media-sound/lmms/files/gcc52.patch b/media-sound/lmms/files/gcc52.patch
deleted file mode 100644
index 60892a717eb..00000000000
--- a/media-sound/lmms/files/gcc52.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 317b2f02a829f694a66c760fc6de7df1db99b006
-Author: Tobias Doerffel <tobias.doerffel@gmail.com>
-Date:   Mon Feb 16 18:22:49 2015 +0100
-
-    AutomatableModel: fix wrong comparison logic
-    
-    We must not negate the float but instead test for inequality in order to
-    determine whether the linked model has to be updated.
-    
-    Closes #1761.
-
-diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
-index 6c7501c..bf56285 100644
---- a/src/core/AutomatableModel.cpp
-+++ b/src/core/AutomatableModel.cpp
-@@ -318,8 +318,7 @@ void AutomatableModel::setAutomatedValue( const float value )
- 									it != m_linkedModels.end(); ++it )
- 		{
- 			if( (*it)->m_setValueDepth < 1 &&
--				!(*it)->fittedValue( m_value ) !=
--							 (*it)->m_value )
-+				(*it)->fittedValue( m_value ) != (*it)->m_value )
- 			{
- 				(*it)->setAutomatedValue( value );
- 			}

diff --git a/media-sound/lmms/files/lmms-1.1.3-Werror.patch b/media-sound/lmms/files/lmms-1.1.3-Werror.patch
deleted file mode 100644
index 4735c3e2b0a..00000000000
--- a/media-sound/lmms/files/lmms-1.1.3-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -334,9 +334,6 @@
- 
- # set compiler flags
- SET(WERROR_FLAGS "-Wall -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
--IF(NOT LMMS_BUILD_APPLE)
--   SET(WERROR_FLAGS "${WERROR_FLAGS} -Werror")
--ENDIF()
- 
- # Due to a regression in gcc-4.8.X, we need to disable array-bounds check
- IF (CMAKE_COMPILER_IS_GNUCXX AND ((CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "4.8.0") OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.8.0")))

diff --git a/media-sound/lmms/lmms-1.0.2.ebuild b/media-sound/lmms/lmms-1.0.2.ebuild
deleted file mode 100644
index 4449d988d50..00000000000
--- a/media-sound/lmms/lmms-1.0.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4[accessibility]
-	>=media-libs/libsamplerate-0.1.8
-	>=media-libs/libsndfile-1.0.11
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	>=x11-libs/fltk-1.3.0_rc3:1
-	alsa? ( media-libs/alsa-lib )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
-	ogg? ( media-libs/libvorbis
-		media-libs/libogg )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1 )
-	stk? ( media-libs/stk )
-	vst? ( || ( app-emulation/wine virtual/wine ) )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.5"
-RDEPEND="${RDEPEND}
-	media-plugins/swh-plugins
-	media-plugins/caps-plugins
-	media-plugins/tap-plugins
-	media-libs/ladspa-cmt"
-
-DOCS="README AUTHORS TODO"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWANT_SYSTEM_SR=TRUE
-		-DWANT_CAPS=FALSE
-		-DWANT_TAP=FALSE
-		-DWANT_SWH=FALSE
-		-DWANT_CMT=FALSE
-		-DWANT_CALF=TRUE
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		$(cmake-utils_use_want alsa ALSA)
-		$(cmake-utils_use_want jack JACK)
-		$(cmake-utils_use_want ogg OGGVORBIS)
-		$(cmake-utils_use_want portaudio PORTAUDIO)
-		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_want sdl SDL)
-		$(cmake-utils_use_want stk STK)
-		$(cmake-utils_use_want vst VST)
-		$(cmake-utils_use_want fluidsynth SF2)"
-	cmake-utils_src_configure
-}

diff --git a/media-sound/lmms/lmms-1.0.3.ebuild b/media-sound/lmms/lmms-1.0.3.ebuild
deleted file mode 100644
index 4449d988d50..00000000000
--- a/media-sound/lmms/lmms-1.0.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4[accessibility]
-	>=media-libs/libsamplerate-0.1.8
-	>=media-libs/libsndfile-1.0.11
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	>=x11-libs/fltk-1.3.0_rc3:1
-	alsa? ( media-libs/alsa-lib )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.99.0 )
-	ogg? ( media-libs/libvorbis
-		media-libs/libogg )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1 )
-	stk? ( media-libs/stk )
-	vst? ( || ( app-emulation/wine virtual/wine ) )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.5"
-RDEPEND="${RDEPEND}
-	media-plugins/swh-plugins
-	media-plugins/caps-plugins
-	media-plugins/tap-plugins
-	media-libs/ladspa-cmt"
-
-DOCS="README AUTHORS TODO"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWANT_SYSTEM_SR=TRUE
-		-DWANT_CAPS=FALSE
-		-DWANT_TAP=FALSE
-		-DWANT_SWH=FALSE
-		-DWANT_CMT=FALSE
-		-DWANT_CALF=TRUE
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		$(cmake-utils_use_want alsa ALSA)
-		$(cmake-utils_use_want jack JACK)
-		$(cmake-utils_use_want ogg OGGVORBIS)
-		$(cmake-utils_use_want portaudio PORTAUDIO)
-		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_want sdl SDL)
-		$(cmake-utils_use_want stk STK)
-		$(cmake-utils_use_want vst VST)
-		$(cmake-utils_use_want fluidsynth SF2)"
-	cmake-utils_src_configure
-}

diff --git a/media-sound/lmms/lmms-1.1.3.ebuild b/media-sound/lmms/lmms-1.1.3.ebuild
deleted file mode 100644
index c464b0d22d4..00000000000
--- a/media-sound/lmms/lmms-1.1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils
-
-DESCRIPTION="Free alternative to popular programs such as Fruityloops, Cubase and Logic"
-HOMEPAGE="http://lmms.sourceforge.net/"
-SRC_URI="https://github.com/LMMS/lmms/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa debug fluidsynth jack ogg portaudio pulseaudio sdl stk vst"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4[accessibility]
-	>=media-libs/libsamplerate-0.1.8
-	>=media-libs/libsndfile-1.0.11
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	>=x11-libs/fltk-1.3.0_rc3:1
-	alsa? ( media-libs/alsa-lib )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( virtual/jack )
-	ogg? ( media-libs/libvorbis
-		media-libs/libogg )
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl
-		>=media-libs/sdl-sound-1.0.1 )
-	stk? ( media-libs/stk )
-	vst? ( || ( app-emulation/wine virtual/wine ) )"
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.5"
-RDEPEND="${RDEPEND}
-	media-plugins/swh-plugins
-	media-plugins/caps-plugins
-	media-plugins/tap-plugins
-	media-libs/ladspa-cmt"
-
-DOCS="README AUTHORS TODO"
-
-PATCHES=(
-	"${FILESDIR}/gcc52.patch"
-	"${FILESDIR}/lmms-1.1.3-Werror.patch"
-)
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		-DWANT_SYSTEM_SR=TRUE
-		-DWANT_CAPS=FALSE
-		-DWANT_TAP=FALSE
-		-DWANT_SWH=FALSE
-		-DWANT_CMT=FALSE
-		-DWANT_CALF=TRUE
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		$(cmake-utils_use_want alsa ALSA)
-		$(cmake-utils_use_want jack JACK)
-		$(cmake-utils_use_want ogg OGGVORBIS)
-		$(cmake-utils_use_want portaudio PORTAUDIO)
-		$(cmake-utils_use_want pulseaudio PULSEAUDIO)
-		$(cmake-utils_use_want sdl SDL)
-		$(cmake-utils_use_want stk STK)
-		$(cmake-utils_use_want vst VST)
-		$(cmake-utils_use_want fluidsynth SF2)"
-	cmake-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
@ 2018-11-22 21:48 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-11-22 21:48 UTC (permalink / raw
  To: gentoo-commits

commit:     7222b3663c3654fb3159fefff328cbc003733e5d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 22 21:47:47 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 22 21:48:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7222b366

media-sound/lmms: Fix build with Qt 5.11.0

Using upstream patch from git master (>1.2.0_rc7).

Closes: https://bugs.gentoo.org/670250
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../lmms/files/lmms-1.2.0_rc4-qt-5.11.patch        | 22 ++++++++++++++++++++++
 media-sound/lmms/lmms-1.2.0_rc4.ebuild             |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
new file mode 100644
index 00000000000..ee1328e8c96
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
@@ -0,0 +1,22 @@
+From daa3f535158f321e7a01ea531fc3085f2d26ab37 Mon Sep 17 00:00:00 2001
+From: Hyunjin Song <tteu.ingog@gmail.com>
+Date: Wed, 23 May 2018 14:59:45 +0900
+Subject: [PATCH] Fix compilation with Qt 5.11 (#4374)
+
+Add extends attribute for custom widget RowTableView per upstream uic change http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
+---
+ src/gui/Forms/EffectSelectDialog.ui | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/Forms/EffectSelectDialog.ui b/src/gui/Forms/EffectSelectDialog.ui
+index a9c6de0191..f8e7734862 100644
+--- a/src/gui/Forms/EffectSelectDialog.ui
++++ b/src/gui/Forms/EffectSelectDialog.ui
+@@ -102,6 +102,7 @@
+  <customwidgets>
+   <customwidget>
+    <class>RowTableView</class>
++   <extends>QTableView</extends>
+    <header>RowTableView.h</header>
+   </customwidget>
+  </customwidgets>

diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
index 354ba7ece7b..a85c255a0f3 100644
--- a/media-sound/lmms/lmms-1.2.0_rc4.ebuild
+++ b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -61,6 +61,8 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_configure() {
 	local mycmakeargs+=(
 		-DUSE_WERROR=FALSE


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
@ 2019-03-31 10:47 Andreas Sturmlechner
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-03-31 10:47 UTC (permalink / raw
  To: gentoo-commits

commit:     28b8a2ea90329c6acdcac59180213ec05a610399
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 20:48:58 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 10:39:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b8a2ea

media-sound/lmms: Drop old

Closes: https://bugs.gentoo.org/677910
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/lmms/Manifest                          |   1 -
 .../lmms/files/lmms-1.2.0_rc4-qt-5.11.patch        |  22 -----
 media-sound/lmms/lmms-1.2.0_rc4.ebuild             | 100 ---------------------
 3 files changed, 123 deletions(-)

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index aeb5d8fb9f8..6f79232bd4c 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,2 +1 @@
-DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
 DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343

diff --git a/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
deleted file mode 100644
index ee1328e8c96..00000000000
--- a/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From daa3f535158f321e7a01ea531fc3085f2d26ab37 Mon Sep 17 00:00:00 2001
-From: Hyunjin Song <tteu.ingog@gmail.com>
-Date: Wed, 23 May 2018 14:59:45 +0900
-Subject: [PATCH] Fix compilation with Qt 5.11 (#4374)
-
-Add extends attribute for custom widget RowTableView per upstream uic change http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
----
- src/gui/Forms/EffectSelectDialog.ui | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/Forms/EffectSelectDialog.ui b/src/gui/Forms/EffectSelectDialog.ui
-index a9c6de0191..f8e7734862 100644
---- a/src/gui/Forms/EffectSelectDialog.ui
-+++ b/src/gui/Forms/EffectSelectDialog.ui
-@@ -102,6 +102,7 @@
-  <customwidgets>
-   <customwidget>
-    <class>RowTableView</class>
-+   <extends>QTableView</extends>
-    <header>RowTableView.h</header>
-   </customwidget>
-  </customwidgets>

diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
deleted file mode 100644
index a85c255a0f3..00000000000
--- a/media-sound/lmms/lmms-1.2.0_rc4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-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/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	>=media-libs/libsamplerate-0.1.8
-	>=media-libs/libsndfile-1.0.11
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	>=x11-libs/fltk-1.3.0_rc3:1
-	alsa? ( media-libs/alsa-lib )
-	fluidsynth? ( media-sound/fluidsynth )
-	jack? ( virtual/jack )
-	libgig? ( media-libs/libgig )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	portaudio? ( >=media-libs/portaudio-19_pre )
-	pulseaudio? ( media-sound/pulseaudio )
-	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/linguist-tools:5
-	>=dev-util/cmake-2.4.5
-"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/ladspa-cmt
-	media-plugins/calf
-	media-plugins/caps-plugins
-	media-plugins/swh-plugins
-	media-plugins/tap-plugins
-"
-
-DOCS=( README.md doc/AUTHORS )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs+=(
-		-DUSE_WERROR=FALSE
-		-DWANT_SYSTEM_SR=TRUE
-		-DWANT_CAPS=FALSE
-		-DWANT_TAP=FALSE
-		-DWANT_SWH=FALSE
-		-DWANT_CMT=FALSE
-		-DWANT_CALF=FALSE
-		-DWANT_QT5=TRUE
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_JACK=$(usex jack)
-		-DWANT_GIG=$(usex libgig)
-		-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-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
@ 2020-06-13  8:58 Miroslav Šulc
  0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2020-06-13  8:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a563f76a35cd106587a432c611587f34106d61c6
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 08:57:47 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 08:58:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a563f76a

media-sound/lmms: fixed compilation with qt 5.15 in 1.2.1

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

 .../lmms-1.2.1-add-missing-qpainterpath.patch      | 61 ++++++++++++++++++++++
 media-sound/lmms/lmms-1.2.1.ebuild                 |  6 ++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
new file mode 100644
index 00000000000..afade79b0fd
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.1-add-missing-qpainterpath.patch
@@ -0,0 +1,61 @@
+From 29a5abc30b5d5efa30b7f6b73fe06d76ec851cca Mon Sep 17 00:00:00 2001
+From: Johannes Lorenz <1042576+JohannesLorenz@users.noreply.github.com>
+Date: Mon, 18 May 2020 18:58:48 +0200
+Subject: [PATCH] Fix Qt 5.15 build issues (#5498)
+
+Add missing QPainterPath includes
+---
+ plugins/Eq/EqSpectrumView.h          | 1 +
+ src/gui/AutomationPatternView.cpp    | 1 +
+ src/gui/LmmsStyle.cpp                | 1 +
+ src/gui/editors/AutomationEditor.cpp | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h
+index cd3f177586..84feeff13e 100644
+--- a/plugins/Eq/EqSpectrumView.h
++++ b/plugins/Eq/EqSpectrumView.h
+@@ -24,6 +24,7 @@
+ #define EQSPECTRUMVIEW_H
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QWidget>
+ 
+ #include "fft_helpers.h"
+diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp
+index 448c233cb4..9889a6b460 100644
+--- a/src/gui/AutomationPatternView.cpp
++++ b/src/gui/AutomationPatternView.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QMenu>
+ 
+ #include "AutomationEditor.h"
+diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp
+index e57e29e479..4fe5cb503c 100644
+--- a/src/gui/LmmsStyle.cpp
++++ b/src/gui/LmmsStyle.cpp
+@@ -28,6 +28,7 @@
+ #include <QApplication>
+ #include <QFrame>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QStyleFactory>
+ #include <QStyleOption>
+ 
+diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp
+index 5e8ea8a0af..74f15d358c 100644
+--- a/src/gui/editors/AutomationEditor.cpp
++++ b/src/gui/editors/AutomationEditor.cpp
+@@ -35,6 +35,7 @@
+ #include <QLayout>
+ #include <QMdiArea>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QScrollBar>
+ #include <QStyleOption>
+ #include <QToolTip>

diff --git a/media-sound/lmms/lmms-1.2.1.ebuild b/media-sound/lmms/lmms-1.2.1.ebuild
index e489666c90f..2f8eba8d8cd 100644
--- a/media-sound/lmms/lmms-1.2.1.ebuild
+++ b/media-sound/lmms/lmms-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -68,6 +68,10 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
+PATCHES=(
+	"${FILESDIR}/${P}-add-missing-qpainterpath.patch"
+)
+
 src_configure() {
 	local mycmakeargs+=(
 		-DUSE_WERROR=FALSE


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
@ 2023-07-21 23:49 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-07-21 23:49 UTC (permalink / raw
  To: gentoo-commits

commit:     3b4a33610c0cb89957719308e5375d8a4a151755
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 23:48:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 23:48:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b4a3361

media-sound/lmms: fix ladspa plugin paths

Bug: https://github.com/LMMS/lmms/issues/5884
Closes: https://bugs.gentoo.org/907285
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/lmms/Manifest                          |  1 +
 .../lmms/files/lmms-1.2.2-plugin-path.patch        | 26 ++++++++++++
 .../lmms/files/lmms-9999-no_compress_man.patch     | 48 ++++++++++++++++++++++
 media-sound/lmms/files/lmms-9999-plugin-path.patch | 26 ++++++++++++
 .../{lmms-9999.ebuild => lmms-1.2.2-r1.ebuild}     | 19 +++++----
 media-sound/lmms/lmms-9999.ebuild                  | 19 +++++----
 6 files changed, 124 insertions(+), 15 deletions(-)

diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 16f24a2a4c61..f2ed22466b75 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1 +1,2 @@
 DIST lmms-1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
+DIST lmms_1.2.2.tar.xz 22733960 BLAKE2B 8b561068194e9a4af8260675e784c25a92b6b2f731c29b677cbc16581306bbadcf27ea529adbcd735ff4adffedf3dd98ec7b2d89428a63ea600d022ecdae58e4 SHA512 df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028

diff --git a/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch b/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch
new file mode 100644
index 000000000000..0fabfbb89a30
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.2-plugin-path.patch
@@ -0,0 +1,26 @@
+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

diff --git a/media-sound/lmms/files/lmms-9999-no_compress_man.patch b/media-sound/lmms/files/lmms-9999-no_compress_man.patch
new file mode 100644
index 000000000000..e6db189f50ed
--- /dev/null
+++ b/media-sound/lmms/files/lmms-9999-no_compress_man.patch
@@ -0,0 +1,48 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -669,7 +669,7 @@ ADD_SUBDIRECTORY(doc)
+ 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"
+@@ -680,7 +680,6 @@ IF(GZIP)
+ 	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
+@@ -698,7 +697,7 @@ ENDIF(LMMS_BUILD_LINUX)
+ #
+ 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
+@@ -140,7 +140,7 @@ IF(NOT CMAKE_VERSION VERSION_LESS 3.6)
+ 	SET_PROPERTY(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT lmms)
+ ENDIF()
+ 
+-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1.gz")
++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_RCC_OUT} ${LMMS_UI_OUT} lmmsconfig.h lmms.1")
+ 
+ IF(LMMS_BUILD_WIN32)
+ 	SET(EXTRA_LIBRARIES "winmm")
+@@ -233,7 +233,7 @@ ELSE()
+ 	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()

diff --git a/media-sound/lmms/files/lmms-9999-plugin-path.patch b/media-sound/lmms/files/lmms-9999-plugin-path.patch
new file mode 100644
index 000000000000..0d04bf8d3027
--- /dev/null
+++ b/media-sound/lmms/files/lmms-9999-plugin-path.patch
@@ -0,0 +1,26 @@
+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

diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-1.2.2-r1.ebuild
similarity index 89%
copy from media-sound/lmms/lmms-9999.ebuild
copy to media-sound/lmms/lmms-1.2.2-r1.ebuild
index 329eb0410291..535760eee0c3 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-1.2.2-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# The order is important here! Both, cmake and xdg define src_prepare.
-# We need the one from cmake
-inherit bash-completion-r1 xdg cmake
+inherit cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -13,7 +11,7 @@ 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/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
@@ -68,9 +66,15 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-no_compress_man.patch" #733284
+	"${FILESDIR}/${PN}-1.2.2-plugin-path.patch" #907285
+)
+
 src_configure() {
-	local mycmakeargs+=(
-		-DBASHCOMP_PKG_PATH="$(get_bashcompdir)"
+	local mycmakeargs=(
 		-DUSE_WERROR=FALSE
 		-DWANT_CAPS=FALSE
 		-DWANT_TAP=FALSE
@@ -91,5 +95,6 @@ src_configure() {
 		-DWANT_VST=$(usex vst)
 		-DWANT_SF2=$(usex fluidsynth)
 	)
+
 	cmake_src_configure
 }

diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 329eb0410291..f525286d2873 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# The order is important here! Both, cmake and xdg define src_prepare.
-# We need the one from cmake
-inherit bash-completion-r1 xdg cmake
+inherit cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -13,9 +11,9 @@ 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/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_/-}.tar.xz"
+	S="${WORKDIR}/${PN}"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P/_/-}"
 fi
 
 LICENSE="GPL-2 LGPL-2"
@@ -68,9 +66,13 @@ RDEPEND="${COMMON_DEPEND}
 
 DOCS=( README.md doc/AUTHORS )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-9999-no_compress_man.patch" #733284
+	"${FILESDIR}/${PN}-9999-plugin-path.patch" #907285
+)
+
 src_configure() {
-	local mycmakeargs+=(
-		-DBASHCOMP_PKG_PATH="$(get_bashcompdir)"
+	local mycmakeargs=(
 		-DUSE_WERROR=FALSE
 		-DWANT_CAPS=FALSE
 		-DWANT_TAP=FALSE
@@ -91,5 +93,6 @@ src_configure() {
 		-DWANT_VST=$(usex vst)
 		-DWANT_SF2=$(usex fluidsynth)
 	)
+
 	cmake_src_configure
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/
@ 2024-06-24  7:13 Miroslav Šulc
  0 siblings, 0 replies; 7+ messages in thread
From: Miroslav Šulc @ 2024-06-24  7:13 UTC (permalink / raw
  To: gentoo-commits

commit:     30d15ff32cf584538ba455d0492c24657f94bd7a
Author:     Brandon Little <blittle <AT> inco <DOT> cc>
AuthorDate: Mon Jun 17 16:28:46 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 07:10:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d15ff3

media-sound/lmms: Fix segfault related to kwidgetsaddons

Closes: https://bugs.gentoo.org/907285
Signed-off-by: Brandon Little <blittle <AT> inco.cc>
Closes: https://github.com/gentoo/gentoo/pull/37197
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../lmms/files/lmms-1.2.2-kwidgetsaddons.patch     | 75 ++++++++++++++++++++++
 .../{lmms-1.2.2-r1.ebuild => lmms-1.2.2-r2.ebuild} |  1 +
 2 files changed, 76 insertions(+)

diff --git a/media-sound/lmms/files/lmms-1.2.2-kwidgetsaddons.patch b/media-sound/lmms/files/lmms-1.2.2-kwidgetsaddons.patch
new file mode 100644
index 000000000000..723e76adfa73
--- /dev/null
+++ b/media-sound/lmms/files/lmms-1.2.2-kwidgetsaddons.patch
@@ -0,0 +1,75 @@
+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 );

diff --git a/media-sound/lmms/lmms-1.2.2-r1.ebuild b/media-sound/lmms/lmms-1.2.2-r2.ebuild
similarity index 97%
rename from media-sound/lmms/lmms-1.2.2-r1.ebuild
rename to media-sound/lmms/lmms-1.2.2-r2.ebuild
index 2f8132cd28a8..06b9e57473c3 100644
--- a/media-sound/lmms/lmms-1.2.2-r1.ebuild
+++ b/media-sound/lmms/lmms-1.2.2-r2.ebuild
@@ -71,6 +71,7 @@ S="${WORKDIR}/${PN}"
 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_configure() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-06-24  7:14 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-22 21:48 [gentoo-commits] repo/gentoo:master commit in: media-sound/lmms/files/, media-sound/lmms/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2024-06-24  7:13 Miroslav Šulc
2023-07-21 23:49 Sam James
2020-06-13  8:58 Miroslav Šulc
2019-03-31 10:47 Andreas Sturmlechner
2017-09-26  0:54 Andreas Sturmlechner
2015-11-06  7:09 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox