1 |
commit: 2b37981a42b6f9259a31f4b1269dadcf6a36bb95 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 27 22:36:56 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 28 01:19:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b37981a |
7 |
|
8 |
app-office/calligra: 3.1.0 version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
11 |
|
12 |
app-office/calligra/Manifest | 2 + |
13 |
app-office/calligra/calligra-3.1.0.ebuild | 241 +++++++++++++++++++++ |
14 |
.../files/calligra-3.1.0-no-arch-detection.patch | 17 ++ |
15 |
app-office/calligra/metadata.xml | 1 + |
16 |
4 files changed, 261 insertions(+) |
17 |
|
18 |
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest |
19 |
index 776ebb77289..8cf6fbe018a 100644 |
20 |
--- a/app-office/calligra/Manifest |
21 |
+++ b/app-office/calligra/Manifest |
22 |
@@ -1 +1,3 @@ |
23 |
DIST calligra-3.0.1.tar.xz 60764344 BLAKE2B e264f1eb5928d2f11fba9c9b71a77d2685230b9128105264d109d3aca51f32a814795dd04f5f8fb980dce4fa4d4365c4073b35c2abb8933c906238bc0b25aef2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0 |
24 |
+DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b |
25 |
+DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 |
26 |
|
27 |
diff --git a/app-office/calligra/calligra-3.1.0.ebuild b/app-office/calligra/calligra-3.1.0.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..b053f117b3a |
30 |
--- /dev/null |
31 |
+++ b/app-office/calligra/calligra-3.1.0.ebuild |
32 |
@@ -0,0 +1,241 @@ |
33 |
+# Copyright 1999-2018 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=6 |
37 |
+ |
38 |
+CHECKREQS_DISK_BUILD="4G" |
39 |
+KDE_APPS_MINIMAL="17.12.0" |
40 |
+KDE_HANDBOOK="forceoptional" |
41 |
+KDE_PO_DIRS="po plan/po" |
42 |
+KDE_TEST="forceoptional" |
43 |
+inherit check-reqs kde5 versionator |
44 |
+ |
45 |
+DESCRIPTION="KDE Office Suite" |
46 |
+HOMEPAGE="https://www.calligra.org/" |
47 |
+[[ ${KDE_BUILD_TYPE} == release ]] && \ |
48 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz |
49 |
+ calligra_features_plan? ( mirror://kde/stable/${PN}/${PV}/${PN}plan-${PV}.tar.xz )" |
50 |
+ |
51 |
+LICENSE="GPL-2" |
52 |
+ |
53 |
+[[ ${KDE_BUILD_TYPE} == release ]] && \ |
54 |
+KEYWORDS="~amd64 ~x86" |
55 |
+ |
56 |
+CAL_FTS=( karbon plan sheets words ) |
57 |
+ |
58 |
+IUSE="activities +crypt +fontconfig gemini gsl import-filter +lcms okular openexr +pdf |
59 |
+ phonon pim spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) |
60 |
+ calligra_experimental_features_stage" |
61 |
+ |
62 |
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) |
63 |
+# Required for the matlab/octave formula tool |
64 |
+# FIXME: Disabled by upstream for good reason |
65 |
+# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) |
66 |
+# $(add_kdeapps_dep akonadi) |
67 |
+# $(add_kdeapps_dep akonadi-contacts) |
68 |
+# Currently upstream-disabled in plan |
69 |
+# =dev-libs/kproperty-3.0*:5 |
70 |
+# =dev-libs/kreport-3.0*:5 |
71 |
+COMMON_DEPEND=" |
72 |
+ $(add_frameworks_dep karchive) |
73 |
+ $(add_frameworks_dep kcmutils) |
74 |
+ $(add_frameworks_dep kcodecs) |
75 |
+ $(add_frameworks_dep kcompletion) |
76 |
+ $(add_frameworks_dep kconfig) |
77 |
+ $(add_frameworks_dep kconfigwidgets) |
78 |
+ $(add_frameworks_dep kcoreaddons) |
79 |
+ $(add_frameworks_dep kdelibs4support) |
80 |
+ $(add_frameworks_dep kemoticons) |
81 |
+ $(add_frameworks_dep kglobalaccel) |
82 |
+ $(add_frameworks_dep kguiaddons) |
83 |
+ $(add_frameworks_dep ki18n) |
84 |
+ $(add_frameworks_dep kiconthemes) |
85 |
+ $(add_frameworks_dep kio) |
86 |
+ $(add_frameworks_dep kitemmodels) |
87 |
+ $(add_frameworks_dep kitemviews) |
88 |
+ $(add_frameworks_dep kjobwidgets) |
89 |
+ $(add_frameworks_dep knotifications) |
90 |
+ $(add_frameworks_dep knotifyconfig) |
91 |
+ $(add_frameworks_dep kparts) |
92 |
+ $(add_frameworks_dep kross) |
93 |
+ $(add_frameworks_dep ktextwidgets) |
94 |
+ $(add_frameworks_dep kwallet) |
95 |
+ $(add_frameworks_dep kwidgetsaddons) |
96 |
+ $(add_frameworks_dep kwindowsystem) |
97 |
+ $(add_frameworks_dep kxmlgui) |
98 |
+ $(add_frameworks_dep sonnet) |
99 |
+ $(add_qt_dep designer) |
100 |
+ $(add_qt_dep qtdbus) |
101 |
+ $(add_qt_dep qtdeclarative) |
102 |
+ $(add_qt_dep qtgui) |
103 |
+ $(add_qt_dep qtnetwork) |
104 |
+ $(add_qt_dep qtprintsupport) |
105 |
+ $(add_qt_dep qtscript) |
106 |
+ $(add_qt_dep qtsvg) |
107 |
+ $(add_qt_dep qtwidgets) |
108 |
+ $(add_qt_dep qtxml) |
109 |
+ dev-lang/perl |
110 |
+ sys-libs/zlib |
111 |
+ virtual/libiconv |
112 |
+ activities? ( $(add_frameworks_dep kactivities) ) |
113 |
+ crypt? ( app-crypt/qca:2[qt5] ) |
114 |
+ fontconfig? ( media-libs/fontconfig ) |
115 |
+ gemini? ( $(add_qt_dep qtdeclarative 'widgets') ) |
116 |
+ gsl? ( sci-libs/gsl ) |
117 |
+ import-filter? ( |
118 |
+ $(add_frameworks_dep khtml) |
119 |
+ app-text/libetonyek |
120 |
+ app-text/libodfgen |
121 |
+ app-text/libwpd:* |
122 |
+ app-text/libwpg:* |
123 |
+ >=app-text/libwps-0.4 |
124 |
+ dev-libs/librevenge |
125 |
+ media-libs/libvisio |
126 |
+ ) |
127 |
+ lcms? ( |
128 |
+ media-libs/ilmbase:= |
129 |
+ media-libs/lcms:2 |
130 |
+ ) |
131 |
+ openexr? ( media-libs/openexr ) |
132 |
+ pdf? ( app-text/poppler:=[qt5] ) |
133 |
+ phonon? ( media-libs/phonon[qt5(+)] ) |
134 |
+ spacenav? ( dev-libs/libspnav ) |
135 |
+ truetype? ( media-libs/freetype:2 ) |
136 |
+ X? ( |
137 |
+ $(add_qt_dep qtx11extras) |
138 |
+ x11-libs/libX11 |
139 |
+ ) |
140 |
+ calligra_experimental_features_stage? ( |
141 |
+ $(add_qt_dep qtwebkit) |
142 |
+ okular? ( $(add_kdeapps_dep okular) ) |
143 |
+ ) |
144 |
+ calligra_features_plan? ( |
145 |
+ $(add_frameworks_dep khtml) |
146 |
+ $(add_kdeapps_dep kholidays) |
147 |
+ dev-libs/kdiagram:5 |
148 |
+ pim? ( |
149 |
+ $(add_kdeapps_dep kcalcore) |
150 |
+ $(add_kdeapps_dep kcontacts) |
151 |
+ ) |
152 |
+ ) |
153 |
+ calligra_features_sheets? ( dev-cpp/eigen:3 ) |
154 |
+ calligra_features_words? ( |
155 |
+ dev-libs/libxslt |
156 |
+ okular? ( $(add_kdeapps_dep okular) ) |
157 |
+ ) |
158 |
+" |
159 |
+DEPEND="${COMMON_DEPEND} |
160 |
+ dev-libs/boost |
161 |
+ sys-devel/gettext |
162 |
+ x11-misc/shared-mime-info |
163 |
+ test? ( $(add_frameworks_dep threadweaver) ) |
164 |
+" |
165 |
+RDEPEND="${COMMON_DEPEND} |
166 |
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) |
167 |
+ !app-office/calligra:4 |
168 |
+ !app-office/calligra-l10n:4 |
169 |
+" |
170 |
+RESTRICT+=" test" |
171 |
+ |
172 |
+PATCHES=( "${FILESDIR}"/${P}-no-arch-detection.patch ) |
173 |
+ |
174 |
+pkg_pretend() { |
175 |
+ check-reqs_pkg_pretend |
176 |
+} |
177 |
+ |
178 |
+pkg_setup() { |
179 |
+ kde5_pkg_setup |
180 |
+ check-reqs_pkg_setup |
181 |
+} |
182 |
+ |
183 |
+src_prepare() { |
184 |
+ if use calligra_features_plan && [[ ${KDE_BUILD_TYPE} == release ]]; then |
185 |
+ mv ../${PN}plan-${PV} plan || die |
186 |
+ sed -e "/add_subdirectory(plan)/s/#//" \ |
187 |
+ -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ |
188 |
+ -i CMakeLists.txt || die |
189 |
+ fi |
190 |
+ kde5_src_prepare |
191 |
+ |
192 |
+ if ! use test; then |
193 |
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ |
194 |
+ -i libs/pigment/CMakeLists.txt || die |
195 |
+ fi |
196 |
+ |
197 |
+ # Unconditionally disable deprecated deps (required by QtQuick1) |
198 |
+ punt_bogus_dep Qt5 Declarative |
199 |
+ punt_bogus_dep Qt5 OpenGL |
200 |
+ |
201 |
+ if ! use calligra_experimental_features_stage; then |
202 |
+ punt_bogus_dep Qt5 WebKitWidgets |
203 |
+ punt_bogus_dep Qt5 WebKit |
204 |
+ fi |
205 |
+ |
206 |
+ # Hack around the excessive use of CMake macros |
207 |
+ if use okular && ! use calligra_features_words; then |
208 |
+ sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ |
209 |
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" |
210 |
+ fi |
211 |
+ |
212 |
+ if use okular && ! use calligra_experimental_features_stage; then |
213 |
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ |
214 |
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" |
215 |
+ fi |
216 |
+} |
217 |
+ |
218 |
+src_configure() { |
219 |
+ local cal_ft myproducts |
220 |
+ |
221 |
+ # applications |
222 |
+ for cal_ft in ${CAL_FTS[@]}; do |
223 |
+ if use calligra_features_${cal_ft} ; then |
224 |
+ myproducts+=( "${cal_ft^^}" ) |
225 |
+ fi |
226 |
+ done |
227 |
+ |
228 |
+ [[ ${KDE_BUILD_TYPE} == release ]] && \ |
229 |
+ use calligra_experimental_features_stage && \ |
230 |
+ myproducts+=( CALLIGRA_FEATURES_STAGE ) |
231 |
+ |
232 |
+ use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
233 |
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
234 |
+ |
235 |
+ local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) |
236 |
+ |
237 |
+ if [[ ${KDE_BUILD_TYPE} == release ]] ; then |
238 |
+ mycmakeargs+=( |
239 |
+ -DRELEASE_BUILD=ON |
240 |
+ -DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage) |
241 |
+ ) |
242 |
+ fi |
243 |
+ |
244 |
+ mycmakeargs+=( |
245 |
+ -DPACKAGERS_BUILD=OFF |
246 |
+ -DWITH_Iconv=ON |
247 |
+ $(cmake-utils_use_find_package activities KF5Activities) |
248 |
+ -DWITH_Qca-qt5=$(usex crypt) |
249 |
+ -DWITH_Fontconfig=$(usex fontconfig) |
250 |
+ $(cmake-utils_use_find_package gemini Libgit2) |
251 |
+ $(cmake-utils_use_find_package gemini Qt5QuickWidgets) |
252 |
+ -DWITH_GSL=$(usex gsl) |
253 |
+ -DWITH_LibEtonyek=$(usex import-filter) |
254 |
+ -DWITH_LibOdfGen=$(usex import-filter) |
255 |
+ -DWITH_LibRevenge=$(usex import-filter) |
256 |
+ -DWITH_LibVisio=$(usex import-filter) |
257 |
+ -DWITH_LibWpd=$(usex import-filter) |
258 |
+ -DWITH_LibWpg=$(usex import-filter) |
259 |
+ -DWITH_LibWps=$(usex import-filter) |
260 |
+ $(cmake-utils_use_find_package phonon Phonon4Qt5) |
261 |
+ $(cmake-utils_use_find_package pim KF5CalendarCore) |
262 |
+ $(cmake-utils_use_find_package pim KF5Contacts) |
263 |
+ -DWITH_LCMS2=$(usex lcms) |
264 |
+ -DWITH_Okular5=$(usex okular) |
265 |
+ -DWITH_OpenEXR=$(usex openexr) |
266 |
+ -DWITH_Poppler=$(usex pdf) |
267 |
+ -DWITH_Eigen3=$(usex calligra_features_sheets) |
268 |
+ -ENABLE_CSTESTER_TESTING=$(usex test) |
269 |
+ -DWITH_Freetype=$(usex truetype) |
270 |
+ ) |
271 |
+ |
272 |
+ kde5_src_configure |
273 |
+} |
274 |
|
275 |
diff --git a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch |
276 |
new file mode 100644 |
277 |
index 00000000000..aa83ba1a301 |
278 |
--- /dev/null |
279 |
+++ b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch |
280 |
@@ -0,0 +1,17 @@ |
281 |
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. |
282 |
+ |
283 |
+Gentoo-bug: 584118 |
284 |
+ |
285 |
+--- a/CMakeLists.txt |
286 |
++++ b/CMakeLists.txt |
287 |
+@@ -617,10 +617,6 @@ |
288 |
+ endif() |
289 |
+ endmacro() |
290 |
+ |
291 |
+- if (NOT PACKAGERS_BUILD) |
292 |
+- # Optimize the whole Calligra for current architecture |
293 |
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") |
294 |
+- endif () |
295 |
+ endif() |
296 |
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) |
297 |
+ |
298 |
|
299 |
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml |
300 |
index d600cd47a36..575f0b0a917 100644 |
301 |
--- a/app-office/calligra/metadata.xml |
302 |
+++ b/app-office/calligra/metadata.xml |
303 |
@@ -11,6 +11,7 @@ |
304 |
</maintainer> |
305 |
<use> |
306 |
<flag name="activities">Enable kactivities support</flag> |
307 |
+ <flag name="gemini">Enable tablet and 2:1 devices support</flag> |
308 |
<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag> |
309 |
<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag> |
310 |
<flag name="okular">Enable bindings for <pkg>kde-apps/okular</pkg></flag> |