Date: Wednesday, June 24, 2020 @ 10:45:09 Author: bgyorgy Revision: 652284
upgpkg: kid3 3.8.3-1: Update to new version, move common files to a separated package to avoid conflicts between the two packages Modified: kid3/trunk/PKGBUILD ----------+ PKGBUILD | 73 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-24 10:44:16 UTC (rev 652283) +++ PKGBUILD 2020-06-24 10:45:09 UTC (rev 652284) @@ -2,70 +2,69 @@ # Contributor: Alois Nespor <[email protected]> pkgbase=kid3 -pkgname=('kid3' 'kid3-qt') -pkgver=3.8.2 +pkgname=('kid3-common' 'kid3-qt' 'kid3') +pkgver=3.8.3 pkgrel=1 +pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor" arch=('x86_64') -url="http://kid3.sourceforge.net/"; +url="https://kid3.kde.org/"; license=('GPL') -makedepends=('qt5-tools' 'qt5-multimedia' 'qt5-declarative' 'chromaprint' - 'id3lib' 'taglib' 'libmp4v2' 'kio' 'hicolor-icon-theme' 'docbook-xml' - 'kdoctools' 'extra-cmake-modules' 'python') +depends=('chromaprint' 'flac' 'id3lib' 'kxmlgui' 'libmp4v2' + 'qt5-declarative' 'qt5-multimedia' 'taglib') +makedepends=('cmake' 'docbook-xsl' 'extra-cmake-modules' 'kdoctools' 'python' 'qt5-tools') changelog=$pkgbase.changelog -source=(https://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz{,.asc}) +source=(https://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig}) validpgpkeys=('7D09794C2812F62194B081C14CAD34426E354DD2') # Urs Fleisch -sha256sums=('7967c920a60902386ada5faf1e6b13edc5611da19fbf7244d731c5cbf5393e14' +sha256sums=('3556e7a76d65baf8b4258b955f6c93d7467a02a0b588ff7249c8ab96bc128377' 'SKIP') prepare() { cd "${srcdir}" - [[ ! -d build ]] && mkdir build - mkdir build-qt } build() { -#kid3 cd "${srcdir}"/build cmake \ ../${pkgbase}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_QT5=ON \ - -DWITH_APPS="CLI;KDE" \ + -DWITH_APPS="CLI;Qt;KDE" \ -DWITH_MP4V2=ON \ -DWITH_FFMPEG=ON \ -DWITH_GSTREAMER=ON - -#kid3-qt - cd "$srcdir"/build-qt - cmake \ - ../${pkgbase}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_QT5=ON \ - -DWITH_APPS="CLI;Qt" \ - -DWITH_MP4V2=ON \ - -DWITH_FFMPEG=ON \ - -DWITH_GSTREAMER=ON + make } -package_kid3() { -pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, KDE version" -depends=('qt5-multimedia' 'phonon-qt5' 'chromaprint' 'id3lib' 'taglib' - 'libmp4v2' 'kio' 'desktop-file-utils' 'hicolor-icon-theme') -optdepends=('qt5-declarative: QmlCommand extension') -conflicts=('kid3-qt') +package_kid3-common() { + pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, CLI version and common files" + depends=('chromaprint' 'flac' 'id3lib' 'libmp4v2' 'libvorbis' 'qt5-base' 'taglib') + optdepends=('qt5-declarative: GUI support library' + 'qt5-multimedia: GUI support library') cd "$srcdir"/build make DESTDIR="${pkgdir}" install + + rm -r "$pkgdir"/usr/bin/kid3{,-qt} \ + "$pkgdir"/usr/share/{applications,icons,kxmlgui5,metainfo} } package_kid3-qt() { -pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, Qt version" -depends=('qt5-multimedia' 'chromaprint' 'id3lib' 'taglib' 'libmp4v2' - 'desktop-file-utils' 'hicolor-icon-theme' 'qt5-declarative') -conflicts=('kid3') -provides=('kid3') + pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, Qt version" + depends=("kid3-common=$pkgver" 'qt5-declarative' 'qt5-multimedia') - cd "$srcdir"/build-qt - make DESTDIR="${pkgdir}" install + cd "$srcdir"/build + make -C src/app/qt DESTDIR="${pkgdir}" install } + +package_kid3() { + pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, KDE version" + depends=("kid3-common=$pkgver" 'kxmlgui' 'qt5-declarative' 'qt5-multimedia') + + cd "$srcdir"/build + make -C src/app DESTDIR="${pkgdir}" install + + rm -r "$pkgdir"/usr/bin/kid3-{cli,qt} \ + "$pkgdir"/usr/share/applications/org.kde.kid3-qt.desktop \ + "$pkgdir"/usr/share/icons/hicolor/*/apps/kid3-qt.{png,svg} \ + "$pkgdir"/usr/share/metainfo/org.kde.kid3-qt.appdata.xml +}
