[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2024-02-05 Thread Andreas Sturmlechner 
commit: 89c10a643b2a5c5de926b94dddbd124d69b492b8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb  5 20:25:32 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb  5 20:26:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c10a64

media-gfx/krita: Fix build w/ LTO

Closes: https://bugs.gentoo.org/922520
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.1.5-lto.patch | 58 +
 media-gfx/krita/krita-5.1.5.ebuild  |  1 +
 2 files changed, 59 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch 
b/media-gfx/krita/files/krita-5.1.5-lto.patch
new file mode 100644
index ..0cccee5be00e
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-lto.patch
@@ -0,0 +1,58 @@
+From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov 
+Date: Tue, 30 Jan 2024 15:30:53 +0100
+Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies
+
+BUG:480520
+
+
+(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102)
+---
+ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp  | 2 ++
+ .../tool_transform2/kis_perspective_transform_strategy.cpp | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp 
b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+index 49486b6bd7c..8a63bce74e3 100644
+--- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
 b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+@@ -23,6 +23,7 @@
+ #include "kis_algebra_2d.h"
+ 
+ 
++namespace {
+ enum StrokeFunction {
+ ROTATE = 0,
+ MOVE,
+@@ -41,6 +42,7 @@ enum StrokeFunction {
+ MOVECENTER,
+ PERSPECTIVE
+ };
++}
+ 
+ struct KisFreeTransformStrategy::Private
+ {
+diff --git 
a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp 
b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+index ad1d9ffe4d3..bca5b51e13f 100644
+--- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
 b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+@@ -23,7 +23,7 @@
+ #include "kis_transform_utils.h"
+ #include "kis_free_transform_strategy_gsl_helpers.h"
+ 
+-
++namespace {
+ enum StrokeFunction {
+ DRAG_HANDLE = 0,
+ DRAG_X_VANISHING_POINT,
+@@ -43,6 +43,7 @@ enum HandleIndexes {
+ HANDLE_MIDDLE_RIGHT,
+ HANDLE_COUNT,
+ };
++}
+ 
+ struct KisPerspectiveTransformStrategy::Private
+ {
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
index 283b2c2e7a76..3c49122dc318 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
"${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
"${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
+   "${FILESDIR}/${P}-lto.patch" # bug 922520
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2023-12-26 Thread Andreas Sturmlechner 
commit: 039e05313098a299f93038ea55934ebfd5b6bb9a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 26 08:58:54 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 26 08:59:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039e0531

media-gfx/krita: Fix build w/ >=dev-python/sip-6.8.0

Closes: https://bugs.gentoo.org/919139
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.1.5-sip-6.8.patch | 26 +
 media-gfx/krita/krita-5.1.5.ebuild  |  1 +
 2 files changed, 27 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch 
b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch
new file mode 100644
index ..d9bcd937a3d2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch
@@ -0,0 +1,26 @@
+From 2d71c47661d43a4e3c1ab0c27803de980bdf2bb2 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas 
+Date: Mon, 11 Dec 2023 20:26:13 +0100
+Subject: [PATCH] Bump SIP ABI version to 12.8
+
+Fixes build with SIP 6.8
+---
+ cmake/modules/pyproject.toml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/pyproject.toml.in b/cmake/modules/pyproject.toml.in
+index 090b2d4b0cb..085ddf41799 100644
+--- a/cmake/modules/pyproject.toml.in
 b/cmake/modules/pyproject.toml.in
+@@ -9,7 +9,7 @@ name = "@module_name_toml@"
+ sip-module = "@sip_name@"
+ sip-include-dirs = @sip_include_dirs@
+ sip-files-dir = "@module_srcs@"
+-abi-version = "12"
++abi-version = "12.8"
+ 
+ [tool.sip.bindings.@module_name_toml@]
+ tags = @module_tags@
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
index f313dc477e04..ab68ac1db844 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -90,6 +90,7 @@ 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
+   "${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2022-12-20 Thread Andreas Sturmlechner 
commit: 436675c61eaefced99e20f8edc9e01355a2b2e70
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 20 18:45:59 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 20 18:59:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436675c6

media-gfx/krita: Fix build against >=media-libs/libraw-0.21.0

Closes: https://bugs.gentoo.org/887473
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../krita/files/krita-5.1.4-libraw-0.21.patch  | 28 ++
 media-gfx/krita/krita-5.1.4-r1.ebuild  |  5 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)

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
new file mode 100644
index ..9cdd0a9f8161
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
@@ -0,0 +1,28 @@
+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.4-r1.ebuild 
b/media-gfx/krita/krita-5.1.4-r1.ebuild
index abf1cf77bf49..86ce7588ec21 100644
--- a/media-gfx/krita/krita-5.1.4-r1.ebuild
+++ b/media-gfx/krita/krita-5.1.4-r1.ebuild
@@ -85,7 +85,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}-libraw-0.21.patch # bug 887473
+)
 
 pkg_setup() {
python-single-r1_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2022-06-15 Thread Andreas Sturmlechner 
commit: 1f2b04f517bfa021c6539b88eba36b8a82b3f201
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 15 17:18:27 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 15 17:18:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2b04f5

media-gfx/krita: Drop 5.0.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest  |   1 -
 media-gfx/krita/files/krita-5.0.0-clang.patch |  50 ---
 media-gfx/krita/krita-5.0.2.ebuild| 124 --
 3 files changed, 175 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index f4dfa19da4cd..5991619dfdc1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-5.0.2.tar.xz 179049488 BLAKE2B 
a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd
 SHA512 
5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777

diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch 
b/media-gfx/krita/files/krita-5.0.0-clang.patch
deleted file mode 100644
index 6c9c71d4fca2..
--- a/media-gfx/krita/files/krita-5.0.0-clang.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index 0c5864b918f4..
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-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 +jpeg +mypaint-brush-engine openexr 
pdf qtmedia +raw vc webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   dev-libs/quazip:0=
-   $(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
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2021-12-29 Thread Andreas Sturmlechner 
commit: 9b4dbc2b6eab22ae41faf217a6b261898de346ba
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 29 11:52:52 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 29 16:33:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4dbc2b

media-gfx/krita: Fix desktop file QA warning

Reported-by: Marco Scardovi  scardovi.com>
Closes: https://bugs.gentoo.org/829987
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/krita-5.0.0-krita_jp2.desktop.patch  | 24 ++
 media-gfx/krita/krita-5.0.0-r1.ebuild  |  1 +
 2 files changed, 25 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch 
b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
new file mode 100644
index ..c678a9f05492
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
@@ -0,0 +1,24 @@
+From e1b2760966b738f1d467013272035433f1666406 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 27 Dec 2021 15:25:25 +0100
+Subject: [PATCH] Fix duplicate "Type" key
+
+Introduced by 542dcd306e236ec776a81e389d0a601387739e48
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ plugins/impex/jp2/krita_jp2.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plugins/impex/jp2/krita_jp2.desktop 
b/plugins/impex/jp2/krita_jp2.desktop
+index 26c448f48b..7de190b247 100644
+--- a/plugins/impex/jp2/krita_jp2.desktop
 b/plugins/impex/jp2/krita_jp2.desktop
+@@ -120,4 +120,3 @@ Icon=krita
+ StartupNotify=true
+ NoDisplay=true
+ Terminal=false
+-Type=Application
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.0.0-r1.ebuild 
b/media-gfx/krita/krita-5.0.0-r1.ebuild
index 757396adc400..d2782068ebcc 100644
--- a/media-gfx/krita/krita-5.0.0-r1.ebuild
+++ b/media-gfx/krita/krita-5.0.0-r1.ebuild
@@ -89,6 +89,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
"${FILESDIR}"/${P}-clang.patch # bug 830225
+   "${FILESDIR}"/${P}-krita_jp2.desktop.patch # bug 829987
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2021-11-15 Thread Andreas Sturmlechner 
commit: 62306e5005656ea05a0ef00b2ffb57ebba8d7e24
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 15 13:28:37 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 15 13:37:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62306e50

media-gfx/krita: Fix build with >=PyQt5-5.15.6

See also:
ttps://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044346.html

Closes: https://bugs.gentoo.org/822843
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../krita-4.4.8-prefer-newer-sip-to-build.patch| 56 ++
 media-gfx/krita/krita-4.4.8-r1.ebuild  |  1 +
 2 files changed, 57 insertions(+)

diff --git a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch 
b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
new file mode 100644
index ..c60b53ffc64b
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
@@ -0,0 +1,56 @@
+From d2f29d77db58b54a8bcabfb68df66e4dd44f0c27 Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+Date: Fri, 12 Nov 2021 12:27:07 +0100
+Subject: [PATCH] Try (and thus prefer) sip >=5 first
+
+If one has sip 4.x and sip 6.x installed sip 4 is picked up
+("Found SIP version: 4.19.24") just because it is searched first.
+
+This matters not only because it is nice to use the "latest and
+greatest", but also because software using the latest PyQt5 (including
+krita) can't be built with sip 4 at the moment and the maintainer is
+apparently in no hurry to fix it [1].
+
+[1] https://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044345.html
+---
+ cmake/modules/FindSIP.py | 19 ++-
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/modules/FindSIP.py b/cmake/modules/FindSIP.py
+index 7b92abd36e..600805c329 100644
+--- a/cmake/modules/FindSIP.py
 b/cmake/modules/FindSIP.py
+@@ -15,6 +15,16 @@ def osAwareSuffix():
+ return os.path.join("lib", "python3.8", "site-packages","sipconfig.py") 
if os.name != 'nt' else os.path.join("lib","krita-python-libs","sipconfig.py")
+ 
+ try:
++import sipbuild
++
++print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
++print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
++
++import shutil
++
++# sip v5 and higher need to invoke sip-build
++print("sip_bin:%s" % shutil.which("sip-build"))
++except ImportError:  # Code for SIP <5
+ import sipconfig
+ 
+ sipcfg = sipconfig.Configuration()
+@@ -41,13 +51,4 @@ try:
+ print("sip_bin:%s" % sip_bin)
+ print("default_sip_dir:%s" % default_sip_dir)
+ print("sip_inc_dir:%s" % sip_inc_dir)
+-except ImportError:  # Code for SIP v5+
+-import sipbuild
+-
+-print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
+-print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
+ 
+-import shutil
+-
+-# sip v5 and higher need to invoke sip-build
+-print("sip_bin:%s" % shutil.which("sip-build"))
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild 
b/media-gfx/krita/krita-4.4.8-r1.ebuild
index 614c5a0ad5d4..dedc461115e7 100644
--- a/media-gfx/krita/krita-4.4.8-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
"${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug 
#417465, git master
+   "${FILESDIR}"/${P}-prefer-newer-sip-to-build.patch # bug 822843
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2021-08-10 Thread Andreas Sturmlechner 
commit: ba2af85078920c0523791faca18cb299626799af
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 10 17:56:49 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 10 18:14:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2af850

media-gfx/krita: 4.4.7 version bump

See also: https://krita.org/en/item/krita-4-4-7-released/

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |  1 +
 .../files/krita-4.4.5-pykrita-crash-on-exit.patch  | 49 ++
 ...tch => krita-4.4.7-pykrita-crash-on-exit.patch} | 16 +--
 media-gfx/krita/krita-4.4.5-r1.ebuild  |  1 +
 .../{krita-4.4.5-r1.ebuild => krita-4.4.7.ebuild}  |  4 +-
 5 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 25e38181019..15f1fd23ee2 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.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
+DIST krita-4.4.7.tar.gz 254871508 BLAKE2B 
c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695
 SHA512 
b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5

diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch 
b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
index 1939c962815..12ebb2fa95a 100644
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
@@ -1,42 +1,18 @@
-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
+From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov 
+Date: Tue, 3 Aug 2021 11:57:33 +0300
+Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit
 
-Suspecting that we can't have Python clean up its QObject's inside
-QCoreApplication's destructor, but must be done before it.
-
-BUG: 417465
-
-* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a
+CCBUG:417465
 ---
- plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++-
- 1 file changed, 10 insertions(+), 5 deletions(-)
+ plugins/extensions/pykrita/plugin/plugin.cpp | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp 
b/plugins/extensions/pykrita/plugin/plugin.cpp
-index ef0e27eb65..66f552b007 100644
+index 028798e2f4..cc06c07fbe 100644
 --- a/plugins/extensions/pykrita/plugin/plugin.cpp
 +++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -13,6 +13,8 @@
- #include 
- #include "pyqtpluginsettings.h"
- 
-+#include 
-+
- #include 
- 
- K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", 
registerPlugin();)
-@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const 
QVariantList &)
- Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
- extension->setup();
- }
-+
-+// This ensures that QObject's owned by Python are destructed before
-+// the destructor of QCoreApplication is called, in order to prevent
-+// a crash on exit.
-+// See https://bugs.kde.org/show_bug.cgi?id=417465
-+connect(QCoreApplication::instance(), ::aboutToQuit, 
this, []() { PyKrita::finalize(); });
- }
+@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const 
QVariantList &)
  
  KritaPyQtPlugin::~KritaPyQtPlugin()
  {
@@ -45,11 +21,12 @@ index ef0e27eb65..66f552b007 100644
 -#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
 -PyKrita::finalize();
 -#endif
-+// Don't call PyKrita::finalize here, because that can result in a crash
-+// deep inside Qt.
++/// XXX: Don't call PyKrita::finalize here, because that can result in a 
crash
++///  deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465
++
++// PyKrita::finalize();
  }
  
  #include "plugin.moc"
 -- 
 GitLab
