* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2016-01-05 17:37 Michael Palimaka
0 siblings, 0 replies; 4+ messages in thread
From: Michael Palimaka @ 2016-01-05 17:37 UTC (permalink / raw
To: gentoo-commits
commit: c3c07f0eb712ff3739d91e8a1a244c3192b60ce1
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 5 17:35:50 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jan 5 17:37:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c07f0e
media-sound/amarok: backport patch from upstream fixing build with >=media-libs/taglib-1.10
Gentoo-bug: 571008
Package-Manager: portage-2.2.26
media-sound/amarok/amarok-2.8.0-r3.ebuild | 1 +
.../amarok/files/amarok-2.8.0-taglib110.patch | 40 ++++++++++++++++++++++
2 files changed, 41 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index ea7dcdf..30760bf 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -81,6 +81,7 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${P}-gmock-1.7.patch"
"${FILESDIR}/${P}-mysqld-rpath.patch"
+ "${FILESDIR}/${P}-taglib110.patch"
)
src_configure() {
diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
new file mode 100644
index 0000000..0934816
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
@@ -0,0 +1,40 @@
+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)
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2016-05-04 20:07 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2016-05-04 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 6615126d2da5b99b1fd8dff7832114cbf1f2dc25
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 4 20:00:55 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 4 20:06:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6615126d
media-sound/amarok: Fix rpath on mysqld
Patch rebased for current version by Peter Levine
<plevine457 <AT> gmail.com>, was unfortunately dropped in kde overlay for
version bump.
Gentoo-bug: 581554
Package-Manager: portage-2.2.28
.../amarok/{amarok-2.8.90.ebuild => amarok-2.8.90-r1.ebuild} | 4 ++++
media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch | 12 ++++++++++++
2 files changed, 16 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild b/media-sound/amarok/amarok-2.8.90-r1.ebuild
similarity index 94%
rename from media-sound/amarok/amarok-2.8.90.ebuild
rename to media-sound/amarok/amarok-2.8.90-r1.ebuild
index 4db4e97..3012de2 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r1.ebuild
@@ -75,6 +75,7 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
"${FILESDIR}/${P}-mysql-embedded.patch"
+ "${FILESDIR}/${P}-mysqld-rpath.patch"
)
src_configure() {
@@ -97,6 +98,9 @@ src_configure() {
-DWITH_UTILITIES=$(usex utils)
)
+ # bug 581554: add libmysqld location for rpath patch
+ use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
+
kde4-base_src_configure
}
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
new file mode 100644
index 0000000..c84975d
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
@@ -0,0 +1,12 @@
+--- 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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2016-06-01 19:15 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2016-06-01 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 8bfde08d22c3e55127883857d4ac46bbe4efa164
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 19:14:58 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 19:15:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfde08d
media-sound/amarok: Fix build w/ gcc-6
By adding upstreamed patch from opensuse.
Gentoo-bug: 584682
Package-Manager: portage-2.3.0_rc1
media-sound/amarok/amarok-2.8.90-r2.ebuild | 1 +
media-sound/amarok/files/amarok-2.8.90-gcc6.patch | 36 +++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild
index 04e5ff6..03a5e12 100644
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
"${FILESDIR}/${P}-mysql-embedded.patch"
"${FILESDIR}/${P}-mysqld-rpath.patch"
"${FILESDIR}/${P}-scriptconsole.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
)
src_configure() {
diff --git a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
new file mode 100644
index 0000000..bad936a
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
@@ -0,0 +1,36 @@
+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
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/
@ 2025-02-23 21:46 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2025-02-23 21:46 UTC (permalink / raw
To: gentoo-commits
commit: 5928960e62b1e49376dd1e9241f2dc984e3f0789
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 22:33:05 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 21:44:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5928960e
media-sound/amarok: new package, add 3.2.2
Closes: https://bugs.gentoo.org/931836
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/amarok/Manifest | 1 +
media-sound/amarok/amarok-3.2.2.ebuild | 158 ++++++++++++++++++++
.../amarok/files/amarok-3.2.2-gpodder-qt6.patch | 163 +++++++++++++++++++++
media-sound/amarok/metadata.xml | 19 +++
4 files changed, 341 insertions(+)
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
new file mode 100644
index 000000000000..7cfd63393704
--- /dev/null
+++ b/media-sound/amarok/Manifest
@@ -0,0 +1 @@
+DIST amarok-3.2.2.tar.xz 47693388 BLAKE2B 011a925163ebd113de15826bdc4165ed001896ce99c8fa49496b208318bb24c339069f99f7d7097d506e0caf437909c8cd0e0babc52b28bceff2a6def07d0fe0 SHA512 918b4fd03a2de717cb1f5968e4ba3eda391c881de384ebabeec423303e84ac6f5a8dbbb8816668d3de52c77d57f1ab9fef6580a8111a9507c9082a8ca25097aa
diff --git a/media-sound/amarok/amarok-3.2.2.ebuild b/media-sound/amarok/amarok-3.2.2.ebuild
new file mode 100644
index 000000000000..d9dce07d1baf
--- /dev/null
+++ b/media-sound/amarok/amarok-3.2.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.9.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..13} )
+inherit ecm kde.org optfeature python-any-r1 xdg
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Advanced audio player based on KDE Frameworks"
+HOMEPAGE="https://amarok.kde.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ipod lastfm mariadb mtp podcast webengine X"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+DEPEND="
+ >=app-crypt/qca-2.3.9:2[qt6(+)]
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=dev-qt/qttools-${QTMIN}:6[designer]
+ >=kde-frameworks/attica-${KFMIN}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kcodecs-${KFMIN}:6
+ >=kde-frameworks/kcolorscheme-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/kdeclarative-${KFMIN}:6
+ >=kde-frameworks/kdnssd-${KFMIN}:6
+ >=kde-frameworks/kglobalaccel-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kitemviews-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/kpackage-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/solid-${KFMIN}:6
+ >=kde-frameworks/threadweaver-${KFMIN}:6
+ >=media-libs/phonon-4.12.0[qt6(+)]
+ >=media-libs/taglib-1.12:=
+ sci-libs/fftw:3.0
+ sys-libs/zlib
+ virtual/opengl
+ ipod? (
+ dev-libs/glib:2
+ media-libs/libgpod[gtk]
+ )
+ lastfm? ( >=media-libs/liblastfm-1.1.0_pre20241124 )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ !mariadb? ( dev-db/mysql-connector-c:= )
+ mtp? ( media-libs/libmtp )
+ podcast? ( >=media-libs/libmygpo-qt-1.1.0_pre20240811 )
+ webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
+"
+RDEPEND="${DEPEND}
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ media-video/ffmpeg
+"
+BDEPEND="${PYTHON_DEPS}
+ >=dev-qt/qttools-${QTMIN}:6[linguist]
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-gpodder-qt6.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_WITH_QT6=ON
+ -DWITH_MP3Tunes=OFF
+ -DWITH_PLAYER=ON
+ -DWITH_UTILITIES=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibOFA=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_MySQLe=ON
+ -DCMAKE_DISABLE_FIND_PACKAGE_Taglib-Extras=ON
+ -DWITH_IPOD=$(usex ipod)
+ $(cmake_use_find_package lastfm LibLastFm)
+ $(cmake_use_find_package !mariadb MySQL)
+ $(cmake_use_find_package mtp Mtp)
+ $(cmake_use_find_package podcast Mygpo-qt6)
+ $(cmake_use_find_package webengine Qt6WebEngineWidgets)
+ -DWITH_X11=$(usex X)
+ )
+ use ipod && mycmakeargs+=( -DWITH_GDKPixBuf=ON )
+
+ ecm_src_configure
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ pkg_is_installed() {
+ echo "${1} ($(has_version ${1} || echo "not ")installed)"
+ }
+
+ db_name() {
+ use mariadb && echo "MariaDB" || echo "MySQL"
+ }
+
+ optfeature "Audio CD support" "kde-apps/audiocd-kio:6"
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "You must configure ${PN} to use an external database server."
+ elog " 1. Make sure either MySQL or MariaDB is installed and configured"
+ elog " Checking local system:"
+ elog " $(pkg_is_installed dev-db/mariadb)"
+ elog " $(pkg_is_installed dev-db/mysql)"
+ elog " For preliminary configuration of $(db_name) Server refer to"
+ elog " https://wiki.gentoo.org/wiki/$(db_name)#Configuration"
+ elog " 2. Ensure 'mysql' service is started and run:"
+ elog " # emerge --config amarok"
+ elog " 3. Run ${PN} and go to 'Configure Amarok - Database' menu page"
+ elog " Check 'Use external MySQL database' and press OK"
+ elog
+ elog "For more information please read:"
+ elog " https://community.kde.org/Amarok/Community/MySQL"
+ fi
+}
+
+pkg_config() {
+ # Create external mysql database with amarok default user/password
+ local AMAROK_DB_NAME="amarokdb"
+ local AMAROK_DB_USER_NAME="amarokuser"
+ local AMAROK_DB_USER_PWD="password"
+
+ einfo "Initializing ${PN} MySQL database 'amarokdb':"
+ einfo "If prompted for a password, please enter your MySQL root password."
+ einfo
+
+ if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
+ "${EROOT}"/usr/bin/mysql -u root -p -e "CREATE DATABASE IF NOT EXISTS ${AMAROK_DB_NAME}; GRANT ALL PRIVILEGES ON ${AMAROK_DB_NAME}.* TO '${AMAROK_DB_USER_NAME}' IDENTIFIED BY '${AMAROK_DB_USER_PWD}'; FLUSH PRIVILEGES;"
+ fi
+ einfo "${PN} MySQL database 'amarokdb' successfully initialized!"
+}
diff --git a/media-sound/amarok/files/amarok-3.2.2-gpodder-qt6.patch b/media-sound/amarok/files/amarok-3.2.2-gpodder-qt6.patch
new file mode 100644
index 000000000000..0568e2c9ee19
--- /dev/null
+++ b/media-sound/amarok/files/amarok-3.2.2-gpodder-qt6.patch
@@ -0,0 +1,163 @@
+From 973ab984b6c289dd2c88abbdf1b29c48abb4dbc7 Mon Sep 17 00:00:00 2001
+From: Tuomas Nurmi <tuomas@norsumanageri.org>
+Date: Sat, 22 Feb 2025 10:56:38 +0200
+Subject: [PATCH] Make lastfm and gpodder parts compile with strict flags, too
+
+---
+ .../applets/similarartists/plugin/SimilarArtistModel.cpp | 6 +++---
+ src/services/gpodder/GpodderPodcastMeta.h | 2 +-
+ src/services/gpodder/GpodderPodcastRequestHandler.h | 2 +-
+ src/services/gpodder/GpodderPodcastTreeItem.h | 2 +-
+ src/services/gpodder/GpodderProvider.h | 4 ++--
+ src/services/gpodder/GpodderService.cpp | 4 ++--
+ src/services/gpodder/GpodderServiceModel.h | 4 ++--
+ src/services/gpodder/GpodderTagTreeItem.h | 2 +-
+ src/services/gpodder/GpodderTreeItem.h | 4 ++--
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp b/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp
+index 333cc85e45..eec964b8c1 100644
+--- a/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp
++++ b/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp
+@@ -185,7 +185,7 @@ SimilarArtistModel::fillArtistInfoFromXml( QXmlStreamReader &xml )
+ QString plays;
+ QString ownPlays;
+ QString tags;
+- QString bio=" ";
++ QString bio=QLatin1String(" ");
+
+ while( xml.name() != QLatin1String("name") )
+ xml.readNextStartElement();
+@@ -242,7 +242,7 @@ SimilarArtistModel::fillArtistInfoFromXml( QXmlStreamReader &xml )
+ {
+ bio = xml.readElementText().replace( QStringLiteral("\n"), QStringLiteral("<br>") );
+ if(bio == QString())
+- bio = " ";
++ bio = QLatin1String(" ");
+ }
+ else
+ xml.skipCurrentElement();
+@@ -256,7 +256,7 @@ SimilarArtistModel::fillArtistInfoFromXml( QXmlStreamReader &xml )
+ {
+ if( auto artist = dynamic_cast< SimilarArtistItem *>( i ) )
+ {
+- artist->m_bioText = bio.isNull() ? " " : bio;
++ artist->m_bioText = bio.isNull() ? QLatin1String(" ") : bio;
+ artist->m_listenerCount = listeners;
+ artist->m_playCount = plays;
+ artist->m_ownPlayCount = ownPlays;
+diff --git a/src/services/gpodder/GpodderPodcastMeta.h b/src/services/gpodder/GpodderPodcastMeta.h
+index abe2c9f2b6..b929173a24 100644
+--- a/src/services/gpodder/GpodderPodcastMeta.h
++++ b/src/services/gpodder/GpodderPodcastMeta.h
+@@ -22,7 +22,7 @@
+
+ #include "core/playlists/PlaylistProvider.h"
+ #include "core/podcasts/PodcastMeta.h"
+-#include <mygpo-qt5/ApiRequest.h>
++#include <mygpo-qt6/ApiRequest.h>
+
+ namespace Podcasts {
+
+diff --git a/src/services/gpodder/GpodderPodcastRequestHandler.h b/src/services/gpodder/GpodderPodcastRequestHandler.h
+index c56ec1942f..ce787f4cb3 100644
+--- a/src/services/gpodder/GpodderPodcastRequestHandler.h
++++ b/src/services/gpodder/GpodderPodcastRequestHandler.h
+@@ -20,7 +20,7 @@
+ #define GPODDERPODCASTREQUESTHANDLER_H_
+
+ #include "GpodderServiceModel.h"
+-#include <mygpo-qt5/PodcastList.h>
++#include <mygpo-qt6/PodcastList.h>
+
+ #include <QModelIndex>
+
+diff --git a/src/services/gpodder/GpodderPodcastTreeItem.h b/src/services/gpodder/GpodderPodcastTreeItem.h
+index 91323fb770..16b0f8c6b2 100644
+--- a/src/services/gpodder/GpodderPodcastTreeItem.h
++++ b/src/services/gpodder/GpodderPodcastTreeItem.h
+@@ -20,7 +20,7 @@
+ #define GPODDERPODCASTTREEITEM_H_
+
+ #include "GpodderTreeItem.h"
+-#include <mygpo-qt5/Podcast.h>
++#include <mygpo-qt6/Podcast.h>
+
+ class GpodderPodcastTreeItem: public GpodderTreeItem
+ {
+diff --git a/src/services/gpodder/GpodderProvider.h b/src/services/gpodder/GpodderProvider.h
+index 9551a97a69..61e6642b01 100644
+--- a/src/services/gpodder/GpodderProvider.h
++++ b/src/services/gpodder/GpodderProvider.h
+@@ -23,8 +23,8 @@
+ #include "core/podcasts/PodcastProvider.h"
+ #include "core/podcasts/PodcastReader.h"
+ #include "GpodderPodcastMeta.h"
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/EpisodeActionList.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/EpisodeActionList.h>
+ #include "playlistmanager/file/KConfigSyncRelStore.h"
+ #include "playlistmanager/PlaylistManager.h"
+
+diff --git a/src/services/gpodder/GpodderService.cpp b/src/services/gpodder/GpodderService.cpp
+index b2d51ea807..4c43ea7b4a 100644
+--- a/src/services/gpodder/GpodderService.cpp
++++ b/src/services/gpodder/GpodderService.cpp
+@@ -27,8 +27,8 @@
+ #include "GpodderServiceModel.h"
+ #include "GpodderServiceView.h"
+ #include "GpodderSortFilterProxyModel.h"
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/Podcast.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/Podcast.h>
+ #include "playlistmanager/PlaylistManager.h"
+ #include "widgets/SearchWidget.h"
+
+diff --git a/src/services/gpodder/GpodderServiceModel.h b/src/services/gpodder/GpodderServiceModel.h
+index 6eb979ca07..59c67d2fde 100644
+--- a/src/services/gpodder/GpodderServiceModel.h
++++ b/src/services/gpodder/GpodderServiceModel.h
+@@ -20,8 +20,8 @@
+ #define GPODDERSERVICEMODEL_H_
+
+ #include "GpodderTreeItem.h"
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/TagList.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/TagList.h>
+ #include "NetworkAccessManagerProxy.h"
+
+ #include <QAbstractItemModel>
+diff --git a/src/services/gpodder/GpodderTagTreeItem.h b/src/services/gpodder/GpodderTagTreeItem.h
+index 63cc965d89..16a8b95cf3 100644
+--- a/src/services/gpodder/GpodderTagTreeItem.h
++++ b/src/services/gpodder/GpodderTagTreeItem.h
+@@ -20,7 +20,7 @@
+ #define GPODDERTAGTREEITEM_H_
+
+ #include "GpodderTreeItem.h"
+-#include <mygpo-qt5/Tag.h>
++#include <mygpo-qt6/Tag.h>
+
+ #include <QObject>
+
+diff --git a/src/services/gpodder/GpodderTreeItem.h b/src/services/gpodder/GpodderTreeItem.h
+index 642e1cb371..7b311b659e 100644
+--- a/src/services/gpodder/GpodderTreeItem.h
++++ b/src/services/gpodder/GpodderTreeItem.h
+@@ -19,8 +19,8 @@
+ #ifndef GPODDERTREEITEM_H_
+ #define GPODDERTREEITEM_H_
+
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/TagList.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/TagList.h>
+
+ #include <QList>
+ #include <QModelIndex>
+--
+GitLab
+
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
new file mode 100644
index 000000000000..27433610de3b
--- /dev/null
+++ b/media-sound/amarok/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=amarok</bugs-to>
+ <remote-id type="kde-invent">multimedia/amarok</remote-id>
+ </upstream>
+ <use>
+ <flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
+ <flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag>
+ <flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
+ <flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
+ <flag name="webengine">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag>
+ </use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-23 21:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-04 20:07 [gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2025-02-23 21:46 Andreas Sturmlechner
2016-06-01 19:15 Johannes Huber
2016-01-05 17:37 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox