1 |
commit: 675e8e6afc49ade90e2bf49ec12166dce0670cae |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 30 15:28:22 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 31 09:20:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675e8e6a |
7 |
|
8 |
media-gfx/krita: 4.4.1 version bump |
9 |
|
10 |
See also: https://krita.org/en/item/krita-4-4-1-released/ |
11 |
|
12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
media-gfx/krita/Manifest | 1 + |
16 |
.../krita/files/krita-4.3.1-tests-optional.patch | 80 +++++++++++++ |
17 |
media-gfx/krita/krita-4.4.1.ebuild | 127 +++++++++++++++++++++ |
18 |
3 files changed, 208 insertions(+) |
19 |
|
20 |
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest |
21 |
index bb2ae2c5f9f..2d039017079 100644 |
22 |
--- a/media-gfx/krita/Manifest |
23 |
+++ b/media-gfx/krita/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 |
26 |
DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c SHA512 5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4 |
27 |
+DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe |
28 |
|
29 |
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..37f2ac50ffd |
32 |
--- /dev/null |
33 |
+++ b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch |
34 |
@@ -0,0 +1,80 @@ |
35 |
+From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001 |
36 |
+From: Andreas Sturmlechner <asturm@g.o> |
37 |
+Date: Sun, 12 Jul 2020 18:55:31 +0200 |
38 |
+Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake: |
39 |
+ Skip ecm_add_test early if Qt5::Test is not available |
40 |
+ |
41 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
42 |
+--- |
43 |
+ cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++ |
44 |
+ cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++ |
45 |
+ 2 files changed, 8 insertions(+) |
46 |
+ |
47 |
+diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake |
48 |
+index b7d0e8d852..901a0a1f99 100644 |
49 |
+--- a/cmake/modules/KritaAddBrokenUnitTest.cmake |
50 |
++++ b/cmake/modules/KritaAddBrokenUnitTest.cmake |
51 |
+@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST) |
52 |
+ message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") |
53 |
+ endif() |
54 |
+ |
55 |
++ if(NOT TARGET Qt5::Test) |
56 |
++ return() |
57 |
++ endif() |
58 |
++ |
59 |
+ set(_testname ${ARG_NAME_PREFIX}${_targetname}) |
60 |
+ |
61 |
+ # add test to the global list of disabled tests |
62 |
+diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake |
63 |
+index c748d8e319..f804d9b8f4 100644 |
64 |
+--- a/cmake/modules/MacroKritaAddBenchmark.cmake |
65 |
++++ b/cmake/modules/MacroKritaAddBenchmark.cmake |
66 |
+@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME) |
67 |
+ set(_nogui "NOGUI") |
68 |
+ endif() |
69 |
+ |
70 |
++ if(NOT TARGET Qt5::Test) |
71 |
++ return() |
72 |
++ endif() |
73 |
++ |
74 |
+ add_executable( ${_test_NAME} ${_srcList} ) |
75 |
+ ecm_mark_as_test(${_test_NAME}) |
76 |
+ |
77 |
+-- |
78 |
+2.27.0 |
79 |
+ |
80 |
+From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001 |
81 |
+From: Andreas Sturmlechner <asturm@g.o> |
82 |
+Date: Wed, 17 Jun 2020 20:18:28 +0200 |
83 |
+Subject: [PATCH] Don't build tests when testing not requested |
84 |
+ |
85 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
86 |
+ |
87 |
+diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt |
88 |
+index cbdac265d2..1a50c1620a 100644 |
89 |
+--- a/libs/flake/CMakeLists.txt |
90 |
++++ b/libs/flake/CMakeLists.txt |
91 |
+@@ -9,8 +9,10 @@ include_directories( |
92 |
+ ) |
93 |
+ |
94 |
+ add_subdirectory(styles) |
95 |
+-add_subdirectory(tests) |
96 |
+-add_subdirectory(resources/tests) |
97 |
++if(BUILD_TESTING) |
98 |
++ add_subdirectory(tests) |
99 |
++ add_subdirectory(resources/tests) |
100 |
++endif() |
101 |
+ |
102 |
+ set(kritaflake_SRCS |
103 |
+ KoGradientHelper.cpp |
104 |
+diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt |
105 |
+index 88c0516360..01f2383ddb 100644 |
106 |
+--- a/libs/image/tiles3/CMakeLists.txt |
107 |
++++ b/libs/image/tiles3/CMakeLists.txt |
108 |
+@@ -1 +1,3 @@ |
109 |
+-add_subdirectory(tests) |
110 |
++if(BUILD_TESTING) |
111 |
++ add_subdirectory(tests) |
112 |
++endif() |
113 |
+-- |
114 |
+2.27.0 |
115 |
|
116 |
diff --git a/media-gfx/krita/krita-4.4.1.ebuild b/media-gfx/krita/krita-4.4.1.ebuild |
117 |
new file mode 100644 |
118 |
index 00000000000..1b8485696af |
119 |
--- /dev/null |
120 |
+++ b/media-gfx/krita/krita-4.4.1.ebuild |
121 |
@@ -0,0 +1,127 @@ |
122 |
+# Copyright 1999-2020 Gentoo Authors |
123 |
+# Distributed under the terms of the GNU General Public License v2 |
124 |
+ |
125 |
+EAPI=7 |
126 |
+ |
127 |
+ECM_TEST="forceoptional" |
128 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
129 |
+KFMIN=5.74.0 |
130 |
+QTMIN=5.15.1 |
131 |
+VIRTUALX_REQUIRED="test" |
132 |
+inherit ecm kde.org python-single-r1 |
133 |
+ |
134 |
+if [[ ${KDE_BUILD_TYPE} = release ]]; then |
135 |
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz |
136 |
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" |
137 |
+ KEYWORDS="~amd64 ~ppc64 ~x86" |
138 |
+fi |
139 |
+ |
140 |
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" |
141 |
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/" |
142 |
+ |
143 |
+LICENSE="GPL-3" |
144 |
+SLOT="5" |
145 |
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" |
146 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
147 |
+ |
148 |
+BDEPEND=" |
149 |
+ dev-cpp/eigen:3 |
150 |
+ dev-lang/perl |
151 |
+ sys-devel/gettext |
152 |
+" |
153 |
+RDEPEND="${PYTHON_DEPS} |
154 |
+ dev-libs/boost:= |
155 |
+ dev-libs/quazip |
156 |
+ $(python_gen_cond_dep ' |
157 |
+ dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] |
158 |
+ dev-python/sip[${PYTHON_MULTI_USEDEP}] |
159 |
+ ') |
160 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
161 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
162 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
163 |
+ >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] |
164 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
165 |
+ >=dev-qt/qtprintsupport-${QTMIN}:5 |
166 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
167 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
168 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
169 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
170 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
171 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
172 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
173 |
+ >=kde-frameworks/kcrash-${KFMIN}:5 |
174 |
+ >=kde-frameworks/kguiaddons-${KFMIN}:5 |
175 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
176 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
177 |
+ >=kde-frameworks/kitemmodels-${KFMIN}:5 |
178 |
+ >=kde-frameworks/kitemviews-${KFMIN}:5 |
179 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
180 |
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5 |
181 |
+ >=kde-frameworks/kxmlgui-${KFMIN}:5 |
182 |
+ media-gfx/exiv2:= |
183 |
+ media-libs/lcms |
184 |
+ media-libs/libpng:0= |
185 |
+ sys-libs/zlib |
186 |
+ virtual/opengl |
187 |
+ x11-libs/libX11 |
188 |
+ x11-libs/libXi |
189 |
+ color-management? ( media-libs/opencolorio ) |
190 |
+ fftw? ( sci-libs/fftw:3.0= ) |
191 |
+ gif? ( media-libs/giflib ) |
192 |
+ gsl? ( sci-libs/gsl:= ) |
193 |
+ jpeg? ( virtual/jpeg:0 ) |
194 |
+ heif? ( media-libs/libheif:= ) |
195 |
+ openexr? ( |
196 |
+ media-libs/ilmbase:= |
197 |
+ media-libs/openexr |
198 |
+ ) |
199 |
+ pdf? ( app-text/poppler[qt5] ) |
200 |
+ qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) |
201 |
+ raw? ( media-libs/libraw:= ) |
202 |
+ tiff? ( media-libs/tiff:0 ) |
203 |
+" |
204 |
+DEPEND="${RDEPEND} |
205 |
+ vc? ( >=dev-libs/vc-1.1.0 ) |
206 |
+" |
207 |
+ |
208 |
+# bug 630508 |
209 |
+RESTRICT+=" test" |
210 |
+ |
211 |
+PATCHES=( |
212 |
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch |
213 |
+ "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch |
214 |
+) |
215 |
+ |
216 |
+pkg_setup() { |
217 |
+ python-single-r1_pkg_setup |
218 |
+ ecm_pkg_setup |
219 |
+} |
220 |
+ |
221 |
+src_prepare() { |
222 |
+ ecm_src_prepare |
223 |
+ sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die |
224 |
+} |
225 |
+ |
226 |
+src_configure() { |
227 |
+ # Prevent sandbox violation from FindPyQt5.py module |
228 |
+ # See Gentoo-bug 655918 |
229 |
+ addpredict /dev/dri |
230 |
+ |
231 |
+ local mycmakeargs=( |
232 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged |
233 |
+ $(cmake_use_find_package color-management OCIO) |
234 |
+ $(cmake_use_find_package fftw FFTW3) |
235 |
+ $(cmake_use_find_package gif GIF) |
236 |
+ $(cmake_use_find_package gsl GSL) |
237 |
+ $(cmake_use_find_package heif HEIF) |
238 |
+ $(cmake_use_find_package jpeg JPEG) |
239 |
+ $(cmake_use_find_package openexr OpenEXR) |
240 |
+ $(cmake_use_find_package pdf Poppler) |
241 |
+ $(cmake_use_find_package qtmedia Qt5Multimedia) |
242 |
+ $(cmake_use_find_package raw LibRaw) |
243 |
+ $(cmake_use_find_package tiff TIFF) |
244 |
+ $(cmake_use_find_package vc Vc) |
245 |
+ ) |
246 |
+ |
247 |
+ ecm_src_configure |
248 |
+} |