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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/
Date: Sat, 31 Oct 2020 09:23:54 +0000 (UTC)	[thread overview]
Message-ID: <1604136029.675e8e6afc49ade90e2bf49ec12166dce0670cae.asturm@gentoo> (raw)

commit:     675e8e6afc49ade90e2bf49ec12166dce0670cae
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 15:28:22 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 31 09:20:29 2020 +0000
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 <asturm <AT> 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 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe

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 00000000000..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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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 <asturm@gentoo.org>
+Date: Wed, 17 Jun 2020 20:18:28 +0200
+Subject: [PATCH] Don't build tests when testing not requested
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+
+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 00000000000..1b8485696af
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+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
+		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
+
+LICENSE="GPL-3"
+SLOT="5"
+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
+"
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	dev-libs/quazip
+	$(python_gen_cond_dep '
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_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/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
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gif? ( media-libs/giflib )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${RDEPEND}
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	ecm_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
+}
+
+src_configure() {
+	# Prevent sandbox violation from FindPyQt5.py module
+	# See Gentoo-bug 655918
+	addpredict /dev/dri
+
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
+		$(cmake_use_find_package color-management OCIO)
+		$(cmake_use_find_package fftw FFTW3)
+		$(cmake_use_find_package gif GIF)
+		$(cmake_use_find_package gsl GSL)
+		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg JPEG)
+		$(cmake_use_find_package openexr OpenEXR)
+		$(cmake_use_find_package pdf Poppler)
+		$(cmake_use_find_package qtmedia Qt5Multimedia)
+		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package tiff TIFF)
+		$(cmake_use_find_package vc Vc)
+	)
+
+	ecm_src_configure
+}

next             reply	other threads:[~2020-10-31  9:23 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-31  9:23 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-10-20 15:36 [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/ Andreas Sturmlechner
2025-10-04 12:44 Andreas Sturmlechner
2025-02-28  8:19 Andreas Sturmlechner
2024-11-28 17:34 Andreas Sturmlechner
2024-11-25 22:39 Andreas Sturmlechner
2024-11-09 15:21 Andreas Sturmlechner
2024-07-13 19:59 Andreas Sturmlechner
2024-07-13 18:02 Sam James
2024-01-21 19:15 Andreas Sturmlechner
2023-10-03 19:21 Andreas Sturmlechner
2023-01-24 16:12 Andreas Sturmlechner
2022-06-06  1:27 Sam James
2022-02-19 16:27 Andreas Sturmlechner
2021-12-29 16:34 Andreas Sturmlechner
2021-02-23 19:53 Andreas Sturmlechner
2020-04-18 19:33 Andreas Sturmlechner
2019-11-15 17:37 Andreas Sturmlechner
2019-07-31  9:45 Andreas Sturmlechner
2019-07-16 11:00 Andreas Sturmlechner
2019-06-27 17:21 Andreas Sturmlechner
2019-06-27 17:21 Andreas Sturmlechner
2019-06-01 14:26 Andreas Sturmlechner
2019-04-03 18:59 Andreas Sturmlechner
2019-01-05 21:08 Andreas Sturmlechner
2018-10-15 16:46 Andreas Sturmlechner
2017-10-18  0:35 Andreas Sturmlechner
2017-10-15 20:47 Andreas Sturmlechner
2017-08-19 22:57 Andreas Sturmlechner
2017-02-15 16:40 Guilherme Amadio
2016-12-17 17:51 Johannes Huber
2016-09-22 11:40 Michael Palimaka

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:bb2ae2c5f9 dfblob:2d03901707 dfblob:37f2ac50ff
dfblob:1b8485696a )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1604136029.675e8e6afc49ade90e2bf49ec12166dce0670cae.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox