kmail-16.12.0-1.nonprism1: updating version

* remove some kdepim packages from [nonprism] since Google Drive support comes from pim-storage-service-manager now

3 files changed, 111 insertions, 108 deletions

diff --git a/nonprism/kdepim/PKGBUILD b/nonprism/kdepim/PKGBUILD
deleted file mode 100644
index d8159bb22..000000000
--- a/nonprism/kdepim/PKGBUILD
+++ /dev/null
@@ -1,108 +0,0 @@
-# $Id: PKGBUILD 280288 2016-11-10 18:13:29Z arojas $
-# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-pkgbase=kdepim
-pkgname=(akonadiconsole kaddressbook kmail knotes korganizer)
-pkgver=16.08.3
-pkgrel=1.nonprism1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde-applications' 'kdepim')
-makedepends=(extra-cmake-modules kdepim-runtime qt5-tools kdoctools knewstuff kpimtextedit
-             ktexteditor kdnssd kldap libktnef kontactinterface kxmlrpcclient kblog akonadi-search boost
-             libgravatar mailcommon incidenceeditor libksieve python kdesignerplugin qt5-webengine)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz")
-sha1sums=('8dc03ac77996d1865cfa6d25b5059364833d4d09')
-
-prepare() {
-	mkdir -p build
-}
-
-build() {
-	cd build
-	cmake ../$pkgbase-$pkgver \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DBUILD_TESTING=OFF \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DKDE_INSTALL_LIBDIR=lib \
-		-DKDE_INSTALL_LIBEXECDIR=lib \
-		-DKDEPIM_STORAGESERVICE_GDRIVE=OFF
-	make
-}
-
-package_akonadiconsole() {
-	pkgdesc='Akonadi Management and Debugging Console, without Google Drive support'
-	depends=(calendarsupport messagelib hicolor-icon-theme)
-	conflicts=("kdepim-$pkgname")
-	replaces=("kdepim-$pkgname")
-	url='http://pim.kde.org'
-
-	cd build/akonadiconsole
-	make DESTDIR="$pkgdir" install
-}
-
-package_kaddressbook() {
-	pkgdesc='Contact Manager, without Google Drive support'
-	depends=('kdepim-common' 'kontactinterface')
-	optdepends=('kdepim-addons: additional plugins')
-	conflicts=("kdepim-$pkgname")
-	replaces=("kdepim-$pkgname")
-	url="http://kde.org/applications/office/kaddressbook/"
-
-	cd "$srcdir"/build/kaddressbook
-	make DESTDIR="$pkgdir" install
-}
-
-package_kmail() {
-	pkgdesc='Mail Client, without Google Drive support'
-	depends=(kdepim-common kontactinterface libksieve)
-	optdepends=('kleopatra: mail encryption support' 'kdepim-addons: additional plugins')
-	conflicts=("kdepim-$pkgname")
-	replaces=("kdepim-$pkgname")
-	url="http://kde.org/applications/internet/kmail/"
-
-	for _i in kmail storageservicemanager importwizard grantleeeditor mboximporter sieveeditor; do
-	  cd "$srcdir"/build/$_i
-	  make DESTDIR="$pkgdir" install
-	done
-
-	for _i in akonadi_archivemail_agent kmail importwizard sieveeditor; do
-	  cd "$srcdir"/build/doc/$_i
-	  make DESTDIR="$pkgdir" install
-	done
-}
-
-package_knotes() {
-	pkgdesc='Popup Notes, without Google Drive support'
-	depends=('kdepim-common' 'kontactinterface')
-	conflicts=("kdepim-$pkgname")
-	replaces=("kdepim-$pkgname")
-	url="http://kde.org/applications/utilities/knotes/"
-
-	cd "$srcdir"/build/knotes
-	make DESTDIR="$pkgdir" install
-
-	for _i in knotes akonadi_notes_agent; do
-	  cd "$srcdir"/build/doc/$_i
-	  make DESTDIR="$pkgdir" install
-	done
-}
-
-package_korganizer() {
-	pkgdesc='Calendar and Scheduling Program, without Google Drive support'
-	depends=('kdepim-common' 'kontactinterface')
-	optdepends=('kdepim-addons: additional plugins')
-	conflicts=("kdepim-$pkgname")
-	replaces=("kdepim-$pkgname")
-	url="http://kde.org/applications/office/korganizer"
-
-        cd "$srcdir"/build/korganizer
-	make DESTDIR="$pkgdir" install
-
-	cd "$srcdir"/build/doc/korganizer
-	make DESTDIR="$pkgdir" install
-}
diff --git a/nonprism/kmail/PKGBUILD b/nonprism/kmail/PKGBUILD
new file mode 100644
index 000000000..0939a78e6
--- /dev/null
+++ b/nonprism/kmail/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
+# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgname=kmail
+pkgver=16.12.0
+pkgrel=1.nonprism1
+pkgdesc="KDE mail client, without pim-storage-service-manager and Phishing Google System support"
+arch=(i686 x86_64)
+url="https://community.kde.org/KDE_PIM"
+license=(GPL2)
+depends=(kdepim-runtime kmail-account-wizard akonadi-import-wizard mbox-importer pim-sieve-editor
+         kontactinterface libktnef)
+makedepends=(extra-cmake-modules kdoctools kdesignerplugin boost python)
+optdepends=('kleopatra: mail encryption support' 'kdepim-addons: additional plugins')
+conflicts=(ktnef)
+replaces=(ktnef)
+groups=(kde-applications kdepim)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+        'nonprism.patch')
+md5sums=('63939b64d6990064fd2d37e6450f00f9'
+         'SKIP'
+         'eabc3c4be17fb6275b15cfb4577f8035')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
+
+prepare() {
+  mkdir -p build
+  cd $pkgname-$pkgver
+  patch -p1 -i ../nonprism.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}
diff --git a/nonprism/kmail/nonprism.patch b/nonprism/kmail/nonprism.patch
new file mode 100644
index 000000000..c688c0249
--- /dev/null
+++ b/nonprism/kmail/nonprism.patch
@@ -0,0 +1,66 @@
+diff --git a/src/configuredialog/configuresecuritypage.cpp b/src/configuredialog/configuresecuritypage.cpp
+index 0ad3748..351f7a2 100644
+--- a/src/configuredialog/configuresecuritypage.cpp
++++ b/src/configuredialog/configuresecuritypage.cpp
+@@ -20,7 +20,6 @@
+ using namespace PimCommon::ConfigureImmutableWidgetUtils;
+ #include "messageviewer/messageviewersettings.h"
+ #include "MessageComposer/MessageComposerSettings"
+-#include <WebEngineViewer/CheckPhishingUrlCache>
+ #include <MailCommon/FolderCollection>
+ #include "settings/kmailsettings.h"
+ 
+@@ -93,7 +92,6 @@ SecurityPageGeneralTab::SecurityPageGeneralTab(QWidget *parent)
+ 
+     connect(mSGTab.mScamDetection, &QAbstractButton::toggled, this, &ConfigModuleTab::slotEmitChanged);
+ 
+-    connect(mSGTab.mCheckUrl, &QCheckBox::stateChanged, this, &SecurityPageGeneralTab::slotEmitChanged);
+     connect(mSGTab.scamWhiteList, &PimCommon::SimpleStringListEditor::changed, this, &ConfigModuleTab::slotEmitChanged);
+     mSGTab.scamWhiteList->setAddDialogLabel(i18n("Email Address:"));
+ }
+@@ -116,7 +114,6 @@ void SecurityPage::GeneralTab::doLoadOther()
+ 
+     loadWidget(mSGTab.mScamDetection, MessageViewer::MessageViewerSettings::self()->scamDetectionEnabledItem());
+     loadWidget(mSGTab.scamWhiteList, MessageViewer::MessageViewerSettings::self()->scamDetectionWhiteListItem());
+-    loadWidget(mSGTab.mCheckUrl, MessageViewer::MessageViewerSettings::self()->checkPhishingUrlItem());
+ }
+ 
+ void SecurityPage::GeneralTab::save()
+@@ -143,10 +140,6 @@ void SecurityPage::GeneralTab::save()
+     saveCheckBox(mSGTab.mAlwaysDecrypt, MessageViewer::MessageViewerSettings::self()->alwaysDecryptItem());
+     saveCheckBox(mSGTab.mScamDetection, MessageViewer::MessageViewerSettings::self()->scamDetectionEnabledItem());
+     saveSimpleStringListEditor(mSGTab.scamWhiteList, MessageViewer::MessageViewerSettings::self()->scamDetectionWhiteListItem());
+-    saveCheckBox(mSGTab.mCheckUrl, MessageViewer::MessageViewerSettings::self()->checkPhishingUrlItem());
+-    if (!mSGTab.mCheckUrl->isChecked()) {
+-        WebEngineViewer::CheckPhishingUrlCache::self()->clearCache();
+-    }
+ }
+ 
+ QString SecurityPage::MDNTab::helpAnchor() const
+diff --git a/src/ui/securitypagegeneraltab.ui b/src/ui/securitypagegeneraltab.ui
+index 5b85959..e4e5e97 100644
+--- a/src/ui/securitypagegeneraltab.ui
++++ b/src/ui/securitypagegeneraltab.ui
+@@ -148,22 +148,6 @@
+      </layout>
+     </widget>
+    </item>
+-   <item row="2" column="0" colspan="2">
+-    <widget class="QGroupBox" name="groupBox_5">
+-     <property name="title">
+-      <string>Safe Browsing</string>
+-     </property>
+-     <layout class="QVBoxLayout" name="verticalLayout_2">
+-      <item>
+-       <widget class="QCheckBox" name="mCheckUrl">
+-        <property name="text">
+-         <string>Check URL With Phishing Google System</string>
+-        </property>
+-       </widget>
+-      </item>
+-     </layout>
+-    </widget>
+-   </item>
+   </layout>
+  </widget>
+  <customwidgets>