libre/kdepim-addons: updated to 17.08.3

2 files changed, 20 insertions, 16 deletions

diff --git a/libre/kdepim-addons/PKGBUILD b/libre/kdepim-addons/PKGBUILD
index 6ee519e27..a4122737d 100644
--- a/libre/kdepim-addons/PKGBUILD
+++ b/libre/kdepim-addons/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 290221 2017-03-09 16:12:45Z arojas $
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
 
 pkgname=kdepim-addons
-pkgver=17.04.3
+
+pkgver=17.08.3
 pkgrel=1.parabola1
-pkgdesc='Addons for KDE PIM applications (built without nonfree qt5-webengine)'
 arch=(i686 x86_64 armv7h)
-url='https://community.kde.org/KDE_PIM'
+
+pkgdesc="Addons for KDE PIM applications (built without nonfree qt5-webengine)"
+url="https://community.kde.org/KDE_PIM"
 license=(GPL LGPL FDL)
-depends=(mailcommon incidenceeditor libktnef libksieve akonadi-notes)
+
+depends=(incidenceeditor libktnef libksieve akonadi-notes akonadi-import-wizard)
 makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin)
 groups=(kde-applications kdepim)
+
 source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
         'libre.patch')
-sha512sums=('7cccf4906dfa43fd12e3971ebf67494986084d364be0bbbacd1d64274851f0f32621811e8a4a5ab5038d2c3c820028d9e0fbc73d0bd5267eeb094fb17a36772b'
+sha256sums=('9d3c674320b311f5107dd6292760a74ceab84107800e23df16e8091e697e18e4'
             'SKIP'
-            '0e422fcdb3fe2c250977906aec6f46b055c082954c5a9d4c25c37a8ee306ab92090f2ab22596107f7b905c81d09ca3a314dc2e81bc46bb539a18a0775c820569')
+            '6a8dafaedbdc3c5f19fd2b59459b54c25e0df35e5c6602f49ef75a7e5dbf2bf6')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
@@ -34,7 +38,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTING=OFF \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib
+    -DCMAKE_INSTALL_LIBDIR=lib
   make
 }
 
diff --git a/libre/kdepim-addons/libre.patch b/libre/kdepim-addons/libre.patch
index 52c3cf0d9..378e89ed3 100644
--- a/libre/kdepim-addons/libre.patch
+++ b/libre/kdepim-addons/libre.patch
@@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index ed70a36a9..030d1a7f1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -47,7 +47,7 @@ include(ECMQtDeclareLoggingCategory)
+@@ -49,7 +49,7 @@ include(ECMQtDeclareLoggingCategory)
  
  option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." FALSE)
  
@@ -11,21 +11,21 @@ index ed70a36a9..030d1a7f1 100644
  
  find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
  find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
-@@ -74,7 +74,6 @@ set(CALENDAR_UTILS_VERSION "5.4.3")
- set(KPIMTEXTEDIT_LIB_VERSION "5.4.3")
+@@ -82,7 +82,6 @@ set(CALENDAR_UTILS_VERSION "5.4.3")
+ set(MAILIMPORTER_LIB_VERSION "5.6.3")
  
  find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED)
 -find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
+ find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
  find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED)
  find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
- find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
 index cc1d1261e..fd906fd02 100644
 --- a/plugins/CMakeLists.txt
 +++ b/plugins/CMakeLists.txt
-@@ -4,5 +4,3 @@ add_subdirectory(messageviewerheaderplugins)
- add_subdirectory(storageservices)
+@@ -4,5 +4,4 @@ add_subdirectory(messageviewerheaderplugins)
  add_subdirectory(messageviewer)
  add_subdirectory(plasma)
--
+ 
 -add_subdirectory(webengineurlinterceptor)
+ add_subdirectory(templateparser)