diff options
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/amarok/ChangeLog | 15 | ||||
-rw-r--r-- | media-sound/amarok/Manifest | 11 | ||||
-rw-r--r-- | media-sound/amarok/amarok-2.8.90-r9001.ebuild | 132 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-2.8.0-taglib110.patch | 40 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch | 60 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-2.8.90-gcc6.patch | 36 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch | 34 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-2.8.90-no-webkit.patch | 39 | ||||
-rw-r--r-- | media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch | 33 | ||||
-rw-r--r-- | media-sound/amarok/metadata.xml | 30 |
11 files changed, 0 insertions, 442 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog deleted file mode 100644 index ecfa6e5..0000000 --- a/media-sound/amarok/ChangeLog +++ /dev/null @@ -1,15 +0,0 @@ -*amarok-2.8.90-r9001 (01 Jun 2018) - - 01 Jun 2018; AstroFloyd <AstroFloyd@gmail.com> +amarok-2.8.90-r9001.ebuild, - -amarok-2.8.90-r5.ebuild, metadata.xml: - media-sound/amarok: dropping dependencies to keep amarok going - -*amarok-2.8.90-r5 (12 Jan 2018) - - 12 Jan 2018; AstroFloyd <AstroFloyd@gmail.com> +amarok-2.8.90-r5.ebuild, - +files/amarok-2.8.0-taglib110.patch, +files/amarok-2.8.90-ffmpeg3.patch, - +files/amarok-2.8.90-gcc6.patch, +files/amarok-2.8.90-mysql-embedded.patch, - +files/amarok-2.8.90-mysqld-rpath.patch, +files/amarok-2.8.90-no-webkit.patch, - +files/amarok-2.8.90-scriptconsole.patch, +metadata.xml: - media-sound/amarok (+3 deps): copy from portage to keep until Plasma-5 version - of Amarok is released diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest deleted file mode 100644 index cbb13da..0000000 --- a/media-sound/amarok/Manifest +++ /dev/null @@ -1,11 +0,0 @@ -AUX amarok-2.8.0-taglib110.patch 1537 BLAKE2B 9f1d85fdf761d5048ddef1fc971bf32fd95b597876113a235e3d1e3abbee7d190c2651d5458258296f66506996a5f3f6a79b03badffe0890d07443318a686b4c SHA512 b15456d5c297a92860306492f51449040504763c0862475a8ecdb732c3cdccab4b0f0d1bc6b9d62a7a01e2a5faa212200c5aba5ac703c267bada830d8033bac6 -AUX amarok-2.8.90-ffmpeg3.patch 2606 BLAKE2B d4a44bbf962ca8e971c832f37d3e3c15268e67669d9e3c22917a58054bb0de04de811adac35daa516abd7bbc768c5a5d89755e69f0922732aee8d9842903063c SHA512 f2c6df1ec6aa526b3def250a11f7ef22d990d753d35dc9d6e8c29c426da63483ea7299d1e93466757ff1e2c645c41c2c69f7470c7a0d77e4c0ffec5e76006e59 -AUX amarok-2.8.90-gcc6.patch 1322 BLAKE2B 0d2bf0da58ee2a763e3946cd0faf5676861c179e980c2b36a209d1678b96c45bc83a15fe68cac790d856b87b30640463f1a37dd94520b67f02a2af74871f535c SHA512 a8a361387c524ff72c8a788048b5b713a6e18bc2976cab6784f8b3e413d21652f861b2b7c92f667abf98a638d7d012f4500afb1f8ea0b5cba8c86e4270eafe7f -AUX amarok-2.8.90-mysql-embedded.patch 1224 BLAKE2B acc4b0abb2a7e000c76e0a07a10919ceb3122139251558c072f515099f6ae6244c75a2dfa6c1c240a92b56ba3b58e604713a9c51c2215f015316213df3aefd11 SHA512 ead9d9d0dc141113d4144326dab525e6e58427f8c3e2d5f8441a87e7d0787199b2947e08a6ff445255f0b1154e23182336403266d8b4e0a040a6b658f0d57155 -AUX amarok-2.8.90-mysqld-rpath.patch 573 BLAKE2B d56b77592e73d624269b8611751f7595e05aad139e65357c004e748f7edf3f41af54c5e3c823904dd4e44c4c2f92c6fc8db0087856967cba699206143f05f9a0 SHA512 724ee90912883baa374bdf8ceca77e1d8ec809279f2254705624fb3966e8300ed02a0ddfc4613e8b9add2b7b20eed333619b3c1d1426e14e5f8ce60bdff39be5 -AUX amarok-2.8.90-no-webkit.patch 1126 BLAKE2B 14b1fc1b3a5c20437896256a6692430934f351754c33b07c8eb61073c75577e70853834dc995474beb8b57464e04a66b143fafb405a451950a5add61f98f8620 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707 -AUX amarok-2.8.90-scriptconsole.patch 1272 BLAKE2B 7483f7d7cbe3351d0ccca3c593ec49641076755f38d3cfcabd426c321957fddae7855016d2ff0ecfccb03b6b8e21017c769bd1717bdcb961b3789877538942cc SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d -DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc -EBUILD amarok-2.8.90-r9001.ebuild 3429 BLAKE2B 615e92e8a599889ac9582af9fd86291fbbcb7dddca294c8667fdbcc33104d60fe006b7493621dcd8add9e31ea0266e3fb528975d621cfbbe16a422e491221ad9 SHA512 60ddf71331fd56aec3366d1e1c698de9dfccc3d441ef95e47753aea6d73057a92020044e9ef989a1bbaa5dad8f291bdb58148818fe1120c2a41a2f631cc8d4e7 -MISC ChangeLog 728 BLAKE2B 9eaeb987a29a9e5efdb3a1eca6c0b08961433f9f35edc71d7aacb23121af7151a3bf65d159bc0ffb4d7ac17d0a6484b16f5c5dc971b69844fbf5b81a191ce8e0 SHA512 8046aa745f4325b6e0476a98d1eda0a821a20b46c19ed3b317f18f0f95170094df9f421ee37cb44724d2d97985a50d134ad8e7cd9145d625be4a4cce19754128 -MISC metadata.xml 1045 BLAKE2B ef7470b455373211e77ecf6cafeac5e6c8fb105dc675859654391fda5dd49666528b9a71100f539bfaacbb21ca27baef06a98185ba3729ed1dc20cbd2f684d1c SHA512 151ab2e8f6d13331c8d952e0785c7ecfc1f305f4aceb768e66053b8ffb7c91bdbeb864f5148175d287f954cba129b15226adf5010df8d0ed22fc0668798004d6 diff --git a/media-sound/amarok/amarok-2.8.90-r9001.ebuild b/media-sound/amarok/amarok-2.8.90-r9001.ebuild deleted file mode 100644 index 03fdb8a..0000000 --- a/media-sound/amarok/amarok-2.8.90-r9001.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_REQUIRED="never" -KDE_HANDBOOK="optional" -SQL_REQUIRED="always" -VIRTUALX_REQUIRED="test" -VIRTUALDBUS_TEST="true" -inherit flag-o-matic kde4-base pax-utils - -DESCRIPTION="Advanced audio player based on KDE framework" -HOMEPAGE="https://amarok.kde.org/" -if [[ ${PV} != *9999* ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="4" -IUSE="debug +embedded ipod mp3tunes mtp ofa test +utils" - -if [[ ${KDE_BUILD_TYPE} == live ]]; then - RESTRICT+=" test" -fi - -# ipod requires gdk enabled and also gtk compiled in libgpod -COMMONDEPEND=" - $(add_kdeapps_dep kdebase-kioslaves) - app-crypt/qca:2 - >=dev-qt/qtcore-4.8:4 - >=dev-qt/qtdbus-4.8:4 - >=dev-qt/qtscript-4.8:4 - >=media-libs/taglib-1.7[asf(+),mp4(+)] - >=media-libs/taglib-extras-1.0.1 - sys-libs/zlib - >=virtual/mysql-5.1 - >=x11-libs/qtscriptgenerator-0.1.0 - ipod? ( >=media-libs/libgpod-0.7.0[gtk] ) - mp3tunes? ( - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/openssl:0 - >=dev-qt/qtcore-4.8.4:4[glib] - net-libs/loudmouth - net-misc/curl - ) - mtp? ( >=media-libs/libmtp-1.0.0 ) - ofa? ( >=media-libs/libofa-0.9.0 ) -" -DEPEND="${COMMONDEPEND} - virtual/pkgconfig -" -RDEPEND="${COMMONDEPEND} - !media-sound/amarok-utils - $(add_kdeapps_dep phonon-kde) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.8.0-taglib110.patch" - "${FILESDIR}/${P}-mysql-embedded.patch" - "${FILESDIR}/${P}-mysqld-rpath.patch" - "${FILESDIR}/${P}-scriptconsole.patch" - "${FILESDIR}/${P}-gcc6.patch" - "${FILESDIR}/${P}-ffmpeg3.patch" - "${FILESDIR}/${P}-no-webkit.patch" -) - -src_prepare() { - kde4-base_src_prepare - - # requires qtwebkit - sed -i -e "s/wikipedia,//" data/amarok_homerc || die - - sed -i -e "/macro_log_feature.*QT_QTOPENGL_FOUND/d" \ - CMakeLists.txt \ - || die "failed to remove QT_QTOPENGL detection" - - sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \ - src/context/applets/CMakeLists.txt \ - || die "failed to sed out QT_QTOPENGL_FOUND" -} - -src_configure() { - # Append minimal-toc cflag for ppc64, see bug 280552 and 292707 - use ppc64 && append-flags -mminimal-toc - - local mycmakeargs=( - -DWITH_PLAYER=ON - -DWITH_NepomukCore=OFF - -DWITH_Soprano=OFF - -DWITH_MYSQL_EMBEDDED=$(usex embedded) - -DWITH_IPOD=$(usex ipod) - -DWITH_MP3Tunes=$(usex mp3tunes) - -DWITH_Mtp=$(usex mtp) - -DWITH_LibOFA=$(usex ofa) - -DWITH_UTILITIES=$(usex utils) - ) - - use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON ) - use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF ) - - # bug 581554: add libmysqld location for rpath patch - use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" ) - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - # bug 481592 - pax-mark m "${ED}"/usr/bin/amarok -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if ! use embedded; then - elog "You've disabled the amarok support for embedded mysql DBs." - elog "You'll have to configure amarok to use an external db server." - elog "Please read https://community.kde.org/Amarok/Community/MySQL for details on how" - elog "to configure the external db and migrate your data from the embedded database." - - if has_version "virtual/mysql[minimal]"; then - elog - elog "You built mysql with the minimal use flag, so it doesn't include the server." - elog "You won't be able to use the local mysql installation to store your amarok collection." - fi - fi -} diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch deleted file mode 100644 index 0934816..0000000 --- a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Omar Plummer <omarplummer@imergetechnologies.com> -Date: Thu, 06 Aug 2015 22:24:27 +0000 -Subject: Fix TagLib version check. -X-Git-Url: http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=fec8817c530ce42b6485fdabff6051784b8d9904 ---- -Fix TagLib version check. - -The version check compared version strings lexicographically, so "1.7" -(the min version) compared as greater than "1.10.0". - -BUG: 351013 -REVIEW: 124639 ---- - - ---- a/cmake/modules/FindTaglib.cmake -+++ b/cmake/modules/FindTaglib.cmake -@@ -29,10 +29,10 @@ - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) - -- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) - message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") - set(TAGLIB_FOUND FALSE) -- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) - - exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) - -@@ -42,7 +42,7 @@ - set(TAGLIB_FOUND TRUE) - endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) - string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") -- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") -+ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION) - mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) - - else(TAGLIBCONFIG_EXECUTABLE) - diff --git a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch b/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch deleted file mode 100644 index 31feca0..0000000 --- a/media-sound/amarok/files/amarok-2.8.90-ffmpeg3.patch +++ /dev/null @@ -1,60 +0,0 @@ -https://git.reviewboard.kde.org/r/129626 - -Index: amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp -=================================================================== ---- amarok-2.8.90.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp -+++ amarok-2.8.90/src/musicbrainz/MusicDNSAudioDecoder.cpp -@@ -223,7 +223,7 @@ MusicDNSAudioDecoder::decode( const QStr - { - if( !decodedFrame ) - { -- decodedFrame = avcodec_alloc_frame(); -+ decodedFrame = av_frame_alloc(); - if( !decodedFrame ) - { - warning() << "Unable to allocate enough memory to decode file."; -@@ -231,7 +231,7 @@ MusicDNSAudioDecoder::decode( const QStr - break; - } - else -- avcodec_get_frame_defaults( decodedFrame ); -+ av_frame_unref ( decodedFrame ); - } - - decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); -@@ -341,7 +341,7 @@ MusicDNSAudioDecoder::decode( const QStr - { - if( !decodedFrame ) - { -- decodedFrame = avcodec_alloc_frame(); -+ decodedFrame = av_frame_alloc(); - if( !decodedFrame ) - { - warning() << "Unable to allocate enough memory to decode file."; -@@ -349,7 +349,7 @@ MusicDNSAudioDecoder::decode( const QStr - break; - } - else -- avcodec_get_frame_defaults( decodedFrame ); -+ av_frame_unref( decodedFrame ); - } - - decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); -@@ -459,7 +459,7 @@ MusicDNSAudioDecoder::decode( const QStr - { - if( !decodedFrame ) - { -- decodedFrame = avcodec_alloc_frame(); -+ decodedFrame = av_frame_alloc(); - if( !decodedFrame ) - { - warning() << "Unable to allocate enough memory to decode file."; -@@ -467,7 +467,7 @@ MusicDNSAudioDecoder::decode( const QStr - break; - } - else -- avcodec_get_frame_defaults( decodedFrame ); -+ av_frame_unref( decodedFrame ); - } - - decoderRet = avcodec_decode_audio4( pCodecCtx, decodedFrame, &gotFrame, &avpkt ); diff --git a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch deleted file mode 100644 index bad936a..0000000 --- a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Wed, 1 Jun 2016 13:58:26 -0500 -Subject: [PATCH] gcc6 buildfix - -courtesy of opensuse, thx - -BUG: 363054 ---- - src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp -index 4bdb9b9..e327354 100644 ---- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp -+++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp -@@ -28,6 +28,7 @@ - #include "playlist/PlaylistModelStack.h" - - using namespace Playlists; -+using namespace Playlist; - - XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad ) - : PlaylistFile( url, provider ) -@@ -101,7 +102,7 @@ XSPFPlaylist::load() - //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist - if( m_autoAppendAfterLoad ) - The::playlistController()->insertPlaylist( -- ::Playlist::ModelStack::instance()->bottom()->rowCount(), -+ ModelStack::instance()->bottom()->rowCount(), - Playlists::PlaylistPtr( this ) - ); - } --- -2.8.3 - diff --git a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch b/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch deleted file mode 100644 index b03aa18..0000000 --- a/media-sound/amarok/files/amarok-2.8.90-mysql-embedded.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 048ca3d57228759f05af7b9553200fd362aeaa8b Mon Sep 17 00:00:00 2001 -From: Matt Whitlock <kde@mattwhitlock.name> -Date: Tue, 29 Mar 2016 12:22:41 -0400 -Subject: [PATCH] Only link with MYSQL_EMBEDDED_LIBRARIES if - WITH_MYSQL_EMBEDDED - -REVIEW: 127523 ---- - src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt -index 244cde1..4c618fc 100644 ---- a/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt -+++ b/src/core-impl/collections/db/sql/mysqlcollection/CMakeLists.txt -@@ -21,11 +21,14 @@ target_link_libraries(amarok_collection-mysqlcollection - ${KDE4_KDECORE_LIBS} - ${QT_QTCORE_LIBRARY} - ${QT_QTGUI_LIBRARY} -- ${MYSQL_EMBEDDED_LIBRARIES} - ${CMAKE_DL_LIBS} - ${ZLIB_LIBRARIES} - ) - -+if(WITH_MYSQL_EMBEDDED) -+ target_link_libraries( amarok_collection-mysqlcollection ${MYSQL_EMBEDDED_LIBRARIES} ) -+endif(WITH_MYSQL_EMBEDDED) -+ - if(NOT WIN32 AND NOT APPLE) - target_link_libraries( amarok_collection-mysqlcollection crypt pthread ) - endif(NOT WIN32 AND NOT APPLE) --- -2.8.1 - diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch deleted file mode 100644 index c84975d..0000000 --- a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.old 2016-05-04 11:01:25.000000000 -0400 -+++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04 11:05:24.216625165 -0400 -@@ -28,6 +28,9 @@ - ${ZLIB_LIBRARIES} - ) - -+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) -+SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH "${MYSQLD_DIR}") -+ - if(NOT WIN32 AND NOT APPLE) - target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread ) - endif(NOT WIN32 AND NOT APPLE) diff --git a/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch b/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch deleted file mode 100644 index 91686b1..0000000 --- a/media-sound/amarok/files/amarok-2.8.90-no-webkit.patch +++ /dev/null @@ -1,39 +0,0 @@ -Borrowed from Arch Linux. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ include_directories( - ${CMAKE_CURRENT_BINARY_DIR}/shared - ) - --find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml QtWebKit REQUIRED ) -+find_package( Qt4 4.8.3 COMPONENTS QtCore QtGui QtScript QtSvg QtXml REQUIRED ) - find_package( KDE4 4.8.4 REQUIRED ) - - include( KDE4Defaults ) -diff --git a/src/context/applets/CMakeLists.txt b/src/context/applets/CMakeLists.txt -index f4d5456d9f..cad9036681 100644 ---- a/src/context/applets/CMakeLists.txt -+++ b/src/context/applets/CMakeLists.txt -@@ -1,18 +1,18 @@ - add_subdirectory( albums ) - add_subdirectory( currenttrack ) --add_subdirectory( info ) -+# add_subdirectory( info ) - add_subdirectory( labels ) - add_subdirectory( lyrics ) - add_subdirectory( photos ) - add_subdirectory( tabs ) --add_subdirectory( wikipedia ) -+# add_subdirectory( wikipedia ) - - if( QT_QTOPENGL_FOUND ) - add_subdirectory( analyzer ) - endif() - - if( LIBLASTFM_FOUND ) -- add_subdirectory( upcomingevents ) -+# add_subdirectory( upcomingevents ) - add_subdirectory( similarartists ) - endif() - diff --git a/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch b/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch deleted file mode 100644 index 455146b..0000000 --- a/media-sound/amarok/files/amarok-2.8.90-scriptconsole.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 2900fe47adde10999a6c0f907d73b00a1c1bd5b1 Mon Sep 17 00:00:00 2001 -From: Myriam Schweingruber <myriam@kde.org> -Date: Wed, 18 May 2016 21:59:17 +0200 -Subject: [PATCH] Fix a crash in amarok when opening the Script Console - -The script console tries to write to a system folder instead of a user - folder. Note to devs: always make sure to test a system installation, - not just a local build. - -Thanks to Johannes Huber for the quick fix suggestion. - -BUG: 363176 -FIXED-IN: 2.9 ---- - src/scripting/scriptconsole/ScriptConsole.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/scripting/scriptconsole/ScriptConsole.cpp b/src/scripting/scriptconsole/ScriptConsole.cpp -index 6edd9a2..e4e0fab 100644 ---- a/src/scripting/scriptconsole/ScriptConsole.cpp -+++ b/src/scripting/scriptconsole/ScriptConsole.cpp -@@ -161,7 +161,7 @@ ScriptConsole::ScriptConsole( QWidget *parent ) - settings.endGroup(); - - if( m_savePath.isEmpty() ) -- m_savePath = KUrl( KStandardDirs::locate( "data", "amarok/scriptconsole/" ) ).path(); -+ m_savePath = KUrl( KStandardDirs::locateLocal( "data", "amarok/scriptconsole/" ) ).path(); - - slotNewScript(); - connect( m_debugger, SIGNAL(evaluationSuspended()), SLOT(slotEvaluationSuspended()) ); --- -2.8.2 - diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml deleted file mode 100644 index 41fea40..0000000 --- a/media-sound/amarok/metadata.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>jmbsvicetto@gentoo.org</email> - <name>Jorge Manuel B. S. Vicetto</name> -</maintainer> -<maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> -</maintainer> -<maintainer type="project"> - <email>sound@gentoo.org</email> - <name>Gentoo Sound project</name> -</maintainer> -<use> - <flag name="embedded">Use libmysqld, MySQL embedded server library. - Try disabling this if you encounter -PIC related in amarok, - it will make amarok rely only on standalone MySQL server. - </flag> - <flag name="mp3tunes">Enable mp3tunes integration</flag> - <flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp - </flag> - <flag name="ofa">Use <pkg>media-libs/libofa</pkg> to compute MusicDNS acoustic - fingerprints (used by MusicBrainz) - </flag> - <flag name="utils">Build the utils - old media-sound/amarok-utils - </flag> -</use> -</pkgmetadata> |