summaryrefslogtreecommitdiffstats
path: root/source/kde
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde')
-rw-r--r--source/kde/kde/build/alkimia2
-rw-r--r--source/kde/kde/build/plasma-workspace2
-rw-r--r--source/kde/kde/cmake/alkimia25
-rw-r--r--source/kde/kde/patch/plasma-desktop.patch2
-rw-r--r--source/kde/kde/patch/plasma-desktop/b893a37fd9b3b5c28173c68ba963fb866a5ac0ed.patch142
-rw-r--r--source/kde/kde/patch/plasma-workspace.patch2
-rw-r--r--source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch49
7 files changed, 146 insertions, 78 deletions
diff --git a/source/kde/kde/build/alkimia b/source/kde/kde/build/alkimia
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/alkimia
+++ b/source/kde/kde/build/alkimia
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index b8626c4cf..d00491fd7 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-4
+1
diff --git a/source/kde/kde/cmake/alkimia b/source/kde/kde/cmake/alkimia
deleted file mode 100644
index ade2681c9..000000000
--- a/source/kde/kde/cmake/alkimia
+++ /dev/null
@@ -1,25 +0,0 @@
-mkdir cmake-build
-cd cmake-build
- cmake \
- $KDE_OPT_ARGS \
- -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_BINARY_DIR=/usr \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DAPPDATA_INSTALL_DIR=/usr/share \
- -DDATA_INSTALL_DIR=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DSYSCONF_INSTALL_DIR=/etc/kde \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DLIB_INSTALL_DIR=lib$LIBDIRSUFFIX \
- -DQT_PLUGIN_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/plugins \
- -DQML_INSTALL_DIR=lib$LIBDIRSUFFIX/qt5/qml \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF \
- -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \
- ..
-
diff --git a/source/kde/kde/patch/plasma-desktop.patch b/source/kde/kde/patch/plasma-desktop.patch
index eddacf9b6..e0376a9d9 100644
--- a/source/kde/kde/patch/plasma-desktop.patch
+++ b/source/kde/kde/patch/plasma-desktop.patch
@@ -2,3 +2,5 @@
cat $CWD/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
# Don't leave an .orig file to be packaged:
rm -f ./applets/taskmanager/package/contents/config/main.xml.orig
+# [PATCH] Desktop as folder: restore functionality of the "delete" action:
+cat $CWD/patch//plasma-desktop/b893a37fd9b3b5c28173c68ba963fb866a5ac0ed.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-desktop/b893a37fd9b3b5c28173c68ba963fb866a5ac0ed.patch b/source/kde/kde/patch/plasma-desktop/b893a37fd9b3b5c28173c68ba963fb866a5ac0ed.patch
new file mode 100644
index 000000000..c602e7046
--- /dev/null
+++ b/source/kde/kde/patch/plasma-desktop/b893a37fd9b3b5c28173c68ba963fb866a5ac0ed.patch
@@ -0,0 +1,142 @@
+From b893a37fd9b3b5c28173c68ba963fb866a5ac0ed Mon Sep 17 00:00:00 2001
+From: Fabio Bas <fabio.bas@officineinformatiche.net>
+Date: Mon, 18 Oct 2021 21:41:17 +0200
+Subject: [PATCH] Desktop as folder: restore functionality of the "delete"
+ action
+
+MR552 introduced RemoveAction but broke functionality of the "delete" action
+when both the "trash" and "delete" actions are shown in the menu by requiring
+the "shift" key being pressed for the action to work.
+
+BUG: 442765
+---
+ .../desktop/plugins/folder/foldermodel.cpp | 52 ++++++++++++-------
+ .../desktop/plugins/folder/foldermodel.h | 1 +
+ 2 files changed, 34 insertions(+), 19 deletions(-)
+
+diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
+index ee03f6de9..68f404fad 100644
+--- a/containments/desktop/plugins/folder/foldermodel.cpp
++++ b/containments/desktop/plugins/folder/foldermodel.cpp
+@@ -1599,6 +1599,7 @@ void FolderModel::createActions()
+
+ QAction *rename = KStandardAction::renameFile(this, &FolderModel::requestRename, this);
+ QAction *trash = KStandardAction::moveToTrash(this, &FolderModel::moveSelectedToTrash, this);
++ QAction *del = KStandardAction::deleteFile(this, &FolderModel::deleteSelected, this);
+ RemoveAction *remove = new RemoveAction(&m_actionCollection, this);
+
+ QAction *emptyTrash = new QAction(QIcon::fromTheme(QStringLiteral("trash-empty")), i18n("&Empty Trash"), this);
+@@ -1607,8 +1608,6 @@ void FolderModel::createActions()
+ QAction *restoreFromTrash = new QAction(i18nc("Restore from trash", "Restore"), this);
+ connect(restoreFromTrash, &QAction::triggered, this, &FolderModel::restoreSelectedFromTrash);
+
+- QAction *del = KStandardAction::deleteFile(this, &FolderModel::deleteSelected, this);
+-
+ QAction *actOpen = new QAction(QIcon::fromTheme(QStringLiteral("window-new")), i18n("&Open"), this);
+ connect(actOpen, &QAction::triggered, this, &FolderModel::openSelected);
+
+@@ -1803,20 +1802,20 @@ void FolderModel::openContextMenu(QQuickItem *visualParent, Qt::KeyboardModifier
+ menu->addSeparator();
+ menu->addAction(m_actionCollection.action(QStringLiteral("restoreFromTrash")));
+
+- KConfigGroup cg(KSharedConfig::openConfig(), "KDE");
+- bool showDeleteCommand = cg.readEntry("ShowDeleteCommand", false);
+-
+- if (showDeleteCommand) {
++ if (isDeleteCommandShown()) {
+ QAction *trashAction = m_actionCollection.action(QStringLiteral("trash"));
+ QAction *deleteAction = m_actionCollection.action(QStringLiteral("del"));
+- deleteAction->setVisible(showDeleteCommand);
+- trashAction->setVisible(showDeleteCommand);
+ menu->addAction(trashAction);
+ menu->addAction(deleteAction);
+ } else {
+ if (RemoveAction *removeAction = qobject_cast<RemoveAction *>(m_actionCollection.action(QStringLiteral("remove")))) {
+ removeAction->update();
+ menu->addAction(removeAction);
++
++ // Used to monitor Shift modifier usage while the menu is open, to
++ // swap the Trash and Delete actions.
++ menu->installEventFilter(removeAction);
++ QCoreApplication::instance()->installEventFilter(removeAction);
+ }
+ }
+
+@@ -1852,13 +1851,6 @@ void FolderModel::openContextMenu(QQuickItem *visualParent, Qt::KeyboardModifier
+ menu->windowHandle()->setTransientParent(visualParent->window());
+ }
+
+- // Used to monitor Shift modifier usage while the menu is open, to
+- // swap the Trash and Delete actions.
+- if (RemoveAction *removeAction = qobject_cast<RemoveAction *>(m_actionCollection.action(QStringLiteral("remove")))) {
+- menu->installEventFilter(removeAction);
+- QCoreApplication::instance()->installEventFilter(removeAction);
+- }
+-
+ menu->popup(m_menuPosition);
+ connect(menu, &QMenu::aboutToHide, [menu]() {
+ menu->deleteLater();
+@@ -2007,8 +1999,16 @@ void FolderModel::moveSelectedToTrash()
+ return;
+ }
+
+- if (RemoveAction *action = qobject_cast<RemoveAction *>(m_actionCollection.action(QStringLiteral("remove")))) {
+- if (action->proxyAction() != m_actionCollection.action(QStringLiteral("trash"))) {
++ if (!isDeleteCommandShown()) {
++ if (RemoveAction *action = qobject_cast<RemoveAction *>(m_actionCollection.action(QStringLiteral("remove")))) {
++ if (action->proxyAction() != m_actionCollection.action(QStringLiteral("trash"))) {
++ return;
++ }
++ }
++ }
++
++ if (QAction *action = m_actionCollection.action(QStringLiteral("trash"))) {
++ if (!action->isEnabled()) {
+ return;
+ }
+ }
+@@ -2029,8 +2029,16 @@ void FolderModel::deleteSelected()
+ return;
+ }
+
+- if (RemoveAction *action = qobject_cast<RemoveAction *>(m_actionCollection.action(QStringLiteral("remove")))) {
+- if (action->proxyAction() != m_actionCollection.action(QStringLiteral("del"))) {
++ if (!isDeleteCommandShown()) {
++ if (RemoveAction *action = qobject_cast<RemoveAction *>(m_actionCollection.action(QStringLiteral("remove")))) {
++ if (action->proxyAction() != m_actionCollection.action(QStringLiteral("del"))) {
++ return;
++ }
++ }
++ }
++
++ if (QAction *action = m_actionCollection.action(QStringLiteral("del"))) {
++ if (!action->isEnabled()) {
+ return;
+ }
+ }
+@@ -2107,3 +2115,9 @@ void FolderModel::createFolder()
+ m_newMenu->setPopupFiles(QList<QUrl>() << m_dirModel->dirLister()->url());
+ m_newMenu->createDirectory();
+ }
++
++bool FolderModel::isDeleteCommandShown()
++{
++ KConfigGroup cg(KSharedConfig::openConfig(), "KDE");
++ return cg.readEntry("ShowDeleteCommand", false);
++}
+diff --git a/containments/desktop/plugins/folder/foldermodel.h b/containments/desktop/plugins/folder/foldermodel.h
+index e6a908624..74fdaaec0 100644
+--- a/containments/desktop/plugins/folder/foldermodel.h
++++ b/containments/desktop/plugins/folder/foldermodel.h
+@@ -301,6 +301,7 @@ private:
+ void addDragImage(QDrag *drag, int x, int y);
+ void setStatus(Status status);
+ static bool isTrashEmpty();
++ static bool isDeleteCommandShown();
+ QList<QUrl> selectedUrls() const;
+ KDirModel *m_dirModel;
+ KDirWatch *m_dirWatch;
+--
+GitLab
+
+
diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch
index e885eddd3..1b7ec6545 100644
--- a/source/kde/kde/patch/plasma-workspace.patch
+++ b/source/kde/kde/patch/plasma-workspace.patch
@@ -1,4 +1,2 @@
-# [PATCH] sddm-theme: fix missing password field on "Other" page:
-cat $CWD/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
# [PATCH] Revert "No icons on the desktop by default":
cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch b/source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch
deleted file mode 100644
index 06d44b916..000000000
--- a/source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d5a3e749a30613294f41386180aaf31dfb1a9bee Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Thu, 14 Oct 2021 15:44:33 -0600
-Subject: [PATCH] sddm-theme: fix missing password field on "Other" page
-
-On this page there is no concept of the user being passwordless because
-no username has been specified by the user yet; we cannot know ahead of
-time. As a result, userList.currentItem.needsPassword is blank so the
-password field gets hidden.
-
-We should just assume that in username/password entry mode, all users
-have a password set. For any users where this is not the case, they can
-just leave the password blank, and it's not any worse than it was in
-Plasma 5.22.
-
-BUG: 443737
-FIXED-IN: 5.23.1
-
-
-(cherry picked from commit f038ab3f494f26b443b10ff5dc9f156e1ec16341)
----
- sddm-theme/Login.qml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
-index 8829666f1..6d3d62804 100644
---- a/sddm-theme/Login.qml
-+++ b/sddm-theme/Login.qml
-@@ -83,7 +83,7 @@ SessionManagementScreen {
- }
- }
-
-- visible: userList.currentItem.needsPassword
-+ visible: root.showUsernamePrompt || userList.currentItem.needsPassword
-
- Keys.onEscapePressed: {
- mainStack.currentItem.forceActiveFocus();
-@@ -119,7 +119,7 @@ SessionManagementScreen {
-
- icon.name: text.length == 0 ? "go-next" : ""
-
-- text: userList.currentItem.needsPassword ? "" : i18n("Log In")
-+ text: root.showUsernamePrompt || userList.currentItem.needsPassword ? "" : i18n("Log In")
- onClicked: startLogin();
- }
- }
---
-2.33.0
-
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-19 15:32:28 +0000