diff options
Diffstat (limited to 'libre/kdepim-addons/libre.patch')
| -rw-r--r-- | libre/kdepim-addons/libre.patch | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/libre/kdepim-addons/libre.patch b/libre/kdepim-addons/libre.patch index 378e89ed3..6d6fe0052 100644 --- a/libre/kdepim-addons/libre.patch +++ b/libre/kdepim-addons/libre.patch @@ -1,29 +1,49 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed70a36a9..030d1a7f1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,7 +49,7 @@ include(ECMQtDeclareLoggingCategory) +diff -rupN kdepim-addons-18.12.2/CMakeLists.txt kdepim-addons-18.12.2.new/CMakeLists.txt +--- kdepim-addons-18.12.2/CMakeLists.txt 2019-02-05 01:49:34.000000000 +0100 ++++ kdepim-addons-18.12.2.new/CMakeLists.txt 2019-02-26 17:22:18.022091381 +0100 +@@ -54,7 +54,7 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable f - option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." FALSE) + option(KMAIL_EDITORCONVERTERPLUGIN_TEMPLATE_BUILD "Build the kmail editor converter plugin." FALSE) -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets Widgets Test) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) -@@ -82,7 +82,6 @@ set(CALENDAR_UTILS_VERSION "5.4.3") - set(MAILIMPORTER_LIB_VERSION "5.6.3") +@@ -95,7 +95,6 @@ set(KPIMPKPASS_LIB_VERSION "5.10.2") + set(KPIMITINERARY_LIB_VERSION "5.10.2") find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED) -find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED) find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED) -diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt -index cc1d1261e..fd906fd02 100644 ---- a/plugins/CMakeLists.txt -+++ b/plugins/CMakeLists.txt -@@ -4,5 +4,4 @@ add_subdirectory(messageviewerheaderplugins) +diff -rupN kdepim-addons-18.12.2/kaddressbook/CMakeLists.txt kdepim-addons-18.12.2.new/kaddressbook/CMakeLists.txt +--- kdepim-addons-18.12.2/kaddressbook/CMakeLists.txt 2019-01-28 08:38:07.000000000 +0100 ++++ kdepim-addons-18.12.2.new/kaddressbook/CMakeLists.txt 2019-02-26 18:10:19.231535755 +0100 +@@ -1,4 +1,4 @@ + add_subdirectory( editorpages ) + add_subdirectory( plugins ) + add_subdirectory( importexportplugins ) +-add_subdirectory( contacteditor ) ++#add_subdirectory( contacteditor ) +diff -rupN kdepim-addons-18.12.2/kmail/editorconvertertextplugins/CMakeLists.txt kdepim-addons-18.12.2.new/kmail/editorconvertertextplugins/CMakeLists.txt +--- kdepim-addons-18.12.2/kmail/editorconvertertextplugins/CMakeLists.txt 2019-01-28 08:38:07.000000000 +0100 ++++ kdepim-addons-18.12.2.new/kmail/editorconvertertextplugins/CMakeLists.txt 2019-02-26 18:09:07.827303257 +0100 +@@ -1,6 +1,6 @@ +-if(discount_FOUND) +- add_subdirectory(markdown) +-endif() ++#if(discount_FOUND) ++# add_subdirectory(markdown) ++#endif() + + if (KMAIL_EDITORCONVERTERPLUGIN_TEMPLATE_BUILD) + add_subdirectory(inserttemplatecommand) +diff -rupN kdepim-addons-18.12.2/plugins/CMakeLists.txt kdepim-addons-18.12.2.new/plugins/CMakeLists.txt +--- kdepim-addons-18.12.2/plugins/CMakeLists.txt 2019-01-28 08:38:07.000000000 +0100 ++++ kdepim-addons-18.12.2.new/plugins/CMakeLists.txt 2019-02-26 17:22:18.022091381 +0100 +@@ -4,5 +4,4 @@ add_subdirectory(messageviewerheaderplug add_subdirectory(messageviewer) add_subdirectory(plasma) |