-

diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2021-06-20 Thread Andreas Sturmlechner 
commit: 75651b0d83a785d1cb8411d36317b0452cb1144b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 19 20:36:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 20 08:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75651b0d

media-gfx/krita: 4.4.5 version bump

Introduce dev-python/sip slot op
Restrict to =media-libs/opencolorio-1*

Bug: https://bugs.gentoo.org/793887
Bug: https://bugs.gentoo.org/795786
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../files/krita-4.4.5-pykrita-crash-on-exit.patch  |  55 +
 media-gfx/krita/krita-4.4.5.ebuild | 129 +
 3 files changed, 185 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 50f9dd6da41..33c5f73c48e 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.4.3.tar.gz 254855083 BLAKE2B 
5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689
 SHA512 
44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
+DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4

diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch 
b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
new file mode 100644
index 000..1939c962815
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
@@ -0,0 +1,55 @@
+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 Python clean up its QObject's inside
+QCoreApplication's destructor, but must be done before it.
+
+BUG: 417465
+
+* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a
+---
+ plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++-
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp 
b/plugins/extensions/pykrita/plugin/plugin.cpp
+index ef0e27eb65..66f552b007 100644
+--- a/plugins/extensions/pykrita/plugin/plugin.cpp
 b/plugins/extensions/pykrita/plugin/plugin.cpp
