[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: c6d41e333a0698baa4b5c1596ffc5c8fd7e866f2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 13 19:32:23 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 13 19:58:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d41e33
media-gfx/krita: drop 5.2.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 -
media-gfx/krita/files/krita-5.2.2-openjpeg.patch | 14 ---
media-gfx/krita/krita-5.2.2.ebuild | 137 ---
3 files changed, 152 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 04a9cb5b8e5f..a82d45e70405 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,3 @@
DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B
e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781
SHA512
130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
DIST krita-5.1.5.tar.xz 184981952 BLAKE2B
3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716
SHA512
b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
-DIST krita-5.2.2.tar.xz 189146788 BLAKE2B
1cfb9f404258467f2cc616bc0320a463f7291d2fe75c76b873982c3741d1f21a338aabed60bc216628e54ae01f7ba52d3b713c3a00d920b03645cba23927d207
SHA512
d2e55d9a6c7be79f5b6661a1bd605cdf1ce20ec78cdaab1ba19a4acca5397afa0c0e8bc1cbf60120993b156aef65ed35fde2de756841342d18221c82ea81a1eb
DIST krita-5.2.3.tar.xz 186685456 BLAKE2B
42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26
SHA512
69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74
diff --git a/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
b/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
deleted file mode 100644
index e21ed33a26b3..
--- a/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Disable the cmake find_package method. It will instead fallback to use
pkgconfig.
-Without this, it will fail to find openjpeg and error out.
-
a/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:50.650715138 +0100
-+++ b/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:57.217399495 +0100
-@@ -45,7 +45,7 @@
-
- # No hints in this case because the library versions semantically
- # the module folder, and it's also capitalized, so let CMake handle it.
--find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
-+#find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
- mark_as_advanced(OPENJPEG_DIR)
-
- if(OPENJPEG_FOUND)
diff --git a/media-gfx/krita/krita-5.2.2.ebuild
b/media-gfx/krita/krita-5.2.2.ebuild
deleted file mode 100644
index f9d1afb09ff6..
--- a/media-gfx/krita/krita-5.2.2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/";
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine
openexr pdf media +raw +xsimd webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/boost:=
- dev-libs/libunibreak:=
- dev-libs/quazip:0=[qt5(+)]
- $(python_gen_cond_dep '
- dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- ')
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kd
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: ffd02e2a654e36bfb98be35f57d486a8b7bc9d9f
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Jan 10 15:43:49 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 13 17:34:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd02e2a
media-gfx/krita: Bump to 5.2.2
Closes: https://bugs.gentoo.org/921972
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/krita/Manifest | 1 +
media-gfx/krita/files/krita-5.2.2-fftw.patch | 18 +++
media-gfx/krita/files/krita-5.2.2-openjpeg.patch | 14 +++
media-gfx/krita/krita-5.2.2.ebuild | 134 +++
media-gfx/krita/metadata.xml | 2 +
5 files changed, 169 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index a0de04766714..48438ab65058 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B
e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781
SHA512
130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
DIST krita-5.1.5.tar.xz 184981952 BLAKE2B
3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716
SHA512
b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
+DIST krita-5.2.2.tar.xz 189146788 BLAKE2B
1cfb9f404258467f2cc616bc0320a463f7291d2fe75c76b873982c3741d1f21a338aabed60bc216628e54ae01f7ba52d3b713c3a00d920b03645cba23927d207
SHA512
d2e55d9a6c7be79f5b6661a1bd605cdf1ce20ec78cdaab1ba19a4acca5397afa0c0e8bc1cbf60120993b156aef65ed35fde2de756841342d18221c82ea81a1eb
diff --git a/media-gfx/krita/files/krita-5.2.2-fftw.patch
b/media-gfx/krita/files/krita-5.2.2-fftw.patch
new file mode 100644
index ..b805be6a21c6
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-fftw.patch
@@ -0,0 +1,18 @@
+Disable the cmake find_package method. It will instead fallback to use
pkgconfig.
+Without this, it will fail to find fftw3 and error out.
+
+--- a/cmake/modules/FindFFTW3.cmake2023-11-24 19:59:45.904059240 +0100
b/cmake/modules/FindFFTW3.cmake2023-11-24 20:00:17.029563107 +0100
+@@ -74,9 +74,9 @@
+ endforeach()
+ mark_as_advanced(PKG_FFTW_CONFIG_DIR)
+
+-find_package(FFTW3 QUIET NO_MODULE
+-HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3
/usr/local/lib/cmake/fftw3
+-)
++#find_package(FFTW3 QUIET NO_MODULE
++#HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3
/usr/local/lib/cmake/fftw3
++#)
+ mark_as_advanced(FFTW3_DIR)
+
+ # if we found the FFTW3 CMake package then we can start
diff --git a/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
b/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
new file mode 100644
index ..e21ed33a26b3
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-openjpeg.patch
@@ -0,0 +1,14 @@
+Disable the cmake find_package method. It will instead fallback to use
pkgconfig.
+Without this, it will fail to find openjpeg and error out.
+
+--- a/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:50.650715138 +0100
b/cmake/modules/FindOpenJPEG.cmake 2023-11-24 19:58:57.217399495 +0100
+@@ -45,7 +45,7 @@
+
+ # No hints in this case because the library versions semantically
+ # the module folder, and it's also capitalized, so let CMake handle it.
+-find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
++#find_package(OPENJPEG QUIET NO_MODULE NAMES OpenJPEG)
+ mark_as_advanced(OPENJPEG_DIR)
+
+ if(OPENJPEG_FOUND)
diff --git a/media-gfx/krita/krita-5.2.2.ebuild
b/media-gfx/krita/krita-5.2.2.ebuild
new file mode 100644
index ..c5dabbfab439
--- /dev/null
+++ b/media-gfx/krita/krita-5.2.2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{10..12} )
+KFMIN=5.82.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/";
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine
openexr pdf media +raw +xsimd webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=
+ dev-libs/quazip:0=[qt5(+)]
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHO
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: e4809498c27efa079b477bfcc80b32a403d5e594
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 21 18:37:51 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 21 19:14:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4809498
media-gfx/krita: Fix build with >=media-libs/libjxl-0.9
Closes: https://bugs.gentoo.org/922524
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch | 73 ++
media-gfx/krita/krita-5.1.5.ebuild | 5 +-
2 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
new file mode 100644
index ..a578f22c67f9
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
@@ -0,0 +1,73 @@
+From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001
+From: Timo Gurr
+Date: Fri, 5 Jan 2024 14:04:50 +
+Subject: [PATCH] Fix build with libjxl 0.9.0
+
+Fix build with libjxl 0.9.0
+
+BUG:478987
+
+Test Plan
+-
+
+* Upgrade to libjxl 0.9.0
+* Apply patch from MR and build krita (5.2.2)
+* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl
+
+Formalities Checklist
+-
+
+- [x] I confirmed this builds.
+- [x] I confirmed Krita ran and the relevant functions work (Could
successfully open/display a sample image
https://jpegxl.info/test-page/red-room.jxl).
+- [ ] I tested the relevant unit tests and can confirm they are not broken.
(If not possible, don't hesitate to ask for help!)
+- [x] I made sure my commits build individually and have good descriptions as
per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
+- [x] I made sure my code conforms to the standards set in the HACKING file.
+- [x] I can confirm the code is licensed and attributed appropriately, and
that unattributed code is mine, as per [KDE Licensing
Policy](https://community.kde.org/Policies/Licensing_Policy).
+
+_**Reminder: the reviewer is responsible for merging the patch, this is to
ensure at the least two people can build the patch. In case a patch breaks the
build, both the author and the reviewer should be contacted to fix the build.**_
+_**If this is not possible, the commits shall be reverted, and a notification
with the reasoning and any relevant logs shall be sent to the mailing list,
kimages...@kde.org.**_
+---
+ plugins/impex/jxl/JPEGXLImport.cpp | 15 ++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/impex/jxl/JPEGXLImport.cpp
b/plugins/impex/jxl/JPEGXLImport.cpp
+index 573bae41247..f5b989b3b70 100644
+--- a/plugins/impex/jxl/JPEGXLImport.cpp
b/plugins/impex/jxl/JPEGXLImport.cpp
+@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice
*io, KisPropertiesConfigu
+ JxlColorEncoding colorEncoding{};
+ if (JXL_DEC_SUCCESS
+ == JxlDecoderGetColorAsEncodedProfile(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
+ nullptr,
++#endif
+
JXL_COLOR_PROFILE_TARGET_DATA,
+ &colorEncoding)) {
+ const TransferCharacteristics transferFunction = [&]() {
+@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice
*io, KisPropertiesConfigu
+ size_t iccSize = 0;
+ QByteArray iccProfile;
+ if (JXL_DEC_SUCCESS
+-!= JxlDecoderGetICCProfileSize(dec.get(), nullptr,
JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) {
++!= JxlDecoderGetICCProfileSize(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
++ nullptr,
++#endif
++
JXL_COLOR_PROFILE_TARGET_DATA,
++ &iccSize)) {
+ errFile << "ICC profile size retrieval failed";
+ document->setErrorMessage(i18nc("JPEG-XL errors", "Unable
to read the image profile."));
+ return ImportExportCodes::ErrorWhileReading;
+@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice
*io, KisPropertiesConfigu
+ iccProfile.resize(static_cast(iccSize));
+ if (JXL_DEC_SUCCESS
+ != JxlDecoderGetColorAsICCProfile(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
+ nullptr,
++#endif
+
JXL_COLOR_PROFILE_TARGET_DATA,
+
reinterpret_cast(iccProfil
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 55f75efa4e03aa1e1dc18bf1374de7d75212aca1
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Oct 3 18:57:00 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Oct 3 19:20:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f75efa
media-gfx/krita: Fix build with >=media-libs/opencolorio-2.3.0
Picked from https://invent.kde.org/graphics/krita/-/merge_requests/1942
after sanitising unrelated changes.
Closes: https://bugs.gentoo.org/915107
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch | 37 ++
media-gfx/krita/krita-5.1.5.ebuild | 1 +
2 files changed, 38 insertions(+)
diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
new file mode 100644
index ..534e24469e8a
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
@@ -0,0 +1,37 @@
+From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001
+From: killy |0veufOrever <80536...@qq.com>
+Date: Tue, 19 Sep 2023 02:18:54 +
+Subject: [PATCH] Update OCIO to version 2.3.0
+
+---
+ 3rdparty/ext_ocio/CMakeLists.txt| 4 ++--
+ plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001
+From: killy |0veufOrever <80536...@qq.com>
+Date: Tue, 19 Sep 2023 03:17:17 +
+Subject: [PATCH] Dimensions are not required when the OCIO version is less
+ than 2.3.0
+
+---
+ plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
+--- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
+@@ -507,7 +507,13 @@
+ unsigned height = 0;
+ OCIO::GpuShaderDesc::TextureType channel =
OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
+ OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR;
++
++#if OCIO_VERSION_HEX >= 0x203
++OCIO::GpuShaderCreator::TextureDimensions dimensions;
++shaderDesc->getTexture(idx, textureName, samplerName, width, height,
channel, dimensions, interpolation);
++#else
+ shaderDesc->getTexture(idx, textureName, samplerName, width, height,
channel, interpolation);
++#endif
+
+ if (!textureName || !*textureName || !samplerName || !*samplerName ||
width == 0) {
+ errOpenGL << "The texture data is corrupted";
diff --git a/media-gfx/krita/krita-5.1.5.ebuild
b/media-gfx/krita/krita-5.1.5.ebuild
index c8945c944730..f313dc477e04 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -89,6 +89,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
"${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
+ "${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 6df2216bbbd544adfed8929a91ca46760d50242e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 24 14:24:28 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 24 16:11:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df2216b
media-gfx/krita: drop 5.1.3-r3, 5.1.4-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 2 -
.../krita/files/krita-5.1.4-libraw-0.21.patch | 28 -
media-gfx/krita/krita-5.1.3-r3.ebuild | 121
media-gfx/krita/krita-5.1.4-r1.ebuild | 123 -
4 files changed, 274 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index bd1d190ff922..5bc573c625ab 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1 @@
-DIST krita-5.1.3.tar.xz 185166464 BLAKE2B
2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd
SHA512
4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
-DIST krita-5.1.4.tar.xz 184969232 BLAKE2B
3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3f94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5
SHA512
316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446
DIST krita-5.1.5.tar.xz 184981952 BLAKE2B
3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716
SHA512
b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1
diff --git a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
deleted file mode 100644
index 9cdd0a9f8161..
--- a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas
-Date: Sun, 18 Dec 2022 16:28:38 +0100
-Subject: [PATCH] Fix build with libraw 0.21
-
- plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-index dcaecc6fa7..71425f909c 100644
a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath,
QByteArray& rawData, DcrawI
- d->setProgress(0.3);
-
- raw.imgdata.params.output_bps = 16;
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+raw.imgdata.rawparams.shot_select = shotSelect;
-+#else
- raw.imgdata.params.shot_select = shotSelect;
-+#endif
- ret= raw.unpack();
-
- if (ret != LIBRAW_SUCCESS)
---
-GitLab
-
diff --git a/media-gfx/krita/krita-5.1.3-r3.ebuild
b/media-gfx/krita/krita-5.1.3-r3.ebuild
deleted file mode 100644
index 310b28bf65bc..
--- a/media-gfx/krita/krita-5.1.3-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{9..11} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/";
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr
pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost:=
- dev-libs/quazip:0=[qt5(+)]
- $(python_gen_cond_dep '
- dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
- dev-python/sip:=[${PYTHON_USEDEP}]
- ')
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: abe6cccfc75fac99646ed066c8a8162c152d67ee
Author: Sam James gentoo org>
AuthorDate: Mon Jun 6 01:26:49 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jun 6 01:26:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe6cccf
media-gfx/krita: drop 4.4.8-r1, 5.0.6-r1
Signed-off-by: Sam James gentoo.org>
media-gfx/krita/Manifest | 3 -
media-gfx/krita/files/krita-4.4.2-quazip1.patch| 36 --
.../files/krita-4.4.7-pykrita-crash-on-exit.patch | 41 ---
.../krita-4.4.8-prefer-newer-sip-to-build.patch| 56 -
media-gfx/krita/krita-4.4.8-r1.ebuild | 130 -
media-gfx/krita/krita-5.0.6-r1.ebuild | 123 ---
6 files changed, 389 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 62dc7f3bd25f..f4dfa19da4cd 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,2 @@
-DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
SHA512
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.8.tar.gz 254887779 BLAKE2B
251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb
SHA512
53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
DIST krita-5.0.2.tar.xz 179049488 BLAKE2B
a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd
SHA512
5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
-DIST krita-5.0.6.tar.xz 179335700 BLAKE2B
dc164fec0ed39d8c9fc8b3624d0ceaeeb25bb55b32cabf56f655116448cea94451421e67069de1d1fbaed1e949b88c982f3e01cf66de40518d1b4e2b9b079bdb
SHA512
7ad92b750a1c54bf79b279730ad84119030ff532f5a8a77f2040776304dbb768a67dfa1bf67ac72c0c984b7e508e59476640f1b41ea38d3f525d52c7eb6cde9f
DIST krita-5.0.8.tar.xz 179344256 BLAKE2B
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
SHA512
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch
b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
deleted file mode 100644
index 6a49bd3ba2e7..
--- a/media-gfx/krita/files/krita-4.4.2-quazip1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
-From: Antonio Rojas
-Date: Mon, 5 Oct 2020 20:11:26 +0200
-Subject: [PATCH] Support quazip 1.0
-
-Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once
support for quazip<1 is dropped this should be ported to use quazip's own
QuaZipConfig
- cmake/modules/FindQuaZip.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
-index 7e628fcd4b..345c7909ab 100644
a/cmake/modules/FindQuaZip.cmake
-+++ b/cmake/modules/FindQuaZip.cmake
-@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
- ELSE(WIN32)
- FIND_PACKAGE(PkgConfig)
- # pkg_check_modules(PC_QCA2 QUIET qca2)
-- pkg_check_modules(PC_QUAZIP quazip)
-+ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
- FIND_LIBRARY(QUAZIP_LIBRARIES
- WIN32_DEBUG_POSTFIX d
--NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
- HINTS /usr/lib /usr/lib64
- )
- FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
- HINTS /usr/include /usr/local/include
-- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
QuaZip-Qt5-1.0/quazip
- )
- FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include
/usr/local/include)
- ENDIF (WIN32)
---
-GitLab
-
diff --git a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
deleted file mode 100644
index f896a3920efc..
--- a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001
-From: Alvin Wong
-Date: Sat, 19 Jun 2021 16:29:45 +0800
-Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash
-
-Suspecting that we can't have
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 36938034e92b826ba1436f01b4af7ae762d72d4a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 29 11:50:41 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 19 16:26:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36938034
media-gfx/krita: Fix build with clang
Reported-by: Michael Egger protonmail.com>
Closes: https://bugs.gentoo.org/830225
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/files/krita-5.0.0-clang.patch | 50 +++
media-gfx/krita/krita-5.0.2.ebuild| 5 ++-
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch
b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index ..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman
+Date: Wed, 27 Oct 2021 22:19:07 +
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt | 6 ++
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+ std::atomic x (0);
+ int main() {
+ uint64_t i = x.load(std::memory_order_relaxed);
++ x.is_lock_free();
+ return 0;
+ }
+ " ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+-if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-target_link_libraries(kritaimage PUBLIC atomic)
+-endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++ target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+
+ if(OpenEXR_FOUND)
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.0.2.ebuild
b/media-gfx/krita/krita-5.0.2.ebuild
index e880d07ce0b2..685904486932 100644
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ b/media-gfx/krita/krita-5.0.2.ebuild
@@ -86,7 +86,10 @@ BDEPEND="
sys-devel/gettext
"
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+ "${FILESDIR}"/${PN}-5.0.0-clang.patch # bug 830225
+)
pkg_setup() {
python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 8e8f74afb6662f813be78b857d6a88a852548e17
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 29 11:50:41 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 29 15:41:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e8f74af
media-gfx/krita: Fix build with clang
Reported-by: Michael Egger protonmail.com>
Closes: https://bugs.gentoo.org/830225
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/files/krita-5.0.0-clang.patch | 50 ++
.../{krita-5.0.0.ebuild => krita-5.0.0-r1.ebuild} | 5 ++-
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch
b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index ..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman
+Date: Wed, 27 Oct 2021 22:19:07 +
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt | 6 ++
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+ std::atomic x (0);
+ int main() {
+ uint64_t i = x.load(std::memory_order_relaxed);
++ x.is_lock_free();
+ return 0;
+ }
+ " ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+-if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-target_link_libraries(kritaimage PUBLIC atomic)
+-endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++ target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+
+ if(OpenEXR_FOUND)
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-5.0.0.ebuild
b/media-gfx/krita/krita-5.0.0-r1.ebuild
similarity index 96%
rename from media-gfx/krita/krita-5.0.0.ebuild
rename to media-gfx/krita/krita-5.0.0-r1.ebuild
index 80d88c6840a7..757396adc400 100644
--- a/media-gfx/krita/krita-5.0.0.ebuild
+++ b/media-gfx/krita/krita-5.0.0-r1.ebuild
@@ -86,7 +86,10 @@ BDEPEND="
sys-devel/gettext
"
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+ "${FILESDIR}"/${P}-clang.patch # bug 830225
+)
pkg_setup() {
python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 1176cc65055bad4ebaf56465578afa995da6e5a7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 20 16:31:29 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Feb 23 19:52:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1176cc65
media-gfx/krita: Support build with >=dev-libs/quazip-1.0
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/files/krita-4.4.2-quazip1.patch | 36 +
media-gfx/krita/krita-4.4.2.ebuild | 3 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch
b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
new file mode 100644
index 000..6a49bd3ba2e
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
@@ -0,0 +1,36 @@
+From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas
+Date: Mon, 5 Oct 2020 20:11:26 +0200
+Subject: [PATCH] Support quazip 1.0
+
+Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once
support for quazip<1 is dropped this should be ported to use quazip's own
QuaZipConfig
+---
+ cmake/modules/FindQuaZip.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
+index 7e628fcd4b..345c7909ab 100644
+--- a/cmake/modules/FindQuaZip.cmake
b/cmake/modules/FindQuaZip.cmake
+@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ ELSE(WIN32)
+ FIND_PACKAGE(PkgConfig)
+ # pkg_check_modules(PC_QCA2 QUIET qca2)
+- pkg_check_modules(PC_QUAZIP quazip)
++ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
+ FIND_LIBRARY(QUAZIP_LIBRARIES
+ WIN32_DEBUG_POSTFIX d
+-NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
+ HINTS /usr/lib /usr/lib64
+ )
+ FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ HINTS /usr/include /usr/local/include
+- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
QuaZip-Qt5-1.0/quazip
+ )
+ FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include
/usr/local/include)
+ ENDIF (WIN32)
+--
+GitLab
+
diff --git a/media-gfx/krita/krita-4.4.2.ebuild
b/media-gfx/krita/krita-4.4.2.ebuild
index 3a09834e46d..62d25fd3463 100644
--- a/media-gfx/krita/krita-4.4.2.ebuild
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
"
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
- dev-libs/quazip
+ dev-libs/quazip:0=
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
dev-python/sip[${PYTHON_MULTI_USEDEP}]
@@ -90,6 +90,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+ "${FILESDIR}"/${P}-quazip1.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 675e8e6afc49ade90e2bf49ec12166dce0670cae
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Oct 30 15:28:22 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 31 09:20:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675e8e6a
media-gfx/krita: 4.4.1 version bump
See also: https://krita.org/en/item/krita-4-4-1-released/
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.3.1-tests-optional.patch | 80 +
media-gfx/krita/krita-4.4.1.ebuild | 127 +
3 files changed, 208 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index bb2ae2c5f9f..2d039017079 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
SHA512
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.3.0.tar.xz 166246720 BLAKE2B
74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c
SHA512
5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
+DIST krita-4.4.1.tar.xz 169788052 BLAKE2B
fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190
SHA512
8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccdbc1b1f8bcbcdeb607909fee710afe
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
new file mode 100644
index 000..37f2ac50ffd
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
@@ -0,0 +1,80 @@
+From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Sun, 12 Jul 2020 18:55:31 +0200
+Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake:
+ Skip ecm_add_test early if Qt5::Test is not available
+
+Signed-off-by: Andreas Sturmlechner
+---
+ cmake/modules/KritaAddBrokenUnitTest.cmake | 4
+ cmake/modules/MacroKritaAddBenchmark.cmake | 4
+ 2 files changed, 8 insertions(+)
+
+diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake
b/cmake/modules/KritaAddBrokenUnitTest.cmake
+index b7d0e8d852..901a0a1f99 100644
+--- a/cmake/modules/KritaAddBrokenUnitTest.cmake
b/cmake/modules/KritaAddBrokenUnitTest.cmake
+@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST)
+ message(FATAL_ERROR "ecm_add_test() called with multiple source files but
without setting \"TEST_NAME\"")
+ endif()
+
++ if(NOT TARGET Qt5::Test)
++return()
++ endif()
++
+ set(_testname ${ARG_NAME_PREFIX}${_targetname})
+
+ # add test to the global list of disabled tests
+diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake
b/cmake/modules/MacroKritaAddBenchmark.cmake
+index c748d8e319..f804d9b8f4 100644
+--- a/cmake/modules/MacroKritaAddBenchmark.cmake
b/cmake/modules/MacroKritaAddBenchmark.cmake
+@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
+ set(_nogui "NOGUI")
+ endif()
+
++if(NOT TARGET Qt5::Test)
++return()
++endif()
++
+ add_executable( ${_test_NAME} ${_srcList} )
+ ecm_mark_as_test(${_test_NAME})
+
+--
+2.27.0
+
+From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Wed, 17 Jun 2020 20:18:28 +0200
+Subject: [PATCH] Don't build tests when testing not requested
+
+Signed-off-by: Andreas Sturmlechner
+
+diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
+index cbdac265d2..1a50c1620a 100644
+--- a/libs/flake/CMakeLists.txt
b/libs/flake/CMakeLists.txt
+@@ -9,8 +9,10 @@ include_directories(
+ )
+
+ add_subdirectory(styles)
+-add_subdirectory(tests)
+-add_subdirectory(resources/tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++add_subdirectory(resources/tests)
++endif()
+
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+diff --git a/libs/image/tiles3/CMakeLists.txt
b/libs/image/tiles3/CMakeLists.txt
+index 88c0516360..01f2383ddb 100644
+--- a/libs/image/tiles3/CMakeLists.txt
b/libs/image/tiles3/CMakeLists.txt
+@@ -1 +1,3 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+--
+2.27.0
diff --git a/media-gfx/krita/krita-4.4.1.ebuild
b/media-gfx/krita/krita-4.4.1.ebuild
new file mode 100644
index 000..1b8485696af
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 4adb681e309103d6306caa0cb1f31e8a3b1037bc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 18 19:15:43 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 18 19:32:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4adb681e
media-gfx/krita: Fix build with Qt 5.15
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.2.9-ecm-findopenexr.patch | 352 -
media-gfx/krita/krita-4.2.9.ebuild | 5 +-
3 files changed, 4 insertions(+), 354 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2bab9ddbf4a..bf42126de16 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,4 @@
DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B
86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f
SHA512
79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B
fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4
SHA512
5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
+DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
SHA512
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
DIST krita-4.2.9.tar.xz 170082028 BLAKE2B
dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66
SHA512
66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
diff --git a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
deleted file mode 100644
index 0a7c7ca6984..000
--- a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-From dae9ddcd45a95fd3b1ec3d42510556a671b08f15 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner
-Date: Tue, 31 Mar 2020 19:56:48 +0200
-Subject: [PATCH 1/2] Revert "Revert "Use e-c-m's findopenexr.cmake module""
-
-This reverts commit d978a33acebb724b862c38895788fc459111c364.
-
-Signed-off-by: Andreas Sturmlechner
- CMakeLists.txt | 2 +-
- cmake/modules/FindOpenEXR.cmake | 98 -
- 2 files changed, 1 insertion(+), 99 deletions(-)
- delete mode 100644 cmake/modules/FindOpenEXR.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a7d9adaa3f..7a4211da13 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -251,7 +251,7 @@ endif(MINGW)
-
-
- find_package(ECM 5.22 REQUIRED NOMODULE)
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}
${ECM_KDE_MODULE_DIR})
-+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}
${ECM_KDE_MODULE_DIR} ${ECM_FIND_MODULE_DIR})
- include(ECMOptionalAddSubdirectory)
- include(ECMAddAppIcon)
- include(ECMSetupVersion)
-diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake
-deleted file mode 100644
-index bb75a03bf0..00
a/cmake/modules/FindOpenEXR.cmake
-+++ /dev/null
-@@ -1,98 +0,0 @@
--#
--# Copyright 2016 Pixar
--#
--# Licensed under the Apache License, Version 2.0 (the "Apache License")
--# with the following modification; you may not use this file except in
--# compliance with the Apache License and the following modification to it:
--# Section 6. Trademarks. is deleted and replaced with:
--#
--# 6. Trademarks. This License does not grant permission to use the trade
--#names, trademarks, service marks, or product names of the Licensor
--#and its affiliates, except as required to comply with Section 4(c) of
--#the License and to reproduce the content of the NOTICE file.
--#
--# You may obtain a copy of the Apache License at
--#
--# http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the Apache License with the above modification is
--# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--# KIND, either express or implied. See the Apache License for the specific
--# language governing permissions and limitations under the Apache License.
--#
--
--find_path(OPENEXR_INCLUDE_DIR
--OpenEXR/half.h
--HINTS
--"${OPENEXR_LOCATION}"
--"$ENV{OPENEXR_LOCATION}"
--PATH_SUFFIXES
--include/
--DOC
--"OpenEXR headers path"
--)
--
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 952ce9a0b17778e2341199167661a106eb073665
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Nov 15 14:25:57 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Nov 15 17:37:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952ce9a0
media-gfx/krita: Drop 4.1.8-r1
Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.0.3-tests-optional.patch | 324 -
.../krita-4.1.8-fix-pre-5.12-tablet-support.patch | 49
...-qt-5.12-fix-unsupported-composition-mode.patch | 38 ---
media-gfx/krita/krita-4.1.8-r1.ebuild | 123
5 files changed, 535 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6fff880799d..e27248b96e5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-4.1.8.tar.gz 244065767 BLAKE2B
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
SHA512
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B
99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48
SHA512
28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
diff --git a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
deleted file mode 100644
index c9e3ddc2aea..000
--- a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-Autogenerated by KDE_TEST=forceoptional-recursive and edited.
-
a/plugins/paintops/libpaintop/CMakeLists.txt 2018-08-29
18:17:38.843385842 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt 2018-08-29
18:17:38.846385865 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
-
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
a/plugins/paintops/defaultpaintops/CMakeLists.txt 2018-08-29
18:17:38.851385903 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt 2018-08-29
18:17:38.854385926 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
-
- include_directories(brush
- duplicate
a/plugins/impex/libkra/CMakeLists.txt 2018-08-29 18:17:38.858385956
+0200
-+++ b/plugins/impex/libkra/CMakeLists.txt 2018-08-29 18:17:38.861385978
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritalibkra_LIB_SRCS
- kis_colorize_dom_utils.cpp
a/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.866386016 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.869386039 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
-
a/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.874386077 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.878386107 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritasvgimport_SOURCES
- kis_svg_import.cc
a/plugins/impex/jpeg/CMakeLists.txt2018-08-29 18:17:38.883386145
+0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt2018-08-29 18:17:38.887386175
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
-
a/plugins/impex/heightmap/CMakeLists.txt 2018-08-29 18:17:38.892386213
+0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt 2018-08-29 18:17:38.896386243
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
a/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.901386281 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.904386304 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
-
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
a/plugins/impex/ppm/CMakeLists.txt 2018-08-29 18:17:38.909386342 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt 2018-08-29 18:17:38.913386372 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-
a/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.918386410 +0200
-+++ b/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.922386440 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: f3086ea525167697941c8a3edc8f0c0480679e6c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jul 31 09:06:12 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Jul 31 09:45:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3086ea5
media-gfx/krita: 4.2.4 version bump
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.2.4-tests-optional.patch | 399 +
media-gfx/krita/krita-4.2.4.ebuild | 117 ++
3 files changed, 517 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2f9aa5dd8df..8865613c448 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
SHA512
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
DIST krita-4.2.3.tar.gz 246136588 BLAKE2B
1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59
SHA512
6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
+DIST krita-4.2.4.tar.gz 246227960 BLAKE2B
94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a051a
SHA512
c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e
diff --git a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
new file mode 100644
index 000..2f13c999b67
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
@@ -0,0 +1,399 @@
+--- a/plugins/filters/CMakeLists.txt 2019-07-31 11:22:19.572862843 +0200
b/plugins/filters/CMakeLists.txt 2019-07-31 11:22:19.576862870 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt 2019-07-31 11:22:19.582862912
+0200
b/plugins/filters/unsharp/CMakeLists.txt 2019-07-31 11:22:19.587862947
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-07-31
11:22:19.592862983 +0200
b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-07-31
11:22:19.595863003 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush
+ duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-07-31
11:22:19.600863038 +0200
b/plugins/paintops/libpaintop/CMakeLists.txt 2019-07-31
11:22:19.603863060 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt 2019-07-31 11:22:19.608863094
+0200
b/plugins/dockers/lut/CMakeLists.txt 2019-07-31 11:22:19.613863129
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-07-31 11:22:19.619863171
+0200
b/plugins/dockers/animation/CMakeLists.txt 2019-07-31 11:22:19.624863206
+0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt 2019-07-31 11:22:19.630863248
+0200
b/plugins/extensions/qmic/CMakeLists.txt 2019-07-31 11:22:19.635863283
+0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/tools/basictools/CMakeLists.txt 2019-07-31 11:22:19.641863325
+0200
b/plugins/tools/basictools/CMakeLists.txt 2019-07-31 11:22:19.645863353
+0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+
+ set(kritadefaulttools_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-07-31
11:22:19.650863388 +0200
b/plugins/tools/tool_transform2/CMakeLists.txt 2019-07-31
11:22:19.653863409 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 6d0bd1936c064b5f2a4a215a6872ad9952d42cf6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jul 16 10:28:47 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jul 16 11:00:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0bd193
media-gfx/krita: Drop 4.2.2
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 -
media-gfx/krita/files/krita-4.2.2-fixuifiles.patch | 25 -
media-gfx/krita/krita-4.2.2.ebuild | 121 -
3 files changed, 147 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 349c094aea4..2f9aa5dd8df 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
SHA512
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.2.tar.gz 246075662 BLAKE2B
0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e
SHA512
7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
DIST krita-4.2.3.tar.gz 246136588 BLAKE2B
1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59
SHA512
6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
deleted file mode 100644
index 1703386a3c7..000
--- a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
-From: Pino Toscano
-Date: Tue, 25 Jun 2019 06:57:40 +0200
-Subject: fixuifiles
-
- libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui
b/libs/widgetutils/tests/dialogsavertestwidget.ui
-index 66e70b3..ba0f54f 100644
a/libs/widgetutils/tests/dialogsavertestwidget.ui
-+++ b/libs/widgetutils/tests/dialogsavertestwidget.ui
-@@ -10,9 +10,6 @@
- 300
-
-
--
-- Form
--
-
-
-
---
-cgit v1.1
diff --git a/media-gfx/krita/krita-4.2.2.ebuild
b/media-gfx/krita/krita-4.2.2.ebuild
deleted file mode 100644
index 5a7e08cbf68..000
--- a/media-gfx/krita/krita-4.2.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.12.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/";
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
- dev-cpp/eigen:3
- dev-lang/perl
- sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui '-gles2' '' '5=')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- dev-libs/quazip
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:0=
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gif? ( media-lib
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 01d6d2e44e75a77477ec077e76abfa078c1886c8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 27 16:53:35 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 27 17:18:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d6d2e4
media-gfx/krita: Drop 4.2.1
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 -
.../krita/files/krita-4.2.0-tests-optional.patch | 324 -
media-gfx/krita/krita-4.2.1.ebuild | 118
3 files changed, 443 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2e2c22bf373..e5583f50a1c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
SHA512
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.1.tar.gz 245929278 BLAKE2B
06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390
SHA512
879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
DIST krita-4.2.2.tar.gz 246075662 BLAKE2B
0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e
SHA512
7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
deleted file mode 100644
index b605e922aba..000
--- a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240
+0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980
+0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${LCMS2_INCLUDE_DIR}
a/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.469257540
+0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.477257332
+0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
-
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
a/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.488257047 +0200
-+++ b/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.497256813 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
a/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.508256528
+0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.516256320
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
-
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
a/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.527256035
+0200
-+++ b/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.535255828
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- include_directories(SYSTEM
- ${OCIO_INCLUDE_DIR}
a/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.546255542
+0200
-+++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309
+0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
-
- set(KRITA_ANIMATIONDOCKER_SOURCES
a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01
15:10:43.566255024 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01
15:10:43.574254816 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
-
- set(kritatooltransform_SOURCES
a/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.584254557
+0200
-+++ b/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.592254349
+0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
-
- set(kritadefaulttools_SOURCES
a/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.602254090
+0200
-+++ b/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.609253908
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(lib
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: a9b8decf11a9e648fc3e5cc175018b22a834f8d9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 27 16:08:05 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 27 17:18:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b8decf
media-gfx/krita: 4.2.2 version bump
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 +
media-gfx/krita/files/krita-4.2.2-fixuifiles.patch | 25 ++
.../krita/files/krita-4.2.2-tests-optional.patch | 405 +
media-gfx/krita/krita-4.2.2.ebuild | 121 ++
4 files changed, 552 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 41abb11141a..2e2c22bf373 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
SHA512
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
DIST krita-4.2.1.tar.gz 245929278 BLAKE2B
06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390
SHA512
879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
+DIST krita-4.2.2.tar.gz 246075662 BLAKE2B
0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e
SHA512
7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
new file mode 100644
index 000..1703386a3c7
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
@@ -0,0 +1,25 @@
+From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
+From: Pino Toscano
+Date: Tue, 25 Jun 2019 06:57:40 +0200
+Subject: fixuifiles
+
+---
+ libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui
b/libs/widgetutils/tests/dialogsavertestwidget.ui
+index 66e70b3..ba0f54f 100644
+--- a/libs/widgetutils/tests/dialogsavertestwidget.ui
b/libs/widgetutils/tests/dialogsavertestwidget.ui
+@@ -10,9 +10,6 @@
+ 300
+
+
+-
+- Form
+-
+
+
+
+--
+cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
new file mode 100644
index 000..2df715be04f
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
@@ -0,0 +1,405 @@
+--- a/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.049823682 +0200
b/plugins/filters/CMakeLists.txt 2019-06-27 18:48:55.056823729 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.063823776
+0200
b/plugins/filters/unsharp/CMakeLists.txt 2019-06-27 18:48:55.069823817
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27
18:48:55.077823871 +0200
b/plugins/paintops/defaultpaintops/CMakeLists.txt 2019-06-27
18:48:55.084823918 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush
+ duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27
18:48:55.092823972 +0200
b/plugins/paintops/libpaintop/CMakeLists.txt 2019-06-27
18:48:55.098824013 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.105824060
+0200
b/plugins/dockers/lut/CMakeLists.txt 2019-06-27 18:48:55.112824107
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161
+0200
b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188
+0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-27 18:48:5
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: fec52e6f9767385205ce4037fbb88597f5ad73f7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed May 29 15:41:31 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 1 14:26:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec52e6f
media-gfx/krita: 4.2.0 version bump
dev-qt/qtgui slot operator is necessary for QPA usage.
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-4.2.0-tests-optional.patch | 324 +
media-gfx/krita/krita-4.2.0.ebuild | 118
3 files changed, 443 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 471a7accb4d..00caf204e91 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
DIST krita-4.1.8.tar.gz 244065767 BLAKE2B
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
SHA512
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
+DIST krita-4.2.0.tar.gz 240015177 BLAKE2B
09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c
SHA512
a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44
diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
new file mode 100644
index 000..b605e922aba
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
@@ -0,0 +1,324 @@
+--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240
+0200
b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980
+0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${LCMS2_INCLUDE_DIR}
+--- a/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.469257540
+0200
b/plugins/extensions/qmic/CMakeLists.txt 2019-06-01 15:10:43.477257332
+0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.488257047 +0200
b/plugins/filters/CMakeLists.txt 2019-06-01 15:10:43.497256813 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.508256528
+0200
b/plugins/filters/unsharp/CMakeLists.txt 2019-06-01 15:10:43.516256320
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.527256035
+0200
b/plugins/dockers/lut/CMakeLists.txt 2019-06-01 15:10:43.535255828
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.546255542
+0200
b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309
+0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01
15:10:43.566255024 +0200
b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01
15:10:43.574254816 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(kritatooltransform_SOURCES
+--- a/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.584254557
+0200
b/plugins/tools/basictools/CMakeLists.txt 2019-06-01 15:10:43.592254349
+0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+
+ set(kritadefaulttools_SOURCES
+--- a/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.602254090
+0200
b/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.609253908
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+--- a/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.620253623
+0200
b/plugins/impex/libkra/CMakeLists.txt 2019-06-01 15:10:43.627253441
+0200
+@@ -1,4 +1,6 @@
++if(BUIL
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 68d2cb566ccf6c5b4cec5d6f021484b2216ad0a8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Apr 3 18:54:58 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Apr 3 18:58:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d2cb56
media-gfx/krita: Add upstream tablet support and crash fix
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../krita-4.1.8-fix-pre-5.12-tablet-support.patch | 49
...-qt-5.12-fix-unsupported-composition-mode.patch | 38 +++
media-gfx/krita/krita-4.1.8-r1.ebuild | 123 +
3 files changed, 210 insertions(+)
diff --git
a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
new file mode 100644
index 000..2928247e57a
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
@@ -0,0 +1,49 @@
+From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov
+Date: Mon, 25 Mar 2019 21:16:41 +0300
+Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
+
+Basically, the patch mimics this Qt's patch that has been
+added in Qt 5.12.0 only:
+https://codereview.qt-project.org/#/c/239918/
+
+BUG:399696
+---
+ libs/ui/input/kis_input_manager_p.cpp | 22 ++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/libs/ui/input/kis_input_manager_p.cpp
b/libs/ui/input/kis_input_manager_p.cpp
+index 4f5a58f..0a26655 100644
+--- a/libs/ui/input/kis_input_manager_p.cpp
b/libs/ui/input/kis_input_manager_p.cpp
+@@ -333,6 +333,28 @@
KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
+
+ bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject*
object, QEvent* event )
+ {
++/**
++ * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made
all
++ * the tablet events be accepted by default. It meant that no mouse
++ * events were synthesized, and, therefore, no Enter/Leave were generated.
++ *
++ * The fix for this bug has been added only in Qt 5.12.0:
++ * https://codereview.qt-project.org/#/c/239918/
++ *
++ * To avoid this problem we should explicitly ignore all the tablet
events.
++ */
++#if defined Q_OS_LINUX && \
++QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
++QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
++
++if (event->type() == QEvent::TabletMove ||
++event->type() == QEvent::TabletPress ||
++event->type() == QEvent::TabletRelease) {
++
++event->ignore();
++}
++#endif
++
+ switch (event->type()) {
+ case QEvent::TabletEnterProximity:
+ d->debugEvent(event);
+--
+cgit v1.1
diff --git
a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
new file mode 100644
index 000..dc65b1c49d2
--- /dev/null
+++
b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
@@ -0,0 +1,38 @@
+From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
+
+Date: Sat, 30 Mar 2019 21:47:37 +0100
+Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
+ 5.12
+
+Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
+
+Trying to paint with a painter that uses this while opengl is enabled
+will lead to a crash. The only relevant place this enum value is still used
+is in kis_tool.cc, where it is only painted on the regular non-accelerated
canvas.
+
+Anyhow, told the smartpatch to use this function instead of doing something
itself.
+
+The whole thing is a little bizar.
+---
+ plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+index 656ba38..32577a3 100644
+--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const
KoViewConverter &converte
+ Q_UNUSED(converter);
+
+ painter.save();
+-painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
+-painter.setPen(QColor(128, 255, 128));
+-painter.drawPath(pixelToView(m_d->brushOutline));
++QPainterPath path = pixelToView(m_d->brushOutline);
++paintToolOutline(&painter, path);
+ painter.restore();
+
+ painter.save();
+--
+cgit v1.1
diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild
b/media-gfx/krita/krita-4.1.8-r1.ebuild
new file mode 100644
index 000..46926f21e6a
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.8-r1.ebui
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: d157b06e5dbc8542c9f59b3575beb6f1ae6268a1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 5 20:07:16 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 5 21:08:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d157b06e media-gfx/krita: Drop 4.1.7 (r0) Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch | 354 - media-gfx/krita/krita-4.1.7.ebuild | 122 --- 2 files changed, 476 deletions(-) diff --git a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch deleted file mode 100644 index 41b290852eb..000 --- a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch +++ /dev/null @@ -1,354 +0,0 @@ -From 6b6758bb37da4997be36a7e2a839b07278160559 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Thu, 27 Dec 2018 22:40:44 +0100 -Subject: [PATCH] Fix building against exiv2-0.27 - -Summary: -Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version. - -Thanks-to: Boudewijn Rempt -for final fix to kis_xmp_io.cpp. - -CCBUG: 402566 - -Test Plan: Built fine against exiv2-0.26 and exiv2-0.27. - -Reviewers: #krita, rempt - -Reviewed By: #krita, rempt - -Subscribers: pino - -Tags: #krita - -Differential Revision: https://phabricator.kde.org/D17810 - CMakeLists.txt| 6 +- - cmake/modules/FindLibExiv2.cmake | 115 ++ - libs/ui/CMakeLists.txt| 3 +- - libs/ui/kisexiv2/kis_exif_io.cpp | 14 ++-- - libs/ui/kisexiv2/kis_exiv2.h | 2 +- - libs/ui/kisexiv2/kis_iptc_io.cpp | 4 +- - libs/ui/kisexiv2/kis_xmp_io.cpp | 6 +- - plugins/impex/jpeg/CMakeLists.txt | 5 +- - 8 files changed, 130 insertions(+), 25 deletions(-) - create mode 100644 cmake/modules/FindLibExiv2.cmake - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5558088200..b2d2cd497e 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -607,11 +607,7 @@ set_package_properties(Eigen3 PROPERTIES - ## - ## Test for exiv2 - ## --find_package(Exiv2 0.16 REQUIRED) --set_package_properties(Exiv2 PROPERTIES --DESCRIPTION "Image metadata library and tools" --URL "http://www.exiv2.org"; --PURPOSE "Required by Krita") -+find_package(LibExiv2 0.16 REQUIRED) - - ## - ## Test for lcms -diff --git a/cmake/modules/FindLibExiv2.cmake b/cmake/modules/FindLibExiv2.cmake -new file mode 100644 -index 00..935cee2c55 /dev/null -+++ b/cmake/modules/FindLibExiv2.cmake -@@ -0,0 +1,115 @@ -+#.rst: -+# FindLibExiv2 -+# -+# -+# Try to find the Exiv2 library. -+# -+# This will define the following variables: -+# -+# ``LibExiv2_FOUND`` -+# System has LibExiv2. -+# -+# ``LibExiv2_VERSION`` -+# The version of LibExiv2. -+# -+# ``LibExiv2_INCLUDE_DIRS`` -+# This should be passed to target_include_directories() if -+# the target is not used for linking. -+# -+# ``LibExiv2_LIBRARIES`` -+# The LibExiv2 library. -+# This can be passed to target_link_libraries() instead of -+# the ``LibExiv2::LibExiv2`` target -+# -+# If ``LibExiv2_FOUND`` is TRUE, the following imported target -+# will be available: -+# -+# ``LibExiv2::LibExiv2`` -+# The Exiv2 library -+# -+# Since 5.53.0. -+# -+#= -+# Copyright (c) 2018, Christophe Giboudeaux, -+# Copyright (c) 2010, Alexander Neundorf, -+# Copyright (c) 2008, Gilles Caulier, -+# -+# -+# Redistribution and use in source and binary forms, with or without -+# modification, are permitted provided that the following conditions -+# are met: -+# -+# 1. Redistributions of source code must retain the copyright -+#notice, this list of conditions and the following disclaimer. -+# 2. Redistributions in binary form must reproduce the copyright -+#notice, this list of conditions and the following disclaimer in the -+#documentation and/or other materials provided with the distribution. -+# 3. The name of the author may not be used to endorse or promote products -+#derived from this software without specific prior written permission. -+# -+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -+# THIS SOFTWARE, EVEN IF ADVISED OF THE
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 9b0400d507d3a77c3da411981f827c2e421c645e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 15 16:45:41 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Oct 15 16:46:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b0400d5
media-gfx/krita: QA: Fix .desktop file to pass validation
Closes: https://bugs.gentoo.org/668702
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../krita/files/krita-4.1.5-desktopfile.patch | 39 ++
media-gfx/krita/krita-4.1.5.ebuild | 5 ++-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
new file mode 100644
index 000..8721ab8a8a9
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
@@ -0,0 +1,39 @@
+From d267979af9524372f00a0759f02e75c60f604da5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Mon, 15 Oct 2018 13:08:09 +0200
+Subject: [PATCH] krita_qimageio.desktop: Fix MimeType separators
+
+Summary:
+desktop file did not pass validation.
+
+/usr/share/applications/krita_qimageio.desktop: error: (will be fatal in the
future): value
"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon"
for key
+"MimeType" in group "Desktop Entry" contains value
"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon"
which is an invalid MIME type:
+"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon"
contains an invalid character in the subtype
+
+Reviewers: #krita, rempt
+
+Reviewed By: #krita, rempt
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D16222
+---
+ plugins/impex/qimageio/krita_qimageio.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/impex/qimageio/krita_qimageio.desktop
b/plugins/impex/qimageio/krita_qimageio.desktop
+index 4d7dabe235..af366fef07 100644
+--- a/plugins/impex/qimageio/krita_qimageio.desktop
b/plugins/impex/qimageio/krita_qimageio.desktop
+@@ -63,7 +63,7 @@ Name[x-test]=xxKritaxx
+ Name[zh_CN]=Krita
+ Name[zh_TW]=Krita
+ Exec=krita %f
+-MimeType=image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon
++MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon;
+ Type=Application
+ Icon=calligrakrita
+ Categories=Qt;KDE;Office;Graphics;
+--
+2.18.0
+
diff --git a/media-gfx/krita/krita-4.1.5.ebuild
b/media-gfx/krita/krita-4.1.5.ebuild
index 1e3252cbd58..24e0eeb67a3 100644
--- a/media-gfx/krita/krita-4.1.5.ebuild
+++ b/media-gfx/krita/krita-4.1.5.ebuild
@@ -84,7 +84,10 @@ RDEPEND="${COMMON_DEPEND}
# bug 630508
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
+ "${FILESDIR}/${P}-desktopfile.patch"
+)
pkg_setup() {
python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 7cdde17ffb6a2cc1a89fa37d19ba124f7a1cbc18
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Oct 18 00:32:58 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Oct 18 00:32:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdde17f
media-gfx/krita: Drop workaround for media-gfx/exiv2-0.27
This reverts commit 3621c5441adf6c1bf587c759d3d621b289f4901b.
media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 ---
media-gfx/krita/krita-3.2.1.ebuild | 7 ++-
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
deleted file mode 100644
index 22c3858f4c6..000
--- a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:09:56.908903726 +0200
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:10:23.956192118 +0200
-@@ -17,7 +17,7 @@
- #include "kis_xmp_io.h"
-
- #include
--#include
-+#include
-
- #include "kis_exiv2.h"
-
diff --git a/media-gfx/krita/krita-3.2.1.ebuild
b/media-gfx/krita/krita-3.2.1.ebuild
index 12b520bc5c5..7c6ab717aba 100644
--- a/media-gfx/krita/krita-3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.2.1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
$(add_qt_dep qtxml)
dev-libs/boost:=
- >=media-gfx/exiv2-0.26_p20170713:=
+ media-gfx/exiv2:=
media-libs/lcms
media-libs/libpng:0=
sys-libs/zlib
@@ -72,10 +72,7 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
-PATCHES=(
- "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
- "${FILESDIR}"/${P}-exiv2-0.26.1.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
src_configure() {
local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 3621c5441adf6c1bf587c759d3d621b289f4901b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 15 20:29:39 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 15 20:46:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3621c544
media-gfx/krita: Fix build with >=media-gfx/exiv2-0.26_p20171013
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 +++
media-gfx/krita/krita-3.2.1.ebuild | 7 +--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
new file mode 100644
index 000..22c3858f4c6
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
@@ -0,0 +1,11 @@
+--- a/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:09:56.908903726 +0200
b/libs/ui/kisexiv2/kis_xmp_io.cpp 2017-10-15 22:10:23.956192118 +0200
+@@ -17,7 +17,7 @@
+ #include "kis_xmp_io.h"
+
+ #include
+-#include
++#include
+
+ #include "kis_exiv2.h"
+
diff --git a/media-gfx/krita/krita-3.2.1.ebuild
b/media-gfx/krita/krita-3.2.1.ebuild
index 7c6ab717aba..12b520bc5c5 100644
--- a/media-gfx/krita/krita-3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.2.1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
$(add_qt_dep qtx11extras)
$(add_qt_dep qtxml)
dev-libs/boost:=
- media-gfx/exiv2:=
+ >=media-gfx/exiv2-0.26_p20170713:=
media-libs/lcms
media-libs/libpng:0=
sys-libs/zlib
@@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
+ "${FILESDIR}"/${P}-exiv2-0.26.1.patch
+)
src_configure() {
local mycmakeargs=(
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 3c9eced271b5ac28a569db8e648e24726f3f433e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 19 21:37:55 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 19 22:57:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9eced2
media-gfx/krita: 3.2.0 version bump
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-gfx/krita/Manifest | 1 +
.../krita/files/krita-3.2.0-tests-optional.patch | 282 +
media-gfx/krita/files/krita-3.2.0-unused-dep.patch | 69 +
media-gfx/krita/krita-3.2.0.ebuild | 94 +++
4 files changed, 446 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index d7276d4cc54..776b275f1dd 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
DIST krita-3.1.4.tar.gz 209778186 SHA256
741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512
6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df
WHIRLPOOL
9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
+DIST krita-3.2.0.tar.gz 207016115 SHA256
0891be48a0338e1419d084da594900864b85de89cc4a38c8946d907cc1009356 SHA512
62fc8f333097eb23bd631f4e28a23c38bfffba2206277463454f2b9cd199a2972b185511407d50e62ce069c3dfbcfadce8faa89484f41bcbed3b352e27d5
WHIRLPOOL
403d0381af6fcf9404b790dc34feb26705629795f77c2fb61d50bfb6691872ffb1d9c56099841088a9d32135fe23ed91cd8f35eb491de2888aa0e6b01c83ef74
diff --git a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
b/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
new file mode 100644
index 000..0f143ff1cc5
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
@@ -0,0 +1,282 @@
+Autogenerated by KDE_TEST=forceoptional-recursive and edited.
+
+--- a/plugins/paintops/libpaintop/CMakeLists.txt 2017-08-19
23:45:06.235796211 +0200
b/plugins/paintops/libpaintop/CMakeLists.txt 2017-08-19
23:45:06.241796045 +0200
+@@ -95,4 +95,6 @@
+ install(TARGETS kritalibpaintop ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt 2017-08-19
23:45:06.250795797 +0200
b/plugins/paintops/defaultpaintops/CMakeLists.txt 2017-08-19
23:45:06.258795576 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+
+ include_directories(brush)
+ include_directories(duplicate)
+--- a/plugins/impex/exr/CMakeLists.txt 2017-08-19 23:45:06.266795355 +0200
b/plugins/impex/exr/CMakeLists.txt 2017-08-19 23:45:06.274795134 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+
+--- a/plugins/impex/jpeg/CMakeLists.txt2017-08-19 23:45:06.282794913
+0200
b/plugins/impex/jpeg/CMakeLists.txt2017-08-19 23:45:06.289794720
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+
+--- a/plugins/impex/psd/CMakeLists.txt 2017-08-19 23:45:06.297794499 +0200
b/plugins/impex/psd/CMakeLists.txt 2017-08-19 23:45:06.304794306 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/ppm/CMakeLists.txt 2017-08-19 23:45:06.313794058 +0200
b/plugins/impex/ppm/CMakeLists.txt 2017-08-19 23:45:06.319793892 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+
+--- a/plugins/impex/png/CMakeLists.txt 2017-08-19 23:45:06.327793672 +0200
b/plugins/impex/png/CMakeLists.txt 2017-08-19 23:45:06.334793478 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritapngimport_SOURCES
+ kis_png_import.cc
+--- a/plugins/impex/csv/CMakeLists.txt 2017-08-19 23:45:06.343793230 +0200
b/plugins/impex/csv/CMakeLists.txt 2017-08-19 23:45:06.349793064 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ include_directories(SYSTEM
+ ${Boost_INCLUDE_DIRS}
+--- a/plugins/impex/xcf/CMakeLists.txt 2017-08-19 23:45:06.357792843 +0200
b/plugins/impex/xcf/CMakeLists.txt 2017-08-19 23:45:06.364792650 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+
+--- a/plugins/impex/tiff/CMakeLists.txt2017-08-19 23:45:06.372792429
+0200
b/plugins/impex/tiff/CMakeLists.txt2017-08-19 23:45:06.379792236
+0200
+@@ -1,4 +1,6 @@
++if(BUI
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 8c3ad9a5535e0c3d5c90c5bfd31511d33a2fffb1
Author: Guilherme Amadio gentoo org>
AuthorDate: Wed Feb 15 16:38:20 2017 +
Commit: Guilherme Amadio gentoo org>
CommitDate: Wed Feb 15 16:40:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3ad9a5
media-gfx/krita: Use right ABI when using GCC4.x, bug 596740
Gentoo-Bug: https://bugs.gentoo.org/596740
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch | 14
media-gfx/krita/krita-3.1.2-r2.ebuild | 95 ++
2 files changed, 109 insertions(+)
diff --git a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
new file mode 100644
index 00..0f0b9674dd
--- /dev/null
+++ b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt 2017-02-13 11:12:47.866321035 -0200
b/CMakeLists.txt 2017-02-13 11:18:55.769657370 -0200
+@@ -533,9 +533,9 @@
+ include (VcMacros)
+
+ if(Vc_COMPILER_IS_CLANG)
+-set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC")
++add_compile_options(-Wabi -ffp-contract=fast -fPIC)
+ elseif (NOT MSVC)
+-set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast
-fPIC")
++add_compile_options(-Wabi -fabi-version=0 -ffp-contract=fast -fPIC)
+ endif()
+
+ #Handle Vc master
diff --git a/media-gfx/krita/krita-3.1.2-r2.ebuild
b/media-gfx/krita/krita-3.1.2-r2.ebuild
new file mode 100644
index 00..87e9facb8b
--- /dev/null
+++ b/media-gfx/krita/krita-3.1.2-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.1.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui '-gles2')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/boost:=
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:0=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr
+ )
+ pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( $(add_qt_dep qtmultimedia) )
+ raw? ( media-libs/libraw:= )
+ tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/calligra:4[calligra_features_krita]
+ !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+S="${WORKDIR}/${P}.1"
+
+PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package color-management OCIO)
+ $(cmake-utils_use_find_package fftw FFTW3)
+ $(cmake-utils_use_find_package gsl GSL)
+ $(cmake-utils_use_find_package jpeg JPEG)
+ $(cmake-utils_use_find_package openexr OpenEXR)
+ $(cmake-utils_use_find_package pdf Poppler)
+ $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
+ $(cmake-utils_use_find_package raw LibRaw)
+ $(cmake-utils_use_find_package tiff TIFF)
+ $(cmake-utils_use_find_package vc Vc)
+ )
+
+ kde5_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: b2478712877abde73f2910ecdedc5342219a847f
Author: Johannes Huber gentoo org>
AuthorDate: Sat Dec 17 17:50:43 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Dec 17 17:50:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2478712
media-gfx/krita: Remove 3.0.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/krita/Manifest | 1 -
.../files/krita-3.0.1-breeze-collisions.patch | 16
.../krita/files/krita-3.0.1-vc-cxxflags.patch | 17
media-gfx/krita/krita-3.0.1.ebuild | 94 --
4 files changed, 128 deletions(-)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 83a924d..815e3e9 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-3.0.1.tar.gz 206137161 SHA256
3c820ec30c3f4c93a33e2982571017eac8f8af2a734a6a1474ef11e1db26d006 SHA512
4d3446b90f7d5e9049ce77e9ac0dff2868dfe8ee1c707eec5d4c9d8e2168867447499079bae63ba45cc4f887ff00f0c91221e9a95c2185c0b023a1be02f09305
WHIRLPOOL
4e7165fa508616f2c36bd22b5a1a4d5c8147a0340ad6dcf1b183a85306aa9d052eea4bf7e068d1e358a1272baaa16ca316fac8fbc1515c1c1bcfae72138c8951
DIST krita-3.1.1.tar.gz 209529508 SHA256
62ef2c4b9b19563c1e2e6dc0643dd0880e04469dd5798373401d8dd666720e8f SHA512
7de24ee9fe36fd832d8c98b14a585ce7c56bab7acd34001cb99009d02059de9e4c0aaf690cd9e48aa5a3db32e94a820e80c78dbeaf22495bf1bd1a8da9f1
WHIRLPOOL
15b097752b3d656b206933c4fd885baeedef01724fbcc7e141bb124a97448168c61cc5df1891d728ccd86e6fadb039b6c9c1c03105f19e97abdb6ab8
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
deleted file mode 100644
index 890f825..
--- a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing files that collide with kde-plasma/breeze.
-
-Gentoo-bug: 594594
-KDE-bug: 368093
-
a/krita/data/themes/CMakeLists.txt
-+++ b/krita/data/themes/CMakeLists.txt
-@@ -1,8 +1,6 @@
- ### install files ###
-
- install(FILES
--BreezeDark.colors
--BreezeHighContrast.colors
- BreezeLight.colors
- KritaNeutral.colors
- KritaBlender.colors
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
deleted file mode 100644
index 11c1105..
--- a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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-3.0.1.ebuild
b/media-gfx/krita/krita-3.0.1.ebuild
deleted file mode 100644
index 7e00db7..
--- a/media-gfx/krita/krita-3.0.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf +raw tiff vc"
-
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep kguiaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtconcurrent)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui '-gles2')
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- $(add_qt_dep qtxml)
- dev-libs/boost:=
- media-gfx/exiv2:=
- media-libs/lcms
- media-libs/libpng:=
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libXi
- color-management? ( media-libs/opencolorio )
- fftw? ( sci-libs/fftw:3.0= )
- gsl? ( sci-libs/gsl:= )
- jpeg? ( virtual/jpeg:0 )
- openexr? (
- media-libs/ilmbase:=
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 692d0c2c43277aa789d73082b521b0794ac2ddc9
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 22 11:40:12 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 22 11:40:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692d0c2c
media-gfx/krita: version bump
Gentoo-bug: 594594
Package-Manager: portage-2.3.1
media-gfx/krita/Manifest | 1 +
.../files/krita-3.0.1-breeze-collisions.patch | 16
.../krita/files/krita-3.0.1-vc-cxxflags.patch | 17
media-gfx/krita/krita-3.0.1.ebuild | 93 ++
4 files changed, 127 insertions(+)
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index cbccb55..dc71f7e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
+DIST krita-3.0.1.tar.gz 206137161 SHA256
3c820ec30c3f4c93a33e2982571017eac8f8af2a734a6a1474ef11e1db26d006 SHA512
4d3446b90f7d5e9049ce77e9ac0dff2868dfe8ee1c707eec5d4c9d8e2168867447499079bae63ba45cc4f887ff00f0c91221e9a95c2185c0b023a1be02f09305
WHIRLPOOL
4e7165fa508616f2c36bd22b5a1a4d5c8147a0340ad6dcf1b183a85306aa9d052eea4bf7e068d1e358a1272baaa16ca316fac8fbc1515c1c1bcfae72138c8951
DIST krita-3.0.tgz 193020370 SHA256
4cea85623b709d6d32084c98a0fd76b97ad96d11be9808fca9fcaad2839a9c5a SHA512
a32507b010b5b785a40d830beb49272155d502c4c27ba874f1c9e75cbf49c7f1f730b3ecef06f24fc1ee9d3e9505c940bc20cb275f97c65e090cc5a59529486b
WHIRLPOOL
fe3b7b308aa754b597375aad49ef5f07d4e0e346f0109aec3b731d6dc1aea320380b01a2166a305c8cc578cad44cc19a1b4ba7fdabf9f7a841e3d5e0bae3e7fa
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
new file mode 100644
index ..890f825
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
@@ -0,0 +1,16 @@
+Avoid installing files that collide with kde-plasma/breeze.
+
+Gentoo-bug: 594594
+KDE-bug: 368093
+
+--- a/krita/data/themes/CMakeLists.txt
b/krita/data/themes/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ ### install files ###
+
+ install(FILES
+-BreezeDark.colors
+-BreezeHighContrast.colors
+ BreezeLight.colors
+ KritaNeutral.colors
+ KritaBlender.colors
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 ..11c1105
--- /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-3.0.1.ebuild
b/media-gfx/krita/krita-3.0.1.ebuild
new file mode 100644
index ..78ef868
--- /dev/null
+++ b/media-gfx/krita/krita-3.0.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="color-management fftw +gsl +jpeg openexr pdf +raw tiff vc"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui '-gles2')
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ $(add_qt_dep qtxml)
+ dev-libs/boost:=
+ media-gfx/exiv2:=
+ media-libs/lcms
+ media-libs/libpng:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXi
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0= )
+ gsl? ( sci-libs/gsl:= )
+ jpeg? ( virtual/jpeg:0 )
+ openexr? (
+ media-libs/ilmbase:=
+ me
