kipi-plugins-5.4.0-1.parabola1{,.nonprism1}: updating version

9 files changed, 62 insertions, 12 deletions

diff --git a/libre/kipi-plugins/0001-optionally-enable-OpenGL.patch b/libre/digikam/0001-optionally-enable-OpenGL.patch
index 909a44434..909a44434 100644
--- a/libre/kipi-plugins/0001-optionally-enable-OpenGL.patch
+++ b/libre/digikam/0001-optionally-enable-OpenGL.patch
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/digikam/PKGBUILD
index dc70a3c9b..87fa37e92 100644
--- a/libre/kipi-plugins/PKGBUILD
+++ b/libre/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 281957 2016-11-22 21:59:52Z arojas $
+# $Id: PKGBUILD 285609 2017-01-09 23:33:53Z arojas $
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -7,9 +7,9 @@
 
 pkgbase=digikam
 pkgname=kipi-plugins
-_pkgver=5.3.0
+_pkgver=5.4.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=6.parabola1
+pkgrel=1.parabola1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
@@ -18,12 +18,13 @@ replaces=("${pkgname}-libre")
 conflicts=("${pkgname}-libre")
 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/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" digikam-find-qtav.patch
         "libre.patch"
         '0001-optionally-enable-OpenGL.patch')
-sha1sums=('3a62f6efdfafc37341626cbf0225cd7adc9d0633'
+sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894'
+          'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939'
           'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
           '95169d438884b1650a4c11e1ca44ae7ad5096a89')
 
@@ -33,6 +34,9 @@ prepare() {
   cd ${pkgbase}-${_pkgver}
   patch -p1 -i ../libre.patch
 
+  # Fix QtAV location
+  patch -p1 -i ../digikam-find-qtav.patch
+
   # OpenGL switch
   if [[ "$CARCH" = arm* ]]; then
     cd core
diff --git a/libre/digikam/digikam-find-qtav.patch b/libre/digikam/digikam-find-qtav.patch
new file mode 100644
index 000000000..e1121897c
--- /dev/null
+++ b/libre/digikam/digikam-find-qtav.patch
@@ -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
+     )
+ 
diff --git a/libre/kipi-plugins/libre.patch b/libre/digikam/libre.patch
index 8c677e210..8c677e210 100644
--- a/libre/kipi-plugins/libre.patch
+++ b/libre/digikam/libre.patch
diff --git a/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch b/nonprism/digikam/0001-optionally-enable-OpenGL.patch
index 909a44434..909a44434 100644
--- a/nonprism/kipi-plugins/0001-optionally-enable-OpenGL.patch
+++ b/nonprism/digikam/0001-optionally-enable-OpenGL.patch
diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/digikam/PKGBUILD
index 350fc1b7e..72602bb03 100644
--- a/nonprism/kipi-plugins/PKGBUILD
+++ b/nonprism/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 281957 2016-11-22 21:59:52Z arojas $
+# $Id: PKGBUILD 285609 2017-01-09 23:33:53Z arojas $
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -7,9 +7,9 @@
 
 pkgbase=digikam
 pkgname=kipi-plugins
-_pkgver=5.3.0
+_pkgver=5.4.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=6.parabola1.nonprism1
+pkgrel=1.parabola1.nonprism1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
@@ -18,13 +18,14 @@ replaces=("${pkgname}-libre" "${pkgname}-libre-nonprism")
 conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism")
 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/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" digikam-find-qtav.patch
         "libre.patch"
         "nonprism.patch"
         '0001-optionally-enable-OpenGL.patch')
-sha1sums=('3a62f6efdfafc37341626cbf0225cd7adc9d0633'
+sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894'
+          'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939'
           'edd5b5eeae7ed4139b4c5f6a8446990f1da2e544'
           '246366b6b4b315957387938d842112e1146b9495'
           '95169d438884b1650a4c11e1ca44ae7ad5096a89')
@@ -36,6 +37,9 @@ prepare() {
   patch -p1 -i ../libre.patch
   patch -p1 -i ../nonprism.patch
 
+  # Fix QtAV location
+  patch -p1 -i ../digikam-find-qtav.patch
+
   # OpenGL switch
   if [[ "$CARCH" = arm* ]]; then
     cd core
diff --git a/nonprism/digikam/digikam-find-qtav.patch b/nonprism/digikam/digikam-find-qtav.patch
new file mode 100644
index 000000000..e1121897c
--- /dev/null
+++ b/nonprism/digikam/digikam-find-qtav.patch
@@ -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
+     )
+ 
diff --git a/nonprism/kipi-plugins/libre.patch b/nonprism/digikam/libre.patch
index 8c677e210..8c677e210 100644
--- a/nonprism/kipi-plugins/libre.patch
+++ b/nonprism/digikam/libre.patch
diff --git a/nonprism/kipi-plugins/nonprism.patch b/nonprism/digikam/nonprism.patch
index 3a4846bec..3a4846bec 100644
--- a/nonprism/kipi-plugins/nonprism.patch
+++ b/nonprism/digikam/nonprism.patch