kdepim-runtime-16.12.2-1.parabola1.nonprism1: updating version

2 files changed, 91 insertions, 7 deletions

diff --git a/nonprism/kdepim-runtime/PKGBUILD b/nonprism/kdepim-runtime/PKGBUILD
index 0c3ec089b..f6854c76e 100644
--- a/nonprism/kdepim-runtime/PKGBUILD
+++ b/nonprism/kdepim-runtime/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 288283 2017-02-09 11:21:12Z arojas $
+# $Id: PKGBUILD 290221 2017-03-09 16:12:45Z 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>
 
 pkgname=kdepim-runtime
-pkgver=16.12.2
-pkgrel=1.nonprism1
-pkgdesc='Extends the functionality of kdepim, without libkgapi support'
+pkgver=16.12.3
+pkgrel=1.parabola1.nonprism1
+pkgdesc='Extends the functionality of kdepim, without libkgapi and nonfree qt5-webengine support'
 arch=('i686' 'x86_64' 'armv7h')
 url='https://community.kde.org/KDE_PIM'
 license=('GPL' 'LGPL' 'FDL')
 depends=(libkolab akonadi-calendar knotifyconfig kross kalarmcal kmbox kimap hicolor-icon-theme)
 makedepends=(extra-cmake-modules kdoctools boost python kdesignerplugin)
 conflicts=(kio-pim)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha1sums=('da8f8dc2ad4c5d2d472b534af2b52cc93ace48d2'
-          'SKIP')
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+        'libre.patch')
+sha256sums=('e1ad03f80737bc4afaa101f108430b011ad2e2c1349e477a66ce59bc901fac48'
+            'SKIP'
+            'b98d522c5335692a724b76491e14aedb343301227ff59560381eabf871e6b36f')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid@kde.org>
 
 prepare() {
   mkdir -p build
+  cd $pkgname-$pkgver
+  patch -p1 -i ../libre.patch
 }
 
 build() {
diff --git a/nonprism/kdepim-runtime/libre.patch b/nonprism/kdepim-runtime/libre.patch
new file mode 100644
index 000000000..4dbbe4c46
--- /dev/null
+++ b/nonprism/kdepim-runtime/libre.patch
@@ -0,0 +1,80 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6786adc43..825e6bfaa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,7 +82,7 @@ find_package( SharedMimeInfo REQUIRED )
+ 
+ 
+ # QT5 package
+-find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus WebEngineWidgets)
++find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Network Widgets Test XmlPatterns DBus)
+ find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
+ if (NOT Qt5TextToSpeech_FOUND)
+     message(STATUS "Qt5TextToSpeech not found, speech feature will be disabled")
+diff --git a/resources/tomboynotes/CMakeLists.txt b/resources/tomboynotes/CMakeLists.txt
+index a49caa91e..97b36a587 100644
+--- a/resources/tomboynotes/CMakeLists.txt
++++ b/resources/tomboynotes/CMakeLists.txt
+@@ -60,7 +60,6 @@ target_link_libraries(akonadi_tomboynotes_resource
+     Qt5::DBus
+     Qt5::Gui
+     Qt5::Network
+-    Qt5::WebEngineWidgets
+     KF5::AkonadiAgentBase
+     KF5::AkonadiNotes
+     KF5::ConfigCore
+diff --git a/resources/tomboynotes/tomboyserverauthenticatejob.cpp b/resources/tomboynotes/tomboyserverauthenticatejob.cpp
+index 00ad110e2..45e3af5e7 100644
+--- a/resources/tomboynotes/tomboyserverauthenticatejob.cpp
++++ b/resources/tomboynotes/tomboyserverauthenticatejob.cpp
+@@ -24,19 +24,15 @@
+ #include <QJsonObject>
+ 
+ TomboyServerAuthenticateJob::TomboyServerAuthenticateJob(KIO::AccessManager *manager, QObject *parent)
+-    : TomboyJobBase(manager, parent),
+-      mWebView(new QWebEngineView(Q_NULLPTR))
++    : TomboyJobBase(manager, parent)
+ {
+     // Connect the o2 authenfication signals
+     connect(mO1, &O1::linkingFailed, this, &TomboyServerAuthenticateJob::onLinkingFailed);
+     connect(mO1, &O1::linkingSucceeded, this, &TomboyServerAuthenticateJob::onLinkingSucceeded);
+-    connect(mO1, &O1::openBrowser, this, &TomboyServerAuthenticateJob::onOpenBrowser);
+-    connect(mO1, &O1::closeBrowser, mWebView, &QWebEngineView::close);
+ }
+ 
+ TomboyServerAuthenticateJob::~TomboyServerAuthenticateJob()
+ {
+-    delete mWebView;
+ }
+ 
+ void TomboyServerAuthenticateJob::start()
+@@ -82,8 +78,6 @@ void TomboyServerAuthenticateJob::onLinkingSucceeded()
+ 
+ void TomboyServerAuthenticateJob::onOpenBrowser(const QUrl &url)
+ {
+-    mWebView->setUrl(url);
+-    mWebView->show();
+ }
+ 
+ void TomboyServerAuthenticateJob::onApiRequestFinished()
+diff --git a/resources/tomboynotes/tomboyserverauthenticatejob.h b/resources/tomboynotes/tomboyserverauthenticatejob.h
+index 6743406d1..5a70ae4e6 100644
+--- a/resources/tomboynotes/tomboyserverauthenticatejob.h
++++ b/resources/tomboynotes/tomboyserverauthenticatejob.h
+@@ -22,7 +22,6 @@
+ 
+ #include "tomboyjobbase.h"
+ #include <QString>
+-#include <QWebEngineView>
+ 
+ class TomboyServerAuthenticateJob : public TomboyJobBase
+ {
+@@ -48,8 +47,6 @@ private:
+     void onUserRequestFinished();
+     QString mUserURL;
+ 
+-    QWebEngineView *mWebView;
+-
+ };
+ 
+ #endif // TOMBOYSERVERAUTHENTICATEJOB_H