+@@ -13,6 +13,8 @@
+ #include 
+ #include "pyqtpluginsettings.h"
+ 
++#include 
++
+ #include 
+ 
+ K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", 
registerPlugin();)
+@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const 
QVariantList &)
+ Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
+ extension->setup();
+ }
++
++// This ensures that QObject's owned by Python are destructed before
++// the destructor of QCoreApplication is called, in order to prevent
++// a crash on exit.
++// See https://bugs.kde.org/show_bug.cgi?id=417465
++connect(QCoreApplication::instance(), ::aboutToQuit, 
this, []() { PyKrita::finalize(); });
+ }
+ 
+ KritaPyQtPlugin::~KritaPyQtPlugin()
+ {
+-// XXX: With Qt 5.14, this crashes Krita on exit. See 
https://bugs.kde.org/show_bug.cgi?id=417465
+-//  So, for now, we just don't call finalize...
+-#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+-PyKrita::finalize();
+-#endif
++// Don't call PyKrita::finalize here, because that can result in a crash
++// deep inside Qt.
+ }
+ 
+ #include "plugin.moc"
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-4.4.5.ebuild 
b/media-gfx/krita/krita-4.4.5.ebuild
new file mode 100644
index 000..9b1b2c73a5e
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8,9,10} )
+KFMIN=5.74.0
+QTMIN=5.15.2
+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.gz
+   
https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz;
+   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2020-12-17 Thread Andreas Sturmlechner 
commit: 7329bad3b388d903d42986336279e0b7a25bf09e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 17 10:11:31 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 17 10:23:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7329bad3

