| author | FabioLolix
<fabio.loli@disroot.org> 2024-06-02 12:03:25 UTC |
| committer | FabioLolix
<fabio.loli@disroot.org> 2024-06-02 12:03:25 UTC |
| parent | 6232c3ceaa6692b147dacd7c529d11ca8149683b |
| .SRCINFO | +6 | -10 |
| PKGBUILD | +21 | -36 |
| amarok.install | +0 | -12 |
| desktop_remove_busactivatable.patch | +0 | -11 |
diff --git a/.SRCINFO b/.SRCINFO index 2281ad3..7d319de 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ pkgbase = amarok pkgdesc = The powerful music player for KDE - pkgver = 2.9.71 - pkgrel = 5 - url = http://amarok.kde.org/ + pkgver = 3.0.0 + pkgrel = 1 + url = https://apps.kde.org/de/amarok/ arch = x86_64 license = FDL license = GPL2 @@ -24,15 +24,11 @@ pkgbase = amarok depends = mariadb depends = phonon-qt5 depends = qt5-webengine - depends = taglib-extras depends = threadweaver5 + depends = taglib optdepends = ifuse: support for Apple iPod Touch and iPhone optdepends = loudmouth: backend needed by mp3tunes for syncing - source = https://download.kde.org/unstable/amarok/2.9.71/amarok-2.9.71.tar.xz - source = desktop_remove_busactivatable.patch - source = ffmpeg5_cmakelist_configure.patch::https://invent.kde.org/multimedia/amarok/-/merge_requests/45.diff - sha256sums = 6a404829d336f69415fb6bb4ea1d5566759fb95e3e84f904ee9ef82a7be4e84f - sha256sums = 92083012e10b0fae50f0caa2ef198f085f97d5856796fc9ef36d699b555353ed - sha256sums = 77a1f8cbc7f786e5616fbb5922dcf193614dbdf2a1d3fa2b2196c3fdb2f0387b + source = https://invent.kde.org/multimedia/amarok/-/archive/v3.0.0/amarok-v3.0.0.tar.gz + sha256sums = 8f9ac4fa2090b0ade823b8a372aad534a2d83c923cf235b289b8c358f4b4b9f7 pkgname = amarok diff --git a/PKGBUILD b/PKGBUILD index a979e78..38285f3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,55 +1,40 @@ -# Maintainer: Fredy García <frealgagu at gmail dot com> +# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix +# Contributor: Fredy García <frealgagu at gmail dot com> # Contributor: Ronald van Haren <ronald@archlinux.org> # Contributor: Antonio Rojas <arojas@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok -pkgver=2.9.71 -pkgrel=5 +pkgver=3.0.0 +pkgrel=1 pkgdesc="The powerful music player for KDE" -arch=("x86_64") -url="http://${pkgname}.kde.org/" -license=("FDL" "GPL2" "LGPL2.1") -depends=("kcmutils5" "kdoctools5" "kdnssd5" "kirigami2" "knewstuff5" "ktexteditor5" "liblastfm-qt5" "libofa" "mariadb" "phonon-qt5" "qt5-webengine" "taglib-extras" "threadweaver5") -makedepends=("extra-cmake-modules" "gdk-pixbuf2" "git" "knotifyconfig5" "qt5-tools" "loudmouth") +arch=(x86_64) +url="https://apps.kde.org/de/amarok/" +license=(FDL GPL2 LGPL2.1) +depends=(kcmutils5 kdoctools5 kdnssd5 kirigami2 knewstuff5 ktexteditor5 liblastfm-qt5 libofa + mariadb phonon-qt5 qt5-webengine threadweaver5 taglib) +makedepends=(extra-cmake-modules gdk-pixbuf2 git knotifyconfig5 qt5-tools loudmouth) optdepends=( "ifuse: support for Apple iPod Touch and iPhone" "loudmouth: backend needed by mp3tunes for syncing" ) -source=( - "https://download.kde.org/unstable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz" - "desktop_remove_busactivatable.patch" - "ffmpeg5_cmakelist_configure.patch::https://invent.kde.org/multimedia/amarok/-/merge_requests/45.diff" -) -sha256sums=( - "6a404829d336f69415fb6bb4ea1d5566759fb95e3e84f904ee9ef82a7be4e84f" - "92083012e10b0fae50f0caa2ef198f085f97d5856796fc9ef36d699b555353ed" - "77a1f8cbc7f786e5616fbb5922dcf193614dbdf2a1d3fa2b2196c3fdb2f0387b" -) - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" +source=("https://invent.kde.org/multimedia/amarok/-/archive/v${pkgver}/amarok-v${pkgver}.tar.gz") +sha256sums=('8f9ac4fa2090b0ade823b8a372aad534a2d83c923cf235b289b8c358f4b4b9f7') - # Patching to remove DBusActivatable=true to make shortcut works as expected - patch -Np1 -i "${srcdir}/desktop_remove_busactivatable.patch" - - # Patching to fix FFMPEG5 and CMakeLists bug with config.h definition position https://invent.kde.org/multimedia/amarok/-/merge_requests/45 - patch -Np1 -i "${srcdir}/ffmpeg5_cmakelist_configure.patch" +build() { + cmake -B build -S "amarok-v${pkgver}" -Wno-dev \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_INSTALL_PREFIX=/usr - mkdir -p "${srcdir}/${pkgname}-${pkgver}/build" + cmake --build build } -build() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - cmake "${srcdir}/${pkgname}-${pkgver}" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF - make +check() { + #ctest --test-dir build --output-on-failure +true } package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install + DESTDIR="${pkgdir}" cmake --install build } diff --git a/amarok.install b/amarok.install deleted file mode 100644 index 5c501dc..0000000 --- a/amarok.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/desktop_remove_busactivatable.patch b/desktop_remove_busactivatable.patch deleted file mode 100644 index b99b8c0..0000000 --- a/desktop_remove_busactivatable.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/org.kde.amarok.desktop b/src/org.kde.amarok.desktop -index 198a0c1..3d82037 100644 ---- a/src/org.kde.amarok.desktop -+++ b/src/org.kde.amarok.desktop -@@ -234,6 +234,5 @@ X-KDE-Keywords[x-test]=xxmusicxx,xxpodcastxx - X-KDE-Keywords[zh_CN]=music,podcast,音乐,播客 - X-KDE-Keywords[zh_TW]=music,podcast - X-KDE-Protocols=http --DBusActivatable=true - Terminal=false - Categories=Qt;KDE;AudioVideo;Audio;Player;