diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-31 20:46:52 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-31 22:22:31 +0200 |
commit | d835f1db2c95dfbbb5b97d4d17eade2f89bf3a80 (patch) | |
tree | fb34a121bd4aae182ebcacb7c6216b78612b3bf9 /app-office/calligra/files | |
parent | app-office/calligra: 3.0.1 version bump (diff) | |
download | gentoo-d835f1db2c95dfbbb5b97d4d17eade2f89bf3a80.tar.gz gentoo-d835f1db2c95dfbbb5b97d4d17eade2f89bf3a80.tar.bz2 gentoo-d835f1db2c95dfbbb5b97d4d17eade2f89bf3a80.zip |
app-office/calligra: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'app-office/calligra/files')
5 files changed, 0 insertions, 199 deletions
diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps1.patch b/app-office/calligra/files/calligra-3.0.0.1-deps1.patch deleted file mode 100644 index 9ee98ffff6cb..000000000000 --- a/app-office/calligra/files/calligra-3.0.0.1-deps1.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 3e3c3a16b9a8b114cc407da9152e20d5dfc422c6 -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Wed Jan 4 14:10:56 2017 +0100 - - Make Activities and KF5Html really optional. - - Before, trying to use CMAKE_DISABLE_FIND_PACKAGE_KF5{Activities,KHtml} - errored out with: - - "if given arguments: "VERSION_LESS" "5.16.0" Unknown arguments specified" - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0394af4..e11d998 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,11 +223,10 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED - Notifications - KCMUtils - ) --find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET -- OPTIONAL_COMPONENTS -- Activities -- KHtml --) -+ -+find_package(KF5Activities) -+find_package(KF5KHtml) -+ - set_package_properties(KF5Activities PROPERTIES - TYPE OPTIONAL - ) diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps2.patch b/app-office/calligra/files/calligra-3.0.0.1-deps2.patch deleted file mode 100644 index c0e3587aee64..000000000000 --- a/app-office/calligra/files/calligra-3.0.0.1-deps2.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit 511d4014beff9f79aeab1c0013470f21ac6b7df7 -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Wed Jan 4 14:13:19 2017 +0100 - - Fix dependencies, sort and clean trailing whitespaces - - Add missing KF5JobWidgets - Drop unused KF5TextEditor - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e11d998..6fab26b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -195,33 +195,33 @@ set(REQUIRED_KF5_VERSION "5.7.0") - - find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED - COMPONENTS -- Archive -- Codecs -+ Archive -+ Codecs - Completion -- Config -- ConfigWidgets -+ Config -+ ConfigWidgets - CoreAddons - DBusAddons - DocTools -- GuiAddons -- I18n -- IconThemes -+ GuiAddons -+ I18n -+ IconThemes - ItemViews -+ JobWidgets -+ KCMUtils - KDELibs4Support -- KIO -- Kross -- Parts -+ KIO -+ Kross -+ Notifications -+ NotifyConfig -+ Parts - Sonnet -- TextEditor -- TextWidgets -+ TextWidgets - ThreadWeaver -- Wallet -- WidgetsAddons -+ Wallet -+ WidgetsAddons - WindowSystem -- XmlGui -- NotifyConfig -- Notifications -- KCMUtils -+ XmlGui - ) - - find_package(KF5Activities) diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps3.patch b/app-office/calligra/files/calligra-3.0.0.1-deps3.patch deleted file mode 100644 index 24591789763c..000000000000 --- a/app-office/calligra/files/calligra-3.0.0.1-deps3.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 019f7e77a341661742b179c92cbce485b7ae361e -Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Wed Jan 4 23:51:32 2017 +0100 - - Push KF5Threadweaver dep to the only place where it is used - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6fab26b..ace6f52 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -217,7 +217,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED - Parts - Sonnet - TextWidgets -- ThreadWeaver - Wallet - WidgetsAddons - WindowSystem -diff --git a/libs/widgets/tests/CMakeLists.txt b/libs/widgets/tests/CMakeLists.txt -index 3934630..744828c 100644 ---- a/libs/widgets/tests/CMakeLists.txt -+++ b/libs/widgets/tests/CMakeLists.txt -@@ -4,6 +4,8 @@ include_directories( ${KOMAIN_INCLUDES} ${CMAKE_SOURCE_DIR}/libs/widgets) - add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/") - add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}") - -+find_package(KF5ThreadWeaver ${REQUIRED_KF5_VERSION} REQUIRED) -+ - #add_subdirectory(filedialogtester) - - # call: kowidgets_add_unit_test(<test-name> <sources> LINK_LIBRARIES <library> [<library> [...]] [GUI]) diff --git a/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch b/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch deleted file mode 100644 index faf4c87f2476..000000000000 --- a/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 8d2383d29beaaad1ebb0b9de2b73589a8b964cdc -Author: Dag Andersen <danders@get2net.dk> -Date: Thu Jan 5 09:32:12 2017 +0100 - - Plan does not depend on Kdelibs4Support - -diff --git a/plan/libs/kernel/CMakeLists.txt b/plan/libs/kernel/CMakeLists.txt -index d85b537..fddb9c3 100644 ---- a/plan/libs/kernel/CMakeLists.txt -+++ b/plan/libs/kernel/CMakeLists.txt -@@ -45,8 +45,6 @@ target_link_libraries(kplatokernel - kowidgetutils - kundo2 - KF5::KIOWidgets -- PRIVATE -- KF5::KDELibs4Support - ) - - set_target_properties(kplatokernel PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} ) -commit 3a3ee7863b65313f573593bf868584f829b725f2 -Author: Dag Andersen <danders@get2net.dk> -Date: Thu Jan 5 12:15:04 2017 +0100 - - Plan: klocale.h is from kde4, so remove - -diff --git a/plan/libs/kernel/kptlocale.cpp b/plan/libs/kernel/kptlocale.cpp -index 6bfc7d8..2145f7c 100644 ---- a/plan/libs/kernel/kptlocale.cpp -+++ b/plan/libs/kernel/kptlocale.cpp -@@ -22,8 +22,6 @@ - - #include "kptdebug.h" - --#include <klocale.h> -- - #include <QLocale> - - diff --git a/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch b/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch deleted file mode 100644 index 3eeb557239e6..000000000000 --- a/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c769476b16068a82c20e195134e7c32ae7c7a081 Mon Sep 17 00:00:00 2001 -From: Dag Andersen <danders@get2net.dk> -Date: Thu, 5 Jan 2017 12:51:26 +0100 -Subject: We should accept all 3.0 versions of KReport/KProperty - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4de94a4..f963bde 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -480,7 +480,7 @@ set_package_properties(KChart PROPERTIES - ## - ## Test for KReport - ## --macro_optional_find_package(KReport 3.0.0 EXACT QUIET) -+macro_optional_find_package(KReport 3.0 QUIET) - set_package_properties(KReport PROPERTIES - DESCRIPTION "A framework for the creation and generation of reports in multiple formats" - URL "https://community.kde.org/KReport" -@@ -491,7 +491,7 @@ set_package_properties(KReport PROPERTIES - ## - ## Test for KPropertyWidgets - ## --macro_optional_find_package(KPropertyWidgets 3.0.0 EXACT QUIET) -+macro_optional_find_package(KPropertyWidgets 3.0 QUIET) - set_package_properties(KPropertyWidgets PROPERTIES - DESCRIPTION "A property editing framework with editor widget" - URL "https://community.kde.org/KProperty" --- -cgit v0.11.2 - |