+++ /dev/null
-DIST simon-0.4.90.tar.xz 25257276 BLAKE2B d5f78c721dc55387db415a740b00831471d6325d3aa2a0282e476132d2c7e378c4b024500527fd54a4073e972494e6ecc6f094022b5651b163d78ff6fcb20fcf SHA512 88b225e6d0168b87241649019376c8726fb3cc96ccbb985fd3dac5f5b67ed2d84de2756537300d7944797bceb7e340cdaf1c5aed731c1a7e2873d284ca3f94c1
+++ /dev/null
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Mar 29 22:00:19 UTC 2013
-Subject: build system
-
-make libdir modifiable
-
---- a/cmake/SimonDirs.cmake
-+++ b/cmake/SimonDirs.cmake
-@@ -29,6 +29,6 @@
- #IF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- #set(SIMON_LIB_INSTALL_DIR lib64)
- #ELSE(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-- set(SIMON_LIB_INSTALL_DIR lib)
-+ set(SIMON_LIB_INSTALL_DIR lib CACHE STRING "libdir")
- #ENDIF(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
- ENDIF(WIN32)
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SQL_REQUIRED="always"
-inherit kde4-base
-
-DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
-HOMEPAGE="http://simon-listens.org/"
-SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libsamplerate opencv sphinx"
-
-RDEPEND="
- media-libs/alsa-lib
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/qwt:6[qt4]
- libsamplerate? ( media-libs/libsamplerate )
- opencv? ( media-libs/opencv )
- sphinx? (
- >=app-accessibility/pocketsphinx-0.8
- >=app-accessibility/sphinxbase-0.8
- >=app-accessibility/SphinxTrain-1
- )
- !sphinx? ( app-accessibility/julius )
-"
-DEPEND="${RDEPEND}
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.1-libdir.patch )
-
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- -DSIMON_LIB_INSTALL_DIR=/usr/$(get_libdir)
- -DWITH_KdepimLibs=OFF
- -DUSE_PLASMA=OFF
- -DWITH_LibSampleRate=$(usex libsamplerate)
- -DWITH_OpenCV=$(usex opencv)
- -DBackendType=$(usex sphinx "both" "jhtk")
- $(cmake-utils_use_find_package sphinx Sphinxbase)
- $(cmake-utils_use_find_package sphinx Pocketsphinx)
- )
-
- kde4-base_src_configure
-}
-
-pkg_postinst() {
- kde4-base_pkg_postinst
-
- elog "Optional dependencies:"
- elog " kde-apps/jovie (support for Jovie TTS system)"
- use sphinx && elog " app-accessibility/julius (alternative backend)"
-}
+++ /dev/null
-DIST kde-runtime-16.04.3.tar.xz 7903920 BLAKE2B d09512c73dcd830c54678d4c41b6711c72b920af6bb7308e547b2b02fead679ba640372be590821edfad0b632e1e10166bbb041d7de063e4d33f65240d618ea3 SHA512 df52cd4c423030d3457bb907eb0bef0cdd3c8bce283d9f181b7ae6b7b4ce9c59a34f874f9ac6d2bd59597647a3c6315d772b2551c739423378186d4debbb53ae
+++ /dev/null
-commit 36139181fff43c227023f4c03c1e1a31e1be9dda
-Author: Tomáš Trnka <tomastrnka@gmx.com>
-Date: Thu Jul 21 21:34:53 2016 +0200
-
- info: remove extra defined(@array)
-
- Such syntax is long deprecated and a fatal error in Perl 5.22.0 [1].
-
- This commit is the KDE4 equivalent of kio-extras.git commit
- af92d6180d479d1e56bc549bbda30a3036687182.
-
- BUG: 359015
-
- [1] http://perldoc.perl.org/perl5220delta.html
-
-diff --git a/kioslave/info/kde-info2html b/kioslave/info/kde-info2html
-index 8dcc28f..0f217ae 100755
---- a/kioslave/info/kde-info2html
-+++ b/kioslave/info/kde-info2html
-@@ -171,7 +171,7 @@ sub FileNotFound {
- next if $looking && !/\* Menu/;
- $looking = 0;
- my @item = &ParseMenuItem($_,'dir');
-- if (!defined(@item)) { next }
-+ if (!@item) { next }
- my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @item;
- if ($MenuLinkRef eq $FileName) {
- &Redirect($MenuLinkFile, $MenuLinkTag);
-@@ -429,7 +429,7 @@ sub ParseMenuItem {
- sub MenuItem2HTML {
- my ($Line, $BaseInfoFile) = @_;
- my @parse_results = &ParseMenuItem($Line, $BaseInfoFile);
-- if (!defined (@parse_results)) { return $Line; }
-+ if (!@parse_results) { return $Line; }
- my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @parse_results;
- #-- produce a HTML line
- return "<tr class=\"infomenutr\"><td class=\"infomenutd\" style=\"width:30%\"><ul><li><a href=\"info:/$MenuLinkFile/$MenuLinkTag\">$MenuLinkRef</a></ul></td><td class=\"infomenutd\">$MenuLinkText";
+++ /dev/null
-commit 7209a3d7aa400f6dec72eb40ff21077a40110927
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue Jul 26 18:22:02 2016 +0200
-
- [kioslave] Make KDEWEBKIT optional
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b4d0f2..520c00a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,6 +62,8 @@ set_package_properties(LibGcrypt PROPERTIES DESCRIPTION "Libgcrypt is a general
- # Build options
- option(KDERUNTIME_BUILD_NEPOMUK "Build the Nepomuk KCM and kioslaves" FALSE)
-
-+option(WITH_KDEWEBKIT "Build features depending on KDEWEBKIT (currently HTML thumbnailer)" TRUE)
-+
- check_include_files(sys/wait.h HAVE_SYS_WAIT_H)
- check_include_files(sys/time.h HAVE_SYS_TIME_H)
-
-diff --git a/kioslave/thumbnail/CMakeLists.txt b/kioslave/thumbnail/CMakeLists.txt
-index 8f28a4e..2d37906 100644
---- a/kioslave/thumbnail/CMakeLists.txt
-+++ b/kioslave/thumbnail/CMakeLists.txt
-@@ -89,7 +89,7 @@ install(TARGETS textthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
-
- ########### next target ###############
-
--if(NOT WINCE)
-+if(NOT WINCE AND WITH_KDEWEBKIT)
- set(htmlthumbnail_PART_SRCS htmlcreator.cpp)
-
- kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS})
-@@ -97,7 +97,8 @@ kde4_add_plugin(htmlthumbnail ${htmlthumbnail_PART_SRCS})
- target_link_libraries(htmlthumbnail ${KDE4_KDEWEBKIT_LIBS})
-
- install(TARGETS htmlthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
--endif(NOT WINCE)
-+install(FILES htmlthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-+endif(NOT WINCE AND WITH_KDEWEBKIT)
-
- ########### next target ###############
-
-@@ -189,7 +190,6 @@ install(FILES
- imagethumbnail.desktop
- jpegthumbnail.desktop
- textthumbnail.desktop
-- htmlthumbnail.desktop
- djvuthumbnail.desktop
- desktopthumbnail.desktop
- comicbookthumbnail.desktop
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-runtime"
-KMMODULE="kioslave"
-WEBKIT_REQUIRED="never"
-inherit kde4-meta
-
-KEYWORDS="amd64 x86"
-DESCRIPTION="KDE VFS framework - kioslaves present a filesystem-like view of arbitrary data"
-IUSE="+bzip2 exif debug lzma openexr samba +sftp"
-
-# tests hang, last checked for 4.2.96
-RESTRICT="test"
-
-DEPEND="
- virtual/jpeg:0
- x11-libs/libXcursor
- bzip2? ( app-arch/bzip2 )
- exif? ( media-gfx/exiv2:= )
- openexr? ( media-libs/openexr:= )
- samba? ( >=net-fs/samba-4.0.0_alpha1[client] )
- sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
-"
-RDEPEND="${DEPEND}
- kde-apps/kdialog:*
- kde-frameworks/kdelibs:4[bzip2?,lzma?]
- virtual/ssh
- !kernel_SunOS? ( virtual/eject )
-"
-
-KMEXTRA="
- kioexec
- kdeeject
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-webkit.patch"
- "${FILESDIR}/${P}-perl-5.22.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_SLP=OFF
- -DWITH_KDEWEBKIT=OFF
- -DWITH_BZip2=$(usex bzip2)
- -DWITH_Exiv2=$(usex exif)
- -DWITH_LibLZMA=$(usex lzma)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Samba=$(usex samba)
- -DWITH_LibSSH=$(usex sftp)
- )
-
- kde4-meta_src_configure
-}
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <use>
- <flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
- </use>
-</pkgmetadata>
+++ /dev/null
-DIST kde-runtime-16.04.3.tar.xz 7903920 BLAKE2B d09512c73dcd830c54678d4c41b6711c72b920af6bb7308e547b2b02fead679ba640372be590821edfad0b632e1e10166bbb041d7de063e4d33f65240d618ea3 SHA512 df52cd4c423030d3457bb907eb0bef0cdd3c8bce283d9f181b7ae6b7b4ce9c59a34f874f9ac6d2bd59597647a3c6315d772b2551c739423378186d4debbb53ae
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kde-runtime"
-KMMODULE="phonon"
-inherit kde4-meta
-
-DESCRIPTION="Phonon KDE Integration"
-HOMEPAGE="https://phonon.kde.org"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug pulseaudio"
-
-DEPEND="
- media-libs/phonon[qt4]
- alsa? ( media-libs/alsa-lib )
- pulseaudio? (
- dev-libs/glib:2
- media-libs/libcanberra
- >=media-sound/pulseaudio-0.9.21[glib]
- )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_tests=OFF
- -DWITH_Xine=OFF
- -DWITH_ALSA=$(usex alsa)
- -DWITH_PulseAudio=$(usex pulseaudio)
- )
-
- kde4-meta_src_configure
-}
+++ /dev/null
-DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc
+++ /dev/null
-# Copyright 1999-2017 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 lastfm 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[qt4]
- >=dev-qt/qtcore-4.8:4
- >=dev-qt/qtdbus-4.8:4
- >=dev-qt/qtscript-4.8:4
- >=kde-frameworks/kdelibs-4.14.37:4[plasma]
- >=media-libs/taglib-1.7[asf(+),mp4(+)]
- >=media-libs/taglib-extras-1.0.1
- sys-libs/zlib
- >=virtual/mysql-5.1[embedded?]
- >=x11-libs/qtscriptgenerator-0.1.0
- ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
- lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
- 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}
- dev-util/automoc
- virtual/pkgconfig
- test? ( dev-cpp/gmock )
-"
-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_LibLastFm=$(usex lastfm)
- -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
-}
+++ /dev/null
-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)
-
+++ /dev/null
-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 );
+++ /dev/null
-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
-
+++ /dev/null
-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
-
+++ /dev/null
---- 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)
+++ /dev/null
-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()
-
+++ /dev/null
-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
-
+++ /dev/null
-<?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="lastfm">Enable Last.fm streaming services support through
- <pkg>media-libs/liblastfm</pkg>
- </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>
+++ /dev/null
-DIST vdr-amarok-0.0.2.tar.bz2 51816 BLAKE2B bc1918065d7a5731f9f7cef7fe22f7c6d6f94c0d4cf35b234115f15682f4b490c5ec1ad280cfde77d9a0e8ce3e388b61cbf4ae80830e2fb5ca1db8168eb58242 SHA512 217eadf28174c0bafc610068a784bdce0a8657c9a11690f0ac52da265271e601f3e48c8654930c693e6ca869307e68046093f7a88a024574e3cc2804a2f60ca3
+++ /dev/null
-diff -ur amarok-0.0.2.orig/Sockets.cpp amarok-0.0.2/Sockets.cpp
---- amarok-0.0.2.orig/Sockets.cpp 2006-05-15 14:03:23.000000000 +0300
-+++ amarok-0.0.2/Sockets.cpp 2009-07-30 14:02:49.000000000 +0300
-@@ -15,6 +15,7 @@
-
- #include "Sockets.h"
-
-+#include <cstring>
- #include <sstream>
-
- #ifndef WIN32
-diff -ur amarok-0.0.2.orig/vdramgw/Sockets.cpp amarok-0.0.2/vdramgw/Sockets.cpp
---- amarok-0.0.2.orig/vdramgw/Sockets.cpp 2006-05-15 12:52:44.000000000 +0300
-+++ amarok-0.0.2/vdramgw/Sockets.cpp 2009-07-30 14:02:57.000000000 +0300
-@@ -15,6 +15,7 @@
-
- #include "Sockets.h"
-
-+#include <cstring>
- #include <sstream>
-
- #ifndef WIN32
-diff -ur amarok-0.0.2.orig/vdramgw/vdramgw.cpp amarok-0.0.2/vdramgw/vdramgw.cpp
---- amarok-0.0.2.orig/vdramgw/vdramgw.cpp 2006-12-14 01:25:52.000000000 +0200
-+++ amarok-0.0.2/vdramgw/vdramgw.cpp 2009-07-30 14:02:40.000000000 +0300
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif
-
--
-+#include <cstring>
- #include <unistd.h>
- #include <getopt.h>
- #include <iostream>
+++ /dev/null
-gcc-4.7 compile fix
-https://bugs.gentoo.org/show_bug.cgi?id=424101
-
-signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/30/06)
-diff -Naur amarok-0.0.2.orig/Sockets.h amarok-0.0.2/Sockets.h
---- amarok-0.0.2.orig/Sockets.h 2012-06-30 17:40:27.000000000 +0200
-+++ amarok-0.0.2/Sockets.h 2012-06-30 17:43:21.000000000 +0200
-@@ -182,8 +182,8 @@
- {
- if (this->gptr() == NULL)
- {
-- setg(s, s + n, s + n);
-- setp(s, s + n);
-+ this->setg(s, s + n, s + n);
-+ this->setp(s, s + n);
- inbuf_ = s;
- outbuf_ = s;
- bufsize_ = n;
-@@ -215,9 +215,9 @@
- {
- _flush();
- }
-- setp(outbuf_, outbuf_ + bufsize_);
-+ this->setp(outbuf_, outbuf_ + bufsize_);
- if (c != traits::eof())
-- sputc(traits::to_char_type(c));
-+ this->sputc(traits::to_char_type(c));
- return 0;
- }
-
-@@ -225,7 +225,7 @@
- {
- // just flush the put area
- _flush();
-- setp(outbuf_, outbuf_ + bufsize_);
-+ this->setp(outbuf_, outbuf_ + bufsize_);
- return 0;
- }
-
-@@ -256,7 +256,7 @@
- return traits::eof();
-
- size_t totalbytes = readn + remained_;
-- setg(inbuf_, inbuf_,
-+ this->setg(inbuf_, inbuf_,
- inbuf_ + totalbytes / sizeof(char_type));
-
- remained_ = totalbytes % sizeof(char_type);
-diff -Naur amarok-0.0.2.orig/vdramgw/Sockets.h amarok-0.0.2/vdramgw/Sockets.h
---- amarok-0.0.2.orig/vdramgw/Sockets.h 2012-06-30 17:40:27.000000000 +0200
-+++ amarok-0.0.2/vdramgw/Sockets.h 2012-06-30 17:41:52.000000000 +0200
-@@ -182,8 +182,8 @@
- {
- if (this->gptr() == NULL)
- {
-- setg(s, s + n, s + n);
-- setp(s, s + n);
-+ this->setg(s, s + n, s + n);
-+ this->setp(s, s + n);
- inbuf_ = s;
- outbuf_ = s;
- bufsize_ = n;
-@@ -215,9 +215,9 @@
- {
- _flush();
- }
-- setp(outbuf_, outbuf_ + bufsize_);
-+ this->setp(outbuf_, outbuf_ + bufsize_);
- if (c != traits::eof())
-- sputc(traits::to_char_type(c));
-+ this->sputc(traits::to_char_type(c));
- return 0;
- }
-
-@@ -225,7 +225,7 @@
- {
- // just flush the put area
- _flush();
-- setp(outbuf_, outbuf_ + bufsize_);
-+ this->setp(outbuf_, outbuf_ + bufsize_);
- return 0;
- }
-
-@@ -256,7 +256,7 @@
- return traits::eof();
-
- size_t totalbytes = readn + remained_;
-- setg(inbuf_, inbuf_,
-+ this->setg(inbuf_, inbuf_,
- inbuf_ + totalbytes / sizeof(char_type));
-
- remained_ = totalbytes % sizeof(char_type);
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>vdr@gentoo.org</email>
- <name>Gentoo VDR Project</name>
- </maintainer>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-MY_P=vdr-amarok-${PV}
-
-DESCRIPTION="vdr to amarok gateway - allows vdr-amarok to access amarok"
-HOMEPAGE="http://irimi.ir.ohost.de/"
-SRC_URI="http://irimi.ir.ohost.de/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-RDEPEND="media-sound/amarok"
-
-S="${WORKDIR}/${MY_P#vdr-}/${PN}"
-
-src_prepare() {
- # Respect CC,CXXFLAGS, LDFLAGS
- sed -i -e "/^CXX /s:?=.*:= $(tc-getCXX):" \
- -e "/^CXXFLAGS/s:?=.*:= ${CFLAGS}:" \
- -e "s:\$(CXXFLAGS):& \$(LDFLAGS) :" "${S}"/Makefile
-
- cd "${WORKDIR}/${MY_P#vdr-}"
- epatch "${FILESDIR}"/${P}-gcc43.patch
- epatch "${FILESDIR}/${P}_gcc-4.7.diff"
-}
-
-src_install() {
- dobin ${PN}
- dodoc README
- newdoc ../README README.vdr-amarok
-
- insinto /etc
- doins ${PN}.conf
-}
# Bug #640884. Masked for removal in 30 days.
sci-electronics/cirkuit
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
-# KF5 released.
-# Possible alternatives are media-sound/cantata (an awesome mpd client),
-# media-sound/clementine and media-sound/tomahawk (the latter also declared
-# unmaintained upstream).
-# Bug #635468. Masked for removal in 30 days.
-media-sound/amarok
-kde-apps/kdebase-kioslaves
-kde-apps/phonon-kde
-x11-libs/qtscriptgenerator
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead media-sound/amarok:4, dead upstream,
-# last release in 2006. Bug #635468. Masked for removal in 30 days.
-media-sound/vdramgw
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead kdelibs4/qt4, no port to KF5 released yet.
-# If you depend on this package, help test KF5-based simon-9999
-# to decide on a possible snapshot. Bugs #640846, 639960, 635816.
-# Masked for removal in 30 days.
-app-accessibility/simon:0
-
# Patrice Clement <monsieurp@gentoo.org> (12 Dec 2017)
# Masked due to a hard dependency on an ancient versions of dev-libs/msgpack
# (<0.6) that have been punted from the tree.
+++ /dev/null
-DIST qtscriptgenerator-src-0.2.0.tar.gz 379776 BLAKE2B d607aac71bafb4858678a8eed73b4af3a343eb6a42e8780e478aaa4003592ae79409c227f86a384220b2ce8523d9360ff88f42ab7ed850a18f2ab59d891d908a SHA512 54b91562d275b634b50ae8f6ae024cf738605efadeb3085527087ebdc8b6b86559088972ab5dafb7ff1ede6d18dc135f935ac1fb307a17ea1975b4f7629cc0fa
+++ /dev/null
-diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml
---- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml 2012-01-23 12:30:03.000000000 +0100
-+++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml 2012-03-08 05:36:14.342528441 +0100
-@@ -921,6 +921,7 @@
- <value-type name="QEasingCurve">
- <modify-function signature="customType()const" remove="all" />
- <modify-function signature="setCustomType(double)" remove="all" />
-+ <modify-function signature="setCustomType(float)" remove="all" />
- </value-type>
-
- <object-type name="QAbstractAnimation" />
-diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml
---- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml 2012-01-23 12:30:03.000000000 +0100
-+++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml 2012-03-08 05:41:37.492524499 +0100
-@@ -1447,6 +1447,7 @@
- <modify-function signature="operator==(const QEasingCurve &)const" remove="all"/>
- <modify-function signature="operator!=(const QEasingCurve &)const" remove="all"/>
- <modify-function signature="setCustomType(double)" remove="all"/>
-+ <modify-function signature="setCustomType(float)" remove="all"/>
- <modify-function signature="customType()const" remove="all"/>
- </value-type>
-
-diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml
---- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml 2012-01-23 12:30:03.000000000 +0100
-+++ qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml 2012-03-08 05:39:53.932524942 +0100
-@@ -1388,14 +1388,12 @@
- </value-type>
-
- <value-type name="QEasingCurve">
-- <modify-function signature="customType()const" remove="all"/>
-- <modify-function signature="setCustomType(double)" remove="all"/>
--
- <modify-function signature="QEasingCurve(QEasingCurve)" remove="all"/>
- <modify-function signature="operator=(QEasingCurve)" remove="all"/>
- <modify-function signature="operator==(const QEasingCurve &)const" remove="all"/>
- <modify-function signature="operator!=(const QEasingCurve &)const" remove="all"/>
- <modify-function signature="setCustomType(double)" remove="all"/>
-+ <modify-function signature="setCustomType(float)" remove="all"/>
- <modify-function signature="customType()const" remove="all"/>
- </value-type>
-
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>kde@gentoo.org</email>
- <name>Gentoo KDE Project</name>
- </maintainer>
- <maintainer type="project">
- <email>qt@gentoo.org</email>
- <name>Gentoo Qt Project</name>
- </maintainer>
-</pkgmetadata>
+++ /dev/null
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Tool for generating Qt bindings for Qt Script"
-HOMEPAGE="https://code.google.com/p/qtscriptgenerator/"
-SRC_URI="https://dev.gentoo.org/~johu/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-IUSE="debug"
-
-DEPEND="
- dev-qt/designer:4
- dev-qt/qtcore:4
- dev-qt/qtgui:4[accessibility]
- dev-qt/qtopengl:4
- dev-qt/qtscript:4
- dev-qt/qtsql:4
- dev-qt/qtsvg:4[accessibility]
- dev-qt/qtxmlpatterns:4
- media-libs/phonon[qt4]
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- # remove phonon
- sed -i "/typesystem_phonon.xml/d" generator/generator.qrc || die "sed failed"
- sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
- sed -i "/qtscript_webkit/d" qtbindings/qtbindings.pro || die "sed failed"
-
- use arm && eapply "${FILESDIR}"/${P}-arm.patch
-}
-
-src_configure() {
- cd "${S}"/generator || die
- eqmake4 generator.pro
-
- cd "${S}"/qtbindings || die
- eqmake4 qtbindings.pro
-}
-
-src_compile() {
- cd "${S}"/generator || die
- emake
- ./generator --include-paths="$(qt4_get_headerdir)" || die
-
- cd "${S}"/qtbindings || die
- emake
-}
-
-src_install() {
- insinto "$(qt4_get_libdir)"/plugins/script
- insopts -m0755
- doins "${S}"/plugins/script/*
-}
projects / gentoo.git / commitdiff