Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9843 from Rmys/master

Browse Source 
plasma-5.23.2
This commit is contained in:
Rmys
2021-10-27 20:51:21 +03:00
committed by GitHub
parent 0547c329ca 451915c263
commit 4af133bdac
6 changed files with 143 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/plasma/kinfocenter/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>app:console</IsA>
<Summary>KDE5 info center</Summary>
<Description>KDE5 Utility that provides information about a computer system. </Description>
<Archive sha1sum="91f6d0d22fc5f7ac8a153fd1b58f42a11ae1fb38" type="tarxz">mirrors://kde/stable/plasma/5.23.1/kinfocenter-5.23.1.tar.xz</Archive>
<Archive sha1sum="feafafe7eeaf7e3c63c5943331fc6ade77084150" type="tarxz">mirrors://kde/stable/plasma/5.23.2/kinfocenter-5.23.2.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency versionFrom="5.7.1">qt5-declarative-devel</Dependency>
@@ -110,6 +110,13 @@
</Package>
<History>
<Update release="53">
<Date>2021-10-27</Date>
<Version>5.23.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="52">
<Date>2021-10-19</Date>
<Version>5.23.1</Version>
desktop/kde/plasma/kmenuedit/pspec.xml
+8 -1
View File
@@ -13,7 +13,7 @@
<IsA>app:console</IsA>
<Summary>Provides the interface and basic tools for the KDE workspace</Summary>
<Description>Provides the interface and basic tools for the KDE workspace</Description>
<Archive sha1sum="96c380ed1afc9e2566e003161f93585b67f1a29d" type="tarxz">mirrors://kde/stable/plasma/5.23.1/kmenuedit-5.23.1.tar.xz</Archive>
<Archive sha1sum="fe003584ea2a5e2ab33c31e4d0ab882e83dd487f" type="tarxz">mirrors://kde/stable/plasma/5.23.2/kmenuedit-5.23.2.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency>kdoctools-devel</Dependency>
@@ -76,6 +76,13 @@
</Package>
<History>
<Update release="53">
<Date>2021-10-27</Date>
<Version>5.23.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="52">
<Date>2021-10-19</Date>
<Version>5.23.1</Version>
desktop/kde/plasma/plasma-browser-integration/pspec.xml
+9 -2
View File
@@ -12,7 +12,7 @@
<IsA>app</IsA>
<Summary>Plasma browser integration</Summary>
<Description>Components necessary to integrate browsers into the Plasma Desktop.</Description>
<Archive sha1sum="2f811ab451a052b9cac4ca59d36bc5a9448881c0" type="tarxz">https://download.kde.org/stable/plasma/5.23.1/plasma-browser-integration-5.23.1.tar.xz</Archive>
<Archive sha1sum="46ebd1a3b7d334ccd6a977f3d04a693a544ebd7b" type="tarxz">https://download.kde.org/stable/plasma/5.23.2/plasma-browser-integration-5.23.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>extra-cmake-modules</Dependency>
@@ -30,7 +30,7 @@
<Dependency>knotifications-devel</Dependency>
<Dependency>kfilemetadata-devel</Dependency>
<Dependency>kitemmodels-devel</Dependency>
<Dependency versionFrom="5.23.1">plasma-workspace-devel</Dependency>
<Dependency versionFrom="5.23.2">plasma-workspace-devel</Dependency>
<Dependency>qt5-quickcontrols2-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
</BuildDependencies>
@@ -64,6 +64,13 @@
</Package>
<History>
<Update release="19">
<Date>2021-10-27</Date>
<Version>5.23.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="18">
<Date>2021-10-19</Date>
<Version>5.23.1</Version>
desktop/kde/plasma/plasma-desktop/files/af9aeecc.patch
+95
View File
@@ -0,0 +1,95 @@
From af9aeeccfa2a6efb16e4c5904768c55f97c022ff Mon Sep 17 00:00:00 2001
From: Noah Davis <noahadvs@gmail.com>
Date: Wed, 20 Oct 2021 23:24:15 -0400
Subject: [PATCH] kickoff: Fix drag and drop causing delegates to reset to a 0
X position and overlap
BUG: 443975
(cherry picked from commit 70860fe8649b56b18301c90bc3c87b9406cc515d)
---
.../package/contents/ui/KickoffGridView.qml | 2 +-
.../contents/ui/KickoffItemDelegate.qml | 19 +++----------------
.../package/contents/ui/KickoffListView.qml | 2 +-
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/applets/kickoff/package/contents/ui/KickoffGridView.qml b/applets/kickoff/package/contents/ui/KickoffGridView.qml
index 269469d66..4367fabf2 100644
--- a/applets/kickoff/package/contents/ui/KickoffGridView.qml
+++ b/applets/kickoff/package/contents/ui/KickoffGridView.qml
@@ -115,7 +115,7 @@ EmptyPage {
highlight: PlasmaCore.FrameSvgItem {
// The default Z value for delegates is 1. The default Z value for the section delegate is 2.
// The highlight gets a value of 3 while the drag is active and then goes back to the default value of 0.
- z: root.currentItem && root.currentItem.dragActive ?
+ z: root.currentItem && root.currentItem.Drag.active ?
3 : 0
opacity: view.activeFocus
|| (KickoffSingleton.contentArea === root
diff --git a/applets/kickoff/package/contents/ui/KickoffItemDelegate.qml b/applets/kickoff/package/contents/ui/KickoffItemDelegate.qml
index e249108fa..1353f5946 100644
--- a/applets/kickoff/package/contents/ui/KickoffItemDelegate.qml
+++ b/applets/kickoff/package/contents/ui/KickoffItemDelegate.qml
@@ -49,9 +49,6 @@ T.ItemDelegate {
property bool isSearchResult: false
readonly property bool menuClosed: ActionMenu.menu.status == 3 // corresponds to DialogStatus.Closed
- property point dragStartPosition: Qt.point(x,y)
- property int dragStartIndex: index
- readonly property alias dragActive: mouseArea.drag.active
property bool dragEnabled: enabled && !root.isCategory && !root.view.interactive
&& plasmoid.immutability !== PlasmaCore.Types.SystemImmutable
@@ -84,7 +81,7 @@ T.ItemDelegate {
// The default Z value for delegates is 1. The default Z value for the section delegate is 2.
// The highlight gets a value of 3 while the drag is active and then goes back to the default value of 0.
- z: dragActive ? 4 : 1
+ z: Drag.active ? 4 : 1
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
implicitContentWidth + leftPadding + rightPadding)
@@ -202,12 +199,9 @@ T.ItemDelegate {
acceptedButtons: Qt.LeftButton | Qt.RightButton
drag {
axis: Drag.XAndYAxis
- target: root.dragEnabled ? root : undefined
- minimumX: 0
- maximumX: root.view ? Math.min(root.view.contentWidth - root.width, root.view.availableWidth - root.width) : root.x
- minimumY: 0
- maximumY: root.view ? Math.min(root.view.contentHeight - root.height, root.view.availableHeight - root.height) : root.y
+ target: root.dragEnabled ? dragItem : undefined
}
+ Item { id: dragItem }
// Using onPositionChanged instead of onEntered to prevent changing
// categories while scrolling with the mouse wheel.
onPositionChanged: {
@@ -279,11 +273,4 @@ T.ItemDelegate {
indicator = null
}
}
- onDragActiveChanged: if (dragActive) {
- dragStartPosition = Qt.point(x,y)
- dragStartIndex = index
- } else if (dragStartIndex === index) {
- x = dragStartPosition.x
- y = dragStartPosition.y
- }
}
diff --git a/applets/kickoff/package/contents/ui/KickoffListView.qml b/applets/kickoff/package/contents/ui/KickoffListView.qml
index 9dffafb41..9a0c3c233 100644
--- a/applets/kickoff/package/contents/ui/KickoffListView.qml
+++ b/applets/kickoff/package/contents/ui/KickoffListView.qml
@@ -117,7 +117,7 @@ EmptyPage {
highlight: PlasmaCore.FrameSvgItem {
// The default Z value for delegates is 1. The default Z value for the section delegate is 2.
// The highlight gets a value of 3 while the drag is active and then goes back to the default value of 0.
- z: root.currentItem && root.currentItem.dragActive ?
+ z: root.currentItem && root.currentItem.Drag.active ?
3 : 0
opacity: view.activeFocus
|| (KickoffSingleton.contentArea === root
--
GitLab
desktop/kde/plasma/plasma-desktop/pspec.xml
+15 -8
View File
@@ -13,11 +13,11 @@
<IsA>app:console</IsA>
<Summary>KDE5 plasma workspace</Summary>
<Description>This package contains the basic packages for a Plasma workspace.</Description>
<Archive sha1sum="a06d7f89a6c027772392c68b172d765439d0b35c" type="tarxz">mirrors://kde/stable/plasma/5.23.1/plasma-desktop-5.23.1.tar.xz</Archive>
<Archive sha1sum="341a812d33248e6c28ece159828c10da4f2ee639" type="tarxz">mirrors://kde/stable/plasma/5.23.2/plasma-desktop-5.23.2.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.7.1">qt5-base-devel</Dependency>
<Dependency>boost-devel</Dependency>
<Dependency versionFrom="5.23.1">breeze-style</Dependency>
<Dependency versionFrom="5.23.2">breeze-style</Dependency>
<Dependency>kdoctools-devel</Dependency>
<Dependency>kactivities-stats-devel</Dependency>
<Dependency>kio-devel</Dependency>
@@ -30,7 +30,7 @@
<Dependency>kscreenlocker-devel</Dependency>
<Dependency>kinit-devel</Dependency>
<Dependency>kunitconversion-devel</Dependency>
<Dependency versionFrom="5.23.1">kwin-devel</Dependency>
<Dependency versionFrom="5.23.2">kwin-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libXft-devel</Dependency>
<Dependency>libxkbfile-devel</Dependency>
@@ -45,9 +45,9 @@
<Dependency>xorg-input-synaptics-devel</Dependency>
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>fontconfig-devel</Dependency>
<Dependency versionFrom="5.23.1">plasma-workspace-devel</Dependency>
<Dependency versionFrom="5.23.2">plasma-workspace-devel</Dependency>
<Dependency>plasma-framework-devel</Dependency>
<!-- <Dependency versionFrom="5.23.1">system-settings-devel</Dependency> -->
<!-- <Dependency versionFrom="5.23.2">system-settings-devel</Dependency> -->
<Dependency>xorg-app-devel</Dependency>
<Dependency>xkeyboard-config</Dependency>
<Dependency>baloo-devel</Dependency>
@@ -95,7 +95,7 @@
<Dependency>libXcursor-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">ac9ef2b6.patch</Patch> -->
<Patch level="1">af9aeecc.patch</Patch>
</Patches>
</Source>
@@ -152,7 +152,7 @@
<Dependency>libXi</Dependency>
<Dependency>libxkbfile</Dependency>
<Dependency>plasma-framework</Dependency>
<Dependency versionFrom="5.23.1">plasma-workspace</Dependency>
<Dependency versionFrom="5.23.2">plasma-workspace</Dependency>
<Dependency>libcanberra</Dependency>
<Dependency>pulseaudio-libs</Dependency>
<Dependency>xkeyboard-config</Dependency>
@@ -164,7 +164,7 @@
<Dependency>solid</Dependency>
<Dependency>sonnet</Dependency>
<Dependency versionFrom="5.7.1">qt5-sql-sqlite</Dependency>
<Dependency versionFrom="5.23.1">system-settings</Dependency>
<Dependency versionFrom="5.23.2">system-settings</Dependency>
<Dependency>ibus</Dependency>
<Dependency>glib2</Dependency>
<Dependency>scim-libs</Dependency>
@@ -194,6 +194,13 @@
</Package>
<History>
<Update release="55">
<Date>2021-10-27</Date>
<Version>5.23.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="54">
<Date>2021-10-19</Date>
<Version>5.23.1</Version>
desktop/kde/plasma/plasma-vault/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Plasma applet and services for creating encrypted vaults</Summary>
<Description>Şifreli kasaları oluşturmak için kullanılan plazma uygulaması ve hizmetleri</Description>
<Archive sha1sum="08f310ef3f29c70ec9e22fdf62f4f63ede041eed" type="tarxz">https://download.kde.org/stable/plasma/5.23.1/plasma-vault-5.23.1.tar.xz</Archive>
<Archive sha1sum="81ef590c490aa27a04d8a3a88f22c3aa8bda42c7" type="tarxz">https://download.kde.org/stable/plasma/5.23.2/plasma-vault-5.23.2.tar.xz</Archive>
<BuildDependencies>
<Dependency>extra-cmake-modules</Dependency>
<Dependency>qt5-base-devel</Dependency>
@@ -65,6 +65,13 @@
</Files>
</Package>
<History>
<Update release="42">
<Date>2021-10-27</Date>
<Version>5.23.2</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="41">
<Date>2021-10-19</Date>
<Version>5.23.1</Version>