media-gfx/krita: Drop 4.3.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-4.3.0-tests-optional.patch   | 536 -
 media-gfx/krita/krita-4.3.0.ebuild | 127 -
 3 files changed, 664 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2d039017079..789a2b08b4f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 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.0-tests-optional.patch 
b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
deleted file mode 100644
index b58dcf1f4a8..000
--- a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
+++ /dev/null
@@ -1,536 +0,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/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
-index 536b1a4ac5..7d8435eec4 100644
 a/libs/brush/CMakeLists.txt
-+++ b/libs/brush/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
-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/global/CMakeLists.txt b/libs/global/CMakeLists.txt
-index e8162c5e46..f6ea6bc840 100644
 a/libs/global/CMakeLists.txt
-+++ b/libs/global/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index 810dee2f16..44c72ba2d5 100644
 a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- 
- add_subdirectory( tiles3 )
- 
-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()
-diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
-index 958104aaaf..3b8a33eadc 100644
 a/libs/libkis/CMakeLists.txt
-+++ b/libs/libkis/CMakeLists.txt
-@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
-diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
-index d33aff38fc..abdc2f7a36 100644
 a/libs/metadata/CMakeLists.txt
-+++ b/libs/metadata/CMakeLists.txt
-@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
- 
- install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
-diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
-index 6acbf4d1a5..50e60b55d8 100644

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2020-06-18 Thread Andreas Sturmlechner 
commit: 4823065bff02a67c88b3d685354b4062c74dd4e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 17 16:49:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 18 23:03:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4823065b

media-gfx/krita: 4.3.0 version bump

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../krita/files/krita-4.3.0-tests-optional.patch   | 536 +
 media-gfx/krita/krita-4.3.0.ebuild | 122 +
 3 files changed, 659 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index acb7f9fd647..65b1492d8b1 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.2.9.tar.xz 170082028 BLAKE2B 
dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66
 SHA512 
66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
+DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 
74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c
 SHA512 
5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4

diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch 
b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
new file mode 100644
index 000..b58dcf1f4a8
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
@@ -0,0 +1,536 @@
+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/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
+index 536b1a4ac5..7d8435eec4 100644
+--- a/libs/brush/CMakeLists.txt
 b/libs/brush/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+ ${EIGEN3_INCLUDE_DIR}
