From 713ef78173bd30ebc96c0816471d7946ab289046 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Sun, 16 Aug 2015 17:15:23 +0000 Subject: [PATCH] Plasma5.4 RC --- bluedevil-kf5/PKGBUILD | 11 +- bluedevil-kf5/bluezqt5.11.patch | 383 -------------------------------- kgamma5/PKGBUILD | 30 +++ kwallet-pam/PKGBUILD | 29 +++ kwayland-integration/PKGBUILD | 29 +++ kwayland/PKGBUILD | 6 +- oxygen-kde4/PKGBUILD | 2 +- plasma-desktop/PKGBUILD | 9 +- plasma-mediacenter/PKGBUILD | 29 +++ plasma-pa/PKGBUILD | 29 +++ plasma.conf | 6 +- plasma.order | 41 ++-- plasma.sums | 73 +++--- sddm-kcm/PKGBUILD | 2 +- sddm/PKGBUILD | 2 +- 15 files changed, 228 insertions(+), 453 deletions(-) delete mode 100644 bluedevil-kf5/bluezqt5.11.patch create mode 100644 kgamma5/PKGBUILD create mode 100644 kwallet-pam/PKGBUILD create mode 100644 kwayland-integration/PKGBUILD create mode 100644 plasma-mediacenter/PKGBUILD create mode 100644 plasma-pa/PKGBUILD diff --git a/bluedevil-kf5/PKGBUILD b/bluedevil-kf5/PKGBUILD index f092a944e..18b4c1691 100644 --- a/bluedevil-kf5/PKGBUILD +++ b/bluedevil-kf5/PKGBUILD @@ -4,7 +4,7 @@ source ../plasma.conf pkgname=bluedevil-kf5 _pkgname=bluedevil pkgver=${PVersion} -pkgrel=2 +pkgrel=1 pkgdesc="Integrate the Bluetooth technology within KDE workspace and applications" arch=('x86_64') url='https://projects.kde.org/projects/kde/workspace/bluedevil' @@ -17,19 +17,14 @@ options=("debug") replaces=('bluedevil') provides=('bluedevil') conflicts=('bluedevil') -source=("${PServer}/${pkgver}/${_pkgname}-${PSubVersion}.tar.xz" - 'bluezqt5.11.patch') -sha256sums=( $(getSum ${_pkgname}) - '4571d8fec90cdd83029b6cfd1d04184084a48b164f11ce19686c7c3d5355f23b') +source=("${PServer}/${pkgver}/${_pkgname}-${PSubVersion}.tar.xz") +sha256sums=( $(getSum ${_pkgname}) ) install=bluedevil.install prepare() { mkdir -p build cd ${_pkgname}-${pkgver} - - # compile against the newest bluez-qt from kde frameworks - patch -p1 -i $srcdir/bluezqt5.11.patch } build() { diff --git a/bluedevil-kf5/bluezqt5.11.patch b/bluedevil-kf5/bluezqt5.11.patch deleted file mode 100644 index 1dc179834..000000000 --- a/bluedevil-kf5/bluezqt5.11.patch +++ /dev/null @@ -1,383 +0,0 @@ -diff --git a/src/applet/package/contents/ui/BluetoothApplet.qml b/src/applet/package/contents/ui/BluetoothApplet.qml -index 834d034..d685cb2 100644 ---- a/src/applet/package/contents/ui/BluetoothApplet.qml -+++ b/src/applet/package/contents/ui/BluetoothApplet.qml -@@ -31,6 +31,7 @@ Item { - - property bool deviceConnected : false - property int runningActions : 0 -+ property QtObject btManager : BluezQt.Manager - - Plasmoid.toolTipMainText: i18n("Bluetooth") - Plasmoid.icon: Logic.icon() -@@ -44,11 +45,7 @@ Item { - focus: true - } - -- BluezQt.Manager { -- id: btManager -- -- onInitFinished: { -- Logic.init(); -- } -+ Component.onCompleted: { -+ Logic.init(); - } - } -diff --git a/src/applet/package/contents/ui/DeviceItem.qml b/src/applet/package/contents/ui/DeviceItem.qml -index 19b55cf..b0fc9ce 100644 ---- a/src/applet/package/contents/ui/DeviceItem.qml -+++ b/src/applet/package/contents/ui/DeviceItem.qml -@@ -378,10 +378,10 @@ PlasmaComponents.ListItem { - return i18n("Connecting"); - } - -- switch (DeviceType) { -+ switch (Type) { - case BluezQt.Device.Headset: - case BluezQt.Device.Headphones: -- case BluezQt.Device.OtherAudio: -+ case BluezQt.Device.AudioVideo: - return i18n("Audio device"); - - case BluezQt.Device.Keyboard: -@@ -422,7 +422,7 @@ PlasmaComponents.ListItem { - function connectToDevice() - { - if (Connected) { -- Device.disconnectDevice(); -+ Device.disconnectFromDevice(); - return; - } - -@@ -433,7 +433,7 @@ PlasmaComponents.ListItem { - connecting = true; - runningActions++; - -- var call = Device.connectDevice(); -+ var call = Device.connectToDevice(); - call.userData = Device; - - call.finished.connect(function(call) { -diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml -index 849ae4e..94df8b4 100644 ---- a/src/applet/package/contents/ui/FullRepresentation.qml -+++ b/src/applet/package/contents/ui/FullRepresentation.qml -@@ -28,9 +28,7 @@ import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt - FocusScope { - PlasmaBt.DevicesProxyModel { - id: devicesModel -- sourceModel: BluezQt.DevicesModel { -- manager: btManager -- } -+ sourceModel: BluezQt.DevicesModel { } - } - - PlasmaExtras.Heading { -diff --git a/src/daemon/kded/devicemonitor.cpp b/src/daemon/kded/devicemonitor.cpp -index 29ac2f3..22c8020 100644 ---- a/src/daemon/kded/devicemonitor.cpp -+++ b/src/daemon/kded/devicemonitor.cpp -@@ -147,7 +147,7 @@ void DeviceMonitor::restoreState() - Q_FOREACH (const QString &addr, connectedDevices) { - BluezQt::DevicePtr device = m_manager->deviceForAddress(addr); - if (device) { -- device->connectDevice(); -+ device->connectToDevice(); - } - } - } -diff --git a/src/daemon/kded/filereceiver/obexagent.cpp b/src/daemon/kded/filereceiver/obexagent.cpp -index 9cd98ff..6ffd620 100644 ---- a/src/daemon/kded/filereceiver/obexagent.cpp -+++ b/src/daemon/kded/filereceiver/obexagent.cpp -@@ -49,11 +49,11 @@ QDBusObjectPath ObexAgent::objectPath() const - return QDBusObjectPath(QStringLiteral("/BlueDevilObexAgent")); - } - --void ObexAgent::authorizePush(BluezQt::ObexTransferPtr transfer, const BluezQt::Request &request) -+void ObexAgent::authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request &request) - { - qCDebug(BLUEDAEMON) << "Agent-AuthorizePush"; - -- ReceiveFileJob *job = new ReceiveFileJob(request, transfer, this); -+ ReceiveFileJob *job = new ReceiveFileJob(request, transfer, session, this); - connect(job, &ReceiveFileJob::finished, this, &ObexAgent::receiveFileJobFinished); - job->start(); - } -diff --git a/src/daemon/kded/filereceiver/obexagent.h b/src/daemon/kded/filereceiver/obexagent.h -index 0f5adc5..e32f1fe 100644 ---- a/src/daemon/kded/filereceiver/obexagent.h -+++ b/src/daemon/kded/filereceiver/obexagent.h -@@ -40,7 +40,7 @@ public: - bool shouldAutoAcceptTransfer(const QString &address) const; - - QDBusObjectPath objectPath() const Q_DECL_OVERRIDE; -- void authorizePush(BluezQt::ObexTransferPtr transfer, const BluezQt::Request &request) Q_DECL_OVERRIDE; -+ void authorizePush(BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, const BluezQt::Request &request) Q_DECL_OVERRIDE; - - private Q_SLOTS: - void receiveFileJobFinished(KJob *job); -diff --git a/src/daemon/kded/filereceiver/receivefilejob.cpp b/src/daemon/kded/filereceiver/receivefilejob.cpp -index 1569163..fbb04b5 100644 ---- a/src/daemon/kded/filereceiver/receivefilejob.cpp -+++ b/src/daemon/kded/filereceiver/receivefilejob.cpp -@@ -36,11 +36,12 @@ - #include - #include - --ReceiveFileJob::ReceiveFileJob(const BluezQt::Request &req, BluezQt::ObexTransferPtr transfer, ObexAgent *parent) -+ReceiveFileJob::ReceiveFileJob(const BluezQt::Request &req, BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, ObexAgent *parent) - : KJob(parent) - , m_speedBytes(0) - , m_agent(parent) - , m_transfer(transfer) -+ , m_session(session) - , m_request(req) - { - setCapabilities(Killable); -@@ -74,24 +75,24 @@ void ReceiveFileJob::init() - qCDebug(BLUEDAEMON) << "\tTransferred:" << m_transfer->transferred(); - - qCDebug(BLUEDAEMON) << "ObexSession:"; -- qCDebug(BLUEDAEMON) << "\tSource:" << m_transfer->session()->source(); -- qCDebug(BLUEDAEMON) << "\tDestination:" << m_transfer->session()->destination(); -+ qCDebug(BLUEDAEMON) << "\tSource:" << m_session->source(); -+ qCDebug(BLUEDAEMON) << "\tDestination:" << m_session->destination(); - - connect(m_transfer.data(), &BluezQt::ObexTransfer::statusChanged, this, &ReceiveFileJob::statusChanged); - connect(m_transfer.data(), &BluezQt::ObexTransfer::transferredChanged, this, &ReceiveFileJob::transferredChanged); - -- m_deviceName = m_transfer->session()->destination(); -+ m_deviceName = m_session->destination(); - -- BluezQt::AdapterPtr adapter = m_agent->manager()->adapterForAddress(m_transfer->session()->source()); -+ BluezQt::AdapterPtr adapter = m_agent->manager()->adapterForAddress(m_session->source()); - if (!adapter) { -- qCDebug(BLUEDAEMON) << "No adapter for" << m_transfer->session()->source(); -+ qCDebug(BLUEDAEMON) << "No adapter for" << m_session->source(); - showNotification(); - return; - } - -- BluezQt::DevicePtr device = adapter->deviceForAddress(m_transfer->session()->destination()); -+ BluezQt::DevicePtr device = adapter->deviceForAddress(m_session->destination()); - if (!device) { -- qCDebug(BLUEDAEMON) << "No device for" << m_transfer->session()->destination(); -+ qCDebug(BLUEDAEMON) << "No device for" << m_session->destination(); - showNotification(); - return; - } -diff --git a/src/daemon/kded/filereceiver/receivefilejob.h b/src/daemon/kded/filereceiver/receivefilejob.h -index 461d453..801bb45 100644 ---- a/src/daemon/kded/filereceiver/receivefilejob.h -+++ b/src/daemon/kded/filereceiver/receivefilejob.h -@@ -34,7 +34,7 @@ class ReceiveFileJob : public KJob - Q_OBJECT - - public: -- explicit ReceiveFileJob(const BluezQt::Request &req, BluezQt::ObexTransferPtr transfer, ObexAgent *parent); -+ explicit ReceiveFileJob(const BluezQt::Request &req, BluezQt::ObexTransferPtr transfer, BluezQt::ObexSessionPtr session, ObexAgent *parent); - - QString deviceAddress() const; - -@@ -63,6 +63,7 @@ private: - - ObexAgent *m_agent; - BluezQt::ObexTransferPtr m_transfer; -+ BluezQt::ObexSessionPtr m_session; - BluezQt::Request m_request; - }; - -diff --git a/src/kcmodule/bluedevildevices.cpp b/src/kcmodule/bluedevildevices.cpp -index b1b6b0e..deafecc 100644 ---- a/src/kcmodule/bluedevildevices.cpp -+++ b/src/kcmodule/bluedevildevices.cpp -@@ -113,7 +113,7 @@ void BluetoothDevicesDelegate::paint(QPainter *painter, const QStyleOptionViewIt - painter->setFont(f); - painter->drawText(r, Qt::AlignLeft | Qt::AlignTop, index.data(BluezQt::DevicesModel::FriendlyNameRole).toString()); - painter->restore(); -- painter->drawText(r, Qt::AlignLeft | Qt::AlignBottom, deviceTypeString(index.data(BluezQt::DevicesModel::DeviceTypeRole).toInt())); -+ painter->drawText(r, Qt::AlignLeft | Qt::AlignBottom, deviceTypeString(index.data(BluezQt::DevicesModel::TypeRole).toInt())); - - // Draw state - r = option.rect; -@@ -166,7 +166,7 @@ QString BluetoothDevicesDelegate::deviceTypeString(int type) const - return i18nc("This device is a Headset", "Headset"); - case BluezQt::Device::Headphones: - return i18nc("This device are Headphones", "Headphones"); -- case BluezQt::Device::OtherAudio: -+ case BluezQt::Device::AudioVideo: - return i18nc("This device is of type Audio", "Audio"); - case BluezQt::Device::Keyboard: - return i18nc("This device is a Keyboard", "Keyboard"); -@@ -349,14 +349,14 @@ void KCMBlueDevilDevices::removeDevice() - void KCMBlueDevilDevices::connectDevice() - { - BluezQt::DevicePtr device = m_devicesModel->device(m_devices->currentIndex()); -- device->connectDevice(); -+ device->connectToDevice(); - } - - void KCMBlueDevilDevices::disconnectDevice() - { - m_disconnectDevice->setEnabled(false); - BluezQt::DevicePtr device = m_devicesModel->device(m_devices->currentIndex()); -- device->disconnectDevice(); -+ device->disconnectFromDevice(); - } - - void KCMBlueDevilDevices::launchWizard() -diff --git a/src/kio/obexftp/daemon/obexftpdaemon.cpp b/src/kio/obexftp/daemon/obexftpdaemon.cpp -index a2cdac4..45a1f75 100644 ---- a/src/kio/obexftp/daemon/obexftpdaemon.cpp -+++ b/src/kio/obexftp/daemon/obexftpdaemon.cpp -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - K_PLUGIN_FACTORY_WITH_JSON(ObexFtpFactory, - "obexftpdaemon.json", -@@ -208,9 +209,9 @@ void ObexFtpDaemon::operationalChanged(bool operational) - } - } - --void ObexFtpDaemon::sessionRemoved(const QDBusObjectPath &session) -+void ObexFtpDaemon::sessionRemoved(BluezQt::ObexSessionPtr session) - { -- const QString &path = session.path(); -+ const QString &path = session->objectPath().path(); - const QString &key = d->m_sessionMap.key(path); - - if (!d->m_sessionMap.contains(key)) { -diff --git a/src/kio/obexftp/daemon/obexftpdaemon.h b/src/kio/obexftp/daemon/obexftpdaemon.h -index c42d720..a902333 100644 ---- a/src/kio/obexftp/daemon/obexftpdaemon.h -+++ b/src/kio/obexftp/daemon/obexftpdaemon.h -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - namespace BluezQt - { - class InitObexManagerJob; -@@ -52,7 +54,7 @@ private Q_SLOTS: - void cancelTransferFinished(QDBusPendingCallWatcher *watcher); - - void operationalChanged(bool operational); -- void sessionRemoved(const QDBusObjectPath &session); -+ void sessionRemoved(BluezQt::ObexSessionPtr session); - - private: - struct Private; -diff --git a/src/kio/obexftp/kioobexftp.cpp b/src/kio/obexftp/kioobexftp.cpp -index cb8d3b1..47910b4 100644 ---- a/src/kio/obexftp/kioobexftp.cpp -+++ b/src/kio/obexftp/kioobexftp.cpp -@@ -442,24 +442,24 @@ QList KioFtp::listFolder(const QUrl &url, bool *ok) - return list; - } - -- const QList &items = call->value().value >(); -+ const QList &items = call->value().value >(); - -- Q_FOREACH (const BluezQt::ObexFileTransfer::Item &item, items) { -+ Q_FOREACH (const BluezQt::ObexFileTransferEntry &item, items) { - KIO::UDSEntry entry; -- entry.insert(KIO::UDSEntry::UDS_NAME, item.name); -- entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, item.label); -+ entry.insert(KIO::UDSEntry::UDS_NAME, item.name()); -+ entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, item.label()); - entry.insert(KIO::UDSEntry::UDS_ACCESS, 0700); -- entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, item.modified.toTime_t()); -- entry.insert(KIO::UDSEntry::UDS_SIZE, item.size); -+ entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, item.modificationTime().toTime_t()); -+ entry.insert(KIO::UDSEntry::UDS_SIZE, item.size()); - -- if (item.type == BluezQt::ObexFileTransfer::Item::Folder) { -+ if (item.type() == BluezQt::ObexFileTransferEntry::Folder) { - entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); - } else { - entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFREG); - } - - if (urlIsRoot(url)) { -- updateRootEntryIcon(entry, item.memoryType); -+ updateRootEntryIcon(entry, item.memoryType()); - } - - list.append(entry); -@@ -467,7 +467,7 @@ QList KioFtp::listFolder(const QUrl &url, bool *ok) - // Most probably the client of the kio will stat each file - // so since we are on it, let's cache all of them. - QUrl statUrl = url; -- statUrl.setPath(statUrl.path() + QLatin1Char('/') + item.name); -+ statUrl.setPath(statUrl.path() + QLatin1Char('/') + item.name()); - - if (!m_statMap.contains(statUrl.toDisplayString())) { - qCDebug(OBEXFTP) << "Stat:" -diff --git a/src/wizard/pages/connect.cpp b/src/wizard/pages/connect.cpp -index 1880c08..082cb10 100644 ---- a/src/wizard/pages/connect.cpp -+++ b/src/wizard/pages/connect.cpp -@@ -54,7 +54,7 @@ void ConnectPage::initializePage() - - m_wizard->device()->setTrusted(true); - -- BluezQt::PendingCall *call = m_wizard->device()->connectDevice(); -+ BluezQt::PendingCall *call = m_wizard->device()->connectToDevice(); - connect(call, &BluezQt::PendingCall::finished, this, &ConnectPage::connectFinished); - } - -diff --git a/src/wizard/pages/discover.cpp b/src/wizard/pages/discover.cpp -index 9810f7c..862cf8a 100644 ---- a/src/wizard/pages/discover.cpp -+++ b/src/wizard/pages/discover.cpp -@@ -215,13 +215,13 @@ int DiscoverPage::nextId() const - pin = m_wizard->agent()->getPin(device); - } - -- qCDebug(WIZARD) << "Class: " << device->deviceType(); -+ qCDebug(WIZARD) << "Class: " << device->type(); - qCDebug(WIZARD) << "Legacy: " << device->hasLegacyPairing(); - qCDebug(WIZARD) << "From DB: " << m_wizard->agent()->isFromDatabase(); - qCDebug(WIZARD) << "PIN: " << m_wizard->agent()->pin(); - - // If keyboard no matter what, we go to the keyboard page -- if (device->deviceType() == BluezQt::Device::Keyboard) { -+ if (device->type() == BluezQt::Device::Keyboard) { - qCDebug(WIZARD) << "Keyboard Pairing"; - return BlueWizard::KeyboardPairing; - } -diff --git a/src/wizard/wizardagent.cpp b/src/wizard/wizardagent.cpp -index a0b4b04..a263e28 100644 ---- a/src/wizard/wizardagent.cpp -+++ b/src/wizard/wizardagent.cpp -@@ -72,8 +72,10 @@ QString WizardAgent::getPin(BluezQt::DevicePtr device) - - QXmlStreamReader xml(&file); - -- int deviceType = device->deviceType(); -- int xmlType = 0; -+ QString deviceType = BluezQt::Device::typeToString(device->type()); -+ if (deviceType == QLatin1String("audiovideo")) { -+ deviceType = QStringLiteral("audio"); -+ } - - while (!xml.atEnd()) { - xml.readNext(); -@@ -87,9 +89,7 @@ QString WizardAgent::getPin(BluezQt::DevicePtr device) - } - - if (attr.hasAttribute(QLatin1String("type")) && attr.value(QLatin1String("type")) != QLatin1String("any")) { -- xmlType = BluezQt::Device::stringToType(attr.value(QLatin1String("type")).toString()); -- if (deviceType != xmlType) { -- xmlType = 0; -+ if (deviceType != attr.value(QLatin1String("type")).toString()) { - continue; - } - } diff --git a/kgamma5/PKGBUILD b/kgamma5/PKGBUILD new file mode 100644 index 000000000..74885085e --- /dev/null +++ b/kgamma5/PKGBUILD @@ -0,0 +1,30 @@ +source ../plasma.conf + +pkgname=kgamma5 +_pkgname=kgamma +pkgver=${PVersion} +pkgrel=1 +pkgdesc="Adjust your monitor's gamma settings" +arch=(x86_64) +url='https://projects.kde.org/kgamma5' +license=(LGPL) +depends=(kdelibs4support) +makedepends=(extra-cmake-modules kdoctools) +groups=('plasma') +options=("debug") +source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz") +sha256sums=( $(getSum ${pkgname}) ) + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake_kf5 ../${_pkgname}-${pkgver} + make +} +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/kwallet-pam/PKGBUILD b/kwallet-pam/PKGBUILD new file mode 100644 index 000000000..6a21a813d --- /dev/null +++ b/kwallet-pam/PKGBUILD @@ -0,0 +1,29 @@ +source ../plasma.conf + +pkgname=kwallet-pam +pkgver=${PVersion} +pkgrel=1 +pkgdesc='KWallet PAM integration' +arch=(x86_64) +url='https://projects.kde.org/kwallet-pam' +license=(LGPL) +depends=(kwallet) +makedepends=(extra-cmake-modules) +groups=('plasma') +options=("debug") +source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz") +sha256sums=( $(getSum ${pkgname}) ) + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake_kf5 ../${pkgname}-${pkgver} + make +} +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/kwayland-integration/PKGBUILD b/kwayland-integration/PKGBUILD new file mode 100644 index 000000000..718a81a22 --- /dev/null +++ b/kwayland-integration/PKGBUILD @@ -0,0 +1,29 @@ +source ../plasma.conf + +pkgname=kwayland-integration +pkgver=${PVersion} +pkgrel=1 +pkgdesc='Provides integration plugins for various KDE frameworks for the wayland windowing system' +arch=(x86_64) +url='https://projects.kde.org/projects/kde/workspace/kwayland-integration' +license=(LGPL) +depends=(kwindowsystem kidletime kwayland) +makedepends=(extra-cmake-modules) +groups=('plasma') +options=("debug") +source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz") +sha256sums=( $(getSum ${pkgname}) ) + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake_kf5 ../${pkgname}-${pkgver} + make +} +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/kwayland/PKGBUILD b/kwayland/PKGBUILD index 30054ca46..11cdeb77d 100644 --- a/kwayland/PKGBUILD +++ b/kwayland/PKGBUILD @@ -10,9 +10,11 @@ url='http://www.kde.org' license=('LGPL') depends=('qt5-base') makedepends=('extra-cmake-modules') +groups=('plasma') +options=("debug") source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz") -options=('debug') -sha256sums=( $(getSum ${pkgname}) ) +#sha256sums=( $(getSum ${pkgname}) ) +sha256sums=(`grep ${pkgname}-$pkgver.tar.xz ../plasma.sums | cut -d " " -f1`) prepare() { mkdir -p build diff --git a/oxygen-kde4/PKGBUILD b/oxygen-kde4/PKGBUILD index d2429797a..890bb3b0a 100644 --- a/oxygen-kde4/PKGBUILD +++ b/oxygen-kde4/PKGBUILD @@ -5,7 +5,7 @@ source ../plasma.conf _pkgname=oxygen pkgname=oxygen-kde4 pkgver=${PVersion} -pkgrel=2 +pkgrel=1 pkgdesc='Artwork, styles and assets for the Oxygen visual style for the KDE4' arch=('x86_64') url='projects.kde.org/' diff --git a/plasma-desktop/PKGBUILD b/plasma-desktop/PKGBUILD index ffeb2d5f3..1c4a77d0e 100644 --- a/plasma-desktop/PKGBUILD +++ b/plasma-desktop/PKGBUILD @@ -9,16 +9,16 @@ arch=('x86_64') url='https://www.kde.org/workspaces/plasmadesktop/' license=('LGPL') depends=('qt5-graphicaleffects' 'powerdevil' 'polkit-kde-agent-frameworks' 'libcanberra' - 'kwin' 'kpeople' 'libusb-compat' 'libxkbfile' 'kmenuedit' 'systemsettings' 'ksysguard' 'breeze' 'krunner' + 'kwin' 'kpeople' 'libusb-compat' 'libxkbfile' 'kmenuedit' 'systemsettings' 'ksysguard' 'breeze' 'krunner' 'baloo' 'kfilemetadata' #sddm can be removed as a dependency in the future, only added here to automate the switch to Plasma 5 'sddm-kcm') -makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'baloo-kf5' 'xf86-input-synaptics' 'xorg-server-devel') +makedepends=('extra-cmake-modules' 'kdoctools' 'boost' 'xf86-input-synaptics' 'xorg-server-devel') optdepends=('plasma-nm: Network manager applet' 'xf86-input-synaptics: Manage touchpad') checkdepends=("cmake") provides=("kcm-touchpad-kf5=${pkgver}") replaces=('kde-workspace' 'kcm-touchpad-kf5<=5.2.0') -conflicts=('kde-workspace' 'kde-baseapps-kdepasswd' 'kcm-touchpad-kf5<=5.2.0') +conflicts=('kde-workspace' 'kcm-touchpad-kf5<=5.2.0') groups=('plasma') options=("debug") source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz") @@ -27,6 +27,9 @@ install=${pkgname}.install prepare() { mkdir -p build + + #sed -i 's/KF5Baloo "5.1.90"/KF5Baloo/g' ${pkgname}-${pkgver}/CMakeLists.txt + #sed -i 's/DBusAddons/DBusAddons Baloo/g' ${pkgname}-${pkgver}/CMakeLists.txt } build() { diff --git a/plasma-mediacenter/PKGBUILD b/plasma-mediacenter/PKGBUILD new file mode 100644 index 000000000..3d53dc63b --- /dev/null +++ b/plasma-mediacenter/PKGBUILD @@ -0,0 +1,29 @@ +source ../plasma.conf + +pkgname=plasma-mediacenter +pkgver=${PVersion} +pkgrel=1 +pkgdesc="A mediacenter user interface based on KDE Plasma components" +arch=(x86_64) +url="http://community.kde.org/Plasma/Plasma_Media_Center/" +license=(GPL3) +depends=(plasma-workspace baloo kfilemetadata) +makedepends=(extra-cmake-modules python3) +groups=('plasma') +options=("debug") +source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz") +sha256sums=( $(getSum ${pkgname}) ) + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake_kf5 ../${pkgname}-${pkgver} + make +} +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/plasma-pa/PKGBUILD b/plasma-pa/PKGBUILD new file mode 100644 index 000000000..493e8927d --- /dev/null +++ b/plasma-pa/PKGBUILD @@ -0,0 +1,29 @@ +source ../plasma.conf + +pkgname=plasma-pa +pkgver=${PVersion} +pkgrel=1 +pkgdesc='Plasma applet for audio volume management using PulseAudio' +arch=(x86_64) +url='https://projects.kde.org/plasma-pa' +license=(LGPL) +depends=(plasma-workspace pulseaudio) +makedepends=(extra-cmake-modules python3) +groups=('plasma') +options=("debug") +source=("${PServer}/${pkgver}/${pkgname}-${PSubVersion}.tar.xz") +sha256sums=( $(getSum ${pkgname}) ) + +prepare() { + mkdir -p build +} + +build() { + cd build + cmake_kf5 ../${pkgname}-${pkgver} + make +} +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/plasma.conf b/plasma.conf index 5f26b01aa..27167a439 100644 --- a/plasma.conf +++ b/plasma.conf @@ -3,10 +3,8 @@ PInstallPrefix="/usr" # download location PServer="http://download.kde.org/stable/plasma/" # Frameworks version -PVersion="5.3.2" -PSubVersion="5.3.2" -# why some package use framework version? -PAltSubVersion="5.9.2" +PVersion="5.3.95" +PSubVersion="5.3.95" # Build type; can be one of Debug,Release and RelWithDebInfo PBuildType="RelWithDebInfo" diff --git a/plasma.order b/plasma.order index 57a81faf8..2dc78ebbd 100644 --- a/plasma.order +++ b/plasma.order @@ -1,13 +1,24 @@ -#kfilemetadata5 -#baloo-kf5 -##bluez-qt +# +# Chakra GNU/Linux Buildscript Config file +# +# KDE Plasma +# +# These are the "package lists" +# +# The buildscript will build from the top to +# the bottom. Be aware that you must insert the +# packages in the right order to solve +# the dependencies correctly +# + +#bluez-qt bluedevil-kf5 polkit-kde-agent-frameworks kde-cli-tools libkscreen-kf5 -kio-extras kwrited kwayland +kwayland-integration kdecoration kwin breeze @@ -24,25 +35,27 @@ kinfocenter kmenuedit systemsettings kdeplasma-addons-kf5 -sddm +#sddm sddm-kcm plasma-desktop plasma-nm +plasma-pa +plasma-mediacenter kscreen-kf5 ksshaskpass plasma-workspace-wallpapers plasma-sdk kde-gtk-config-kf5 - -# Total files above: 36 > 35 come from KDE Plasma 5.2 tars + sddm (github) -# KDE Plasma 5.2 tars > 37 files > 34 files + kwin (dual version) + muon + sums +kgamma5 +kwallet-pam +user-manager # Notes: # don't build muon until we have akabei -# During 5.2 build these changes occured: -# kwin > available version 5.2.0.1 -# merged breeze + breeze4 packages -# merged oxygen + oxygen-kde4 packages -# moved oxygen-fonts from platform to desktop -# kcm-touchpad-kf5 was not built cause not upstream tar available (remained on 5.1.95) + + + + + + diff --git a/plasma.sums b/plasma.sums index ee97e77d5..e6ff9da14 100644 --- a/plasma.sums +++ b/plasma.sums @@ -1,36 +1,37 @@ -1ca97763c136d3b7762cdc04f6e76fb9d314ba38db8ad48778647590626e19e6 baloo-5.9.2.tar.xz -c8721922777f8de95880ebe1935bf2e69315e91ddb2f2b4ac32a5e92af23b55d bluedevil-5.3.2.tar.xz -90e625d20c2e19419fe782ffd1d556cf1f280386e6c474073406baf551bc892d bluez-qt-5.3.2.tar.xz -3e12fcd285c92466405efa053c27ed6266ba40e65c746349672d9b4f172bdc66 breeze-5.3.2.tar.xz -7dacbe8d90c5d2a966de80c42eb3370f08e9090d125732d9f70571e7603683a9 kde-cli-tools-5.3.2.tar.xz -fb3099994c907cbc863a92d7d5c9b3fb1723dedacc211fb91c2d138da4b351a4 kdecoration-5.3.2.tar.xz -55bc964dda26620bfe64731435f72a87dedd530d486d7c0dd856aeadd1f68467 kde-gtk-config-5.3.2.tar.xz -c46e0c6962a6fe055d160c177cf2843c50515c5bc60d7f460e2447adcd386322 kdeplasma-addons-5.3.2.tar.xz -0959a19591180216472c9c7845d180d2b16501b266c6ca10e438c745ca2e151c kfilemetadata-5.9.2.tar.xz -63f1c405d2aaf1e29339cb015e54ac49989e05e7357b239ba34170f8899ca4d9 khelpcenter-5.3.2.tar.xz -6a06e3fc62a4fdc349736a481873e5f205b86bb0dd3fbcf792a4c43af936ff38 khotkeys-5.3.2.tar.xz -79c6ac792c330142f66b1ab01f32e010aa44303bf4d8e3ba422fd02c704f18f1 kinfocenter-5.3.2.tar.xz -7cc90553fc6a003e776ee5417e437007cc97d37f774edc92e21bdf5a0710d7ed kio-extras-5.3.2.tar.xz -b199a0c8214bac0b6833ab2c0018daaecf49a1881fe5b34c540940940c94da8e kmenuedit-5.3.2.tar.xz -8d43e503b983f9b3dd4dc21662ad8f92f092ac81435a843ecbc5eab195cab695 kscreen-5.3.2.tar.xz -e78d5d0540f9a206d2da03b62f62ceb3a0511c3d0ed6eefceca7dd40820097ec ksshaskpass-5.3.2.tar.xz -073f431a035658935c82c831a13057fd615f5c7ab7b6f226cdd2ed0c637bc2ed ksysguard-5.3.2.tar.xz -916d1be1ba46ecff321b0dcb3031032955bef1fb538928955ab6ba95e11e13fd kwayland-5.3.2.tar.xz -7f77420455a1bb5887f586aa2a31eaeab919240757f47b1ca1c0ff849571575c kwin-5.3.2.tar.xz -41bdcbf600d8d3ec4c769c2f82bb2a6f05db0f11a15e35e32e5acb736f4e89c0 kwrited-5.3.2.tar.xz -c2b9c8219d1743cdb28fbf571a16fcc6b608b6800ac4e6f993a205e2bb25d2cc libkscreen-5.3.2.tar.xz -17a59b5b7d99ae940e1b0cdf4c64cc713482216b340bed4e6d540d4ceec9ed8c libksysguard-5.3.2.tar.xz -7c9604ef843f8507f6c56f872891064bb0b631d2180422f9797d1f788b8e96f2 milou-5.3.2.tar.xz -3f39df3061b0bdd7e24816ce09bafdafbee47f3fc73d306e6733bb1c3d494c30 muon-5.3.2.tar.xz -80e74901854d903feee8a2a43f1a0901763e8e06dc6ede4236c120fc8f45e1a7 oxygen-5.3.2.tar.xz -ca179061374a0d37f2ae445bd58b339be47dcdf11d349169d71a354ce972e874 oxygen-fonts-5.3.2.tar.xz -e16f878bd07cdbe46205eff6294f1b19cdebd021e1fa6d0720409d54ab050fa4 plasma-desktop-5.3.2.tar.xz -e69991e5a9770d799ef4a530d5792d212415246d10c0634a16f3a0e83cfc935a plasma-mediacenter-5.3.2.tar.xz -4f15c2284ba5d5642e45273beb9416b772d91ffb30e293f577641e9b8dd16c70 plasma-nm-5.3.2.tar.xz -5f68cf38adf0c8d03478b0e467c6a144a632d9d519101afa22f2bdeed5ea738f plasma-sdk-5.3.2.tar.xz -4165a547efc59dd42a15d24f21f722d88e4acfb6fb6d6a4db3c3d0ce54fa54c4 plasma-workspace-5.3.2.tar.xz -4a21809c01fe7a7c3e537b37ac6aedbd2cda1a3551ef44cd97de97dd88407cc0 plasma-workspace-wallpapers-5.3.2.tar.xz -d655ec153a8db423b62ab4a96e7c62c3a1ea6bc49d656100ed62013dda9b0b4e polkit-kde-agent-1-5.3.2.tar.xz -f34d92f343e7b0738af509d6d7f0bb0455df038d1c850838142adf8b53c4ceff powerdevil-5.3.2.tar.xz -cd46c8c9b7c638eeb36adcfb2a10304c4f71ed3bfa916882950f818c7b49f39e sddm-kcm-5.3.2.tar.xz -adabe7383d49249af0564319f83395a88d7fda2a19f9dcc21eca8eec6009f451 systemsettings-5.3.2.tar.xz +3ef8cd4cb168ef6d1a72cf183ba43e66e9da1be345e90d856e72d0b1ac230011 bluedevil-5.3.95.tar.xz +28f8e3c17dfc73ac485b7701ad828c5de6dc31ab05b4b666579b48c81906010a breeze-5.3.95.tar.xz +9969dfeec3935a673e2056594a58c2e14e735c1ad657620ebe3eab15a9145cf6 kde-cli-tools-5.3.95.tar.xz +9025cf7dc72755094c96c72e06985fee967b93d3ae12231855f8a57cfaf5b079 kdecoration-5.3.95.tar.xz +924763a70741841a8c5367e9771c780148fa7f419452c547f20a0adad272b28d kde-gtk-config-5.3.95.tar.xz +d09abd8d0c8a4d18e3c5e533904078a0ffb6fa77b063b5d05517fe1cef3167e6 kdeplasma-addons-5.3.95.tar.xz +988be2aac1136a040b7df6b14ff3830cb5120ba66ad6a491da689fd720ad37cf kgamma5-5.3.95.tar.xz +1bbb5091aabe028f137d9ad56510665b412f92ac4ebd91b4719ca42b3f060f50 khelpcenter-5.3.95.tar.xz +39ac263039a2ad2c11101f3bb657829eff46a5eaec7a62691643bd24432f10e5 khotkeys-5.3.95.tar.xz +acaecde182cc9bcd71b2ae20ccebb55bdbed656bd1c5b6971712ceda0c18f13a kinfocenter-5.3.95.tar.xz +d36998983e93538733e2f488eb2a3ae613a875179ea91e48a74cc91d6f74f3e8 kmenuedit-5.3.95.tar.xz +d46259a1d37126efbd022d5777fbb902e606d278df5fe83c74c294258bd2640f kscreen-5.3.95.tar.xz +908d6b60cc7c21cf3da4b5eabbe51a39dd0dd11c14492104c8948d54464b778b ksshaskpass-5.3.95.tar.xz +7b69905e17c108c8547d523b8ed4f09b60d7b42b9b23be75d7724741ea6933f8 ksysguard-5.3.95.tar.xz +e46e42ed7ca5fc11283f856a082b248af1b365ed9a12ba166d8b76b6b526b444 kwallet-pam-5.3.95.tar.xz +efd787061e7897d28ccdd92a932c583844ee1e0fbcf895882e040b295ba32992 kwayland-5.3.95.tar.xz +2cac139906a2499df3a339f686e794186d51e36b5990906572978c424c35a9fd kwayland-integration-5.3.95.tar.xz +956dca9e3e5d29b357707defb5984ecf4e023960d12286a0a815436fca708123 kwin-5.3.95.tar.xz +dfd5528059e23b33177659163e0bfc608a5c404d04889ad7831f861832d478a0 kwrited-5.3.95.tar.xz +aa6e559ea1b58ce25d2bbfd85570cf6aaf53813199594a3dbff99dfbbe84291f libkscreen-5.3.95.tar.xz +682d9acc9388b2cd6b22670aced954607084ffc5924c703b74f19aa8b8182ecd libksysguard-5.3.95.tar.xz +138aca05e08dc097ef52d7761b192ef628b5bf065c95613ebca86bc7cd7ab2ac milou-5.3.95.tar.xz +404d0c8ae329e32a99850fb0e35ebc0d0e33097478112aad3168b7bd45d4020e muon-5.3.95.tar.xz +173fadc8212de797e3f45556a6b3a05b9311363f234774a22d0f5ad095f4a96e oxygen-5.3.95.tar.xz +85eeac2c7911b7f3138d040149eb943daea877f0f2943d32e063ba67f8196c0e oxygen-fonts-5.3.95.tar.xz +b02fd351c0f88a5d66b0237ca56d6df6e5c6737b59c6bd5ca28b1c02898fe3bb plasma-desktop-5.3.95.tar.xz +5cca297dc1e7fa60a2eb2d41824c322d8d9f98cbe090f9c81d8d236d2c999b5a plasma-mediacenter-5.3.95.tar.xz +12b5f0c6881d87d55702b2a7ed592b14aa51f57f7c1185e387a94b09fcd19ce4 plasma-nm-5.3.95.tar.xz +1161991165a3dbb39451f4c8c8528e3c75c9187762e9278c96e5b47e2edbb915 plasma-pa-5.3.95.tar.xz +f5d0dd910ffac5e6988737892b9bd2b15aba1d08f78ace0097a02bb7117777ee plasma-sdk-5.3.95.tar.xz +80227f1f5bbf45ad71c397fc670eef3f7ae8dc888942a11a4799b5c661b8bd7c plasma-workspace-5.3.95.tar.xz +e58adcda8c4fb597a5972021233169e94213c87db0302006c9f6f619866e0968 plasma-workspace-wallpapers-5.3.95.tar.xz +c2fca3bdd756f365420bc2a974cdcd841712598f4d7c1adbf916289ef3c9623a polkit-kde-agent-1-5.3.95.tar.xz +78849ea26722d95ed3d15159470c2265a3945b10fdaa361565b4a14f339d94b1 powerdevil-5.3.95.tar.xz +3e653315a7bc72b63c5a50bc4465170bb93f5c20e088edcf22292597faa1b036 sddm-kcm-5.3.95.tar.xz +dfe1ffada733d9d1bb214f6a29114534fd2c44a8feeddc5452aad671e8d7c75a systemsettings-5.3.95.tar.xz +ca92aec52aa5db3de8416d41d6d2f41c1453605149d3ac3179aada663e341e7b user-manager-5.3.95.tar.xz diff --git a/sddm-kcm/PKGBUILD b/sddm-kcm/PKGBUILD index 7f19ce2c9..4c2ee572d 100644 --- a/sddm-kcm/PKGBUILD +++ b/sddm-kcm/PKGBUILD @@ -4,7 +4,7 @@ source ../plasma.conf pkgname=sddm-kcm epoch=1 pkgver=${PVersion} -pkgrel=2 +pkgrel=1 pkgdesc="SDDM configuration module for KDE" arch=('x86_64') url='https://projects.kde.org/projects/kde/workspace/sddm-kcm' diff --git a/sddm/PKGBUILD b/sddm/PKGBUILD index bfc47e1bb..991b88f59 100644 --- a/sddm/PKGBUILD +++ b/sddm/PKGBUILD @@ -2,7 +2,7 @@ pkgname=sddm pkgver=0.11.0 -pkgrel=6 +pkgrel=1 pkgdesc='QML based X11 display manager' arch=('x86_64') url='http://github.com/sddm/sddm'