app-office/calligra: 3.2.0 version bump
authorAndreas Sturmlechner <asturm@gentoo.org>
Fri, 24 Apr 2020 13:32:45 +0000 (15:32 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Fri, 24 Apr 2020 14:10:15 +0000 (16:10 +0200)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
app-office/calligra/Manifest
app-office/calligra/calligra-3.2.0.ebuild [new file with mode: 0644]
app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch [new file with mode: 0644]

index 510689b2e9819fa36a50cfa58c88a21db1cd8eee..ac459e7481df93d64283a2512c77056904531665 100644 (file)
@@ -1 +1,2 @@
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
+DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e SHA512 625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013
diff --git a/app-office/calligra/calligra-3.2.0.ebuild b/app-office/calligra/calligra-3.2.0.ebuild
new file mode 100644 (file)
index 0000000..dc2f5fb
--- /dev/null
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+       SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+       KEYWORDS="~amd64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr
+       +pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+       sys-devel/gettext
+"
+COMMON_DEPEND="
+       dev-lang/perl
+       >=dev-qt/designer-${QTMIN}:5
+       >=dev-qt/qtdbus-${QTMIN}:5
+       >=dev-qt/qtdeclarative-${QTMIN}:5
+       >=dev-qt/qtgui-${QTMIN}:5
+       >=dev-qt/qtnetwork-${QTMIN}:5
+       >=dev-qt/qtprintsupport-${QTMIN}:5
+       >=dev-qt/qtscript-${QTMIN}:5
+       >=dev-qt/qtsvg-${QTMIN}:5
+       >=dev-qt/qtwidgets-${QTMIN}:5
+       >=dev-qt/qtxml-${QTMIN}:5
+       >=kde-frameworks/karchive-${KFMIN}:5
+       >=kde-frameworks/kcmutils-${KFMIN}:5
+       >=kde-frameworks/kcodecs-${KFMIN}:5
+       >=kde-frameworks/kcompletion-${KFMIN}:5
+       >=kde-frameworks/kconfig-${KFMIN}:5
+       >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+       >=kde-frameworks/kcoreaddons-${KFMIN}:5
+       >=kde-frameworks/kdelibs4support-${KFMIN}:5
+       >=kde-frameworks/kemoticons-${KFMIN}:5
+       >=kde-frameworks/kglobalaccel-${KFMIN}:5
+       >=kde-frameworks/kguiaddons-${KFMIN}:5
+       >=kde-frameworks/ki18n-${KFMIN}:5
+       >=kde-frameworks/kiconthemes-${KFMIN}:5
+       >=kde-frameworks/kio-${KFMIN}:5
+       >=kde-frameworks/kitemmodels-${KFMIN}:5
+       >=kde-frameworks/kitemviews-${KFMIN}:5
+       >=kde-frameworks/kjobwidgets-${KFMIN}:5
+       >=kde-frameworks/knotifications-${KFMIN}:5
+       >=kde-frameworks/knotifyconfig-${KFMIN}:5
+       >=kde-frameworks/kparts-${KFMIN}:5
+       >=kde-frameworks/kross-${KFMIN}:5
+       >=kde-frameworks/ktextwidgets-${KFMIN}:5
+       >=kde-frameworks/kwallet-${KFMIN}:5
+       >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+       >=kde-frameworks/kwindowsystem-${KFMIN}:5
+       >=kde-frameworks/kxmlgui-${KFMIN}:5
+       >=kde-frameworks/sonnet-${KFMIN}:5
+       sys-libs/zlib
+       virtual/libiconv
+       activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+       charts? ( dev-libs/kdiagram:5 )
+       crypt? ( app-crypt/qca:2[qt5(+)] )
+       fontconfig? ( media-libs/fontconfig )
+       gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+       gsl? ( sci-libs/gsl )
+       import-filter? (
+               app-text/libetonyek
+               app-text/libodfgen
+               app-text/libwpd:*
+               app-text/libwpg:*
+               >=app-text/libwps-0.4
+               dev-libs/librevenge
+               >=kde-frameworks/khtml-${KFMIN}:5
+               media-libs/libvisio
+       )
+       lcms? (
+               media-libs/ilmbase:=
+               media-libs/lcms:2
+       )
+       openexr? ( media-libs/openexr )
+       pdf? ( app-text/poppler:=[qt5] )
+       phonon? ( media-libs/phonon[qt5(+)] )
+       spacenav? ( dev-libs/libspnav )
+       truetype? ( media-libs/freetype:2 )
+       X? (
+               >=dev-qt/qtx11extras-${QTMIN}:5
+               x11-libs/libX11
+       )
+       calligra_features_sheets? ( dev-cpp/eigen:3 )
+       calligra_features_stage? ( okular? ( kde-apps/okular:5 ) )
+       calligra_features_words? (
+               dev-libs/libxslt
+               okular? ( kde-apps/okular:5 )
+       )
+"
+DEPEND="${COMMON_DEPEND}
+       dev-libs/boost
+       test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+       calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+       gemini? (
+               >=dev-qt/qtquickcontrols2-${QTMIN}:5
+               >=kde-frameworks/kirigami-${KFMIN}:5
+       )
+"
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+
+pkg_pretend() {
+       check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+       ecm_pkg_setup
+       check-reqs_pkg_setup
+}
+
+src_prepare() {
+       ecm_src_prepare
+
+       if ! use test; then
+               sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+                       -i libs/pigment/CMakeLists.txt || die
+       fi
+
+       # Unconditionally disable deprecated deps (required by QtQuick1)
+       ecm_punt_bogus_dep Qt5 Declarative
+       ecm_punt_bogus_dep Qt5 OpenGL
+
+       # Hack around the excessive use of CMake macros
+       if use okular && ! use calligra_features_words; then
+               sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \
+                       extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT"
+       fi
+
+       if use okular && ! use calligra_features_stage; then
+               sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \
+                       extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP"
+       fi
+}
+
+src_configure() {
+       local cal_ft myproducts
+
+       # applications
+       for cal_ft in ${CAL_FTS[@]}; do
+               use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+       done
+
+       use lcms && myproducts+=( PLUGIN_COLORENGINES )
+       use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+       local mycmakeargs=(
+               -DPACKAGERS_BUILD=OFF
+               -DRELEASE_BUILD=ON
+               -DWITH_Iconv=ON
+               -DPRODUCTSET="${myproducts[*]}"
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package charts KChart)
+               -DWITH_Qca-qt5=$(usex crypt)
+               -DWITH_Fontconfig=$(usex fontconfig)
+               $(cmake_use_find_package gemini Libgit2)
+               $(cmake_use_find_package gemini Qt5QuickWidgets)
+               -DWITH_GSL=$(usex gsl)
+               -DWITH_LibEtonyek=$(usex import-filter)
+               -DWITH_LibOdfGen=$(usex import-filter)
+               -DWITH_LibRevenge=$(usex import-filter)
+               -DWITH_LibVisio=$(usex import-filter)
+               -DWITH_LibWpd=$(usex import-filter)
+               -DWITH_LibWpg=$(usex import-filter)
+               -DWITH_LibWps=$(usex import-filter)
+               $(cmake_use_find_package phonon Phonon4Qt5)
+               -DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+               -DWITH_LCMS2=$(usex lcms)
+               -DWITH_Okular5=$(usex okular)
+               -DWITH_OpenEXR=$(usex openexr)
+               -DWITH_Poppler=$(usex pdf)
+               -DWITH_Eigen3=$(usex calligra_features_sheets)
+               -DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+               -ENABLE_CSTESTER_TESTING=$(usex test)
+               -DWITH_Freetype=$(usex truetype)
+       )
+
+       ecm_src_configure
+}
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
new file mode 100644 (file)
index 0000000..f4efa3d
--- /dev/null
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -617,10 +617,6 @@
+           endif()
+       endmacro()
+-      if (NOT PACKAGERS_BUILD)
+-          # Optimize the whole Calligra for current architecture
+-          set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+-      endif ()
+     endif()
+     set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )