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

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

[Michael Palimaka]

commit:     9b2cfc053be5063b0f9ef283eae287beadb1ba71
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Sep  3 21:58:07 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 09:05:44 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b2cfc05

app-office/calligra: Drop author, avoid automagic CXXFLAG detection

Remove obsolete comment.

Package-Manager: portage-2.2.28

 app-office/calligra/calligra-9999.ebuild             |  6 +++---
 app-office/calligra/files/calligra-vc-cxxflags.patch | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index fa80431..d3f88fc 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -29,15 +29,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms kdepim
 	marble okular openexr +pdf spacenav +truetype vc +webkit +xml X"
 
-# Don't use Active, it's broken on desktops.
-CAL_FTS="author braindump karbon plan sheets stage words"
+CAL_FTS="braindump karbon plan sheets stage words"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
 unset cal_ft
 
 REQUIRED_USE="
-	calligra_features_author? ( calligra_features_words )
 	calligra_features_sheets? ( eigen )
 	calligra_features_stage? ( webkit )
 	test? ( calligra_features_karbon )
@@ -150,6 +148,8 @@ RDEPEND="${COMMON_DEPEND}
 #[[ ${PV} == 9999 ]] && LANGVERSION="3.0" || LANGVERSION="$(get_version_component_range 1-2)"
 #PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
 
+PATCHES=( "${FILESDIR}/${PN}-vc-cxxflags.patch" )
+
 pkg_pretend() {
 	check-reqs_pkg_pretend
 }

diff --git a/app-office/calligra/files/calligra-vc-cxxflags.patch b/app-office/calligra/files/calligra-vc-cxxflags.patch
new file mode 100644
index 0000000..1c544e9
--- /dev/null
+++ b/app-office/calligra/files/calligra-vc-cxxflags.patch
@@ -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} )
+ 

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

[Andreas Sturmlechner]

commit:     1c81b6921e00cd424d677419a42b50858fbb6dd7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 31 17:49:38 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 17:49:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c81b692

app-office/calligra: Fix CALLIGRA_EXPERIMENTAL_FEATURES_STAGE

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 app-office/calligra/calligra-9999.ebuild           | 24 +++++++---------------
 ...atch => calligra-3.1.0-no-arch-detection.patch} |  0
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 5a1cab4cd2..834247c72f 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -137,7 +137,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}"-3.0.90-no-arch-detection.patch )
+PATCHES=( "${FILESDIR}/${PN}"-3.1.0-no-arch-detection.patch )
 
 pkg_pretend() {
 	check-reqs_pkg_pretend
@@ -188,30 +188,19 @@ src_configure() {
 
 	# applications
 	for cal_ft in ${CAL_FTS[@]}; do
-		if use calligra_features_${cal_ft} ; then
-			myproducts+=( "${cal_ft^^}" )
-		fi
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
 	done
 
-	[[ ${KDE_BUILD_TYPE} == release ]] && \
-		use calligra_experimental_features_stage && \
-			myproducts+=( CALLIGRA_FEATURES_STAGE )
+	use calligra_experimental_features_stage && myproducts+=( STAGE )
 
 	use lcms && myproducts+=( PLUGIN_COLORENGINES )
 	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
 
-	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-	if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-		mycmakeargs+=(
-			-DRELEASE_BUILD=ON
-			-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
-		)
-	fi
-
-	mycmakeargs+=(
+	local mycmakeargs=(
 		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
 		-DWITH_Iconv=ON
+		-DPRODUCTSET="${myproducts[*]}"
 		$(cmake-utils_use_find_package activities KF5Activities)
 		-DWITH_Qca-qt5=$(usex crypt)
 		-DWITH_Fontconfig=$(usex fontconfig)
@@ -233,6 +222,7 @@ src_configure() {
 		-DWITH_OpenEXR=$(usex openexr)
 		-DWITH_Poppler=$(usex pdf)
 		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_experimental_features_stage)
 		-ENABLE_CSTESTER_TESTING=$(usex test)
 		-DWITH_Freetype=$(usex truetype)
 	)

diff --git a/app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch
similarity index 100%
rename from app-office/calligra/files/calligra-3.0.90-no-arch-detection.patch
rename to app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch