From 8f3f280456e455cde158c48286a9e6175797b9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Fri, 20 Apr 2018 18:55:06 +0200
Subject: [PATCH] qmmp: update to 1.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
---
 srcpkgs/qmmp/patches/default-ui-simple.patch | 11 ---------
 srcpkgs/qmmp/template                        | 24 ++++++++++----------
 2 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 srcpkgs/qmmp/patches/default-ui-simple.patch

diff --git a/srcpkgs/qmmp/patches/default-ui-simple.patch b/srcpkgs/qmmp/patches/default-ui-simple.patch
deleted file mode 100644
index 53d8117fbe7..00000000000
--- a/srcpkgs/qmmp/patches/default-ui-simple.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/qmmpui/uiloader.cpp	2016-10-04 11:49:39.000000000 +0200
-+++ src/qmmpui/uiloader.cpp	2016-10-11 11:51:37.780613874 +0200
-@@ -84,7 +84,7 @@
- {
-     loadPlugins();
-     QSettings settings (Qmmp::configFile(), QSettings::IniFormat);
--    QString name = settings.value("Ui/current_plugin", "skinned").toString();
-+    QString name = settings.value("Ui/current_plugin", "simple").toString();
-     foreach(QmmpUiPluginCache *item, *m_cache)
-     {
-         if(item->shortName() == name && item->uiFactory())
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index 929a873344c..2594aa2293f 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -1,23 +1,23 @@
 # Template file for 'qmmp'
 pkgname=qmmp
-version=1.2.0
-revision=2
+version=1.2.1
+revision=1
 build_style=cmake
-configure_args="-DUSE_HAL:BOOL=FALSE"
+configure_args="-DUSE_HAL:BOOL=FALSE -DQMMP_DEFAULT_UI:STRING=simple"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
-# XXX projectm, libsidplayfp, libgme, wildmidi
-makedepends="libcurl-devel jack-devel libsoxr-devel libmpcdec-devel
- ffmpeg-devel pulseaudio-devel libcdio-paranoia-devel enca-devel
- libmad-devel libmms-devel libsamplerate-devel libmodplug-devel
- wavpack-devel faad2-devel libbs2b-devel taglib-devel
- qt5-tools-devel qt5-multimedia-devel qt5-x11extras-devel
- libshout-devel opusfile-devel"
+# XXX projectm, wildmidi
+makedepends="enca-devel faad2-devel ffmpeg-devel jack-devel libarchive-devel
+ libbs2b-devel libcdio-paranoia-devel libcurl-devel libgme-devel libmad-devel
+ libmms-devel libmodplug-devel libmpcdec-devel libsamplerate-devel libshout-devel
+ libsidplayfp-devel libsoxr-devel opusfile-devel pulseaudio-devel
+ qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel taglib-devel
+ wavpack-devel"
 short_desc="Audio player based on the Qt5 libraries"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-3"
+license="GPL-3.0-or-newer"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
-checksum=8020c92e5dd75ed9ab34fd5d1bb524e01f2f361dafd2fe9a3073ae97f5896c9e
+checksum=b9314126adf72534d3ba907246b075a45a997578e5fb86e52769e01602e4e8a9
 
 qmmp-devel_package() {
 	short_desc+=" - development files"