git » plasma-workspace.git » commit c28f6f8

diff --git a/PKGBUILD b/PKGBUILD
index 7722e2c..12eee2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=plasma-workspace
 pkgname=('plasma-workspace' 'drkonqi' 'kuiserver' 'plasma-wayland-session')
-pkgver=5.7.5
+pkgver=5.8.0
 pkgrel=1
 pkgdesc='KDE Plasma Workspace'
 arch=('i686' 'x86_64')
@@ -20,25 +20,16 @@ depends=('kjsembed' 'knotifyconfig' 'libxdamage' 'libksysguard' 'ktexteditor' 'l
 makedepends=('extra-cmake-modules' 'kdoctools' 'gpsd' 'baloo'
              'krunner' 'kxmlrpcclient' 'networkmanager-qt' 'kdesignerplugin')
 groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"{,.sig} 'kde.pam' klipper-prison-5.25.patch)
-sha256sums=('116d9af304c212d58163130f1b7d5478085523c967f96f0d9b4ba2c5a73eb9f5'
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgbase}-${pkgver}.tar.xz"{,.sig} 'kde.pam')
+sha256sums=('365b152c69ee7863bd1abe0e339707e412384beeb10294aacbc07e3d9da2b319'
             'SKIP'
-            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
-            '11a5afd87e776f31743515b5d934dba7e8d34bdd3acf8c45f02ff9a152f8b1d5')
+            '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
               'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson
 
 prepare() {
   mkdir -p build
-
-  cd $pkgbase-$pkgver
-  # be sure to use the Qt5 version of qtpaths
-  sed -e 's:qtpaths:qtpaths-qt5:' -i startkde/start*.cmake
-
-# Port to new prison API
-  sed -e 's|EXACT QUIET|QUIET|' -i klipper/CMakeLists.txt
-  patch -p1 -i ../klipper-prison-5.25.patch
 }
 
 build() {
diff --git a/klipper-prison-5.25.patch b/klipper-prison-5.25.patch
deleted file mode 100644
index 049686d..0000000
--- a/klipper-prison-5.25.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- plasma-workspace-5.7.4/klipper/klipper.cpp.orig	2016-08-30 21:44:15.250331148 +0000
-+++ plasma-workspace-5.7.4/klipper/klipper.cpp	2016-08-30 21:44:27.716944865 +0000
-@@ -50,8 +50,7 @@
- #include "klipperpopup.h"
- 
- #ifdef HAVE_PRISON
--#include <prison/DataMatrixBarcode>
--#include <prison/QRCodeBarcode>
-+#include <prison/Prison>
- #endif
- 
- #include <config-X11.h>
-@@ -913,7 +913,7 @@
- class BarcodeLabel : public QLabel
- {
- public:
--    BarcodeLabel(prison::AbstractBarcode *barcode, QWidget *parent = nullptr)
-+    BarcodeLabel(Prison::AbstractBarcode *barcode, QWidget *parent = nullptr)
-         : QLabel(parent)
-         , m_barcode(barcode)
-         {
-@@ -926,12 +926,12 @@
-         setPixmap(QPixmap::fromImage(m_barcode->toImage(event->size())));
-     }
- private:
--    QScopedPointer<prison::AbstractBarcode> m_barcode;
-+    QScopedPointer<Prison::AbstractBarcode> m_barcode;
- };
- 
- void Klipper::showBarcode(const QSharedPointer< const HistoryItem > &item)
- {
--    using namespace prison;
-+    using namespace Prison;
-     QPointer<QDialog> dlg(new QDialog());
-     dlg->setWindowTitle( i18n("Mobile Barcode") );
-     QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok, dlg);
-@@ -942,8 +942,8 @@
-     QWidget* mw = new QWidget(dlg);
-     QHBoxLayout* layout = new QHBoxLayout(mw);
- 
--    QRCodeBarcode *qrCode = new QRCodeBarcode;
--    DataMatrixBarcode *dataMatrix = new DataMatrixBarcode;
-+    AbstractBarcode *qrCode = createBarcode(QRCode);
-+    AbstractBarcode *dataMatrix = createBarcode(DataMatrix);
-     if (item) {
-         qrCode->setData(item->text());
-         dataMatrix->setData(item->text());
---- plasma-workspace-5.7.4/klipper/clipboardjob.cpp.orig	2016-08-23 12:57:58.000000000 +0000
-+++ plasma-workspace-5.7.4/klipper/clipboardjob.cpp	2016-08-30 21:37:18.525435667 +0000
-@@ -28,10 +28,7 @@
- #include <QIcon>
- 
- #ifdef HAVE_PRISON
--#include <prison/QRCodeBarcode>
--#include <prison/DataMatrixBarcode>
--#include <prison/Code39Barcode>
--#include <prison/Code93Barcode>
-+#include <prison/Prison>
- #endif
- 
- const static QString s_iconKey = QStringLiteral("icon");
-@@ -92,26 +89,26 @@
- #ifdef HAVE_PRISON
-         int pixelWidth = parameters().value(QStringLiteral("width")).toInt();
-         int pixelHeight = parameters().value(QStringLiteral("height")).toInt();
--        prison::AbstractBarcode *code = nullptr;
-+        Prison::AbstractBarcode *code = nullptr;
-         switch (parameters().value(QStringLiteral("barcodeType")).toInt()) {
-         case 1: {
--            code = new prison::DataMatrixBarcode;
-+            code = Prison::createBarcode(Prison::DataMatrix);
-             const int size = qMin(pixelWidth, pixelHeight);
-             pixelWidth = size;
-             pixelHeight = size;
-             break;
-         }
-         case 2: {
--            code = new prison::Code39Barcode;
-+            code = Prison::createBarcode(Prison::Code39);
-             break;
-         }
-         case 3: {
--            code = new prison::Code93Barcode;
-+            code = Prison::createBarcode(Prison::Code93);
-             break;
-         }
-         case 0:
-         default: {
--            code = new prison::QRCodeBarcode;
-+            code = Prison::createBarcode(Prison::QRCode);
-             const int size = qMin(pixelWidth, pixelHeight);
-             pixelWidth = size;
-             pixelHeight = size;
-@@ -129,7 +126,7 @@
-                     emitResult();
-                 }
-             );
--            auto future = QtConcurrent::run(code, &prison::AbstractBarcode::toImage, QSizeF(pixelWidth, pixelHeight));
-+            auto future = QtConcurrent::run(code, &Prison::AbstractBarcode::toImage, QSizeF(pixelWidth, pixelHeight));
-             watcher->setFuture(future);
-             return;
-         } else {