diff options
Diffstat (limited to 'user')
| -rw-r--r-- | user/audacious-plugins/APKBUILD | 7 | ||||
| -rw-r--r-- | user/audacious/APKBUILD | 11 | ||||
| -rw-r--r-- | user/audacious/qt-crash.patch | 43 |
3 files changed, 54 insertions, 7 deletions
diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index 150efce23..8a4742252 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -2,8 +2,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious-plugins -pkgver=3.9 -pkgrel=2 +pkgver=3.10 +pkgrel=0 pkgdesc="Playlist-oriented media player (plugins)" url="https://audacious-media-player.org/" arch="all" @@ -17,6 +17,7 @@ makedepends="audacious-dev>=${pkgver%.*} libcue-dev libmms-dev libsamplerate-dev libsndfile-dev libxcomposite-dev libnotify-dev libogg-dev libvorbis-dev pulseaudio-dev alsa-lib-dev curl-dev flac-dev lame-dev neon-dev sdl-dev wavpack-dev + faad2-dev fluidsynth-dev qt5-qtmultimedia-dev automake autoconf" subpackages="$pkgname-lang" source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2" @@ -46,4 +47,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa audacious-plugins-3.9.tar.bz2" +sha512sums="88dd93b5a7f6582ec42cf539d1000de0900cce683f4de85d8a17f57c7ba34545c6277882cad1505cb6682ee7b885ffcd1fe5675f7e24dc3e2a650615789d9d52 audacious-plugins-3.10.tar.bz2" diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD index e4a2377c7..de1cc6993 100644 --- a/user/audacious/APKBUILD +++ b/user/audacious/APKBUILD @@ -2,8 +2,8 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious -pkgver=3.9 -pkgrel=2 +pkgver=3.10 +pkgrel=0 pkgdesc="A playlist-oriented media player with multiple interfaces" url="https://audacious-media-player.org/" arch="all" @@ -12,7 +12,9 @@ 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" +source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2 + qt-crash.patch + " prepare() { default_prepare @@ -38,4 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d8ef24c91c84bfa80831075cd9a12fc4bf02cec8bc96bcfa5a941254d194cccdc482482b1c015bc63e1142718c2221034c0f3a87e2cb6e4daf3b4cc428328aaa audacious-3.9.tar.bz2" +sha512sums="513d5f9608c1ebeae9cf9bb95128244e990e66c74bf49aff6570ec557d537809f3ebf93c400f5df2708ff61cf04ecc95da183b111f5a757735cef5a68dd9907f audacious-3.10.tar.bz2 +debc016b8a2a1313bdd4a840c103755a52a7e4a5e21970ca82031bac101253f04ade3e81aa648cf5f44b8225da6e1b245f995df6ea43f2ed1f2e757d774205d4 qt-crash.patch" diff --git a/user/audacious/qt-crash.patch b/user/audacious/qt-crash.patch new file mode 100644 index 000000000..4b7d42d3b --- /dev/null +++ b/user/audacious/qt-crash.patch @@ -0,0 +1,43 @@ +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 + |