| 1 |
commit: 91811eefedfd2e0bd104987a3a6c029e07f29d39 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 24 13:32:45 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 24 14:10:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91811eef |
| 7 |
|
| 8 |
app-office/calligra: 3.2.0 version bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/calligra/Manifest | 1 + |
| 14 |
app-office/calligra/calligra-3.2.0.ebuild | 201 +++++++++++++++++++++ |
| 15 |
.../files/calligra-3.1.89-no-arch-detection.patch | 17 ++ |
| 16 |
3 files changed, 219 insertions(+) |
| 17 |
|
| 18 |
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest |
| 19 |
index 510689b2e98..ac459e7481d 100644 |
| 20 |
--- a/app-office/calligra/Manifest |
| 21 |
+++ b/app-office/calligra/Manifest |
| 22 |
@@ -1 +1,2 @@ |
| 23 |
DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b |
| 24 |
+DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e SHA512 625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013 |
| 25 |
|
| 26 |
diff --git a/app-office/calligra/calligra-3.2.0.ebuild b/app-office/calligra/calligra-3.2.0.ebuild |
| 27 |
new file mode 100644 |
| 28 |
index 00000000000..dc2f5fb9f55 |
| 29 |
--- /dev/null |
| 30 |
+++ b/app-office/calligra/calligra-3.2.0.ebuild |
| 31 |
@@ -0,0 +1,201 @@ |
| 32 |
+# Copyright 1999-2020 Gentoo Authors |
| 33 |
+# Distributed under the terms of the GNU General Public License v2 |
| 34 |
+ |
| 35 |
+EAPI=7 |
| 36 |
+ |
| 37 |
+CHECKREQS_DISK_BUILD="4G" |
| 38 |
+ECM_HANDBOOK="forceoptional" |
| 39 |
+ECM_TEST="forceoptional" |
| 40 |
+KFMIN=5.60.0 |
| 41 |
+QTMIN=5.12.3 |
| 42 |
+inherit check-reqs ecm kde.org |
| 43 |
+ |
| 44 |
+DESCRIPTION="KDE Office Suite" |
| 45 |
+HOMEPAGE="https://www.calligra.org/" |
| 46 |
+ |
| 47 |
+if [[ ${KDE_BUILD_TYPE} == release ]]; then |
| 48 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
| 49 |
+ KEYWORDS="~amd64 ~x86" |
| 50 |
+fi |
| 51 |
+ |
| 52 |
+CAL_FTS=( karbon sheets stage words ) |
| 53 |
+ |
| 54 |
+LICENSE="GPL-2" |
| 55 |
+SLOT="5" |
| 56 |
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr |
| 57 |
+ +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})" |
| 58 |
+ |
| 59 |
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) |
| 60 |
+# Required for the matlab/octave formula tool |
| 61 |
+BDEPEND=" |
| 62 |
+ sys-devel/gettext |
| 63 |
+" |
| 64 |
+COMMON_DEPEND=" |
| 65 |
+ dev-lang/perl |
| 66 |
+ >=dev-qt/designer-${QTMIN}:5 |
| 67 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
| 68 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
| 69 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
| 70 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
| 71 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
| 72 |
+ >=dev-qt/qtscript-${QTMIN}:5 |
| 73 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
| 74 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
| 75 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
| 76 |
+ >=kde-frameworks/karchive-${KFMIN}:5 |
| 77 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
| 78 |
+ >=kde-frameworks/kcodecs-${KFMIN}:5 |
| 79 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
| 80 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
| 81 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
| 82 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
| 83 |
+ >=kde-frameworks/kdelibs4support-${KFMIN}:5 |
| 84 |
+ >=kde-frameworks/kemoticons-${KFMIN}:5 |
| 85 |
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5 |
| 86 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
| 87 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
| 88 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
| 89 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
| 90 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
| 91 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
| 92 |
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
| 93 |
+ >=kde-frameworks/knotifications-${KFMIN}:5 |
| 94 |
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5 |
| 95 |
+ >=kde-frameworks/kparts-${KFMIN}:5 |
| 96 |
+ >=kde-frameworks/kross-${KFMIN}:5 |
| 97 |
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5 |
| 98 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
| 99 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
| 100 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
| 101 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
| 102 |
+ >=kde-frameworks/sonnet-${KFMIN}:5 |
| 103 |
+ sys-libs/zlib |
| 104 |
+ virtual/libiconv |
| 105 |
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 ) |
| 106 |
+ charts? ( dev-libs/kdiagram:5 ) |
| 107 |
+ crypt? ( app-crypt/qca:2[qt5(+)] ) |
| 108 |
+ fontconfig? ( media-libs/fontconfig ) |
| 109 |
+ gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] ) |
| 110 |
+ gsl? ( sci-libs/gsl ) |
| 111 |
+ import-filter? ( |
| 112 |
+ app-text/libetonyek |
| 113 |
+ app-text/libodfgen |
| 114 |
+ app-text/libwpd:* |
| 115 |
+ app-text/libwpg:* |
| 116 |
+ >=app-text/libwps-0.4 |
| 117 |
+ dev-libs/librevenge |
| 118 |
+ >=kde-frameworks/khtml-${KFMIN}:5 |
| 119 |
+ media-libs/libvisio |
| 120 |
+ ) |
| 121 |
+ lcms? ( |
| 122 |
+ media-libs/ilmbase:= |
| 123 |
+ media-libs/lcms:2 |
| 124 |
+ ) |
| 125 |
+ openexr? ( media-libs/openexr ) |
| 126 |
+ pdf? ( app-text/poppler:=[qt5] ) |
| 127 |
+ phonon? ( media-libs/phonon[qt5(+)] ) |
| 128 |
+ spacenav? ( dev-libs/libspnav ) |
| 129 |
+ truetype? ( media-libs/freetype:2 ) |
| 130 |
+ X? ( |
| 131 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
| 132 |
+ x11-libs/libX11 |
| 133 |
+ ) |
| 134 |
+ calligra_features_sheets? ( dev-cpp/eigen:3 ) |
| 135 |
+ calligra_features_stage? ( okular? ( kde-apps/okular:5 ) ) |
| 136 |
+ calligra_features_words? ( |
| 137 |
+ dev-libs/libxslt |
| 138 |
+ okular? ( kde-apps/okular:5 ) |
| 139 |
+ ) |
| 140 |
+" |
| 141 |
+DEPEND="${COMMON_DEPEND} |
| 142 |
+ dev-libs/boost |
| 143 |
+ test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) |
| 144 |
+" |
| 145 |
+RDEPEND="${COMMON_DEPEND} |
| 146 |
+ calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) |
| 147 |
+ gemini? ( |
| 148 |
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5 |
| 149 |
+ >=kde-frameworks/kirigami-${KFMIN}:5 |
| 150 |
+ ) |
| 151 |
+" |
| 152 |
+RESTRICT+=" test" |
| 153 |
+ |
| 154 |
+PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch ) |
| 155 |
+ |
| 156 |
+pkg_pretend() { |
| 157 |
+ check-reqs_pkg_pretend |
| 158 |
+} |
| 159 |
+ |
| 160 |
+pkg_setup() { |
| 161 |
+ ecm_pkg_setup |
| 162 |
+ check-reqs_pkg_setup |
| 163 |
+} |
| 164 |
+ |
| 165 |
+src_prepare() { |
| 166 |
+ ecm_src_prepare |
| 167 |
+ |
| 168 |
+ if ! use test; then |
| 169 |
+ sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ |
| 170 |
+ -i libs/pigment/CMakeLists.txt || die |
| 171 |
+ fi |
| 172 |
+ |
| 173 |
+ # Unconditionally disable deprecated deps (required by QtQuick1) |
| 174 |
+ ecm_punt_bogus_dep Qt5 Declarative |
| 175 |
+ ecm_punt_bogus_dep Qt5 OpenGL |
| 176 |
+ |
| 177 |
+ # Hack around the excessive use of CMake macros |
| 178 |
+ if use okular && ! use calligra_features_words; then |
| 179 |
+ sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ |
| 180 |
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" |
| 181 |
+ fi |
| 182 |
+ |
| 183 |
+ if use okular && ! use calligra_features_stage; then |
| 184 |
+ sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ |
| 185 |
+ extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" |
| 186 |
+ fi |
| 187 |
+} |
| 188 |
+ |
| 189 |
+src_configure() { |
| 190 |
+ local cal_ft myproducts |
| 191 |
+ |
| 192 |
+ # applications |
| 193 |
+ for cal_ft in ${CAL_FTS[@]}; do |
| 194 |
+ use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" ) |
| 195 |
+ done |
| 196 |
+ |
| 197 |
+ use lcms && myproducts+=( PLUGIN_COLORENGINES ) |
| 198 |
+ use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR ) |
| 199 |
+ |
| 200 |
+ local mycmakeargs=( |
| 201 |
+ -DPACKAGERS_BUILD=OFF |
| 202 |
+ -DRELEASE_BUILD=ON |
| 203 |
+ -DWITH_Iconv=ON |
| 204 |
+ -DPRODUCTSET="${myproducts[*]}" |
| 205 |
+ $(cmake_use_find_package activities KF5Activities) |
| 206 |
+ $(cmake_use_find_package charts KChart) |
| 207 |
+ -DWITH_Qca-qt5=$(usex crypt) |
| 208 |
+ -DWITH_Fontconfig=$(usex fontconfig) |
| 209 |
+ $(cmake_use_find_package gemini Libgit2) |
| 210 |
+ $(cmake_use_find_package gemini Qt5QuickWidgets) |
| 211 |
+ -DWITH_GSL=$(usex gsl) |
| 212 |
+ -DWITH_LibEtonyek=$(usex import-filter) |
| 213 |
+ -DWITH_LibOdfGen=$(usex import-filter) |
| 214 |
+ -DWITH_LibRevenge=$(usex import-filter) |
| 215 |
+ -DWITH_LibVisio=$(usex import-filter) |
| 216 |
+ -DWITH_LibWpd=$(usex import-filter) |
| 217 |
+ -DWITH_LibWpg=$(usex import-filter) |
| 218 |
+ -DWITH_LibWps=$(usex import-filter) |
| 219 |
+ $(cmake_use_find_package phonon Phonon4Qt5) |
| 220 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON |
| 221 |
+ -DWITH_LCMS2=$(usex lcms) |
| 222 |
+ -DWITH_Okular5=$(usex okular) |
| 223 |
+ -DWITH_OpenEXR=$(usex openexr) |
| 224 |
+ -DWITH_Poppler=$(usex pdf) |
| 225 |
+ -DWITH_Eigen3=$(usex calligra_features_sheets) |
| 226 |
+ -DBUILD_UNMAINTAINED=$(usex calligra_features_stage) |
| 227 |
+ -ENABLE_CSTESTER_TESTING=$(usex test) |
| 228 |
+ -DWITH_Freetype=$(usex truetype) |
| 229 |
+ ) |
| 230 |
+ |
| 231 |
+ ecm_src_configure |
| 232 |
+} |
| 233 |
|
| 234 |
diff --git a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch |
| 235 |
new file mode 100644 |
| 236 |
index 00000000000..f4efa3d81a4 |
| 237 |
--- /dev/null |
| 238 |
+++ b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch |
| 239 |
@@ -0,0 +1,17 @@ |
| 240 |
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. |
| 241 |
+ |
| 242 |
+Gentoo-bug: 584118 |
| 243 |
+ |
| 244 |
+--- a/CMakeLists.txt |
| 245 |
++++ b/CMakeLists.txt |
| 246 |
+@@ -617,10 +617,6 @@ |
| 247 |
+ endif() |
| 248 |
+ endmacro() |
| 249 |
+ |
| 250 |
+- if (NOT PACKAGERS_BUILD) |
| 251 |
+- # Optimize the whole Calligra for current architecture |
| 252 |
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") |
| 253 |
+- endif () |
| 254 |
+ endif() |
| 255 |
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) |
| 256 |
+ |
Archives