aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-09-22 21:38:03 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-09-22 21:38:08 +1000
commit3f62cdbbba05554ccc0230d532e5ba2193b8ac4c (patch)
treeea31b9c6f47aefd9a93039a879b970e26f01fa51
parentmedia-gfx/krita: add patch solving file collision with kde-plasma/breeze (diff)
downloadkde-3f62cdbb.tar.gz
kde-3f62cdbb.tar.bz2
kde-3f62cdbb.zip
media-gfx/krita: avoid automagic CXXFLAG detection courtesy of dev-libs/vc
Gentoo-bug: 584118 Package-Manager: portage-2.3.1
-rw-r--r--media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch17
-rw-r--r--media-gfx/krita/krita-9999.ebuild5
2 files changed, 21 insertions, 1 deletions
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
new file mode 100644
index 0000000000..11c110567f
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-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
+@@ -525,10 +525,6 @@
+ endif()
+ endmacro()
+
+- if (NOT PACKAGERS_BUILD)
+- # Optimize everything for the current architecture
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+- endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 930b316bb0..4634b46a33 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -70,7 +70,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
"
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch"
+ "${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
+)
src_configure() {
local mycmakeargs=(