[arch-commits] Commit in digikam/trunk (PKGBUILD digikam-find-qtav.patch)

[Antonio Rojas]

    Date: Monday, January 9, 2017 @ 23:33:53
  Author: arojas
Revision: 285609

Update to 5.4.0

Added:
  digikam/trunk/digikam-find-qtav.patch
Modified:
  digikam/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   17 +++++++++++------
 digikam-find-qtav.patch |   21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-09 22:56:32 UTC (rev 285608)
+++ PKGBUILD	2017-01-09 23:33:53 UTC (rev 285609)
@@ -5,9 +5,9 @@
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins')
-_pkgver=5.3.0
+_pkgver=5.4.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=6
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,13 +14,18 @@
 url="http://www.digikam.org/"
 makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
              'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
-             'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
+             'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
              'knotifyconfig' 'libmediawiki' 'libkvkontakte')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
-sha1sums=('3a62f6efdfafc37341626cbf0225cd7adc9d0633')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-find-qtav.patch)
+sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894'
+          'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939')
 
 prepare() {
   mkdir -p build
+
+# Fix QtAV location
+  cd $pkgname-$pkgver
+  patch -p1 -i ../digikam-find-qtav.patch
 }
 
 build() {
@@ -43,7 +48,7 @@
 package_digikam() {
   pkgdesc="Digital photo management application for KDE"
   depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
-	'knotifyconfig' 'libksane' 'kfilemetadata' 'qt5-multimedia' 'marble' 'threadweaver' 'kcalcore')
+	'knotifyconfig' 'libksane' 'kfilemetadata' 'qtav' 'marble' 'threadweaver' 'kcalcore')
   optdepends=('kipi-plugins: export to various online services'
               'hugin: panorama tool' 'qt5-imageformats: support for additional image formats (WEBP, TIFF)')
 

Added: digikam-find-qtav.patch
===================================================================
--- digikam-find-qtav.patch	                        (rev 0)
+++ digikam-find-qtav.patch	2017-01-09 23:33:53 UTC (rev 285609)
@@ -0,0 +1,21 @@
+--- digikam-5.4.0/core/cmake/modules/FindQtAV.cmake.0	2017-01-09 22:56:43.303991660 +0000
++++ digikam-5.4.0/core/cmake/modules/FindQtAV.cmake	2017-01-09 22:57:24.843934106 +0000
+@@ -24,15 +24,17 @@
+               HINTS ${_qt5_install_prefix}                                           # For MXE
+                     ${_qt5_install_prefix}/../qt5/include                            # For Mageia
+                     ${_qt5_install_prefix}/../../include/qt5                         # For Suse
++                    ${_qt5_install_prefix}/../../include/qt
+                     ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5     # For Debian
+               PATH_SUFFIXES QtAV
+     )
+ 
+     find_path(QTAV_WIDGETS_INCLUDE_DIR
+               NAMES QtAVWidgets.h
+               HINTS ${_qt5_install_prefix}                                           # For MXE
+                     ${_qt5_install_prefix}/../qt5/include                            # For Mageia
+                     ${_qt5_install_prefix}/../../include/qt5                         # For Suse
++                    ${_qt5_install_prefix}/../../include/qt
+                     ${_qt5_install_prefix}/../../../include/x86_64-linux-gnu/qt5     # For Debian
+               PATH_SUFFIXES QtAVWidgets
+     )
+