summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-04-20 18:15:02 +0200
committerJohannes Huber <johu@gentoo.org>2017-04-20 18:22:40 +0200
commit8f00b2bf566d896205f52099530159c97b977f68 (patch)
tree6dfeae9f7a9dc7b276cb384a7f4ad8d589de52d1 /kde-apps/libkcompactdisc/files
parentkde5*eclass: KDE Applications 17.04.0 improvements (diff)
downloadgentoo-8f00b2bf566d896205f52099530159c97b977f68.tar.gz
gentoo-8f00b2bf566d896205f52099530159c97b977f68.tar.bz2
gentoo-8f00b2bf566d896205f52099530159c97b977f68.zip
kde-apps: Version bump KDE Applications 17.04.0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'kde-apps/libkcompactdisc/files')
-rw-r--r--kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
new file mode 100644
index 000000000000..1346f740445d
--- /dev/null
+++ b/kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch
@@ -0,0 +1,52 @@
+commit 006fda07f559206f9f9f1ccc29080ce71a367b09
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun Apr 16 21:23:58 2017 +0200
+
+ Fix linking with ALSA
+
+ REVIEW: 130089
+
+diff --git a/src/kcompactdisc.cpp b/src/kcompactdisc.cpp
+index 437648f..2e297d1 100644
+--- a/src/kcompactdisc.cpp
++++ b/src/kcompactdisc.cpp
+@@ -22,6 +22,8 @@
+ #include "kcompactdisc.h"
+ #include "kcompactdisc_p.h"
+
++#include <config-alsa.h>
++
+ #include <QtDBus>
+ #include <QUrl>
+ #include <QtGlobal>
+diff --git a/src/wmlib/audio/audio.c b/src/wmlib/audio/audio.c
+index 9ed7a82..729ada5 100644
+--- a/src/wmlib/audio/audio.c
++++ b/src/wmlib/audio/audio.c
+@@ -19,9 +19,8 @@
+ #include "audio.h"
+ #include "../include/wm_config.h"
+
+-#ifdef HAVE_ALSA
+ #include <config-alsa.h>
+-#endif
++
+ #include <string.h>
+
+ struct audio_oops *setup_phonon(const char *dev, const char *ctl);
+diff --git a/src/wmlib/audio/audio_alsa.c b/src/wmlib/audio/audio_alsa.c
+index 87bbca5..af1a1cb 100644
+--- a/src/wmlib/audio/audio_alsa.c
++++ b/src/wmlib/audio/audio_alsa.c
+@@ -26,9 +26,10 @@
+ #include "../include/wm_struct.h"
+ #include "../include/wm_config.h"
+
++#include <config-alsa.h>
++
+ #ifdef HAVE_ALSA
+
+-#include <config-alsa.h>
+ #include <alsa/asoundlib.h>
+
+ static char *device = NULL;