lmms: Update to 1.2.2

New changes in 1.2.2: (2020-06-25)

 * General improvements

      * Stop filtering out valid characters from file name while
	exporting tracks (#5282)
      * Fix Invalid warning about "dummy-MIDI-client" (#5509)

 * UI improvements

      * Note selection: Editing values works in dialog (#5438)

 * Bug Fixes

      * Piano Roll - Fix retrigger with vol/pan sliders (#5271)
      * Fix a rare crash on export (#5293)
      * Fix LMMS not launching when AppImage has spaces in name (#5297)
      * Fix vertical piano being unresponsive when clicked too fast
	(#5262)
      * Fix crash with Grooove VST (#5300)
      * Fix crash on deleting instrument with controller connections on
	knobs (#5306)
      * Fix notes being placed at negative positions on MIDI import
	(#5343)
      * Fix scrolling direction in the song editor due to stuck
	Ctrl/Shift (#5286)
      * Fix stuck notes with Helm VST on tempo automation (#5365)
      * Fix file factory delimeter position (#5378)
      * Fix a muted demo project "Greippi - Krem Kaakkuja (Second Flight
	Remix)" (aeac24c)
      * Fix controls linking misbehaviors (#5336)
      * Fix loading and saving of .fxb/.fxp files on Windows (#5411)
      * Fix crashes and hangs on importing some Hydrogen drum kit songs
	(#5420)
      * Fix freeze when replacing Mallets with another instrument (#5428)
      * DrumSynth: ensure correct envelope length in any sample rate
	(#5467)
      * AFP: fix loading start and loop points if the loop point is
	automated (#5472)
      * Select the correct piano key for marking semitones (#5478)
      * Ensure consistent use of effect gate (#5475)
      * Fix Piano roll crashing when window is vertically scaled too
	large (#5449)
      * Fix some memory errors with JACK audio/MIDI (#5452)
      * JackMidi: Remove confusing warnings at shutdown (737fcd3)
      * Fix SF2 player crashing when file is not a soundfont, with
	FluidSynth 2 (#5487)
      * BB editor: fix mouse event affecting wrong beats due to the
	cursor shape (#5489)
      * Fix knobs moving too fast on some platforms (#5360)
      * Fix notes created in BB editor resizing incorrectly when resizing
	a selection (#5515)
      * Fix some patterns not being saved in project (#5537)

7 files changed, 13 insertions, 89 deletions

diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile
index faaed54563c..d985b77af3d 100644
--- a/audio/lmms/Makefile
+++ b/audio/lmms/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2020/06/02 08:23:13 adam Exp $
+# $NetBSD: Makefile,v 1.63 2020/07/07 12:40:58 nia Exp $
 
-DISTNAME=	lmms_1.2.1
+DISTNAME=	lmms_1.2.2
 PKGNAME=	${DISTNAME:S/_/-/1}
-PKGREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=LMMS/}
 GITHUB_PROJECT=	lmms
@@ -16,10 +15,10 @@ LICENSE=	gnu-gpl-v2
 
 TOOL_DEPENDS+=	qt5-qttools-[0-9]*:../../x11/qt5-qttools
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=		${WRKDIR}/lmms
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++03
+USE_LANGUAGES=	c c++
 
 .include "../../mk/oss.buildlink3.mk"
 
@@ -54,7 +53,9 @@ CHECK_PORTABILITY_SKIP+=	cmake/linux/package_linux.sh.in
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+.  include "../../x11/qt5-qtx11extras/buildlink3.mk"
+.endif
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
diff --git a/audio/lmms/PLIST b/audio/lmms/PLIST
index 35d16033d3d..ebdd837e987 100644
--- a/audio/lmms/PLIST
+++ b/audio/lmms/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/06/10 19:08:42 nia Exp $
+@comment $NetBSD: PLIST,v 1.6 2020/07/07 12:40:58 nia Exp $
 bin/lmms
 include/lmms/AboutDialog.h
 include/lmms/ActionGroup.h
@@ -283,7 +283,6 @@ lib/lmms/ladspa/imp_1199.so
 lib/lmms/ladspa/impulse_1885.so
 lib/lmms/ladspa/inv_1429.so
 lib/lmms/ladspa/karaoke_1409.so
-lib/lmms/ladspa/ladspa-util.so
 lib/lmms/ladspa/latency_1914.so
 lib/lmms/ladspa/lcr_delay_1436.so
 lib/lmms/ladspa/lowpass_iir_1891.so
diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo
index 40ac9c022e1..576778888dd 100644
--- a/audio/lmms/distinfo
+++ b/audio/lmms/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.12 2020/06/09 16:03:00 nia Exp $
+$NetBSD: distinfo,v 1.13 2020/07/07 12:40:58 nia Exp $
 
-SHA1 (lmms_1.2.1.tar.xz) = 47d139272ba938de89fbd432fbd7438ea919e58c
-RMD160 (lmms_1.2.1.tar.xz) = 8a0361b2771eb49e979047e03600265c127dc220
-SHA512 (lmms_1.2.1.tar.xz) = 7054d1592fdea60d76423a0260e941c217f50d2db9c4fcc35df20c8b58067c431ed9b264ef05e9f3f2cba84ca66870d1bf23da92b294a00ac6d567e3d3e771d6
-Size (lmms_1.2.1.tar.xz) = 14543092 bytes
+SHA1 (lmms_1.2.2.tar.xz) = 9b0681490e0f8a06347b6a0d4470be138bba6338
+RMD160 (lmms_1.2.2.tar.xz) = cb4a07dc27dfa31a70b5154a5386b2a8873774c8
+SHA512 (lmms_1.2.2.tar.xz) = df74d9e938f1c3807e9941b11db4ccfe9450e23b723c82774de15b7666ac39f1bfdd8519231e28849f994628190ecc92fa05d55bbc0b50a4421f2d183e729028
+Size (lmms_1.2.2.tar.xz) = 22733960 bytes
 SHA1 (patch-CMakeLists.txt) = e30599b486c83b734fd8f9afa4cf2bd488eab338
-SHA1 (patch-plugins_Eq_EqSpectrumView.h) = 76a2efb341ca724be552cdb9f04fb7d835eeee4b
 SHA1 (patch-src_CMakeLists.txt) = 92acfc9bc236c1b211bbe9686de818641c01b257
 SHA1 (patch-src_core_audio_AudioOss.cpp) = 6bc591b929f26cbfb5f160c3d9b49316bf165e58
 SHA1 (patch-src_core_midi_MidiOss.cpp) = d1bf1a7bf9aaec549f3ac97d300c7bee4d81ff29
-SHA1 (patch-src_gui_AutomationPatternView.cpp) = 50d1b5130ce98ce2fe0e40c4eada0197ab9af706
-SHA1 (patch-src_gui_LmmsStyle.cpp) = 4d965590a8dfd6facb40a156f93de303da26cfaf
-SHA1 (patch-src_gui_editors_AutomationEditor.cpp) = 6f0b7e5d2609059586df323ef7779c4af8465cf2
diff --git a/audio/lmms/patches/patch-plugins_Eq_EqSpectrumView.h b/audio/lmms/patches/patch-plugins_Eq_EqSpectrumView.h
deleted file mode 100644
index d6e794212ac..00000000000
--- a/audio/lmms/patches/patch-plugins_Eq_EqSpectrumView.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-plugins_Eq_EqSpectrumView.h,v 1.1 2020/06/09 16:03:00 nia Exp $
-
-[PATCH] Fix Qt 5.15 build issues (#5498)
-
-Add missing QPainterPath includes
-
-https://github.com/LMMS/lmms/commit/29a5abc30b5d5efa30b7f6b73fe06d76ec851cca.patch
-
---- plugins/Eq/EqSpectrumView.h.orig	2018-11-03 01:43:42.000000000 +0000
-+++ plugins/Eq/EqSpectrumView.h
-@@ -24,6 +24,7 @@
- #define EQSPECTRUMVIEW_H
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QWidget>
- 
- #include "fft_helpers.h"
diff --git a/audio/lmms/patches/patch-src_gui_AutomationPatternView.cpp b/audio/lmms/patches/patch-src_gui_AutomationPatternView.cpp
deleted file mode 100644
index d3e486dda7d..00000000000
--- a/audio/lmms/patches/patch-src_gui_AutomationPatternView.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_gui_AutomationPatternView.cpp,v 1.1 2020/06/09 16:03:00 nia Exp $
-
-[PATCH] Fix Qt 5.15 build issues (#5498)
-
-Add missing QPainterPath includes
-
-https://github.com/LMMS/lmms/commit/29a5abc30b5d5efa30b7f6b73fe06d76ec851cca.patch
-
---- src/gui/AutomationPatternView.cpp.orig	2018-11-03 01:43:42.000000000 +0000
-+++ src/gui/AutomationPatternView.cpp
-@@ -25,6 +25,7 @@
- 
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMenu>
- 
- #include "AutomationEditor.h"
diff --git a/audio/lmms/patches/patch-src_gui_LmmsStyle.cpp b/audio/lmms/patches/patch-src_gui_LmmsStyle.cpp
deleted file mode 100644
index 31eb06dbe98..00000000000
--- a/audio/lmms/patches/patch-src_gui_LmmsStyle.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_gui_LmmsStyle.cpp,v 1.1 2020/06/09 16:03:00 nia Exp $
-
-[PATCH] Fix Qt 5.15 build issues (#5498)
-
-Add missing QPainterPath includes
-
-https://github.com/LMMS/lmms/commit/29a5abc30b5d5efa30b7f6b73fe06d76ec851cca.patch
-
---- src/gui/LmmsStyle.cpp.orig	2018-11-03 01:43:42.000000000 +0000
-+++ src/gui/LmmsStyle.cpp
-@@ -28,6 +28,7 @@
- #include <QApplication>
- #include <QFrame>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleFactory>
- #include <QStyleOption>
- 
diff --git a/audio/lmms/patches/patch-src_gui_editors_AutomationEditor.cpp b/audio/lmms/patches/patch-src_gui_editors_AutomationEditor.cpp
deleted file mode 100644
index 9dcb2c07e93..00000000000
--- a/audio/lmms/patches/patch-src_gui_editors_AutomationEditor.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_gui_editors_AutomationEditor.cpp,v 1.1 2020/06/09 16:03:00 nia Exp $
-
-[PATCH] Fix Qt 5.15 build issues (#5498)
-
-Add missing QPainterPath includes
-
-https://github.com/LMMS/lmms/commit/29a5abc30b5d5efa30b7f6b73fe06d76ec851cca.patch
-
---- src/gui/editors/AutomationEditor.cpp.orig	2018-11-03 01:43:42.000000000 +0000
-+++ src/gui/editors/AutomationEditor.cpp
-@@ -35,6 +35,7 @@
- #include <QLayout>
- #include <QMdiArea>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QScrollBar>
- #include <QStyleOption>
- #include <QToolTip>