From 12247c019b3c54916a1807d077fe5ba8d591337b Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 12 Mar 2019 13:07:22 +0000
Subject: user/audacious: bump to 3.10.1, modernise

---
 user/audacious/APKBUILD       |  7 ++-----
 user/audacious/qt-crash.patch | 43 -------------------------------------------
 2 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 user/audacious/qt-crash.patch

(limited to 'user')

diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD
index f37ff9b60..d671e395d 100644
--- a/user/audacious/APKBUILD
+++ b/user/audacious/APKBUILD
@@ -12,9 +12,7 @@ license="ISC"
 depends_dev="qt5-qtbase-dev dbus-glib-dev"
 makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev autoconf automake"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2
-	qt-crash.patch
-	"
+source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
 	default_prepare
@@ -38,5 +36,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43  audacious-3.10.1.tar.bz2
-debc016b8a2a1313bdd4a840c103755a52a7e4a5e21970ca82031bac101253f04ade3e81aa648cf5f44b8225da6e1b245f995df6ea43f2ed1f2e757d774205d4  qt-crash.patch"
+sha512sums="e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43  audacious-3.10.1.tar.bz2"
diff --git a/user/audacious/qt-crash.patch b/user/audacious/qt-crash.patch
deleted file mode 100644
index 4b7d42d3b..000000000
--- a/user/audacious/qt-crash.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 61471d51503736d868f5978f5b9a1471f3d2c9ce Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Thu, 20 Sep 2018 12:36:16 -0500
-Subject: [PATCH] libaudqt: Fix crash when infopopup is being hidden
-
-Hovering over the track I wanted to listen to showed a tool tip (the
-InfoPopup widget); if I moved the mouse in any way after the widget was
-displayed, it would immediately crash with a segmentation fault.
-
-Valgrind showed that this was due to s_infopopup being deleted from an
-event that involved it.  By switching both `delete` to `deleteLater`,
-the crash no longer occurs.
-
-Closes: #828.
----
- src/libaudqt/infopopup-qt.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libaudqt/infopopup-qt.cc b/src/libaudqt/infopopup-qt.cc
-index fdbba41d2..cad4d16d5 100644
---- a/src/libaudqt/infopopup-qt.cc
-+++ b/src/libaudqt/infopopup-qt.cc
-@@ -176,7 +176,7 @@ static InfoPopup * s_infopopup;
- 
- static void infopopup_show (const String & filename, const Tuple & tuple)
- {
--    delete s_infopopup;
-+    if(s_infopopup) s_infopopup->deleteLater();
-     s_infopopup = new InfoPopup (filename, tuple);
- 
-     QObject::connect (s_infopopup, & QObject::destroyed, [] () {
-@@ -206,7 +206,7 @@ EXPORT void infopopup_show_current ()
- 
- EXPORT void infopopup_hide ()
- {
--    delete s_infopopup;
-+    s_infopopup->deleteLater();
- }
- 
- } // namespace audqt
--- 
-2.18.0
-
-- 
cgit v1.2.3-70-g09d2