+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/global/CMakeLists.txt b/libs/global/CMakeLists.txt
+index e8162c5e46..f6ea6bc840 100644
+--- a/libs/global/CMakeLists.txt
 b/libs/global/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index 810dee2f16..44c72ba2d5 100644
+--- a/libs/image/CMakeLists.txt
 b/libs/image/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+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()
+diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
+index 958104aaaf..3b8a33eadc 100644
+--- a/libs/libkis/CMakeLists.txt
 b/libs/libkis/CMakeLists.txt
+@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
+index d33aff38fc..abdc2f7a36 100644
+--- a/libs/metadata/CMakeLists.txt
 b/libs/metadata/CMakeLists.txt
+@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
+ 
+ install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
+index 6acbf4d1a5..50e60b55d8 100644
+---

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2020-04-03 Thread Andreas Sturmlechner 
commit: a8bb0bded01f24e82706af39c4efbfafb9107d07
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  2 13:10:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  3 14:56:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bb0bde

media-gfx/krita: 4.2.9 version bump

Package-Manager: Portage-2.3.96, 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 | 121 +++
 3 files changed, 474 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8cf7a3d4191..2bab9ddbf4a 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 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.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
new file mode 100644
index 000..0a7c7ca6984
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
@@ -0,0 +1,352 @@
+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"
+-)
+-
+-if(OPENEXR_INCLUDE_DIR)
+-  set(openexr_config_file "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h")
+-  if(EXISTS ${openexr_config_file})
+-  file(STRINGS
+-   ${openexr_config_file}
+-   TMP
+-   REGEX "#define OPENEXR_VERSION_STRING.*$")
+-  string(REGEX MATCHALL "[0-9.]+" OPENEXR_VERSION

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2019-07-31 Thread Andreas Sturmlechner 
commit: 7c5b52a734a337fa6afe2e4ab1e5780aacdc8f25
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 31 09:25:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 31 09:45:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5b52a7

media-gfx/krita: Drop 4.2.3

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.2-tests-optional.patch   | 405 -
 media-gfx/krita/krita-4.2.3.ebuild | 118 --
 3 files changed, 524 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8865613c448..a81da4ec9a4 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.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.2-tests-optional.patch 
b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
deleted file mode 100644
index 2df715be04f..000
--- a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
+++ /dev/null
@@ -1,405 +0,0 @@
 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:55.132824242 
+0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt   2019-06-27 18:48:55.136824270 
+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-06-27 18:48:55.141824303 
+0200
-+++ b/plugins/tools/basictools/CMakeLists.txt  2019-06-27 18:48:55.146824337 
+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-06-27 
18:48:55.151824371 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 
18:48:55.155824398 +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/, media-gfx/krita/files/

2019-01-14 Thread Andreas Sturmlechner 
commit: 7b0e3372c1436dadb12b09499a8f8f74c7e456e0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 14 15:11:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 14 16:03:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0e3372

media-gfx/krita: Drop 4.1.5

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-4.1.5-desktopfile.patch  |  39 ---
 media-gfx/krita/krita-4.1.5.ebuild | 118 -
 3 files changed, 158 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index e3b4fa1a135..fc40c80ff6e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
-DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 
7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82
 SHA512 
7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
 DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 
0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772
 SHA512 
a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 
84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de
 SHA512 
8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791

diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch 
b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
deleted file mode 100644
index 8721ab8a8a9..000
--- a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index 71d42ec6ccc..000
--- a/media-gfx/krita/krita-4.1.5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
-   KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://www.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}"
-
-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 kio)
-   $(add_frameworks_dep kitemmodels)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2018-12-28 Thread Andreas Sturmlechner 
commit: 2bbfd797742c55c3b7ccb14dbc36ab931e9d5bfe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 26 12:03:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 28 17:47:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbfd797

media-gfx/krita: Fix build with >=exiv2-0.27

Package-Manager: Portage-2.3.52, 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 |   5 +-
 2 files changed, 358 insertions(+), 1 deletion(-)

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
new file mode 100644
index 000..41b290852eb
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
@@ -0,0 +1,354 @@
+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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2018-11-09 Thread Andreas Sturmlechner 
commit: e3d9bbef39f9dfd42d46d4fa33eebbab2214ef13
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov  9 18:53:32 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov  9 18:54:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d9bbef

media-gfx/krita: Drop 4.0.3

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-4.0.3-libraw-0.19.patch  |  77 --
 media-gfx/krita/krita-4.0.4.ebuild | 116 -
 3 files changed, 194 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 26c3c9590ab..3b9fcf2006d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-4.0.4.tar.gz 241431012 BLAKE2B 
c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601
 SHA512 
a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 
7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82
 SHA512 
7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499

