[gentoo-commits] proj/kde-sunset:master commit in: app-office/calligra/, app-office/calligra/files/

[Michael Palimaka]

commit:     5d02f2c7cee655610658f046b378caf9b1fefe9e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  6 12:46:08 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jul  6 12:47:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=5d02f2c7

app-office/calligra: import from main tree

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 app-office/calligra/calligra-2.9.11-r1.ebuild      | 227 +++++++++++++++++++++
 .../files/calligra-2.9.1-no-arch-detection.patch   |  14 ++
 .../files/calligra-2.9.11-libwps-0.4.patch         |  46 +++++
 .../files/calligra-2.9.11-postgresql-9.6.patch     |  19 ++
 app-office/calligra/metadata.xml                   |  25 +++
 5 files changed, 331 insertions(+)

diff --git a/app-office/calligra/calligra-2.9.11-r1.ebuild b/app-office/calligra/calligra-2.9.11-r1.ebuild
new file mode 100644
index 0000000..ae488fe
--- /dev/null
+++ b/app-office/calligra/calligra-2.9.11-r1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="4G"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+OPENGL_REQUIRED="optional"
+WEBKIT_REQUIRED="optional"
+inherit check-reqs kde4-base versionator
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/"
+
+case ${PV} in
+	2.[456789].[789]?)
+		# beta or rc releases
+		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
+	2.[456789].?|2.[456789].??)
+		# stable releases
+		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
+	2.[456789].9999)
+		# stable branch live ebuild
+		SRC_URI="" ;;
+	9999)
+		# master branch live ebuild
+		SRC_URI="" ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="4"
+
+if [[ ${KDE_BUILD_TYPE} == release ]] ; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+IUSE="color-management +crypt +eigen +exif fftw +fontconfig freetds +glew +glib
++gsf gsl import-filter +jpeg jpeg2k +lcms mysql openexr +pdf +pim
+postgres spacenav sybase test tiff +threads +truetype vc xbase +xml"
+
+# Don't use Active, it's broken on desktops.
+CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+REQUIRED_USE="
+	|| ( $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) )
+	calligra_features_author? ( calligra_features_words )
+	calligra_features_gemini? ( opengl )
+	calligra_features_krita? ( eigen exif lcms opengl )
+	calligra_features_plan? ( pim )
+	calligra_features_sheets? ( eigen )
+	calligra_features_stage? ( webkit )
+	vc? ( calligra_features_krita )
+	test? ( calligra_features_karbon )
+"
+
+RDEPEND="
+	dev-lang/perl
+	dev-libs/boost
+	dev-qt/qtcore:4[exceptions]
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/libiconv
+	color-management? ( media-libs/opencolorio )
+	crypt? ( app-crypt/qca:2[qt4] )
+	eigen? ( dev-cpp/eigen:3 )
+	exif? ( media-gfx/exiv2:= )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl:= )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		app-text/libwps
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:0 )
+	lcms? (
+		media-libs/lcms:2
+		x11-libs/libX11
+	)
+	mysql? ( virtual/mysql )
+	openexr? ( media-libs/openexr:= )
+	opengl? (
+		media-libs/glew:0
+		virtual/glu
+	)
+	pdf? (
+		app-text/poppler:=
+		media-gfx/pstoedit
+	)
+	pim? ( $(add_kdeapps_dep kdepimlibs) )
+	postgres? (
+		dev-db/postgresql:*
+		dev-libs/libpqxx
+	)
+	spacenav? ( dev-libs/libspnav )
+	sybase? ( dev-db/freetds )
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vc? ( <dev-libs/vc-1.0.0 )
+	xbase? ( dev-db/xbase )
+	calligra_features_kexi? (
+		dev-db/sqlite:3[extensions(+)]
+		dev-libs/icu:=
+	)
+	calligra_features_krita? (
+		dev-qt/qtdeclarative:4
+		net-misc/curl
+		x11-libs/libX11
+		x11-libs/libXi
+	)
+	calligra_features_words? ( dev-libs/libxslt )
+"
+DEPEND="${RDEPEND}
+	x11-misc/shared-mime-info
+"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
+
+# bug 394273
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.1-no-arch-detection.patch
+	"${FILESDIR}"/${P}-postgresql-9.6.patch
+	"${FILESDIR}"/${P}-libwps-0.4.patch
+)
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	kde4-base_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	if ! use webkit; then
+		sed -i CMakeLists.txt -e "/^find_package/ s/QtWebKit //" || die
+	fi
+}
+
+src_configure() {
+	local cal_ft myproducts
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
+
+	# regular options
+	mycmakeargs+=(
+		-DCREATIVEONLY=OFF
+		-DPACKAGERS_BUILD=OFF
+		-DWITH_Soprano=OFF
+		-DWITH_KActivities=OFF
+		-DWITH_CalligraMarble=OFF
+		-DWITH_Iconv=ON
+		-DWITH_OCIO=$(usex color-management)
+		-DWITH_QCA2=$(usex crypt)
+		-DWITH_Eigen3=$(usex eigen)
+		-DWITH_Exiv2=$(usex exif)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		-DWITH_FreeTDS=$(usex freetds)
+		-DWITH_GLIB2=$(usex glib)
+		-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)
+		-DWITH_JPEG=$(usex jpeg)
+		-DWITH_OpenJPEG=$(usex jpeg2k)
+		-DWITH_Kdcraw=OFF
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_MySQL=$(usex mysql)
+		-DWITH_Okular=OFF
+		-DWITH_OpenEXR=$(usex openexr)
+		-DUSEOPENGL=$(usex opengl)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Pstoedit=$(usex pdf)
+		-DWITH_KdepimLibs=$(usex pim)
+		-DWITH_CalligraPostgreSQL=$(usex postgres)
+		-DWITH_Spnav=$(usex spacenav)
+		-DWITH_FreeTDS=$(usex sybase)
+		-DWITH_Threads=$(usex threads)
+		-DWITH_TIFF=$(usex tiff)
+		-DWITH_Freetype=$(usex truetype)
+		-DWITH_Vc=$(usex vc)
+		-DWITH_XBase=$(usex xbase)
+	)
+
+	use test && mycmakeargs+=( -DENABLE_CSTESTER_TESTING=$(usex test) )
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# bug 613414
+	QA_DT_NEEDED="usr/lib64/libkoversion.so.14.0.0"
+}

