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} )
+