diff --git a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch 
b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
deleted file mode 100644
index 03dd3c6bc75..000
--- a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Wed, 29 Aug 2018 17:50:28 +0200
-Subject: [PATCH] Fix build with libraw 0.19
-
-Summary:
-Patch taken from arojas in https://phabricator.kde.org/D15132 applied
-with little offset.
-
-Test Plan: Built fine against libraw-0.19 with krita.git master.
-
-Reviewers: rempt, #krita
-
-Subscribers: lbeltrame, rdieter, pino, arojas
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D15148

- plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 
- 1 file changed, 8 insertions(+)
-
-diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp 
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-index 1c761f8563..adc26d2662 100644
 a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
-@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
- raw.imgdata.params.fbdd_noiserd = 
lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
- break;
- }
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- case RawDecodingSettings::LINENR:
- {
- // (100 - 1000) => (0.001 - 0.02) conversion.
-@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
- raw.imgdata.params.cfa_clean= true;
- break;
- }
-+#endif
- default:   // No Noise Reduction
- {
- raw.imgdata.params.threshold= 0;
- raw.imgdata.params.fbdd_noiserd = 0;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- raw.imgdata.params.linenoise= 0;
- raw.imgdata.params.cfaline  = false;
- raw.imgdata.params.lclean   = 0;
- raw.imgdata.params.cclean   = 0;
- raw.imgdata.params.cfa_clean= false;
-+#endif
- break;
- }
- }
- 
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- // Chromatic aberration correction.
- raw.imgdata.params.ca_correc  = 
m_parent->m_rawDecodingSettings.enableCACorrection;
- raw.imgdata.params.cared  = 
m_parent->m_rawDecodingSettings.caMultiplier[0];
- raw.imgdata.params.cablue = 
m_parent->m_rawDecodingSettings.caMultiplier[1];
-+#endif
- 
- // Exposure Correction before interpolation.
- raw.imgdata.params.exp_correc = 
m_parent->m_rawDecodingSettings.expoCorrection;
-@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
- 
- raw.imgdata.params.dcb_iterations = 
m_parent->m_rawDecodingSettings.dcbIterations;
- raw.imgdata.params.dcb_enhance_fl = 
m_parent->m_rawDecodingSettings.dcbEnhanceFl;
-+#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
- raw.imgdata.params.eeci_refine= 
m_parent->m_rawDecodingSettings.eeciRefine;
- raw.imgdata.params.es_med_passes  = 
m_parent->m_rawDecodingSettings.esMedPasses;
-+#endif
- 
- 
//---
- 
--- 
-2.18.0
-

diff --git a/media-gfx/krita/krita-4.0.4.ebuild

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2018-09-01 Thread Andreas Sturmlechner 
commit: a1f2a30c593f6d748720218a462bc5640f4a071b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 30 11:57:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  1 19:31:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f2a30c

media-gfx/krita: Drop 3.3.3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-3.2.0-tests-optional.patch   | 282 -
 media-gfx/krita/krita-3.3.3.ebuild |  94 ---
 3 files changed, 377 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 81392963b2a..2725ffd07b5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
-DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 
36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693
 SHA512 
b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
 DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 
222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72
 SHA512 
13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
 DIST krita-4.0.4.tar.gz 241431012 BLAKE2B 
c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601
 SHA512 
a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45

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
deleted file mode 100644
index 0f143ff1cc5..000
--- a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-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
-+++

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2018-08-29 Thread Andreas Sturmlechner 
commit: 1073bbaf30c2a586930d2738f9ad958889c64416
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 29 16:17:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 29 16:47:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1073bbaf

media-gfx/krita: Fix build with >=libraw-0.19

Reverting 88d14e3.

Closes: https://bugs.gentoo.org/659904
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../krita/files/krita-4.0.3-libraw-0.19.patch  | 77 ++
 media-gfx/krita/krita-4.0.3.ebuild |  4 +-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch 
b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
new file mode 100644
index 000..03dd3c6bc75
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch
@@ -0,0 +1,77 @@
+From 9fd6b44701e674058b0eaa5d3f98a99e410a1e03 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Wed, 29 Aug 2018 17:50:28 +0200
+Subject: [PATCH] Fix build with libraw 0.19
+
+Summary:
+Patch taken from arojas in https://phabricator.kde.org/D15132 applied
+with little offset.
+
+Test Plan: Built fine against libraw-0.19 with krita.git master.
+
+Reviewers: rempt, #krita
+
+Subscribers: lbeltrame, rdieter, pino, arojas
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D15148
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp | 8 
+ 1 file changed, 8 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp 
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+index 1c761f8563..adc26d2662 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
 b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw_p.cpp
