Gentoo Archives: gentoo-commits

From: Guilherme Amadio <amadio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
Date: Wed, 15 Feb 2017 16:40:34
Message-Id: 1487176803.8c3ad9a5535e0c3d5c90c5bfd31511d33a2fffb1.amadio@gentoo
1 commit: 8c3ad9a5535e0c3d5c90c5bfd31511d33a2fffb1
2 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 15 16:38:20 2017 +0000
4 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 15 16:40:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3ad9a5
7
8 media-gfx/krita: Use right ABI when using GCC4.x, bug 596740
9
10 Gentoo-Bug: https://bugs.gentoo.org/596740
11
12 Package-Manager: Portage-2.3.3, Repoman-2.3.1
13
14 media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch | 14 ++++
15 media-gfx/krita/krita-3.1.2-r2.ebuild | 95 ++++++++++++++++++++++
16 2 files changed, 109 insertions(+)
17
18 diff --git a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
19 new file mode 100644
20 index 0000000000..0f0b9674dd
21 --- /dev/null
22 +++ b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
23 @@ -0,0 +1,14 @@
24 +--- a/CMakeLists.txt 2017-02-13 11:12:47.866321035 -0200
25 ++++ b/CMakeLists.txt 2017-02-13 11:18:55.769657370 -0200
26 +@@ -533,9 +533,9 @@
27 + include (VcMacros)
28 +
29 + if(Vc_COMPILER_IS_CLANG)
30 +- set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC")
31 ++ add_compile_options(-Wabi -ffp-contract=fast -fPIC)
32 + elseif (NOT MSVC)
33 +- set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC")
34 ++ add_compile_options(-Wabi -fabi-version=0 -ffp-contract=fast -fPIC)
35 + endif()
36 +
37 + #Handle Vc master
38
39 diff --git a/media-gfx/krita/krita-3.1.2-r2.ebuild b/media-gfx/krita/krita-3.1.2-r2.ebuild
40 new file mode 100644
41 index 0000000000..87e9facb8b
42 --- /dev/null
43 +++ b/media-gfx/krita/krita-3.1.2-r2.ebuild
44 @@ -0,0 +1,95 @@
45 +# Copyright 1999-2017 Gentoo Foundation
46 +# Distributed under the terms of the GNU General Public License v2
47 +# $Id$
48 +
49 +EAPI=6
50 +
51 +KDE_TEST="forceoptional"
52 +inherit kde5
53 +
54 +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
55 +HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
56 +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.1.tar.gz"
57 +
58 +LICENSE="GPL-2+"
59 +KEYWORDS="~amd64 ~x86"
60 +IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
61 +
62 +COMMON_DEPEND="
63 + $(add_frameworks_dep karchive)
64 + $(add_frameworks_dep kcompletion)
65 + $(add_frameworks_dep kconfig)
66 + $(add_frameworks_dep kcoreaddons)
67 + $(add_frameworks_dep kcrash)
68 + $(add_frameworks_dep kguiaddons)
69 + $(add_frameworks_dep ki18n)
70 + $(add_frameworks_dep kiconthemes)
71 + $(add_frameworks_dep kio)
72 + $(add_frameworks_dep kitemmodels)
73 + $(add_frameworks_dep kitemviews)
74 + $(add_frameworks_dep kwidgetsaddons)
75 + $(add_frameworks_dep kwindowsystem)
76 + $(add_frameworks_dep kxmlgui)
77 + $(add_qt_dep qtconcurrent)
78 + $(add_qt_dep qtdbus)
79 + $(add_qt_dep qtgui '-gles2')
80 + $(add_qt_dep qtnetwork)
81 + $(add_qt_dep qtprintsupport)
82 + $(add_qt_dep qtsvg)
83 + $(add_qt_dep qtwidgets)
84 + $(add_qt_dep qtx11extras)
85 + $(add_qt_dep qtxml)
86 + dev-libs/boost:=
87 + media-gfx/exiv2:=
88 + media-libs/lcms
89 + media-libs/libpng:0=
90 + net-misc/curl
91 + sys-libs/zlib
92 + virtual/opengl
93 + x11-libs/libX11
94 + x11-libs/libxcb
95 + x11-libs/libXi
96 + color-management? ( media-libs/opencolorio )
97 + fftw? ( sci-libs/fftw:3.0= )
98 + gsl? ( sci-libs/gsl:= )
99 + jpeg? ( virtual/jpeg:0 )
100 + openexr? (
101 + media-libs/ilmbase:=
102 + media-libs/openexr
103 + )
104 + pdf? ( app-text/poppler[qt5] )
105 + qtmedia? ( $(add_qt_dep qtmultimedia) )
106 + raw? ( media-libs/libraw:= )
107 + tiff? ( media-libs/tiff:0 )
108 +"
109 +DEPEND="${COMMON_DEPEND}
110 + dev-cpp/eigen:3
111 + dev-lang/perl
112 + sys-devel/gettext
113 + vc? ( >=dev-libs/vc-1.1.0 )
114 +"
115 +RDEPEND="${COMMON_DEPEND}
116 + !app-office/calligra:4[calligra_features_krita]
117 + !app-office/calligra-l10n:4[calligra_features_krita(+)]
118 +"
119 +
120 +S="${WORKDIR}/${P}.1"
121 +
122 +PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
123 +
124 +src_configure() {
125 + local mycmakeargs=(
126 + $(cmake-utils_use_find_package color-management OCIO)
127 + $(cmake-utils_use_find_package fftw FFTW3)
128 + $(cmake-utils_use_find_package gsl GSL)
129 + $(cmake-utils_use_find_package jpeg JPEG)
130 + $(cmake-utils_use_find_package openexr OpenEXR)
131 + $(cmake-utils_use_find_package pdf Poppler)
132 + $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
133 + $(cmake-utils_use_find_package raw LibRaw)
134 + $(cmake-utils_use_find_package tiff TIFF)
135 + $(cmake-utils_use_find_package vc Vc)
136 + )
137 +
138 + kde5_src_configure
139 +}