From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- media-gfx/krita/Manifest | 5 +- .../krita/files/krita-4.0.3-libraw-0.19.patch | 77 -------------- media-gfx/krita/krita-4.0.4.ebuild | 116 --------------------- media-gfx/krita/krita-4.1.5.ebuild | 2 +- 4 files changed, 2 insertions(+), 198 deletions(-) delete mode 100644 media-gfx/krita/files/krita-4.0.3-libraw-0.19.patch delete mode 100644 media-gfx/krita/krita-4.0.4.ebuild (limited to 'media-gfx/krita') diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index c5fe3b5f877c..ad742ac65df5 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,8 +1,5 @@ -AUX krita-4.0.3-libraw-0.19.patch 3124 BLAKE2B c84c94b2e0032b4f1f78f1ca944940688775c91a48a0a6449343af36d03f5a754a48749e67365a028314757c0b822db7bda5e9b4e7c7c58796b032306abcd19b SHA512 90e2d40a6d30990b7de7365c06a769e500d2df75281767f3d724b7e5288e131b4cfcfff989a75e66642e374f624bdb8da2e6afe8c12de0ba3282ebd362189140 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb AUX krita-4.1.5-desktopfile.patch 1587 BLAKE2B 7155223dfa5a9bace62729f71a298953c9c2b9ec426693b539bcab961287ee172d8c6151f028508efdfc4e0983b3a8903affefc8ee1a30eb48a51f807c3545df SHA512 ad2a265d287a8e5de9752a83f697f49470ec9984b69a24dd351708372f7c3f1b5dabbbd671a53e5e0fdfa4dae2a0ab1b90ebfc19e6e8ba745a673f1cff607707 -DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499 -EBUILD krita-4.0.4.ebuild 3092 BLAKE2B d1fbb96ff445244a35e16411cf49fbcd3e81317a1759965ccde6b492568a7b69d30430582fa74e3239c66238fe80ad070456ae4c7b3fda36d9ddf14c81f90ba3 SHA512 4af6eabe2319395ac019a5679ae4176ae5629722ef57544a12a1c7a6b5c3f7ba108099b13c3e304fc6979a2bf9a7a65748321639cfa49ccc3b212897912dbc7a -EBUILD krita-4.1.5.ebuild 3170 BLAKE2B 8fc7a641bb7a93f28bc2d2e75c48aae389668591090b47dd12939473011e7c7ed27cae149621408eba4aa2e6ae8cd0889dd17b72444a04a188da693898ef6c87 SHA512 52b3357a184cc2857fc095cde08a8fc7ca52b61de0c13b73d01d8b494720a61ef3973cf2a0d755f406a3446b5043f52532ebcb531ba43e9dee34720ac80c0b0e +EBUILD krita-4.1.5.ebuild 3169 BLAKE2B bb899ccaecd54bb8ba069631692aac6a64a0ed9618175b4e685ff9198818fae355814af4cb550f025f6093c6e2eb314b63a3f33da64d1e5d48c002189e6ea5a6 SHA512 33b4e2e836b187428f92620d590cfd3ed068ca48d6811a9290cf582db11e118463b13fc933b3948b5f4dd9d4addefc416f8cdf41cbdf51a1e2930060a28221f2 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd 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 03dd3c6bc758..000000000000 --- 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 b/media-gfx/krita/krita-4.0.4.ebuild deleted file mode 100644 index 8e5ccf9eb204..000000000000 --- 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 -} diff --git a/media-gfx/krita/krita-4.1.5.ebuild b/media-gfx/krita/krita-4.1.5.ebuild index 24e0eeb67a37..71d42ec6cccf 100644 --- a/media-gfx/krita/krita-4.1.5.ebuild +++ b/media-gfx/krita/krita-4.1.5.ebuild @@ -10,7 +10,7 @@ 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" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -- cgit v1.2.3