diff --git a/kde/pim/akonadi/akonadi-18.12.2-errorstring.diff b/kde/pim/akonadi/akonadi-18.12.2-errorstring.diff new file mode 100644 index 00000000..e01e49e2 --- /dev/null +++ b/kde/pim/akonadi/akonadi-18.12.2-errorstring.diff @@ -0,0 +1,46 @@ +commit 1fe4801638f1f34d9bdb139a949cc330c27074b9 +Author: David Faure +Date: Thu Jun 6 16:26:30 2019 +0200 + + Show error string from QLocalServer on failure + +diff --git a/src/server/akonadi.cpp b/src/server/akonadi.cpp +index d5b714f38..883aca4a2 100644 +--- a/src/server/akonadi.cpp ++++ b/src/server/akonadi.cpp +@@ -124,7 +124,7 @@ bool AkonadiServer::init() + const QString defaultCmdPipe = QStringLiteral("Akonadi-Cmd-") % suffix; + const QString cmdPipe = settings.value(QStringLiteral("Connection/NamedPipe"), defaultCmdPipe).toString(); + if (!mCmdServer->listen(cmdPipe)) { +- qCCritical(AKONADISERVER_LOG) << "Unable to listen on Named Pipe" << cmdPipe; ++ qCCritical(AKONADISERVER_LOG) << "Unable to listen on Named Pipe" << cmdPipe << ":" << mCmdServer->errorString(); + quit(); + return false; + } +@@ -132,7 +132,7 @@ bool AkonadiServer::init() + const QString defaultNtfPipe = QStringLiteral("Akonadi-Ntf-") % suffix; + const QString ntfPipe = settings.value(QStringLiteral("Connection/NtfNamedPipe"), defaultNtfPipe).toString(); + if (!mNtfServer->listen(ntfPipe)) { +- qCCritical(AKONADISERVER_LOG) << "Unable to listen on Named Pipe" << ntfPipe; ++ qCCritical(AKONADISERVER_LOG) << "Unable to listen on Named Pipe" << ntfPipe << ":" << mNtfServer->errorString(); + quit(); + return false; + } +@@ -146,7 +146,7 @@ bool AkonadiServer::init() + const QString cmdSocketFile = socketDir % QStringLiteral("/akonadiserver-cmd.socket"); + QFile::remove(cmdSocketFile); + if (!mCmdServer->listen(cmdSocketFile)) { +- qCCritical(AKONADISERVER_LOG) << "Unable to listen on Unix socket" << cmdSocketFile; ++ qCCritical(AKONADISERVER_LOG) << "Unable to listen on Unix socket" << cmdSocketFile << ":" << mCmdServer->errorString(); + quit(); + return false; + } +@@ -154,7 +154,7 @@ bool AkonadiServer::init() + const QString ntfSocketFile = socketDir % QStringLiteral("/akonadiserver-ntf.socket"); + QFile::remove(ntfSocketFile); + if (!mNtfServer->listen(ntfSocketFile)) { +- qCCritical(AKONADISERVER_LOG) << "Unable to listen on Unix socket" << ntfSocketFile; ++ qCCritical(AKONADISERVER_LOG) << "Unable to listen on Unix socket" << ntfSocketFile << ":" << mNtfServer->errorString(); + quit(); + return false; + } diff --git a/kde/pim/akonadi/akonadi-19.04-macos.diff b/kde/pim/akonadi/akonadi-19.04-macos.diff new file mode 100644 index 00000000..da5099c1 --- /dev/null +++ b/kde/pim/akonadi/akonadi-19.04-macos.diff @@ -0,0 +1,150 @@ +diff --git a/autotests/libs/testresource/CMakeLists.txt b/autotests/libs/testresource/CMakeLists.txt +--- a/autotests/libs/testresource/CMakeLists.txt ++++ b/autotests/libs/testresource/CMakeLists.txt +@@ -26,12 +26,7 @@ + ) + + add_executable(akonadi_knut_resource ${knutresource_SRCS}) +- +-if (APPLE) +- set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template) +- set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.Knut") +- set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE Akonadi Knut Resource") +-endif () ++set_target_properties(akonadi_knut_resource PROPERTIES MACOSX_BUNDLE FALSE) + + target_link_libraries(akonadi_knut_resource + KF5::AkonadiXml +diff --git a/src/agentserver/CMakeLists.txt b/src/agentserver/CMakeLists.txt +--- a/src/agentserver/CMakeLists.txt ++++ b/src/agentserver/CMakeLists.txt +@@ -9,6 +9,7 @@ + ecm_qt_declare_logging_category(akonadi_agent_server_srcs HEADER akonadiagentserver_debug.h IDENTIFIER AKONADIAGENTSERVER_LOG CATEGORY_NAME org.kde.pim.akonadiagentserver) + + add_executable(akonadi_agent_server ${akonadi_agent_server_srcs}) ++set_target_properties(akonadi_agent_server PROPERTIES MACOSX_BUNDLE FALSE) + + target_link_libraries(akonadi_agent_server + akonadi_shared +@@ -25,29 +26,19 @@ + akonadiagentserver_debug.cpp + ) + +-add_executable(akonadi_agent_launcher MACOSX_BUNDLE ${akonadi_agent_launcher_SRCS}) ++add_executable(akonadi_agent_launcher ${akonadi_agent_launcher_SRCS}) ++set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE FALSE) + + target_link_libraries(akonadi_agent_launcher + akonadi_shared + KF5AkonadiPrivate + Qt5::Core + Qt5::Widgets + ) + +-if(Q_WS_MAC) +- set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/../Info.plist.template) +- set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.Akonadi.agentlauncher") +- set_target_properties(akonadi_agent_launcher PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Akonadi Agent Launcher") +-endif() +- + # Install both helper apps. +-if(Q_WS_MAC) +- install(TARGETS akonadi_agent_launcher +- DESTINATION ${AKONADI_BUNDLE_PATH}) +-else() +- install(TARGETS akonadi_agent_launcher ++install(TARGETS akonadi_agent_launcher + DESTINATION ${BIN_INSTALL_DIR}) +-endif() + + install(TARGETS akonadi_agent_server + ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +diff --git a/src/akonadicontrol/CMakeLists.txt b/src/akonadicontrol/CMakeLists.txt +--- a/src/akonadicontrol/CMakeLists.txt ++++ b/src/akonadicontrol/CMakeLists.txt +@@ -31,6 +31,7 @@ + qt5_add_dbus_interface(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.PreprocessorManager.xml preprocessor_manager) + + add_executable(akonadi_control ${control_SRCS}) ++set_target_properties(akonadi_control PROPERTIES MACOSX_BUNDLE FALSE) + set_target_properties(akonadi_control PROPERTIES OUTPUT_NAME akonadi_control) + + if (WIN32) +diff --git a/src/akonadictl/CMakeLists.txt b/src/akonadictl/CMakeLists.txt +--- a/src/akonadictl/CMakeLists.txt ++++ b/src/akonadictl/CMakeLists.txt +@@ -15,6 +15,7 @@ + ) + + add_executable(akonadictl ${akonadictl_SRCS}) ++set_target_properties(akonadictl PROPERTIES MACOSX_BUNDLE FALSE) + set_target_properties(akonadictl PROPERTIES OUTPUT_NAME akonadictl) + ecm_mark_nongui_executable(akonadictl) + target_link_libraries(akonadictl +diff --git a/src/asapcat/CMakeLists.txt b/src/asapcat/CMakeLists.txt +--- a/src/asapcat/CMakeLists.txt ++++ b/src/asapcat/CMakeLists.txt +@@ -4,6 +4,7 @@ + ) + + add_executable(asapcat ${asapcat_srcs}) ++set_target_properties(asapcat PROPERTIES MACOSX_BUNDLE FALSE) + + target_link_libraries(asapcat + akonadi_shared +diff --git a/src/private/protocolgen/CMakeLists.txt b/src/private/protocolgen/CMakeLists.txt +--- a/src/private/protocolgen/CMakeLists.txt ++++ b/src/private/protocolgen/CMakeLists.txt +@@ -10,6 +10,7 @@ + ) + + add_executable(protocolgen ${protocolgen_SRCS}) ++set_target_properties(protocolgen PROPERTIES MACOSX_BUNDLE FALSE) + target_link_libraries(protocolgen + Qt5::Core + ) +diff --git a/src/rds/CMakeLists.txt b/src/rds/CMakeLists.txt +--- a/src/rds/CMakeLists.txt ++++ b/src/rds/CMakeLists.txt +@@ -7,6 +7,7 @@ + ) + + add_executable(akonadi_rds ${akonadi_rds_srcs}) ++set_target_properties(akonadi_rds PROPERTIES MACOSX_BUNDLE FALSE) + + target_link_libraries(akonadi_rds + akonadi_shared +diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt +--- a/src/server/CMakeLists.txt ++++ b/src/server/CMakeLists.txt +@@ -170,6 +170,7 @@ + ) + + add_executable(akonadiserver ${akonadiserver_SRCS}) ++set_target_properties(akonadiserver PROPERTIES MACOSX_BUNDLE FALSE) + set_target_properties(akonadiserver PROPERTIES OUTPUT_NAME akonadiserver) + target_link_libraries(akonadiserver + libakonadiserver +diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt +--- a/src/xml/CMakeLists.txt ++++ b/src/xml/CMakeLists.txt +@@ -32,6 +32,7 @@ + ) + + add_executable(akonadi2xml akonadi2xml.cpp) ++set_target_properties(akonadi2xml PROPERTIES MACOSX_BUNDLE FALSE) + + target_link_libraries(akonadi2xml + KF5::AkonadiXml +diff --git a/templates/akonadiresource/src/CMakeLists.txt b/templates/akonadiresource/src/CMakeLists.txt +--- a/templates/akonadiresource/src/CMakeLists.txt ++++ b/templates/akonadiresource/src/CMakeLists.txt +@@ -24,6 +24,7 @@ + ) + + add_executable(akonadi_%{APPNAMELC}_resource ${%{APPNAMELC}resource_SRCS}) ++set_target_properties(akonadi_%{APPNAMELC}_resource PROPERTIES MACOSX_BUNDLE FALSE) + + target_link_libraries(akonadi_%{APPNAMELC}_resource + Qt5::DBus + diff --git a/kde/pim/akonadi/akonadi.py b/kde/pim/akonadi/akonadi.py index 2edcbf48..3acd9e94 100644 --- a/kde/pim/akonadi/akonadi.py +++ b/kde/pim/akonadi/akonadi.py @@ -1,43 +1,48 @@ # -*- coding: utf-8 -*- import info class subinfo(info.infoclass): def setTargets(self): self.versionInfo.setDefaultValues() self.patchToApply["17.04.0"] = [("akonadi-17.04.0-20170530.diff", 1)] self.patchToApply["17.04.1"] = [("akonadi-17.04.0-20170530.diff", 1)] self.patchToApply["17.04.2"] = [("akonadi-17.04.0-20170530.diff", 1)] self.patchToApply["17.08.3"] = [("akonadi-17.08.3-20171204.diff", 1), #workaround for locked log crash https://phabricator.kde.org/T7538#119826 ("akonadi-17.08.3-20171204-1.diff", 1), ("akonadi-17.08.3-20171204-2.diff", 1)] self.patchToApply["17.12.0"] = [("akonadi-17.12.0-20171220.diff", 1), ("0001-Win-Create-local-socket-named-pipes-based-on-the-ins.patch", 1)] - self.patchToApply["18.12.2"] = [("akonadi-18.12.2-macos.diff", 1)] - self.patchLevel["18.12.2"] = 1 - self.patchToApply["18.12.3"] = [("akonadi-18.12.2-macos.diff", 1)] - self.patchLevel["18.12.3"] = 1 + self.patchToApply["18.12.2"] = [("akonadi-18.12.2-macos.diff", 1), + ("akonadi-18.12.2-errorstring.diff", 1)] + self.patchLevel["18.12.2"] = 2 + self.patchToApply["18.12.3"] = [("akonadi-18.12.2-macos.diff", 1), + ("akonadi-18.12.2-errorstring.diff", 1)] + self.patchLevel["18.12.3"] = 2 + self.patchToApply["19.04.1"] = [("akonadi-19.04-macos.diff", 1), + ("akonadi-18.12.2-errorstring.diff", 1)] + self.patchLevel["19.04.1"] = 1 self.description = "A storage service for PIM data and meta data" def setDependencies(self): self.buildDependencies["kde/frameworks/extra-cmake-modules"] = None self.buildDependencies["libs/boost/boost-graph"] = None self.runtimeDependencies["libs/libxslt"] = None self.runtimeDependencies["libs/sqlite"] = None self.runtimeDependencies["libs/shared-mime-info"] = None self.runtimeDependencies["libs/qt5/qtbase"] = None self.runtimeDependencies["kde/frameworks/tier3/kdesignerplugin"] = None self.runtimeDependencies["kde/frameworks/tier2/kcompletion"] = None self.runtimeDependencies["kde/frameworks/tier1/kitemmodels"] = None self.runtimeDependencies["kde/frameworks/tier3/kio"] = None from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self) self.subinfo.options.configure.args = " -DDATABASE_BACKEND=SQLITE -DAKONADI_RUN_MYSQL_ISOLATED_TESTS=OFF -DBUILD_TESTING=OFF"