diff options
Diffstat (limited to 'source/kde/kde/patch')
6 files changed, 92 insertions, 168 deletions
diff --git a/source/kde/kde/patch/breeze-icons.patch b/source/kde/kde/patch/breeze-icons.patch deleted file mode 100644 index 24df893fa..000000000 --- a/source/kde/kde/patch/breeze-icons.patch +++ /dev/null @@ -1,2 +0,0 @@ -cat $CWD/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } -cat $CWD/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch b/source/kde/kde/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch deleted file mode 100644 index 30bc17dd6..000000000 --- a/source/kde/kde/patch/breeze-icons/05f11af435edc57650d0221ed8a74ecfb997e576.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 05f11af435edc57650d0221ed8a74ecfb997e576 Mon Sep 17 00:00:00 2001 -From: Christoph Cullmann <cullmann@kde.org> -Date: Mon, 6 Dec 2021 18:12:46 +0000 -Subject: [PATCH] improve installation of light fallback icons - -icon install works now like this: - -* collect all light icons -* install them just for light theme - -* install dark icons -* install all missing ones from light theme we collected before ---- - icons-dark/CMakeLists.txt | 45 +++++++++++---------------------------- - icons/CMakeLists.txt | 18 ++++++---------- - 2 files changed, 20 insertions(+), 43 deletions(-) - -diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt -index 40590a8b..ab582c13 100644 ---- a/icons-dark/CMakeLists.txt -+++ b/icons-dark/CMakeLists.txt -@@ -4,10 +4,6 @@ endif() - - ########### install files ############### - --set(breeze_icon_dark_dirs -- actions animations applets apps devices emblems -- mimetypes places status) -- - set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze-dark) - - if(WITH_ICON_GENERATION) -@@ -26,36 +22,21 @@ if(NOT WIN32) - endif() - - if(NOT SKIP_INSTALL_ICONS) -- # In order to ensure the dark icons are copied over the light icons which -- # are installed into the dark theme for BUG:444095, we need to execute the -- # copy command ourselves rather than using CMake's internal copy mechanism -- # used by the normal install command, so we use CODE mode of install to -- # execute_process and print an appropriate status message. -- # See https://bugs.kde.org/show_bug.cgi?id=445489 -- set(COPY_CMD "cp -a") -- set(XCOPY_ARGS "") -- if(WIN32) -- set(COPY_CMD "xcopy") -- set(XCOPY_ARGS "/q /e /y") -- endif(WIN32) -- install(CODE "cmake_policy(VERSION 3.6) -- foreach(CAT_DIR ${breeze_icon_dark_dirs}) -- execute_process(COMMAND ${COPY_CMD} \${CAT_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -- endforeach() -- file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/*.svg) -- foreach(ICON_FILE IN LISTS ICON_FILES) -- message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\") -- endforeach()") -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ foreach (icon_file ${icon_files}) -+ install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) -+ endforeach() -+ -+ # install for all missing icons the light icons as fallback -+ foreach (icon_file ${BREEZE_LIGHT_ICONS}) -+ if (NOT ${icon_file} IN_LIST icon_files) -+ install(FILES ${CMAKE_SOURCE_DIR}/icons/${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) -+ endif() -+ endforeach() -+ - install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR}) - if(WITH_ICON_GENERATION) -- install(CODE "cmake_policy(VERSION 3.6) -- foreach(GEN_DIR ${breeze_icon_dark_dirs}) -- execute_process(COMMAND ${COPY_CMD} \${GEN_DIR} \$ENV{DESTDIR}${BREEZE_INSTALL_DIR} ${XCOPY_ARGS} ERROR_QUIET WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated) -- endforeach() -- file(GLOB_RECURSE ICON_FILES RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/generated LIST_DIRECTORIES false ${CMAKE_CURRENT_BINARY_DIR}/generated/*.svg) -- foreach(ICON_FILE IN LISTS ICON_FILES) -- message(STATUS \"Installing: \$ENV{DESTDIR}${BREEZE_INSTALL_DIR}/\${ICON_FILE}\") -- endforeach()") -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR}) - endif() - endif() - -diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt -index 220b81e9..8f31db4a 100644 ---- a/icons/CMakeLists.txt -+++ b/icons/CMakeLists.txt -@@ -4,10 +4,6 @@ endif() - - ########### install files ############### - --set(breeze_icon_dirs -- actions animations applets apps categories preferences devices emblems -- emotes mimetypes places status) -- - set(BREEZE_INSTALL_DIR ${KDE_INSTALL_FULL_ICONDIR}/breeze) - - if(WITH_ICON_GENERATION) -@@ -26,17 +22,17 @@ if(NOT WIN32) - endif() - - if(NOT SKIP_INSTALL_ICONS) -- install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR}) -+ # collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE) -+ foreach (icon_file ${icon_files}) -+ install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) -+ endforeach() -+ - install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR}) - if(WITH_ICON_GENERATION) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR}) - endif() -- -- # Install the colored icon sizes into breeze-dark theme as well, to ensure -- # that icons are available on alternate environments which do not support -- # colorized symbolic icons which are not named as "-symbolic" -- # NOTE: icons-dark will install /some/ files over top of these -- install(DIRECTORY ${breeze_icon_dirs} DESTINATION ${BREEZE_INSTALL_DIR}-dark) - endif() - - gtk_update_icon_cache(${BREEZE_INSTALL_DIR}) --- -GitLab - diff --git a/source/kde/kde/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch b/source/kde/kde/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch deleted file mode 100644 index b294711e3..000000000 --- a/source/kde/kde/patch/breeze-icons/08bf45db9b883b4201ac3cbb666821472f17ad97.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 08bf45db9b883b4201ac3cbb666821472f17ad97 Mon Sep 17 00:00:00 2001 -From: Rodney Dawes <dobey.pwns@gmail.com> -Date: Mon, 6 Dec 2021 15:13:22 -0500 -Subject: [PATCH] Include "*@*" in the icon_files list for installation - -As some of the directories of the theme are symlinks for scaled sizes -we need to include them in the list of files to install as well. ---- - icons-dark/CMakeLists.txt | 2 +- - icons/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt -index ab582c13..6ceddc5c 100644 ---- a/icons-dark/CMakeLists.txt -+++ b/icons-dark/CMakeLists.txt -@@ -22,7 +22,7 @@ if(NOT WIN32) - endif() - - if(NOT SKIP_INSTALL_ICONS) -- file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*") - foreach (icon_file ${icon_files}) - install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) - endforeach() -diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt -index 8f31db4a..b48852eb 100644 ---- a/icons/CMakeLists.txt -+++ b/icons/CMakeLists.txt -@@ -23,7 +23,7 @@ endif() - - if(NOT SKIP_INSTALL_ICONS) - # collect all our icons we need to install, will be used by dark icon set as fallback icons if not there, too -- file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg") -+ file(GLOB_RECURSE icon_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/*.svg" "${CMAKE_CURRENT_SOURCE_DIR}/*@*") - set(BREEZE_LIGHT_ICONS ${icon_files} PARENT_SCOPE) - foreach (icon_file ${icon_files}) - install(FILES ${icon_file} DESTINATION ${BREEZE_INSTALL_DIR} RENAME ${icon_file}) --- -GitLab - diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch index 1b7ec6545..d6d7d971b 100644 --- a/source/kde/kde/patch/plasma-workspace.patch +++ b/source/kde/kde/patch/plasma-workspace.patch @@ -1,2 +1,4 @@ # [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 ; } +cat $CWD/patch/plasma-workspace/70d23b89.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } +cat $CWD/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/plasma-workspace/70d23b89.patch b/source/kde/kde/patch/plasma-workspace/70d23b89.patch new file mode 100644 index 000000000..2d9c2a0f8 --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/70d23b89.patch @@ -0,0 +1,52 @@ +From 70d23b891e95bc6911389773f320a4406a12bd87 Mon Sep 17 00:00:00 2001 +From: Lufan Zhong <lufanzhong@gmail.com> +Date: Sun, 26 Dec 2021 19:33:09 +0000 +Subject: [PATCH] runners/shell: Port from KToolInvocation::invokeTerminal to + KTerminalLauncherJob + +kinit is being deprecated; this change will allow it to open a terminal and execute +commands normally without kinit being present. + +BUG: 437131 +FIXED-IN: 5.24 +--- + runners/shell/shellrunner.cpp | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/runners/shell/shellrunner.cpp b/runners/shell/shellrunner.cpp +index 03b54e1f1..be4058acf 100644 +--- a/runners/shell/shellrunner.cpp ++++ b/runners/shell/shellrunner.cpp +@@ -12,8 +12,9 @@ + #include <KLocalizedString> + #include <KNotificationJobUiDelegate> + #include <KShell> +-#include <KToolInvocation> ++#include <KTerminalLauncherJob> + #include <QAction> ++#include <QProcessEnvironment> + #include <QRegularExpression> + #include <QStandardPaths> + +@@ -62,7 +63,17 @@ void ShellRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryM + { + if (match.selectedAction()) { + const QVariantList data = match.data().toList(); +- KToolInvocation::invokeTerminal(data.at(0).toString(), data.at(1).toStringList()); ++ const QStringList list = data.at(1).toStringList(); ++ QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); ++ for (const auto& str : list) ++ { ++ const int pos = str.indexOf('='); ++ env.insert(str.left(pos), str.mid(pos+1)); ++ } ++ auto job = new KTerminalLauncherJob(data.at(0).toString()); ++ job->setProcessEnvironment(env); ++ job->setUiDelegate(new KNotificationJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled)); ++ job->start(); + return; + } + +-- +GitLab + diff --git a/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch b/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch new file mode 100644 index 000000000..4c30b8dec --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch @@ -0,0 +1,38 @@ +From 926f864756e5586f38574c166abdb5befa3dc771 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Wed, 8 Dec 2021 13:08:43 +0000 +Subject: [PATCH] [libtaskmanager] Increase buffer for pipewire format + negotiation + +Libtaskmanager's buffer for spa_builder is too small on certain +configurations. Because podBuilder->state.offset is never reset, the +buffer space can run out when EGL returns a long list of dma_buf +modifiers, causing PipeWire negotiation to fail. + +An example is when EGL returns 20 modifiers. There are 6 formats defined +in pipewiresourcestream.cpp, for each format it will construct 2 frames, +one with 21*8=168 bytes long of modifiers. The modifier lists for all +frames will be 6*168=1008 bytes (only 16 bytes left of 1024 bytes), let +alone other frames. + +BUG: 446061 +--- + libtaskmanager/declarative/pipewiresourcestream.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libtaskmanager/declarative/pipewiresourcestream.cpp b/libtaskmanager/declarative/pipewiresourcestream.cpp +index a6713ae76..f1d3032a5 100644 +--- a/libtaskmanager/declarative/pipewiresourcestream.cpp ++++ b/libtaskmanager/declarative/pipewiresourcestream.cpp +@@ -260,7 +260,7 @@ bool PipeWireSourceStream::createStream(uint nodeid) + pwNodeId = nodeid; + pw_stream_add_listener(pwStream, &streamListener, &pwStreamEvents, this); + +- uint8_t buffer[1024]; ++ uint8_t buffer[4096]; + spa_pod_builder podBuilder = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); + + const QVector<spa_video_format> formats = +-- +GitLab + |