commit: e3d9bbef39f9dfd42d46d4fa33eebbab2214ef13 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 9 18:53:32 2018 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Nov 9 18:54:12 2018 +0000 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 <asturm <AT> 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..00000000000 --- 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 <ast...@gentoo.org> -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 b/media-gfx/krita/krita-4.0.4.ebuild deleted file mode 100644 index 8e5ccf9eb20..00000000000 --- a/media-gfx/krita/krita-4.0.4.ebuild +++ /dev/null @@ -1,116 +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}/${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 +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) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui '-gles2') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - dev-libs/boost:= - dev-python/PyQt5[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXi - color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpeg? ( virtual/jpeg:0 ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr - ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( $(add_qt_dep qtmultimedia) ) - raw? ( media-libs/libraw:= ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext - vc? ( >=dev-libs/vc-1.1.0 ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/calligra:4[calligra_features_krita] - !app-office/calligra-l10n:4[calligra_features_krita(+)] -" - -# bug 630508 -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" - "${FILESDIR}/${PN}-4.0.3-libraw-0.19.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup - kde5_pkg_setup -} - -src_configure() { - # Prevent sandbox violation from FindPyQt5.py module - # See Gentoo-bug 655918 - addpredict /dev/dri - - local mycmakeargs=( - $(cmake-utils_use_find_package color-management OCIO) - $(cmake-utils_use_find_package fftw FFTW3) - $(cmake-utils_use_find_package gif GIF) - $(cmake-utils_use_find_package gsl GSL) - $(cmake-utils_use_find_package jpeg JPEG) - $(cmake-utils_use_find_package openexr OpenEXR) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package qtmedia Qt5Multimedia) - $(cmake-utils_use_find_package raw LibRaw) - $(cmake-utils_use_find_package tiff TIFF) - $(cmake-utils_use_find_package vc Vc) - ) - - kde5_src_configure -}
