From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- media-gfx/krita/Manifest | 5 +- .../krita/files/krita-4.1.5-desktopfile.patch | 39 +++++++ media-gfx/krita/krita-4.1.3.ebuild | 115 -------------------- media-gfx/krita/krita-4.1.5.ebuild | 118 +++++++++++++++++++++ 4 files changed, 160 insertions(+), 117 deletions(-) create mode 100644 media-gfx/krita/files/krita-4.1.5-desktopfile.patch delete mode 100644 media-gfx/krita/krita-4.1.3.ebuild create mode 100644 media-gfx/krita/krita-4.1.5.ebuild (limited to 'media-gfx/krita') diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index ce572e4b0213..c5fe3b5f877c 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,7 +1,8 @@ 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.3.tar.gz 243979838 BLAKE2B 460d7c507b0d86d318b384ad26fd0d2be82d7b60734bd7b1f2016baaf5e0cc3ad91ef7410837aaab207d270745a3a08c1abde11ce3c3543cbf990d922794b606 SHA512 b0d9d8fecdf9f49e6431d0e31fdd6df2f53e654f64e93a05c73afbbdff0625c072a00347e667f1ba87c6d145185fe98d0518df3a4c0c56ccb944216a42d53d5c +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.3.ebuild 3131 BLAKE2B f2f64de5571c11861bcff90fe335d47c0ff5caeb3b22554d87a0c636d3b602efd3f3e5d91b0b85d03361162ec0233f68bcc7b4e6f4fdb0671f75a41078553777 SHA512 7ef19e4b4267710942e32e18c333eec5d51d51049ab469af507c2bdcf24278ae2e4d5a8de73b0286cc53e239c8388749987dbae619d5fcedeb6073800888a9d4 +EBUILD krita-4.1.5.ebuild 3170 BLAKE2B 8fc7a641bb7a93f28bc2d2e75c48aae389668591090b47dd12939473011e7c7ed27cae149621408eba4aa2e6ae8cd0889dd17b72444a04a188da693898ef6c87 SHA512 52b3357a184cc2857fc095cde08a8fc7ca52b61de0c13b73d01d8b494720a61ef3973cf2a0d755f406a3446b5043f52532ebcb531ba43e9dee34720ac80c0b0e MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/files/krita-4.1.5-desktopfile.patch b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch new file mode 100644 index 000000000000..8721ab8a8a95 --- /dev/null +++ b/media-gfx/krita/files/krita-4.1.5-desktopfile.patch @@ -0,0 +1,39 @@ +From d267979af9524372f00a0759f02e75c60f604da5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Mon, 15 Oct 2018 13:08:09 +0200 +Subject: [PATCH] krita_qimageio.desktop: Fix MimeType separators + +Summary: +desktop file did not pass validation. + +/usr/share/applications/krita_qimageio.desktop: error: (will be fatal in the future): value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" for key +"MimeType" in group "Desktop Entry" contains value "image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" which is an invalid MIME type: +"image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon" contains an invalid character in the subtype + +Reviewers: #krita, rempt + +Reviewed By: #krita, rempt + +Tags: #krita + +Differential Revision: https://phabricator.kde.org/D16222 +--- + plugins/impex/qimageio/krita_qimageio.desktop | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugins/impex/qimageio/krita_qimageio.desktop b/plugins/impex/qimageio/krita_qimageio.desktop +index 4d7dabe235..af366fef07 100644 +--- a/plugins/impex/qimageio/krita_qimageio.desktop ++++ b/plugins/impex/qimageio/krita_qimageio.desktop +@@ -63,7 +63,7 @@ Name[x-test]=xxKritaxx + Name[zh_CN]=Krita + Name[zh_TW]=Krita + Exec=krita %f +-MimeType=image/bmp,image/x-xpixmap,image/x-xbitmap,image/webp,image/vnd.microsoft.icon ++MimeType=image/bmp;image/x-xpixmap;image/x-xbitmap;image/webp;image/vnd.microsoft.icon; + Type=Application + Icon=calligrakrita + Categories=Qt;KDE;Office;Graphics; +-- +2.18.0 + diff --git a/media-gfx/krita/krita-4.1.3.ebuild b/media-gfx/krita/krita-4.1.3.ebuild deleted file mode 100644 index 1e3252cbd580..000000000000 --- a/media-gfx/krita/krita-4.1.3.ebuild +++ /dev/null @@ -1,115 +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) - $(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 ) - heif? ( media-libs/libheif:= ) - 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" ) - -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 heif HEIF) - $(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 new file mode 100644 index 000000000000..24e0eeb67a37 --- /dev/null +++ b/media-gfx/krita/krita-4.1.5.ebuild @@ -0,0 +1,118 @@ +# 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) + $(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 ) + heif? ( media-libs/libheif:= ) + 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}/${P}-desktopfile.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 heif HEIF) + $(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 +} -- cgit v1.2.3