+@@ -375,6 +375,7 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
+ raw.imgdata.params.fbdd_noiserd = 
lround(m_parent->m_rawDecodingSettings.NRThreshold / 100.0);
+ break;
+ }
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ case RawDecodingSettings::LINENR:
+ {
+ // (100 - 1000) => (0.001 - 0.02) conversion.
+@@ -391,23 +392,28 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
+ raw.imgdata.params.cfa_clean= true;
+ break;
+ }
++#endif
+ default:   // No Noise Reduction
+ {
+ raw.imgdata.params.threshold= 0;
+ raw.imgdata.params.fbdd_noiserd = 0;
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ raw.imgdata.params.linenoise= 0;
+ raw.imgdata.params.cfaline  = false;
+ raw.imgdata.params.lclean   = 0;
+ raw.imgdata.params.cclean   = 0;
+ raw.imgdata.params.cfa_clean= false;
++#endif
+ break;
+ }
+ }
+ 
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ // Chromatic aberration correction.
+ raw.imgdata.params.ca_correc  = 
m_parent->m_rawDecodingSettings.enableCACorrection;
+ raw.imgdata.params.cared  = 
m_parent->m_rawDecodingSettings.caMultiplier[0];
+ raw.imgdata.params.cablue = 
m_parent->m_rawDecodingSettings.caMultiplier[1];
++#endif
+ 
+ // Exposure Correction before interpolation.
+ raw.imgdata.params.exp_correc = 
m_parent->m_rawDecodingSettings.expoCorrection;
+@@ -461,8 +467,10 @@ bool KDcraw::Private::loadFromLibraw(const QString& 
filePath, QByteArray& imageD
+ 
+ raw.imgdata.params.dcb_iterations = 
m_parent->m_rawDecodingSettings.dcbIterations;
+ raw.imgdata.params.dcb_enhance_fl = 
m_parent->m_rawDecodingSettings.dcbEnhanceFl;
++#if !LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 19)
+ raw.imgdata.params.eeci_refine= 
m_parent->m_rawDecodingSettings.eeciRefine;
+ raw.imgdata.params.es_med_passes  = 
m_parent->m_rawDecodingSettings.esMedPasses;
++#endif
+ 
+ 
//---
+ 
+-- 
+2.18.0
+

diff --git a/media-gfx/krita/krita-4.0.3.ebuild 
b/media-gfx/krita/krita-4.0.3.ebuild
index ef2f33ef248..fd16ae05438 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.0.3.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND="
dev-python/sip[${PYTHON_USEDEP}]
)
qtmedia? ( $(add_qt_dep qtmultimedia) )
-   raw? (

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2018-08-29 Thread Andreas Sturmlechner 
commit: bac6717f669476b6de842bb51a3cfa65c4e944c0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 29 16:26:41 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 29 16:47:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac6717f

media-gfx/krita: Use patch, not KDE_TEST=forceoptional-recursive

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 .../krita/files/krita-4.0.3-tests-optional.patch   | 324 +
 media-gfx/krita/krita-4.0.3.ebuild |   7 +-
 2 files changed, 329 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000..c9e3ddc2aea
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
@@ -0,0 +1,324 @@
+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)
++endif()
+ 
+ set(kritapngimport_SOURCES
+ kis_png_import.cc
+--- a/plugins/impex/csv/CMakeLists.txt 2018-08-29 18:17:38.927386478 +0200
 b/plugins/impex/csv/CMakeLists.txt 2018-08-29 18:17:38.931386508 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ # import
+ 
+--- a/plugins/impex/xcf/CMakeLists.txt 2018-08-29 18:17:38.936386546 +0200
 b/plugins/impex/xcf/CMakeLists.txt 2018-08-29 18:17:38.940386576 +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.txt2018-08-29 18:17:38.944386606 
+0200
 b/plugins/impex/tiff/CMakeLists.txt2018-08-29 18:17:38.947386630 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+--- a/plugins/extensions/qmic/CMakeLists.txt   2018-08-29

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2017-09-08 Thread Johannes Huber 
commit: 2cc5dd0ef9bd058906055037bf798fa5127d7141
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Sep  8 20:59:33 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Sep  8 20:59:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc5dd0e

media-gfx/krita: Remove 3.2.0

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 media-gfx/krita/Manifest   |  1 -
 media-gfx/krita/files/krita-3.2.0-unused-dep.patch | 69 
 media-gfx/krita/krita-3.2.0.ebuild | 94 --
 3 files changed, 164 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 1fab2f458db..58962f199bf 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +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
 DIST krita-3.2.1.tar.gz 207014866 SHA256 
ef06cee677d75861edca0e1f825bca42ff59b7200aeb827e16f8d1fb5ef14e39 SHA512 
ddc7153a3fcef072de762cd48d4d6df765cc88b7a413028b3aec5690382c1ab7f61f6ae37070c78ef2be1bdc26107908d288976bfa12d14ca35934ce33fb10a3
 WHIRLPOOL 
79bc89b7ebf63b2a31bac726e91e4b77bf7b2a6eafe15a6bf15baf935f2bf56e2f612359fc16c7129251623dfe4d7fe53cd9d2f42d423385487a832309afd17e

diff --git a/media-gfx/krita/files/krita-3.2.0-unused-dep.patch 
b/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
deleted file mode 100644
index 34031b51bac..000
--- a/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 176546ed492883b63f6b8c274a97ce781af3631c Mon Sep 17 00:00:00 2001
-From: Heiko Becker 
-Date: Wed, 16 Aug 2017 23:35:07 +0200
-Subject: Remove unused dependency
-
-Summary:
-libcurl doesn't seem to be used anymore since
-427a9ede658e4bee0e96e09741adb879e396c0c1 and the removal of the gmic
-plugin.
-
-Test Plan: Still builds fine.
-
-Reviewers: #krita, rempt
-
-Subscribers: woltherav
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D7360

- CMakeLists.txt  | 10 --
- README_PACKAGERS.md |  3 ---
- 2 files changed, 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5575b8c..b1edfc1 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -604,16 +604,6 @@ set_package_properties(OpenMP PROPERTIES
- TYPE OPTIONAL
- PURPOSE "Optionally used by the G'Mic plugin")
- 
--##
--## Test for Curl (for G'Mic)
--##
--find_package(CURL)
--set_package_properties(CURL PROPERTIES
--DESCRIPTION "A tool to fetch remote data"
--URL "http://curl.haxx.se/;
--TYPE OPTIONAL
--PURPOSE "Optionally used by the G'Mic plugin")
--
-  
- #
- ## Add Krita helper macros ##
-diff --git a/README_PACKAGERS.md b/README_PACKAGERS.md
-index ef66f9d..bd3d694 100644
 a/README_PACKAGERS.md
-+++ b/README_PACKAGERS.md
-@@ -23,8 +23,6 @@ There are four forks of 3rd party libraries that are 
relevant and cannot be repl
- 
- * plugins/impex/xcf/3rdparty contains the xcftools code. This has never been 
released as a library
- 
--* plugins/extensions/gmic/3rdparty contains G'Mic. This has never been 
released as a shared library.
--
- * libs/image/3rdparty contains einspline. This code is directly linke d into 
the kritaimage library and has never been released as a separate library.
- 
- == Build flags ==
-@@ -47,7 +45,6 @@ Krita depends on:
-   * ilmbase   
-   * jpeg: Note that libjpeg-turbo is recommended.   
-   * lcms2 
--  * libcurl   
-   * libraw
-   * opencolorio
-   * openexr   
--- 
-cgit v0.11.2
-

diff --git a/media-gfx/krita/krita-3.2.0.ebuild 
b/media-gfx/krita/krita-3.2.0.ebuild
deleted file mode 100644
index fb7757c8404..000
--- a/media-gfx/krita/krita-3.2.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia

[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/

2017-07-01 Thread Andreas Sturmlechner 
commit: a9d8edad93cd754f53112207483258f467ce1e27
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul  1 13:36:20 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul  1 13:36:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d8edad

media-gfx/krita: Drop obsolete header, fix build with Qt-5.9

Reported-by: Vasco Gervasi  gmail.com>
Gentoo-bug: 621420

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-gfx/krita/files/krita-3.1.4-qt-5.9.patch | 24 
 media-gfx/krita/krita-3.1.4.ebuild |  5 -
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch 
b/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch
new file mode 100644
index 000..6bda9ddd206
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.1.4-qt-5.9.patch
@@ -0,0 +1,24 @@
+From 2f59d0d1d91e3f79342c20d0df68aa9a51817e8d Mon Sep 17 00:00:00 2001
+From: Luca Beltrame 
+Date: Sat, 6 May 2017 16:00:21 +0200
+Subject: [PATCH] Drop QForeachContainer include and fix Qt 5.9 build
+
+It's not used anywhere.
+
+Acked by boud.
+---
+ libs/ui/KisResourceBundleManifest.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libs/ui/KisResourceBundleManifest.cpp 
b/libs/ui/KisResourceBundleManifest.cpp
+index e4f94ca788..83761657d8 100644
+--- a/libs/ui/KisResourceBundleManifest.cpp
 b/libs/ui/KisResourceBundleManifest.cpp
+@@ -22,7 +22,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ 
+ #include 
+ #include 

diff --git a/media-gfx/krita/krita-3.1.4.ebuild 
b/media-gfx/krita/krita-3.1.4.ebuild
index 0b60191a36a..371f0260e9b 100644
--- a/media-gfx/krita/krita-3.1.4.ebuild
+++ b/media-gfx/krita/krita-3.1.4.ebuild
@@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch
+   "${FILESDIR}"/${P}-qt-5.9.patch
+)
 
 src_configure() {
local mycmakeargs=(