1 |
commit: 40297c8d3eaea4cb4b5893a0d648dd91a70cac93 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 31 19:02:13 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 31 20:04:23 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=40297c8d |
7 |
|
8 |
app-office/calligra: Fix patch new DEPENDs, add USE=gemini |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
app-office/calligra/calligra-9999.ebuild | 45 +++++++++------------- |
13 |
.../files/calligra-3.0.0-no-arch-detection.patch | 17 -------- |
14 |
.../files/calligra-3.0.90-no-arch-detection.patch | 17 ++++++++ |
15 |
app-office/calligra/metadata.xml | 2 +- |
16 |
4 files changed, 36 insertions(+), 45 deletions(-) |
17 |
|
18 |
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild |
19 |
index db53b6af33..8c55ddf184 100644 |
20 |
--- a/app-office/calligra/calligra-9999.ebuild |
21 |
+++ b/app-office/calligra/calligra-9999.ebuild |
22 |
@@ -18,11 +18,10 @@ LICENSE="GPL-2" |
23 |
KEYWORDS="~amd64 ~x86" |
24 |
|
25 |
CAL_FTS=( karbon plan sheets words ) |
26 |
-CAL_EXP_FTS=( braindump stage ) |
27 |
|
28 |
-IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf |
29 |
- phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) |
30 |
- $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})" |
31 |
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf |
32 |
+ phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) |
33 |
+ calligra_experimental_features_stage" |
34 |
|
35 |
# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) |
36 |
# Required for the matlab/octave formula tool |
37 |
@@ -30,6 +29,9 @@ IUSE="activities +crypt +fontconfig gsl import-filter jpeg2k +lcms okular openex |
38 |
# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) |
39 |
# $(add_kdeapps_dep akonadi) |
40 |
# $(add_kdeapps_dep akonadi-contacts) |
41 |
+# Currently upstream-disabled in plan |
42 |
+# =dev-libs/kproperty-3.0*:5 |
43 |
+# =dev-libs/kreport-3.0*:5 |
44 |
COMMON_DEPEND=" |
45 |
$(add_frameworks_dep karchive) |
46 |
$(add_frameworks_dep kcmutils) |
47 |
@@ -74,6 +76,7 @@ COMMON_DEPEND=" |
48 |
activities? ( $(add_frameworks_dep kactivities) ) |
49 |
crypt? ( app-crypt/qca:2[qt5] ) |
50 |
fontconfig? ( media-libs/fontconfig ) |
51 |
+ gemini? ( $(add_qt_dep qtdeclarative 'widgets') ) |
52 |
gsl? ( sci-libs/gsl ) |
53 |
import-filter? ( |
54 |
$(add_frameworks_dep khtml) |
55 |
@@ -98,17 +101,14 @@ COMMON_DEPEND=" |
56 |
$(add_qt_dep qtx11extras) |
57 |
x11-libs/libX11 |
58 |
) |
59 |
- calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) ) |
60 |
calligra_experimental_features_stage? ( |
61 |
$(add_qt_dep qtwebkit) |
62 |
okular? ( $(add_kdeapps_dep okular) ) |
63 |
) |
64 |
- calligra_features_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) ) |
65 |
calligra_features_plan? ( |
66 |
$(add_frameworks_dep khtml) |
67 |
+ $(add_kdeapps_dep kholidays) |
68 |
dev-libs/kdiagram:5 |
69 |
- =dev-libs/kproperty-3.0*:5 |
70 |
- =dev-libs/kreport-3.0*:5 |
71 |
pim? ( |
72 |
$(add_kdeapps_dep kcalcore) |
73 |
$(add_kdeapps_dep kcontacts) |
74 |
@@ -125,7 +125,6 @@ DEPEND="${COMMON_DEPEND} |
75 |
sys-devel/gettext |
76 |
x11-misc/shared-mime-info |
77 |
test? ( $(add_frameworks_dep threadweaver) ) |
78 |
- vc? ( >=dev-libs/vc-1.1.0 ) |
79 |
" |
80 |
RDEPEND="${COMMON_DEPEND} |
81 |
calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) |
82 |
@@ -134,7 +133,7 @@ RDEPEND="${COMMON_DEPEND} |
83 |
" |
84 |
RESTRICT+=" test" |
85 |
|
86 |
-PATCHES=( "${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch ) |
87 |
+PATCHES=( "${FILESDIR}/${PN}"-3.0.90-no-arch-detection.patch ) |
88 |
|
89 |
pkg_pretend() { |
90 |
check-reqs_pkg_pretend |
91 |
@@ -157,8 +156,7 @@ src_prepare() { |
92 |
punt_bogus_dep Qt5 Declarative |
93 |
punt_bogus_dep Qt5 OpenGL |
94 |
|
95 |
- if ! use calligra_experimental_features_stage && \ |
96 |
- ! use calligra_experimental_features_braindump; then |
97 |
+ if ! use calligra_experimental_features_stage; then |
98 |
punt_bogus_dep Qt5 WebKitWidgets |
99 |
punt_bogus_dep Qt5 WebKit |
100 |
fi |
101 |
@@ -176,7 +174,7 @@ src_prepare() { |
102 |
} |
103 |
|
104 |
src_configure() { |
105 |
- local cal_ft myproducts experimental=OFF |
106 |
+ local cal_ft myproducts |
107 |
|
108 |
# applications |
109 |
for cal_ft in ${CAL_FTS[@]}; do |
110 |
@@ -184,13 +182,10 @@ src_configure() { |
111 |
myproducts+=( "${cal_ft^^}" ) |
112 |
fi |
113 |
done |
114 |
- # experimental/unmaintained applications |
115 |
- for cal_ft in ${CAL_EXP_FTS[@]}; do |
116 |
- if use calligra_experimental_features_${cal_ft} ; then |
117 |
- experimental=ON |
118 |
- myproducts+=( "${cal_ft^^}" ) |
119 |
- fi |
120 |
- done |
121 |
+ |
122 |
+ [[ ${KDE_BUILD_TYPE} == release ]] && \ |
123 |
+ use calligra_experimental_features_stage && \ |
124 |
+ myproducts+=( CALLIGRA_FEATURES_STAGE ) |
125 |
|
126 |
use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
127 |
use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
128 |
@@ -200,19 +195,18 @@ src_configure() { |
129 |
if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
130 |
mycmakeargs+=( |
131 |
-DRELEASE_BUILD=ON |
132 |
- -DBUILD_UNMAINTAINED=${experimental} |
133 |
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
134 |
) |
135 |
fi |
136 |
|
137 |
- use calligra_features_karbon && \ |
138 |
- mycmakeargs+=( $(cmake-utils_use_find_package jpeg2k OpenJPEG) ) |
139 |
- |
140 |
mycmakeargs+=( |
141 |
-DPACKAGERS_BUILD=OFF |
142 |
-DWITH_Iconv=ON |
143 |
$(cmake-utils_use_find_package activities KF5Activities) |
144 |
-DWITH_Qca-qt5=$(usex crypt) |
145 |
-DWITH_Fontconfig=$(usex fontconfig) |
146 |
+ $(cmake-utils_use_find_package gemini Libgit2) |
147 |
+ $(cmake-utils_use_find_package gemini Qt5QuickWidgets) |
148 |
-DWITH_GSL=$(usex gsl) |
149 |
-DWITH_LibEtonyek=$(usex import-filter) |
150 |
-DWITH_LibOdfGen=$(usex import-filter) |
151 |
@@ -231,9 +225,6 @@ src_configure() { |
152 |
-DWITH_Eigen3=$(usex calligra_features_sheets) |
153 |
-ENABLE_CSTESTER_TESTING=$(usex test) |
154 |
-DWITH_Freetype=$(usex truetype) |
155 |
- -DWITH_Vc=$(usex vc) |
156 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON |
157 |
- -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON |
158 |
) |
159 |
|
160 |
kde5_src_configure |
161 |
|
162 |
diff --git a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch |
163 |
deleted file mode 100644 |
164 |
index 1c544e9277..0000000000 |
165 |
--- a/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch |
166 |
+++ /dev/null |
167 |
@@ -1,17 +0,0 @@ |
168 |
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. |
169 |
- |
170 |
-Gentoo-bug: 584118 |
171 |
- |
172 |
---- a/CMakeLists.txt |
173 |
-+++ b/CMakeLists.txt |
174 |
-@@ -617,10 +617,6 @@ |
175 |
- endif() |
176 |
- endmacro() |
177 |
- |
178 |
-- if (NOT PACKAGERS_BUILD) |
179 |
-- # Optimize the whole Calligra for current architecture |
180 |
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") |
181 |
-- endif () |
182 |
- endif() |
183 |
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) |
184 |
- |
185 |
|
186 |
diff --git a/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch b/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch |
187 |
new file mode 100644 |
188 |
index 0000000000..aa83ba1a30 |
189 |
--- /dev/null |
190 |
+++ b/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch |
191 |
@@ -0,0 +1,17 @@ |
192 |
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. |
193 |
+ |
194 |
+Gentoo-bug: 584118 |
195 |
+ |
196 |
+--- a/CMakeLists.txt |
197 |
++++ b/CMakeLists.txt |
198 |
+@@ -617,10 +617,6 @@ |
199 |
+ endif() |
200 |
+ endmacro() |
201 |
+ |
202 |
+- if (NOT PACKAGERS_BUILD) |
203 |
+- # Optimize the whole Calligra for current architecture |
204 |
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") |
205 |
+- endif () |
206 |
+ endif() |
207 |
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) |
208 |
+ |
209 |
|
210 |
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml |
211 |
index 5558990fe6..d7ebffccf0 100644 |
212 |
--- a/app-office/calligra/metadata.xml |
213 |
+++ b/app-office/calligra/metadata.xml |
214 |
@@ -11,12 +11,12 @@ |
215 |
</maintainer> |
216 |
<use> |
217 |
<flag name="activities">Enable kactivities support</flag> |
218 |
+ <flag name="gemini">Enable tablet and 2:1 devices support</flag> |
219 |
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag> |
220 |
<flag name="pim">Enable support for KDE PIM resources integration</flag> |
221 |
<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag> |
222 |
<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag> |
223 |
<flag name="phonon">Build stage/eventplugins and videoshape plugin using <pkg>media-libs/phonon</pkg></flag> |
224 |
<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag> |
225 |
- <flag name="vc">Build with <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag> |
226 |
</use> |
227 |
</pkgmetadata> |