diff --git a/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch b/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
new file mode 100644
index 0000000..85f401b
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.1-no-arch-detection.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt	2016-12-07 12:48:03.771533639 -0200
++++ b/CMakeLists.txt	2016-12-07 12:49:07.534866207 -0200
+@@ -441,11 +441,6 @@
+         endif()
+         endmacro()
+     endif()
+-
+-    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} )
+ 

diff --git a/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
new file mode 100644
index 0000000..79595d9
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.11-libwps-0.4.patch
@@ -0,0 +1,46 @@
+Last-Update: 2015-06-17
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969
+Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070
+From: David Tardon <dtardon@××××××.com>
+Description: adapt to libwps 0.4
+
+--- a/cmake/modules/FindLibWps.cmake
++++ b/cmake/modules/FindLibWps.cmake
+@@ -9,18 +9,18 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ 
+ include(LibFindMacros)
+ libfind_package(LIBWPS LibWpd)
+-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
+ 
+ find_path(LIBWPS_INCLUDE_DIR
+     NAMES libwps/libwps.h
+     HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libwps-0.3
++    PATH_SUFFIXES libwps-0.4
+ )
+ 
+ find_library(LIBWPS_LIBRARY
+-    NAMES wps wps-0.3
++    NAMES wps wps-0.4
+     HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
+ )
+ 
+ set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES)
+--- a/filters/words/works/import/WPSImport.cpp
++++ b/filters/words/works/import/WPSImport.cpp
+@@ -90,9 +90,11 @@
+     }
+     bool isSupportedFormat(librevenge::RVNGInputStream &input)
+     {
+         WPSKind kind = WPS_TEXT;
+-        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind);
++        WPSCreator creator = WPS_MSWORKS;
++        bool needsEncoding = false;
++        WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding);
+         if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
+             return false;
+         return true;
+     }

diff --git a/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
new file mode 100644
index 0000000..617a0c3
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.11-postgresql-9.6.patch
@@ -0,0 +1,19 @@
+commit 843c41decfa85e351349f7a410893ac85c9d60b7
+Author: Pino Toscano <pino@×××.org>
+Date:   Sat Oct 8 16:17:17 2016 +0200
+
+    cmake: find PostgreSQL 9.6
+
+diff --git a/cmake/modules/FindCalligraPostgreSQL.cmake b/cmake/modules/FindCalligraPostgreSQL.cmake
+index 035508b..98a1e88 100644
+--- a/cmake/modules/FindCalligraPostgreSQL.cmake
++++ b/cmake/modules/FindCalligraPostgreSQL.cmake
+@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
+ 
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++    "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
new file mode 100644
index 0000000..6870758
--- /dev/null
+++ b/app-office/calligra/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@g.o</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>office@g.o</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
+		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
+		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
+		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
+		<flag name="import-filter">Enable support for various import filter file formats like WordPerfect, Visio and Apple Keynote</flag>
+		<flag name="lcms">Build colorengine plugins using <pkg>media-libs/lcms</pkg></flag>
+		<flag name="pim">Enable support for KDE PIM resources integration</flag>
+		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
+		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost on krita</flag>
+		<flag name="xbase">Enable support for xbase compatible database formats</flag>
+	</use>
+</pkgmetadata>