From dec087d1f8c2f7f2e77eb32f2d754fcc7fe652ae Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Tue, 26 Feb 2019 20:12:46 +0100 Subject: libre/kdepim-addons: updated to 18.12.2 --- libre/kdepim-addons/PKGBUILD | 28 ++++++++++++------------- libre/kdepim-addons/libre.patch | 46 +++++++++++++++++++++++++++++------------ 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/libre/kdepim-addons/PKGBUILD b/libre/kdepim-addons/PKGBUILD index a4122737d..43047585e 100644 --- a/libre/kdepim-addons/PKGBUILD +++ b/libre/kdepim-addons/PKGBUILD @@ -1,27 +1,26 @@ -# Maintainer: Andreas Grapentin # Maintainer (Arch): Antonio Rojas # Contributor: André Silva # Contributor: jc_gargma +# Maintainer: Andreas Grapentin pkgname=kdepim-addons - -pkgver=17.08.3 -pkgrel=1.parabola1 -arch=(i686 x86_64 armv7h) - -pkgdesc="Addons for KDE PIM applications (built without nonfree qt5-webengine)" -url="https://community.kde.org/KDE_PIM" +pkgver=18.12.2 +pkgrel=1 +pkgrel+=.parabola1 +pkgdesc='Addons for KDE PIM applications' +pkgdesc+=' (built without nonfree qt5-webengine)' +arch=(x86_64) +arch+=(i686 armv7h) +url='https://kontact.kde.org' license=(GPL LGPL FDL) - -depends=(incidenceeditor libktnef libksieve akonadi-notes akonadi-import-wizard) -makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin) +depends=(incidenceeditor ktnef libksieve akonadi-notes akonadi-import-wizard kparts poppler-qt5 kitinerary discount) +makedepends=(extra-cmake-modules kdoctools boost) groups=(kde-applications kdepim) - source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig} 'libre.patch') -sha256sums=('9d3c674320b311f5107dd6292760a74ceab84107800e23df16e8091e697e18e4' +sha256sums=('346d28e915c59360874120645f04c4269872ce17043901661411de36ec6dcd23' 'SKIP' - '6a8dafaedbdc3c5f19fd2b59459b54c25e0df35e5c6602f49ef75a7e5dbf2bf6') + 'f416c6397a51db17674d891ea6c5b3939e017bc8f1a78fc2856b59fe131e2700') validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck @@ -35,7 +34,6 @@ prepare() { build() { cd build cmake ../$pkgname-$pkgver \ - -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTING=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib diff --git a/libre/kdepim-addons/libre.patch b/libre/kdepim-addons/libre.patch index 378e89ed3..6d6fe0052 100644 --- a/libre/kdepim-addons/libre.patch +++ b/libre/kdepim-addons/libre.patch @@ -1,29 +1,49 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed70a36a9..030d1a7f1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,7 @@ include(ECMQtDeclareLoggingCategory) +diff -rupN kdepim-addons-18.12.2/CMakeLists.txt kdepim-addons-18.12.2.new/CMakeLists.txt +--- kdepim-addons-18.12.2/CMakeLists.txt 2019-02-05 01:49:34.000000000 +0100 ++++ kdepim-addons-18.12.2.new/CMakeLists.txt 2019-02-26 17:22:18.022091381 +0100 +@@ -54,7 +54,7 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable f - option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." FALSE) + option(KMAIL_EDITORCONVERTERPLUGIN_TEMPLATE_BUILD "Build the kmail editor converter plugin." FALSE) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets Widgets Test) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) -@@ -82,7 +82,6 @@ set(CALENDAR_UTILS_VERSION "5.4.3") - set(MAILIMPORTER_LIB_VERSION "5.6.3") +@@ -95,7 +95,6 @@ set(KPIMPKPASS_LIB_VERSION "5.10.2") + set(KPIMITINERARY_LIB_VERSION "5.10.2") 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) -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,4 @@ add_subdirectory(messageviewerheaderplugins) +diff -rupN kdepim-addons-18.12.2/kaddressbook/CMakeLists.txt kdepim-addons-18.12.2.new/kaddressbook/CMakeLists.txt +--- kdepim-addons-18.12.2/kaddressbook/CMakeLists.txt 2019-01-28 08:38:07.000000000 +0100 ++++ kdepim-addons-18.12.2.new/kaddressbook/CMakeLists.txt 2019-02-26 18:10:19.231535755 +0100 +@@ -1,4 +1,4 @@ + add_subdirectory( editorpages ) + add_subdirectory( plugins ) + add_subdirectory( importexportplugins ) +-add_subdirectory( contacteditor ) ++#add_subdirectory( contacteditor ) +diff -rupN kdepim-addons-18.12.2/kmail/editorconvertertextplugins/CMakeLists.txt kdepim-addons-18.12.2.new/kmail/editorconvertertextplugins/CMakeLists.txt +--- kdepim-addons-18.12.2/kmail/editorconvertertextplugins/CMakeLists.txt 2019-01-28 08:38:07.000000000 +0100 ++++ kdepim-addons-18.12.2.new/kmail/editorconvertertextplugins/CMakeLists.txt 2019-02-26 18:09:07.827303257 +0100 +@@ -1,6 +1,6 @@ +-if(discount_FOUND) +- add_subdirectory(markdown) +-endif() ++#if(discount_FOUND) ++# add_subdirectory(markdown) ++#endif() + + if (KMAIL_EDITORCONVERTERPLUGIN_TEMPLATE_BUILD) + add_subdirectory(inserttemplatecommand) +diff -rupN kdepim-addons-18.12.2/plugins/CMakeLists.txt kdepim-addons-18.12.2.new/plugins/CMakeLists.txt +--- kdepim-addons-18.12.2/plugins/CMakeLists.txt 2019-01-28 08:38:07.000000000 +0100 ++++ kdepim-addons-18.12.2.new/plugins/CMakeLists.txt 2019-02-26 17:22:18.022091381 +0100 +@@ -4,5 +4,4 @@ add_subdirectory(messageviewerheaderplug add_subdirectory(messageviewer) add_subdirectory(plasma) -- cgit v1.2.2