pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

amarok: improvements from markd



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu May 2 08:58:43 2024 +0200
Changeset:	84708bca8f1a9523ae8c398c666911b9fe5bf5c1

Modified Files:
	amarok/Makefile
	amarok/PLIST
Removed Files:
	amarok/TODO

Log Message:
amarok: improvements from markd

More dependencies added, starts up now.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=84708bca8f1a9523ae8c398c666911b9fe5bf5c1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 amarok/Makefile | 12 +++++-----
 amarok/PLIST    | 72 ++++++++++++++++++++++++++++++++-------------------------
 amarok/TODO     |  5 ----
 3 files changed, 47 insertions(+), 42 deletions(-)

diffs:
diff --git a/amarok/Makefile b/amarok/Makefile
index b4cf59adda..f9095658a2 100644
--- a/amarok/Makefile
+++ b/amarok/Makefile
@@ -7,22 +7,19 @@ EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://amarok.kde.org/
-COMMENT=	KDE4 audio player
+COMMENT=	KDE audio player
 LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
 
-TOOL_DEPENDS+=	extra-cmake-modules>=0:../../devel/extra-cmake-modules
-DEPENDS+=	phonon-qt5-backend-gstreamer>=4.6.3:../../multimedia/phonon-qt5-backend-gstreamer
+.include "../../meta-pkgs/kde/applications.mk"
 
+DEPENDS+=	phonon-qt5-backend-gstreamer>=4.6.3:../../multimedia/phonon-qt5-backend-gstreamer
 
-USE_LANGUAGES=	c c++
 USE_TOOLS+=	msgfmt pkg-config perl:run
 
 REPLACE_PERL+=	src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
 
 MYSQL_VERSIONS_ACCEPTED=	mariadb1011 mariadb106 mariadb105 mariadb104
 
-BUILDLINK_TRANSFORM+=	rm:-Wl,--fatal-warnings
-
 CONF_FILES+=	share/examples/amarok/xdg/amarok_homerc ${PKG_SYSCONFDIR}/xdg/amarok_homerc
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
 
@@ -34,6 +31,7 @@ post-install:
 .include "../../archivers/karchive/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
+.include "../../devel/googletest/buildlink3.mk"
 .include "../../devel/kcmutils/buildlink3.mk"
 .include "../../devel/kconfig/buildlink3.mk"
 .include "../../devel/kcoreaddons/buildlink3.mk"
@@ -45,6 +43,7 @@ post-install:
 .include "../../devel/knotifications/buildlink3.mk"
 .include "../../devel/kpackage/buildlink3.mk"
 .include "../../devel/ktexteditor/buildlink3.mk"
+.include "../../devel/libmtp/buildlink3.mk"
 .include "../../devel/threadweaver/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/kiconthemes/buildlink3.mk"
@@ -64,5 +63,6 @@ post-install:
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/amarok/PLIST b/amarok/PLIST
index 8ccb7117bb..1e726aef79 100644
--- a/amarok/PLIST
+++ b/amarok/PLIST
@@ -20,39 +20,44 @@ lib/libamarokshared.so
 lib/libamarokshared.so.1
 lib/libamarokshared.so.1.0.0
 lib/libampache_account_login.so
