diff --git a/0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch b/0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch deleted file mode 100644 index 7142141..0000000 --- a/0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch +++ /dev/null @@ -1,63 +0,0 @@ -From e4c083449aee849cf316f9bd18b06e2d37684608 Mon Sep 17 00:00:00 2001 -From: Bhushan Shah -Date: Thu, 26 Mar 2015 21:20:11 +0530 -Subject: [PATCH 1/1] Fix one pixel gap between screenedge and right placed - vertical panel - -Appearantly right() / bottomRight() / topRight() returns values with 1 -pixel x off for historical reasons and hence 1px gap. This causes the -autohide panel not hiding automatically. - -BUG: 339323 -BUG: 340549 -FIXED-IN: 5.3 -REVIEW: 123136 -(cherry picked from commit 975e5009c176eb378daa5c8f74cd4cffb64ff459) ---- - shell/panelview.cpp | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/shell/panelview.cpp b/shell/panelview.cpp -index 48687ba5c2e8d41722fe3be1d078319019cb4d0b..d934da1aeb0c13da0ec25d55e32528635bd135ad 100644 ---- a/shell/panelview.cpp -+++ b/shell/panelview.cpp -@@ -426,7 +426,7 @@ QRect PanelView::geometryByDistance(int distance) const - position = QPoint(QPoint(s->geometry().center().x(), s->geometry().top()) + QPoint(m_offset - size().width()/2, distance)); - break; - case Qt::AlignRight: -- position = QPoint(s->geometry().topRight() - QPoint(m_offset + size().width(), distance)); -+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y()) - QPoint(m_offset + size().width(), distance)); - break; - case Qt::AlignLeft: - default: -@@ -440,7 +440,7 @@ QRect PanelView::geometryByDistance(int distance) const - position = QPoint(QPoint(s->geometry().left(), s->geometry().center().y()) + QPoint(distance, m_offset - size().height()/2)); - break; - case Qt::AlignRight: -- position = QPoint(s->geometry().bottomLeft() - QPoint(distance, m_offset + size().height())); -+ position = QPoint(QPoint(s->geometry().left(), s->geometry().y() + s->geometry().height()) - QPoint(distance, m_offset + size().height())); - break; - case Qt::AlignLeft: - default: -@@ -451,14 +451,15 @@ QRect PanelView::geometryByDistance(int distance) const - case Plasma::Types::RightEdge: - switch (m_alignment) { - case Qt::AlignCenter: -- position = QPoint(QPoint(s->geometry().right(), s->geometry().center().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset - size().height()/2)); -+ // Never use rect.right(); for historical reasons it returns left() + width() - 1; see http://doc.qt.io/qt-5/qrect.html#right -+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().center().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset - size().height()/2)); - break; - case Qt::AlignRight: -- position = QPoint(s->geometry().bottomRight() - QPoint(thickness() + distance, 0) - QPoint(0, m_offset + size().height())); -+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y() + s->geometry().height()) - QPoint(thickness() + distance, 0) - QPoint(0, m_offset + size().height())); - break; - case Qt::AlignLeft: - default: -- position = QPoint(s->geometry().topRight() - QPoint(thickness() + distance, 0) + QPoint(0, m_offset)); -+ position = QPoint(QPoint(s->geometry().x() + s->geometry().width(), s->geometry().y()) - QPoint(thickness() + distance, 0) + QPoint(0, m_offset)); - } - break; - --- -2.3.3 - diff --git a/0001-Workaround-the-lockscreen-password-field-focus-issue.patch b/0001-Workaround-the-lockscreen-password-field-focus-issue.patch deleted file mode 100644 index 6ab4272..0000000 --- a/0001-Workaround-the-lockscreen-password-field-focus-issue.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 24f24e03793c8214a5d1f3414a5aeb48eccef4f4 Mon Sep 17 00:00:00 2001 -From: Bhushan Shah -Date: Wed, 25 Mar 2015 21:25:22 +0530 -Subject: [PATCH 1/1] Workaround the lockscreen password field focus issue - -Fixes bug 344823 -Backport of a476e1b6bf6f683bd74000bb30076868c9f92371 in 5.2 - -CCMAIL: release-team@kde.org ---- - lookandfeel/contents/lockscreen/LockScreen.qml | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml -index 8b013220eeec8402b9ce40466a32009a448155bb..ab554bd8a072688957cad24301b65d38b6383e9e 100644 ---- a/lookandfeel/contents/lockscreen/LockScreen.qml -+++ b/lookandfeel/contents/lockscreen/LockScreen.qml -@@ -156,6 +156,14 @@ Image { - enabled: !authenticator.graceLocked - onAccepted: unlockFunction() - focus: true -+ //HACK: Similar hack is needed in sddm loginscreen -+ //TODO: investigate -+ Timer { -+ interval: 200 -+ running: true -+ repeat: false -+ onTriggered: passwordInput.forceActiveFocus() -+ } - visible: block.mainItem.model.get(block.mainItem.selectedIndex)["showPassword"] - onVisibleChanged: { - if (visible) { --- -2.3.3 - diff --git a/plasma-workspace-5.2.2.tar.xz b/plasma-workspace-5.2.2.tar.xz deleted file mode 100644 index c60bb6d..0000000 --- a/plasma-workspace-5.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b174136ab7e5ec7190d5ad872e7334245b2e59c2a93e5f53666d155744a90572 -size 6722008 diff --git a/plasma-workspace-5.2.95.tar.xz b/plasma-workspace-5.2.95.tar.xz new file mode 100644 index 0000000..3759ad1 --- /dev/null +++ b/plasma-workspace-5.2.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ffb026981334762a12e1d5c209d85a6dd9090896a2775ffc3874197d7003ee0 +size 6839724 diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 1b866c4..5795a9f 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -16,8 +16,9 @@ # +%bcond_without lang Name: plasma5-workspace -Version: 5.2.2 +Version: 5.2.95 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0+ @@ -32,30 +33,28 @@ Patch0: 0001-Rename-qdbus-in-startkde.patch Patch1: create_kdehome.patch # PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch -# PATCHES 100-1000 and above are from upstream 5.2 branch -Patch100: 0001-Workaround-the-lockscreen-password-field-focus-issue.patch -# PATCHES 1000 and above are from upstream master/5.3 branch -Patch1000: 0001-Fix-one-pixel-gap-between-screenedge-and-right-place.patch +# PATCHES 100-200 and above are from upstream 5.3 branch +# PATCHES 201-300 and above are from upstream master/5.4 branch BuildRequires: alsa-devel BuildRequires: baloo5-devel >= %{version} -BuildRequires: kactivities5-devel >= 5.6.0 -BuildRequires: kcmutils-devel >= 5.6.0 -BuildRequires: kcoreaddons-devel >= 5.6.0 -BuildRequires: kcrash-devel >= 5.6.0 -BuildRequires: kdeclarative-devel >= 5.6.0 -BuildRequires: kdelibs4support-devel >= 5.6.0 -BuildRequires: kdesu-devel >= 5.6.0 -BuildRequires: kdewebkit-devel >= 5.6.0 -BuildRequires: kdoctools-devel >= 5.6.0 +BuildRequires: kactivities5-devel >= 5.8.0 +BuildRequires: kcmutils-devel >= 5.8.0 +BuildRequires: kcoreaddons-devel >= 5.8.0 +BuildRequires: kcrash-devel >= 5.8.0 +BuildRequires: kdeclarative-devel >= 5.8.0 +BuildRequires: kdelibs4support-devel >= 5.8.0 +BuildRequires: kdesu-devel >= 5.8.0 +BuildRequires: kdewebkit-devel >= 5.8.0 +BuildRequires: kdoctools-devel >= 5.8.0 BuildRequires: kf5-filesystem BuildRequires: kglobalaccel-devel >= 5.7.0 -BuildRequires: kidletime-devel >= 5.6.0 -BuildRequires: kjsembed-devel >= 5.6.0 -BuildRequires: knewstuff-devel >= 5.6.0 -BuildRequires: knotifyconfig-devel >= 5.6.0 -BuildRequires: krunner-devel >= 5.6.0 -BuildRequires: ktexteditor-devel >= 5.6.0 -BuildRequires: kwallet-framework-devel >= 5.6.0 +BuildRequires: kidletime-devel >= 5.8.0 +BuildRequires: kjsembed-devel >= 5.8.0 +BuildRequires: knewstuff-devel >= 5.8.0 +BuildRequires: knotifyconfig-devel >= 5.8.0 +BuildRequires: krunner-devel >= 5.8.0 +BuildRequires: ktexteditor-devel >= 5.8.0 +BuildRequires: kwallet-framework-devel >= 5.8.0 BuildRequires: kwayland-devel >= %{version} BuildRequires: kwin5-devel >= %{version} BuildRequires: libkscreen2-devel >= %{version} @@ -63,20 +62,20 @@ BuildRequires: libksysguard5-devel >= %{version} BuildRequires: libxcb-devel BuildRequires: pam-devel BuildRequires: phonon4qt5-devel -BuildRequires: plasma-framework-devel >= 5.6.0 -BuildRequires: solid-devel >= 5.6.0 +BuildRequires: plasma-framework-devel >= 5.8.0 +BuildRequires: solid-devel >= 5.8.0 BuildRequires: update-desktop-files BuildRequires: wayland-devel >= 1.3.0 BuildRequires: xz -BuildRequires: pkgconfig(Qt5Concurrent) >= 5.3.0 -BuildRequires: pkgconfig(Qt5DBus) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Qml) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Quick) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Script) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Sql) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.3.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.3.0 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.3.0 +BuildRequires: pkgconfig(Qt5Concurrent) >= 5.4.0 +BuildRequires: pkgconfig(Qt5DBus) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Qml) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Quick) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Script) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Sql) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 +BuildRequires: pkgconfig(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(libqalculate) BuildRequires: pkgconfig(sm) @@ -96,7 +95,7 @@ Requires: kded Requires: kdelibs4support Requires: kinit Requires: kwin5 >= %{version} -Requires: libqt5-qttools >= 5.3.0 +Requires: libqt5-qttools >= 5.4.0 # contains default style, cursors, etc Requires: breeze >= %{version} # needed by krunner @@ -187,8 +186,6 @@ workspace. Development files. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch100 -p1 -%patch1000 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 @@ -200,8 +197,6 @@ workspace. Development files. %{buildroot}/usr/bin/installdbgsymbols.sh # we have a separate package for Plasma5 session rm -rfv %{buildroot}%{_kf5_sharedir}/xsessions - # as the name says, this is private library - rm -rfv %{buildroot}%{_kf5_libdir}/libKF5XmlRpcClientPrivate.so %post -p /sbin/ldconfig @@ -211,10 +206,6 @@ workspace. Development files. %postun libs -p /sbin/ldconfig -%post -n drkonqi5 -p /sbin/ldconfig - -%postun -n drkonqi5 -p /sbin/ldconfig - %files libs %defattr(-,root,root) %doc COPYING* @@ -283,7 +274,6 @@ workspace. Development files. %dir %{_kf5_libdir}/libexec %{_kf5_libdir}/libexec/drkonqi %{_kf5_sharedir}/drkonqi/ -%{_kf5_libdir}/libKF5XmlRpcClientPrivate.so.* %files branding-upstream %defattr(-,root,root)