[arch-commits] Commit in phonon/trunk (PKGBUILD qt-5.4.2.patch)

[Antonio Rojas]

    Date: Friday, February 9, 2018 @ 11:11:51
  Author: arojas
Revision: 316506

Rebuild, remove unused makedep

Modified:
  phonon/trunk/PKGBUILD
Deleted:
  phonon/trunk/qt-5.4.2.patch

----------------+
 PKGBUILD       |   34 +++++++++++++++++-----------------
 qt-5.4.2.patch |   23 -----------------------
 2 files changed, 17 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-09 10:35:33 UTC (rev 316505)
+++ PKGBUILD	2018-02-09 11:11:51 UTC (rev 316506)
@@ -3,16 +3,16 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgbase=phonon
-pkgname=('phonon-qt4' 'phonon-qt5')
+pkgname=(phonon-qt4 phonon-qt5)
 pkgver=4.9.1
-pkgrel=4
-arch=('x86_64')
+pkgrel=5
+arch=(x86_64)
 url='http://phonon.kde.org/'
-license=('LGPL')
-makedepends=('extra-cmake-modules' 'automoc4' 'libpulse' 'qt5-base' 'qt5-tools')
-source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz"{,.sig})
-md5sums=('7896a560f5da345a626e782610c8e71e'
-         'SKIP')
+license=(LGPL)
+makedepends=(extra-cmake-modules libpulse qt4 qt5-base qt5-tools)
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz"{,.sig})
+sha256sums=('67bee986f85ca8b575186c8ba58a85886cb3b1c3567c86a118d56129f221e69c'
+            'SKIP')
 validpgpkeys=(CB9387521E1EE0127DA804843FDBB55084CC5D84) # Harald Sitter <sitter at kde.org>
 
 prepare() {
@@ -22,7 +22,7 @@
 
 build() {
   cd build
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../$pkgbase-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -33,7 +33,7 @@
   make
 
   cd ../build-qt5
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../$pkgbase-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -46,25 +46,25 @@
 
 package_phonon-qt4(){
   pkgdesc="The multimedia framework for KDE4"
-  depends=('qt4' 'libpulse' 'phonon-qt4-backend')
+  depends=(qt4 libpulse phonon-qt4-backend)
   optdepends=('pulseaudio: PulseAudio support')
 
   cd build
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 
   # Install headers into the Qt4 dir
-  install -d "${pkgdir}"/usr/include/qt4
-  mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
+  install -d "$pkgdir"/usr/include/qt4
+  mv "$pkgdir"/usr/include/{phonon,KDE} "$pkgdir"/usr/include/qt4/
 
   sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
-    "${pkgdir}/usr/lib/pkgconfig/phonon.pc"
+    "$pkgdir/usr/lib/pkgconfig/phonon.pc"
 }
 
 package_phonon-qt5(){
   pkgdesc="The multimedia framework for KF5"
-  depends=('libpulse' 'qt5-base' 'phonon-qt5-backend')
+  depends=(libpulse qt5-base phonon-qt5-backend)
   optdepends=('pulseaudio: PulseAudio support')
 
   cd build-qt5
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }

Deleted: qt-5.4.2.patch
===================================================================
--- qt-5.4.2.patch	2018-02-09 10:35:33 UTC (rev 316505)
+++ qt-5.4.2.patch	2018-02-09 11:11:51 UTC (rev 316506)
@@ -1,23 +0,0 @@
-From: Hrvoje Senjan <hrvoje.senjan at gmail.com>
-Date: Thu, 28 May 2015 15:56:47 +0000
-Subject: Yet another _include_dirs fix
-X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6
----
-Yet another _include_dirs fix
-
-The variable is set as a definition, so mark it as such
----
-
-
---- a/cmake/FindPhononInternal.cmake
-+++ b/cmake/FindPhononInternal.cmake
-@@ -409,7 +409,7 @@
-       file(WRITE "${_source_file}" "${_source}")
-       set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
- 
--      try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
-+      try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
- 
-       if(NOT _compile_result)
-          message("${_compile_output_var}")
-