[arch-commits] Commit in plasma-workspace/repos (8 files)
Antonio Rojas
arojas at archlinux.org
Tue Aug 30 21:57:54 UTC 2016
Date: Tuesday, August 30, 2016 @ 21:57:53
Author: arojas
Revision: 275346
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
plasma-workspace/repos/testing-i686/
plasma-workspace/repos/testing-i686/PKGBUILD
(from rev 275345, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/testing-i686/kde.pam
(from rev 275345, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/testing-i686/klipper-prison-5.25.patch
(from rev 275345, plasma-workspace/trunk/klipper-prison-5.25.patch)
plasma-workspace/repos/testing-x86_64/
plasma-workspace/repos/testing-x86_64/PKGBUILD
(from rev 275345, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/testing-x86_64/kde.pam
(from rev 275345, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/testing-x86_64/klipper-prison-5.25.patch
(from rev 275345, plasma-workspace/trunk/klipper-prison-5.25.patch)
------------------------------------------+
testing-i686/PKGBUILD | 103 +++++++++++++++++++++++++++++
testing-i686/kde.pam | 9 ++
testing-i686/klipper-prison-5.25.patch | 102 ++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 103 +++++++++++++++++++++++++++++
testing-x86_64/kde.pam | 9 ++
testing-x86_64/klipper-prison-5.25.patch | 102 ++++++++++++++++++++++++++++
6 files changed, 428 insertions(+)
Copied: plasma-workspace/repos/testing-i686/PKGBUILD (from rev 275345, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-08-30 21:57:53 UTC (rev 275346)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi' 'kuiserver' 'plasma-wayland-session')
+pkgver=5.7.4
+pkgrel=2
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://www.kde.org/workspaces/plasmadesktop/'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('kjsembed' 'knotifyconfig' 'libxdamage' 'libksysguard' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot' 'iso-codes' 'kactivitymanagerd' 'kholidays'
+ 'xorg-xmessage' 'xorg-xprop' 'milou' 'prison' 'kwin' 'plasma-integration')
+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=('5785b5dd3cd44847720f4e639ad4ccf4bdd842624abda5b78ffd49362c0f0e3d'
+ 'SKIP'
+ '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
+ '11a5afd87e776f31743515b5d934dba7e8d34bdd3acf8c45f02ff9a152f8b1d5')
+validpgpkeys=('13C16D03EDE728514473AA73A506E6D4DD4D5088' # 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() {
+ cd build
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_LIBEXECDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_plasma-workspace() {
+ depends+=('kuiserver')
+ optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS based geolocation' 'networkmanager-qt: IP based geolocation')
+ conflicts=('kdebase-workspace')
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde
+
+ # Remove conflicts with drkonqi
+ rm "$pkgdir"/usr/lib/drkonqi
+ rm -r "$pkgdir"/usr/share/drkonqi
+
+ # Remove conflicts with kuiserver
+ rm "$pkgdir"/usr/bin/kuiserver5
+ rm "$pkgdir"/usr/lib/libkdeinit5_kuiserver5.so
+ rm "$pkgdir"/usr/share/dbus-1/services/kf5_org.kde.kuiserver.service
+ rm "$pkgdir"/usr/share/kservices5/kuiserver.desktop
+
+ # Split plasma-wayland scripts
+ rm -r "$pkgdir"/usr/share/wayland-sessions
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kxmlrpcclient' 'kidletime' 'gdb')
+
+ cd build/drkonqi
+ make DESTDIR="$pkgdir" install
+}
+
+package_kuiserver() {
+ pkgdesc='KDE Progress Info UI server'
+ depends=('kxmlgui')
+
+ cd build/kuiserver
+ make DESTDIR="$pkgdir" install
+}
+
+package_plasma-wayland-session() {
+ pkgdesc='Plasma Wayland session'
+ depends=('plasma-workspace' 'qt5-wayland' 'kwayland-integration' 'xorg-server-xwayland')
+ groups=()
+
+ install -Dm644 build/plasmawayland.desktop "$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
+}
Copied: plasma-workspace/repos/testing-i686/kde.pam (from rev 275345, plasma-workspace/trunk/kde.pam)
===================================================================
--- testing-i686/kde.pam (rev 0)
+++ testing-i686/kde.pam 2016-08-30 21:57:53 UTC (rev 275346)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
Copied: plasma-workspace/repos/testing-i686/klipper-prison-5.25.patch (from rev 275345, plasma-workspace/trunk/klipper-prison-5.25.patch)
===================================================================
--- testing-i686/klipper-prison-5.25.patch (rev 0)
+++ testing-i686/klipper-prison-5.25.patch 2016-08-30 21:57:53 UTC (rev 275346)
@@ -0,0 +1,102 @@
+--- 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 {
Copied: plasma-workspace/repos/testing-x86_64/PKGBUILD (from rev 275345, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-08-30 21:57:53 UTC (rev 275346)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgbase=plasma-workspace
+pkgname=('plasma-workspace' 'drkonqi' 'kuiserver' 'plasma-wayland-session')
+pkgver=5.7.4
+pkgrel=2
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://www.kde.org/workspaces/plasmadesktop/'
+license=('LGPL')
+# note on libxdamage:
+# not detected by namcap because libgl depends on it
+# but nvidia providing libgl does not depend on libxdamage
+depends=('kjsembed' 'knotifyconfig' 'libxdamage' 'libksysguard' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot' 'iso-codes' 'kactivitymanagerd' 'kholidays'
+ 'xorg-xmessage' 'xorg-xprop' 'milou' 'prison' 'kwin' 'plasma-integration')
+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=('5785b5dd3cd44847720f4e639ad4ccf4bdd842624abda5b78ffd49362c0f0e3d'
+ 'SKIP'
+ '00090291204baabe9d6857d3b1419832376dd2e279087d718b64792691e86739'
+ '11a5afd87e776f31743515b5d934dba7e8d34bdd3acf8c45f02ff9a152f8b1d5')
+validpgpkeys=('13C16D03EDE728514473AA73A506E6D4DD4D5088' # 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() {
+ cd build
+ cmake ../$pkgbase-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE_INSTALL_LIBDIR=lib \
+ -DKDE_INSTALL_LIBEXECDIR=lib \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package_plasma-workspace() {
+ depends+=('kuiserver')
+ optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS based geolocation' 'networkmanager-qt: IP based geolocation')
+ conflicts=('kdebase-workspace')
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir"/kde.pam "$pkgdir"/etc/pam.d/kde
+
+ # Remove conflicts with drkonqi
+ rm "$pkgdir"/usr/lib/drkonqi
+ rm -r "$pkgdir"/usr/share/drkonqi
+
+ # Remove conflicts with kuiserver
+ rm "$pkgdir"/usr/bin/kuiserver5
+ rm "$pkgdir"/usr/lib/libkdeinit5_kuiserver5.so
+ rm "$pkgdir"/usr/share/dbus-1/services/kf5_org.kde.kuiserver.service
+ rm "$pkgdir"/usr/share/kservices5/kuiserver.desktop
+
+ # Split plasma-wayland scripts
+ rm -r "$pkgdir"/usr/share/wayland-sessions
+}
+
+package_drkonqi() {
+ pkgdesc='KDE crash handler'
+ depends=('kxmlrpcclient' 'kidletime' 'gdb')
+
+ cd build/drkonqi
+ make DESTDIR="$pkgdir" install
+}
+
+package_kuiserver() {
+ pkgdesc='KDE Progress Info UI server'
+ depends=('kxmlgui')
+
+ cd build/kuiserver
+ make DESTDIR="$pkgdir" install
+}
+
+package_plasma-wayland-session() {
+ pkgdesc='Plasma Wayland session'
+ depends=('plasma-workspace' 'qt5-wayland' 'kwayland-integration' 'xorg-server-xwayland')
+ groups=()
+
+ install -Dm644 build/plasmawayland.desktop "$pkgdir"/usr/share/wayland-sessions/plasmawayland.desktop
+}
Copied: plasma-workspace/repos/testing-x86_64/kde.pam (from rev 275345, plasma-workspace/trunk/kde.pam)
===================================================================
--- testing-x86_64/kde.pam (rev 0)
+++ testing-x86_64/kde.pam 2016-08-30 21:57:53 UTC (rev 275346)
@@ -0,0 +1,9 @@
+#%PAM-1.0
+
+auth include system-login
+
+account include system-login
+
+password include system-login
+
+session include system-login
Copied: plasma-workspace/repos/testing-x86_64/klipper-prison-5.25.patch (from rev 275345, plasma-workspace/trunk/klipper-prison-5.25.patch)
===================================================================
--- testing-x86_64/klipper-prison-5.25.patch (rev 0)
+++ testing-x86_64/klipper-prison-5.25.patch 2016-08-30 21:57:53 UTC (rev 275346)
@@ -0,0 +1,102 @@
+--- 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 {
More information about the arch-commits
mailing list