-lib/plugins/amarok_collection-audiocdcollection.so
-lib/plugins/amarok_collection-daapcollection.so
-lib/plugins/amarok_collection-mysqlcollection.so
-lib/plugins/amarok_collection-playdarcollection.so
-lib/plugins/amarok_collection-umscollection.so
-lib/plugins/amarok_importer-amarok.so
-lib/plugins/amarok_importer-banshee.so
-lib/plugins/amarok_importer-clementine.so
-lib/plugins/amarok_importer-fastforward.so
-lib/plugins/amarok_importer-itunes.so
-lib/plugins/amarok_importer-rhythmbox.so
-lib/plugins/amarok_service_ampache.so
-lib/plugins/amarok_service_magnatunestore.so
-lib/plugins/amarok_service_opmldirectory.so
-lib/plugins/amarok_storage-mysqlserverstorage.so
-lib/plugins/kcm_amarok_service_ampache.so
-lib/plugins/kcm_amarok_service_magnatunestore.so
-lib/qml/org/kde/amarok/albums/libamarok_context_applet_albums.so
-lib/qml/org/kde/amarok/albums/qmldir
-lib/qml/org/kde/amarok/analyzer/libamarok_context_applet_analyzer.so
-lib/qml/org/kde/amarok/analyzer/qmldir
-lib/qml/org/kde/amarok/currenttrack/libamarok_context_applet_currenttrack.so
-lib/qml/org/kde/amarok/currenttrack/qmldir
-lib/qml/org/kde/amarok/lyrics/libamarok_context_applet_lyrics.so
-lib/qml/org/kde/amarok/lyrics/qmldir
-lib/qml/org/kde/amarok/photos/libamarok_context_applet_photos.so
-lib/qml/org/kde/amarok/photos/qmldir
-lib/qml/org/kde/amarok/qml/Applet.qml
-lib/qml/org/kde/amarok/qml/AppletHeader.qml
-lib/qml/org/kde/amarok/qml/libqml_plugin.so
-lib/qml/org/kde/amarok/qml/qmldir
+qt5/plugins/amarok_collection-audiocdcollection.so
+qt5/plugins/amarok_collection-daapcollection.so
+qt5/plugins/amarok_collection-mtpcollection.so
+qt5/plugins/amarok_collection-mysqlcollection.so
+qt5/plugins/amarok_collection-playdarcollection.so
+qt5/plugins/amarok_collection-umscollection.so
+qt5/plugins/amarok_importer-amarok.so
+qt5/plugins/amarok_importer-banshee.so
+qt5/plugins/amarok_importer-clementine.so
+qt5/plugins/amarok_importer-fastforward.so
+qt5/plugins/amarok_importer-itunes.so
+qt5/plugins/amarok_importer-rhythmbox.so
+qt5/plugins/amarok_service_ampache.so
+qt5/plugins/amarok_service_magnatunestore.so
+qt5/plugins/amarok_service_opmldirectory.so
+qt5/plugins/amarok_storage-mysqlserverstorage.so
+qt5/plugins/kcm_amarok_service_ampache.so
+qt5/plugins/kcm_amarok_service_magnatunestore.so
+qt5/qml/org/kde/amarok/albums/libamarok_context_applet_albums.so
+qt5/qml/org/kde/amarok/albums/qmldir
+qt5/qml/org/kde/amarok/analyzer/libamarok_context_applet_analyzer.so
+qt5/qml/org/kde/amarok/analyzer/qmldir
+qt5/qml/org/kde/amarok/currenttrack/libamarok_context_applet_currenttrack.so
+qt5/qml/org/kde/amarok/currenttrack/qmldir
+qt5/qml/org/kde/amarok/lyrics/libamarok_context_applet_lyrics.so
+qt5/qml/org/kde/amarok/lyrics/qmldir
+qt5/qml/org/kde/amarok/photos/libamarok_context_applet_photos.so
+qt5/qml/org/kde/amarok/photos/qmldir
+qt5/qml/org/kde/amarok/qml/Applet.qml
+qt5/qml/org/kde/amarok/qml/AppletHeader.qml
+qt5/qml/org/kde/amarok/qml/libqml_plugin.so
+qt5/qml/org/kde/amarok/qml/qmldir
+qt5/qml/org/kde/amarok/wikipedia/libamarok_context_applet_wikipedia.so
+qt5/qml/org/kde/amarok/wikipedia/qmldir
 share/amarok/data/DefaultPlaylistLayouts.xml
 share/amarok/data/InfoParserLoading.html
+share/amarok/data/WikipediaCustomStyle.css
+share/amarok/data/bullet.gif
 share/amarok/data/first_run_jingle.ogg
 share/amarok/data/hover_info_template.html
 share/amarok/data/podcast_directory.opml
@@ -1144,6 +1149,10 @@ share/kpackage/amarok/org.kde.amarok.lyrics/metadata.json
 share/kpackage/amarok/org.kde.amarok.photos/contents/images/icon.png
 share/kpackage/amarok/org.kde.amarok.photos/contents/ui/main.qml
 share/kpackage/amarok/org.kde.amarok.photos/metadata.json
+share/kpackage/amarok/org.kde.amarok.wikipedia/contents/images/amarok-wikipediaheader.svg
+share/kpackage/amarok/org.kde.amarok.wikipedia/contents/images/icon.svg
+share/kpackage/amarok/org.kde.amarok.wikipedia/contents/ui/main.qml
+share/kpackage/amarok/org.kde.amarok.wikipedia/metadata.json
 share/kpackage/genericqml/org.kde.amarok.context/contents/ui/main.qml
 share/kpackage/genericqml/org.kde.amarok.context/contents/ui/toolbar/AppletToolbar.qml
 share/kpackage/genericqml/org.kde.amarok.context/contents/ui/toolbar/AppletToolbarAddItem.qml
@@ -1352,4 +1361,5 @@ share/metainfo/org.kde.amarok.context.appdata.xml
 share/metainfo/org.kde.amarok.currenttrack.appdata.xml
 share/metainfo/org.kde.amarok.lyrics.appdata.xml
 share/metainfo/org.kde.amarok.photos.appdata.xml
+share/metainfo/org.kde.amarok.wikipedia.appdata.xml
 share/solid/actions/amarok-play-audiocd.desktop
diff --git a/amarok/TODO b/amarok/TODO
deleted file mode 100644
index dd45a64d9a..0000000000
--- a/amarok/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-builds and packages fine, but at startup there's a popup that says:
-
-"Amarok could not find any plugins. That indicates an installation problem."
-
-and it quits.


Home | Main Index | Thread Index | Old Index