| 1 |
commit: 634a047520c11151ac1316bd382327fd1efcbfb9 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 1 15:02:54 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 1 19:40:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=634a0475 |
| 7 |
|
| 8 |
app-office/calligra: Drop bogus Qt5WebKit dependency |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/calligra/calligra-3.1.0-r3.ebuild | 7 +-- |
| 14 |
.../calligra/files/calligra-3.1.0-no-webkit.patch | 70 ++++++++++++++++++++++ |
| 15 |
2 files changed, 71 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/calligra/calligra-3.1.0-r3.ebuild b/app-office/calligra/calligra-3.1.0-r3.ebuild |
| 18 |
index 46e011852b1..0fe2f8fc959 100644 |
| 19 |
--- a/app-office/calligra/calligra-3.1.0-r3.ebuild |
| 20 |
+++ b/app-office/calligra/calligra-3.1.0-r3.ebuild |
| 21 |
@@ -95,7 +95,6 @@ COMMON_DEPEND=" |
| 22 |
x11-libs/libX11 |
| 23 |
) |
| 24 |
calligra_experimental_features_stage? ( |
| 25 |
- $(add_qt_dep qtwebkit) |
| 26 |
okular? ( $(add_kdeapps_dep okular) ) |
| 27 |
) |
| 28 |
calligra_features_sheets? ( dev-cpp/eigen:3 ) |
| 29 |
@@ -124,6 +123,7 @@ PATCHES=( |
| 30 |
"${FILESDIR}"/${P}-stage-qt-5.11.patch |
| 31 |
"${FILESDIR}"/${P}-poppler-0.69.patch |
| 32 |
"${FILESDIR}"/${P}-poppler-0.71.patch |
| 33 |
+ "${FILESDIR}"/${P}-no-webkit.patch |
| 34 |
) |
| 35 |
|
| 36 |
pkg_pretend() { |
| 37 |
@@ -147,11 +147,6 @@ src_prepare() { |
| 38 |
punt_bogus_dep Qt5 Declarative |
| 39 |
punt_bogus_dep Qt5 OpenGL |
| 40 |
|
| 41 |
- if ! use calligra_experimental_features_stage; then |
| 42 |
- punt_bogus_dep Qt5 WebKitWidgets |
| 43 |
- punt_bogus_dep Qt5 WebKit |
| 44 |
- fi |
| 45 |
- |
| 46 |
# Hack around the excessive use of CMake macros |
| 47 |
if use okular && ! use calligra_features_words; then |
| 48 |
sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ |
| 49 |
|
| 50 |
diff --git a/app-office/calligra/files/calligra-3.1.0-no-webkit.patch b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch |
| 51 |
new file mode 100644 |
| 52 |
index 00000000000..f126e2e5138 |
| 53 |
--- /dev/null |
| 54 |
+++ b/app-office/calligra/files/calligra-3.1.0-no-webkit.patch |
| 55 |
@@ -0,0 +1,70 @@ |
| 56 |
+From 9817c4c2ee1e11ae1d2eacb31b8a2a65d6ea6e8d Mon Sep 17 00:00:00 2001 |
| 57 |
+From: Dag Andersen <danders@×××××××.dk> |
| 58 |
+Date: Mon, 22 Oct 2018 09:41:53 +0200 |
| 59 |
+Subject: Stage does not use WebKit, so remove |
| 60 |
+ |
| 61 |
+--- |
| 62 |
+ CMakeLists.txt | 21 +-------------------- |
| 63 |
+ stage/part/CMakeLists.txt | 1 - |
| 64 |
+ 2 files changed, 1 insertion(+), 21 deletions(-) |
| 65 |
+ |
| 66 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 67 |
+index 8b148c0..1e29140 100644 |
| 68 |
+--- a/CMakeLists.txt |
| 69 |
++++ b/CMakeLists.txt |
| 70 |
+@@ -272,14 +272,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET |
| 71 |
+ Quick |
| 72 |
+ QuickWidgets |
| 73 |
+ Sql |
| 74 |
+- WebKit |
| 75 |
+-# WebKitWidgets |
| 76 |
+-) |
| 77 |
+-message("**********************************************************************************************************************") |
| 78 |
+-message("**********************************************************************************************************************") |
| 79 |
+-message("Qt WebKitWidgets is required for Stage's html export preview. This will need porting, as that module no longer exists.") |
| 80 |
+-message("**********************************************************************************************************************") |
| 81 |
+-message("**********************************************************************************************************************") |
| 82 |
++) |
| 83 |
+ |
| 84 |
+ # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call |
| 85 |
+ # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error: |
| 86 |
+@@ -313,14 +306,6 @@ set_package_properties(Qt5WebKit PROPERTIES |
| 87 |
+ PURPOSE "Required for Braindump's Web shape" |
| 88 |
+ TYPE OPTIONAL |
| 89 |
+ ) |
| 90 |
+-set_package_properties(Qt5WebKitWidget PROPERTIES |
| 91 |
+- PURPOSE "Required for Stage" |
| 92 |
+- TYPE RECOMMENDED |
| 93 |
+-) |
| 94 |
+- |
| 95 |
+-if(Qt5WebKit_FOUND) |
| 96 |
+- add_definitions( -DCAN_USE_QTWEBKIT ) |
| 97 |
+-endif() |
| 98 |
+ |
| 99 |
+ set(HAVE_OPENGL ${Qt5OpenGL_FOUND}) |
| 100 |
+ |
| 101 |
+@@ -983,10 +968,6 @@ calligra_drop_product_on_bad_condition( FEATURE_RDF |
| 102 |
+ Soprano_FOUND "Soprano not found" |
| 103 |
+ ) |
| 104 |
+ |
| 105 |
+-# calligra_drop_product_on_bad_condition( PART_STAGE |
| 106 |
+-# Qt5WebKitWidgets_FOUND "Qt5WebKitWidgets devel not found" |
| 107 |
+-# ) |
| 108 |
+- |
| 109 |
+ calligra_drop_product_on_bad_condition( PART_SHEETS |
| 110 |
+ EIGEN3_FOUND "Eigen devel not found" |
| 111 |
+ ) |
| 112 |
+diff --git a/stage/part/CMakeLists.txt b/stage/part/CMakeLists.txt |
| 113 |
+index d6000a1..9bdc840 100644 |
| 114 |
+--- a/stage/part/CMakeLists.txt |
| 115 |
++++ b/stage/part/CMakeLists.txt |
| 116 |
+@@ -165,7 +165,6 @@ target_link_libraries(calligrastageprivate |
| 117 |
+ KF5::IconThemes |
| 118 |
+ KF5::Completion |
| 119 |
+ Qt5::Svg |
| 120 |
+-# Qt5::WebKitWidgets |
| 121 |
+ ) |
| 122 |
+ if(HAVE_OPENGL) |
| 123 |
+ target_link_libraries(calligrastageprivate PRIVATE Qt5::OpenGL) |
| 124 |
+-- |
| 125 |
+cgit v1.1 |
Archives