[arch-commits] Commit in kid3/trunk (PKGBUILD kid3.changelog)

[Jaroslav Lichtblau]

    Date: Saturday, October 3, 2015 @ 16:42:24
  Author: jlichtblau
Revision: 142891

upgpkg: kid3 3.3.0-2 - FS#45660 - [kid3] switch to Qt5/KF5

Modified:
  kid3/trunk/PKGBUILD
  kid3/trunk/kid3.changelog

----------------+
 PKGBUILD       |   38 ++++++++++++++++++++++----------------
 kid3.changelog |    3 +++
 2 files changed, 25 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-03 14:16:59 UTC (rev 142890)
+++ PKGBUILD	2015-10-03 14:42:24 UTC (rev 142891)
@@ -5,60 +5,66 @@
 pkgbase=kid3
 pkgname=('kid3' 'kid3-qt')
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://kid3.sourceforge.net/"
 license=('GPL')
-makedepends=('xorg-server-xvfb' 'automoc4' 'cmake' 'docbook-xml' 'docbook-xsl' 'phonon-qt4'
-             'chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kdebase-runtime')
+makedepends=('qt5-tools' 'qt5-multimedia' 'chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kio'
+             'hicolor-icon-theme' 'docbook-xml' 'kdoctools' 'extra-cmake-modules')
 install=$pkgbase.install
 changelog=$pkgbase.changelog
 source=(http://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz)
 sha256sums=('5a9e469d740ef8ee7c5060d294424b75a2383510d117589f9a7cacf02a294a8b')
 
-build() {
+prepare() {
   cd "${srcdir}"
   [[ ! -d build ]] && mkdir build
   mkdir build-qt
+}
 
+build() {
 #kid3
-  cd build
-
+  cd "${srcdir}"/build
   cmake \
     ../${pkgbase}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_APPS="CLI;KDE"
+    -DCMAKE_BUILD_TYPE=Release \
+    -DWITH_QT5=ON \
+    -DWITH_APPS="CLI;KDE" \
+    -DWITH_MP4V2=ON \
+    -DWITH_FFMPEG=ON \
+    -DWITH_GSTREAMER=ON
 
-#https://sourceforge.net/p/kid3/bugs/108/
-  xvfb-run -a make
-
 #kid3-qt
   cd "$srcdir"/build-qt
-
   cmake \
     ../${pkgbase}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_APPS="CLI;Qt"
+    -DWITH_QT5=ON \
+    -DWITH_APPS="CLI;Qt" \
+    -DWITH_MP4V2=ON \
+    -DWITH_FFMPEG=ON \
+    -DWITH_GSTREAMER=ON
 }
 
 package_kid3() {
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, KDE version"
-depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kdebase-runtime')
+depends=('qt5-multimedia' 'phonon-qt5' 'chromaprint' 'id3lib' 'taglib'
+         'libmp4v2' 'kio' 'desktop-file-utils' 'hicolor-icon-theme')
 conflicts=('kid3-qt')
 
   cd "$srcdir"/build
-
   make DESTDIR="${pkgdir}" install
 }
 
 package_kid3-qt() {
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, QT version"
-depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'qt4' 'phonon-qt4')
+depends=('qt5-multimedia' 'chromaprint' 'id3lib' 'taglib' 'libmp4v2'
+         'kio' 'desktop-file-utils' 'hicolor-icon-theme')
 conflicts=('kid3')
 provides=('kid3')
 
   cd "$srcdir"/build-qt
-
   make DESTDIR="${pkgdir}" install
 }

Modified: kid3.changelog
===================================================================
--- kid3.changelog	2015-10-03 14:16:59 UTC (rev 142890)
+++ kid3.changelog	2015-10-03 14:42:24 UTC (rev 142891)
@@ -1,4 +1,7 @@
 2015-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* kid3 3.3.0-2 QT5 version
+
+2015-10-03 Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* kid3 3.3.0-1
 
 2015-05-12 Jaroslav Lichtblau <svetlemodry at archlinux.org>