Commit 4494f5c8 authored by AlmAck's avatar AlmAck

frameworks 5.21.0

parent 738fc7f4
# the install prefix
KFInstallPrefix="/usr"
# download location
KFServer="http://download.kde.org/stable/frameworks/5.20"
KFECMVersion=5.20.0
KFServer="http://download.kde.org/stable/frameworks/5.21.0"
KFECMVersion=5.21.0
# Frameworks version
KFVersion="5.20.0"
KFVersion="5.21.0"
# Build type; can be one of Debug,Release and RelWithDebInfo
KFBuildType="RelWithDebInfo"
......
......@@ -15,42 +15,43 @@
#
#_build_platform_kf5="
extra-cmake-modules
kapidox
attica-qt5
ki18n
kconfig
kcoreaddons
kwindowsystem
kcrash
kdbusaddons
karchive
kdoctools
kservice
kauth
kcodecs
kpackage
kguiaddons
kwidgetsaddons
kconfigwidgets
kitemviews
kiconthemes
kcompletion
sonnet
ktextwidgets
kglobalaccel
kxmlgui
kbookmarks
knotifications
kpeople
kwallet
solid
kjobwidgets
kio
kxmlrpcclient
kdeclarative
kcmutils
kactivities-frameworks
#extra-cmake-modules
#kapidox
#attica-qt5
#ki18n
#kconfig
#kcoreaddons
#kwindowsystem
#kcrash
#kdbusaddons
#karchive
#kdoctools
#kservice
#kauth
#kcodecs
#kpackage
#kguiaddons
#kwidgetsaddons
#kconfigwidgets
#kitemviews
#kiconthemes
#kcompletion
#sonnet
#ktextwidgets
#kglobalaccel
#kxmlgui
#kbookmarks
#knotifications
#kpeople
#kwallet
#solid
#kjobwidgets
#kio
#kxmlrpcclient
#kdeclarative
#kcmutils
kactivities
kactivities-stats
kinit
kded
kparts
......
This diff is collapsed.
source ../frameworks.conf
pkgname=kactivities-stats
pkgver=${KFVersion}
pkgrel=1
arch=('x86_64')
pkgdesc="A library for accessing the usage data collected by the activities system"
url='https://projects.kde.org/projects/frameworks/kactivities-stats'
license=('LGPL')
depends=('kactivities')
makedepends=("extra-cmake-modules>=${KFECMVersion}" 'boost' 'python3')
options=("debug")
groups=('kf5')
source=("$KFServer/${pkgname}-${pkgver}.tar.xz")
sha256sums=( $(getSum ${pkgname} | head -n 2) )
prepare() {
mkdir -p build
}
build() {
cd build
cmake_kf5 ../${pkgname}-${pkgver} \
-DPYTHON_EXECUTABLE=/usr/bin/python3
make
}
package() {
cd build
make DESTDIR="${pkgdir}" install
}
......@@ -2,7 +2,7 @@ source ../frameworks.conf
pkgname=kactivities
pkgver=${KFVersion}
pkgrel=2
pkgrel=1
arch=('x86_64')
pkgdesc="Core components for the KDE's Activities"
url='https://projects.kde.org/projects/frameworks/kactivities'
......@@ -15,7 +15,7 @@ conflicts=('kactivities4' 'kactivities-frameworks')
options=("debug")
groups=('kf5')
source=("$KFServer/${pkgname}-${pkgver}.tar.xz")
sha256sums=( $(getSum ${pkgname}) )
sha256sums=( $(getSum ${pkgname} | head -n 1) )
prepare() {
mkdir -p build
......
diff --git a/src/service/ksmserver/KSMServer.cpp b/src/service/ksmserver/KSMServer.cpp
index b5e1467..695f642 100644
--- a/src/service/ksmserver/KSMServer.cpp
+++ b/src/service/ksmserver/KSMServer.cpp
@@ -69,7 +69,7 @@ void KSMServer::Private::serviceOwnerChanged(const QString &service,
if (KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(KWIN_SERVICE)) {
// Creating the new dbus interface
- kwin = new QDBusInterface(KWIN_SERVICE, QStringLiteral("/KWin"), QStringLiteral("org.kde.kwin"));
+ kwin = new QDBusInterface(KWIN_SERVICE, QStringLiteral("/KWin"), QStringLiteral("org.kde.KWin"));
// If the service is valid, initialize it
// otherwise delete the object
@@ -178,6 +178,8 @@ void KSMServer::Private::startCallFinished(QDBusPendingCallWatcher *call)
if (!retval) {
subSessionSendEvent(KSMServer::Stopped);
+ } else {
+ subSessionSendEvent(KSMServer::Started);
}
}
@@ -198,6 +200,8 @@ void KSMServer::Private::stopCallFinished(QDBusPendingCallWatcher *call)
if (!retval) {
subSessionSendEvent(KSMServer::FailedToStop);
+ } else {
+ subSessionSendEvent(KSMServer::Stopped);
}
}
@@ -214,18 +218,3 @@ void KSMServer::Private::subSessionSendEvent(int event)
processingActivity.clear();
}
-
-void KSMServer::Private::subSessionOpened()
-{
- subSessionSendEvent(KSMServer::Started);
-}
-
-void KSMServer::Private::subSessionClosed()
-{
- subSessionSendEvent(KSMServer::Stopped);
-}
-
-void KSMServer::Private::subSessionCloseCanceled()
-{
- subSessionSendEvent(KSMServer::FailedToStop);
-}
diff --git a/src/service/ksmserver/KSMServer_p.h b/src/service/ksmserver/KSMServer_p.h
index c0f5598..86153d8 100644
--- a/src/service/ksmserver/KSMServer_p.h
+++ b/src/service/ksmserver/KSMServer_p.h
@@ -50,9 +50,6 @@ private Q_SLOTS:
void startCallFinished(QDBusPendingCallWatcher *watcher);
void stopCallFinished(QDBusPendingCallWatcher *watcher);
- void subSessionOpened();
- void subSessionClosed();
- void subSessionCloseCanceled();
void subSessionSendEvent(int event);
private:
......@@ -4,7 +4,7 @@ source ../frameworks.conf
pkgname=ki18n
pkgver=${KFVersion}
pkgrel=2
pkgrel=1
pkgdesc='A get-text based translation framework'
arch=('x86_64')
url='https://projects.kde.org/projects/frameworks/ki18n'
......
......@@ -4,7 +4,7 @@ source ../frameworks.conf
pkgname=kimageformats
pkgver=${KFVersion}
pkgrel=2
pkgrel=1
pkgdesc='Image format plugins for Qt5'
arch=('x86_64')
url='https://projects.kde.org/projects/frameworks/kimageformats'
......
From a5f62007c294220c13bb080287035aeab77ae640 Mon Sep 17 00:00:00 2001
From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Thu, 17 Mar 2016 10:28:09 +0100
Subject: [PATCH] Fix crash in rename dialog
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
ResizePanels must only be called in case of overwrite, all other cases violate
the preconditions.
BUG: 360488
---
src/widgets/renamedialog.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
index 2d456c7..cb3c0fb 100644
--- a/src/widgets/renamedialog.cpp
+++ b/src/widgets/renamedialog.cpp
@@ -105,6 +105,8 @@ public:
m_destPendingPreview = false;
m_srcPreview = 0;
m_destPreview = 0;
+ m_srcArea = Q_NULLPTR;
+ m_destArea = Q_NULLPTR;
}
void setRenameBoxText(const QString &fileName)
@@ -385,7 +387,9 @@ RenameDialog::RenameDialog(QWidget *parent, const QString &_caption,
#if 1 // without kfilemetadata
// don't wait for kfilemetadata, but wait until the layouting is done
- QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection);
+ if (_options & RenameDialog_Overwrite) {
+ QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection);
+ }
#endif
}
@@ -584,6 +588,11 @@ void RenameDialog::showDestPreview(const KFileItem &fileitem, const QPixmap &pix
void RenameDialog::resizePanels()
{
+ Q_ASSERT(d->m_srcArea != Q_NULLPTR);
+ Q_ASSERT(d->m_destArea != Q_NULLPTR);
+ Q_ASSERT(d->m_srcPreview != Q_NULLPTR);
+ Q_ASSERT(d->m_destPreview != Q_NULLPTR);
+
// using QDesktopWidget geometry as Kephal isn't accessible here in kdelibs
const QSize screenSize = QApplication::desktop()->availableGeometry(this).size();
QSize halfSize = d->m_srcArea->widget()->sizeHint().expandedTo(d->m_destArea->widget()->sizeHint());
--
2.7.3
......@@ -3,7 +3,7 @@ source ../frameworks.conf
pkgname=kio
pkgver=${KFVersion}
pkgrel=3
pkgrel=1
pkgdesc='Resource and network access abstraction'
arch=('x86_64')
url='https://projects.kde.org/projects/frameworks/kio'
......@@ -15,17 +15,13 @@ checkdepends=('xorg-server-xvfb' 'openbox')
groups=('kf5')
install=kio.install
options=("debug")
source=("${KFServer}/${pkgname}-${pkgver}.tar.xz"
'0001-Fix-crash-in-rename-dialog.patch')
sha256sums=( $(getSum ${pkgname})
'1d2f48f859521f3ded1c0fa1211fccea22a52df41ac253e40c295569d534047c')
source=("${KFServer}/${pkgname}-${pkgver}.tar.xz")
sha256sums=( $(getSum ${pkgname}) )
prepare() {
mkdir -p build
cd ${srcdir}/${pkgname}-${pkgver}
# Bug 360488 - dolphin with >=kde-frameworks-5.20 crashes when copy+paste file in same directory
patch -p1 -i ${srcdir}/0001-Fix-crash-in-rename-dialog.patch
}
build() {
......
......@@ -9,7 +9,7 @@ arch=('x86_64')
url='https://www.kde.org/workspaces/plasmadesktop/'
license=('LGPL')
depends=('qt5-graphicaleffects' 'powerdevil' 'polkit-kde-agent' 'libcanberra'
'kwin' 'kpeople' 'libusb-compat' 'libxkbfile' 'kmenuedit' 'systemsettings' 'ksysguard' 'breeze' 'krunner' 'baloo' 'kfilemetadata' 'graphite'
'kwin' 'kpeople' 'libusb-compat' 'libxkbfile' 'kmenuedit' 'systemsettings' 'ksysguard' 'breeze' 'krunner' 'baloo' 'kfilemetadata' 'graphite' 'kactivities-stats'
#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' 'xf86-input-synaptics' 'xorg-server-devel' 'xf86-input-evdev')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment