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

[Antonio Rojas]

    Date: Tuesday, March 14, 2017 @ 08:05:30
  Author: arojas
Revision: 290817

Update to 5.5.0

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-14 07:23:53 UTC (rev 290816)
+++ PKGBUILD	2017-03-14 08:05:30 UTC (rev 290817)
@@ -5,9 +5,9 @@
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins')
-_pkgver=5.4.0
+_pkgver=5.5.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=2
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -16,16 +16,14 @@
              'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble-common' 'kdesignerplugin'
              'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
              'knotifyconfig' 'libmediawiki' 'libkvkontakte')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-find-qtav.patch)
-sha1sums=('6c58ee30cd84b40acf4427f1bb9dbb8b891eb894'
-          'b170e5eab5a8c40d1c8c8f2d2cfe5e911ad66939')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
+sha256sums=('df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252')
 
 prepare() {
   mkdir -p build
 
-# Fix QtAV location
-  cd $pkgname-$pkgver
-  patch -p1 -i ../digikam-find-qtav.patch
+# sv docs fail to build
+  sed -e '/sv/d' -i $pkgname-$pkgver/doc-translated/CMakeLists.txt
 }
 
 build() {

Deleted: digikam-find-qtav.patch
===================================================================
--- digikam-find-qtav.patch	2017-03-14 07:23:53 UTC (rev 290816)
+++ digikam-find-qtav.patch	2017-03-14 08:05:30 UTC (rev 290817)
@@ -1,21 +0,0 @@
---- 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
-     )
-