diff options
| author |   Johannes Huber <johu@gentoo.org> | 2017-04-20 18:15:02 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2017-04-20 18:22:40 +0200 |
| commit | 8f00b2bf566d896205f52099530159c97b977f68 (patch) | |
| tree | 6dfeae9f7a9dc7b276cb384a7f4ad8d589de52d1 /kde-apps/libkcompactdisc | |
| parent | kde5*eclass: KDE Applications 17.04.0 improvements (diff) | |
| download | gentoo-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')
| -rw-r--r-- | kde-apps/libkcompactdisc/Manifest | 1 | ||||
| -rw-r--r-- | kde-apps/libkcompactdisc/files/libkcompactdisc-17.04.0-no-alsa.patch | 52 | ||||
| -rw-r--r-- | kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild | 31 |
3 files changed, 84 insertions, 0 deletions
diff --git a/kde-apps/libkcompactdisc/Manifest b/kde-apps/libkcompactdisc/Manifest index 87862cabe90a..5454374f29cb 100644 --- a/kde-apps/libkcompactdisc/Manifest +++ b/kde-apps/libkcompactdisc/Manifest @@ -1,2 +1,3 @@ DIST libkcompactdisc-16.08.3.tar.xz 76240 SHA256 c48d23d355dddc538e4ed5538482e5ccbefd23f3928aaa625148928d5c793224 SHA512 07070f4fed8d0e7dea5503b7ae27c0bbe093bf4b08d3d06c792e0069a4d6eed7bd23f3f60013695af6dbb1adc79d59a5e13e2516cf2c54a3d2ef0011e05b28d8 WHIRLPOOL aed6c827dca44a8302de2da9ad4271cf83aa7f78f630971b669f513a260c1b3699c38c1d3217aa3fa930c1303832a5779429caa1990e89e263cd07cd4d331c37 DIST libkcompactdisc-16.12.3.tar.xz 77428 SHA256 943430081bac8e8a4c3a8260df0b644aa47ff3412b0cee387786938292e63e08 SHA512 2d5f480124959b00abd68121135e95589d8e27ca44cf9f94b817cf2c415dae46c05b810ae2a27a638e27ff93811ea6b647293d5d9d7338b52ad156df3fb91267 WHIRLPOOL 8635abe78f63d21692193a15c00db39a8b35d9b452f11d080f5821a61dd22cd0ed2a8bb2438da23f35374c2d16a11e8ebdb91a2f11e37a8f1f3bd84ceb38190d +DIST libkcompactdisc-17.04.0.tar.xz 88824 SHA256 a7a4050053fa84811262a6a281d265a519f87b7a468e567b348e65a27e89d4ad SHA512 0560a2b6cb2a42dab80a5d1365bde1e4352e4e1ef9e9d031d2902f692c8744016250ae1f35ddeb88aba15b4376d3bbf5be22b751c789b567ef807c1d56a20fd3 WHIRLPOOL 066ae36eac832edfdcd0c4500e4c300750ca245ed540733bf335f003a6d0aa05bd34876f8d0ec5afce75a3b2baa361cc10eb1811fb411308a7607c561f736939 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; diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild new file mode 100644 index 000000000000..d6863f4e178b --- /dev/null +++ b/kde-apps/libkcompactdisc/libkcompactdisc-17.04.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_BLOCK_SLOT4="false" +inherit kde5 + +DESCRIPTION="Library for playing & ripping CDs" +LICENSE="GPL-2+ LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="alsa" + +DEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + media-libs/phonon[qt5] + alsa? ( media-libs/alsa-lib ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-no-alsa.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package alsa ALSA) + ) + kde5_src_configure +} |