diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/kde/FTBFSlog | 3 | ||||
-rw-r--r-- | source/kde/kde/build/breeze-icons | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/breeze-icons.patch | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/breeze-icons/250a7d0bbe6dd8e7d2e7cba4cc82a2d8cce37cf1.patch | 62 | ||||
-rw-r--r-- | source/kde/kde/patch/kmymoney.patch | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch | 34 |
6 files changed, 40 insertions, 64 deletions
diff --git a/source/kde/FTBFSlog b/source/kde/FTBFSlog index 50cdd0db..dc6556f2 100644 --- a/source/kde/FTBFSlog +++ b/source/kde/FTBFSlog @@ -1,2 +1,5 @@ +Sun Dec 12 19:21:35 UTC 2021 + kmymoney: Fix build with recent akonadi. Thanks to Daedra and nobodino. ++--------------------------+ Sat Dec 5 23:01:14 UTC 2020 All packages tested and found to compile properly. diff --git a/source/kde/kde/build/breeze-icons b/source/kde/kde/build/breeze-icons index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/breeze-icons +++ b/source/kde/kde/build/breeze-icons @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/patch/breeze-icons.patch b/source/kde/kde/patch/breeze-icons.patch deleted file mode 100644 index e6362941..00000000 --- a/source/kde/kde/patch/breeze-icons.patch +++ /dev/null @@ -1 +0,0 @@ -cat $CWD/patch/breeze-icons/250a7d0bbe6dd8e7d2e7cba4cc82a2d8cce37cf1.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/breeze-icons/250a7d0bbe6dd8e7d2e7cba4cc82a2d8cce37cf1.patch b/source/kde/kde/patch/breeze-icons/250a7d0bbe6dd8e7d2e7cba4cc82a2d8cce37cf1.patch deleted file mode 100644 index 9fb7e559..00000000 --- a/source/kde/kde/patch/breeze-icons/250a7d0bbe6dd8e7d2e7cba4cc82a2d8cce37cf1.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 250a7d0bbe6dd8e7d2e7cba4cc82a2d8cce37cf1 Mon Sep 17 00:00:00 2001 -From: Rodney Dawes <dobey.pwns@gmail.com> -Date: Mon, 15 Nov 2021 10:47:54 -0500 -Subject: [PATCH] Install dark icons via execute_process to use copy command - -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. - -BUG: 445489 ---- - icons-dark/CMakeLists.txt | 30 ++++++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - -diff --git a/icons-dark/CMakeLists.txt b/icons-dark/CMakeLists.txt -index d14bdba5..40590a8b 100644 ---- a/icons-dark/CMakeLists.txt -+++ b/icons-dark/CMakeLists.txt -@@ -26,10 +26,36 @@ if(NOT WIN32) - endif() - - if(NOT SKIP_INSTALL_ICONS) -- install(DIRECTORY ${breeze_icon_dark_dirs} DESTINATION ${BREEZE_INSTALL_DIR}) -+ # 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()") - install(FILES index.theme DESTINATION ${BREEZE_INSTALL_DIR}) - if(WITH_ICON_GENERATION) -- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/ DESTINATION ${BREEZE_INSTALL_DIR}) -+ 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()") - endif() - endif() - --- -GitLab - diff --git a/source/kde/kde/patch/kmymoney.patch b/source/kde/kde/patch/kmymoney.patch new file mode 100644 index 00000000..ead3686f --- /dev/null +++ b/source/kde/kde/patch/kmymoney.patch @@ -0,0 +1,2 @@ +# Fix build with recent akonadi: +cat $CWD/patch/kmymoney/kmymoney.akonadi.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch b/source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch new file mode 100644 index 00000000..6d062326 --- /dev/null +++ b/source/kde/kde/patch/kmymoney/kmymoney.akonadi.patch @@ -0,0 +1,34 @@ +diff -aurN kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp kmymoney-5.1.2-mod/kmymoney/mymoney/mymoneycontact.cpp +--- kmymoney-5.1.2/kmymoney/mymoney/mymoneycontact.cpp 2021-06-23 17:49:12.000000000 +0200 ++++ kmymoney-5.1.2-mod/kmymoney/mymoney/mymoneycontact.cpp 2021-12-12 17:03:38.513691645 +0100 +@@ -8,11 +8,20 @@ + #include "mymoneycontact.h" + + #ifdef ENABLE_ADDRESSBOOK +-#include <KIdentityManagement/IdentityManager> + #include <KIdentityManagement/Identity> ++#include <KIdentityManagement/IdentityManager> ++#include <akonadi_version.h> ++ ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include <Akonadi/Collection> ++#include <Akonadi/ItemFetchScope> ++#include <Akonadi/RecursiveItemFetchJob> ++#else + #include <AkonadiCore/RecursiveItemFetchJob> + #include <AkonadiCore/ItemFetchScope> + #include <AkonadiCore/Collection> ++#endif ++ + #include <KContacts/Addressee> + #include <QRegularExpression> + #endif +@@ -67,7 +76,7 @@ + job->fetchScope().fetchFullPayload(); + job->fetchScope().setAncestorRetrieval(Akonadi::ItemFetchScope::Parent); + job->setProperty("MyMoneyContact_email", email); +- connect(job, SIGNAL(result(KJob*)), this, SLOT(searchContactResult(KJob*))); ++ connect(job, &Akonadi::RecursiveItemFetchJob::result, this, &MyMoneyContact::searchContactResult); + job->start(); + } + #else |