logo

overlay

Personnal gentoo overlay
commit: 57b34218d83969700d7c6891af5426987fdb4bf3
parent: 038835cc2510f231eccfbece0defc92703bbf668
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Thu, 24 Aug 2017 19:07:50 +0200

media-gfx/krita: version bump

Diffstat:

media-gfx/krita/Manifest | 1+
media-gfx/krita/files/krita-3.2.0-tests-optional.patch | 282+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
media-gfx/krita/files/krita-3.2.0-unused-dep.patch | 69+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
media-gfx/krita/krita-3.2.0.ebuild | 90+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 442 insertions(+), 0 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest @@ -1 +1,2 @@ DIST krita-3.1.4.tar.gz 1034 SHA256 46bdebd2967d4100614b7ea3f863601d9386c2b1a044869ec6089bc560805e54 SHA512 30ee70b7d9ce0c8a6831ea804e056580e560eb48777ba14ae25f7baeadca2e8abe2acbcb99e5966d3f44aa2c912015ff44c67ad635d18b3cf9bcc5beaec12c0b WHIRLPOOL 1c01ddf8910a29391d9bd5ff429223ebbd746e68ab1f3e35bb5c114ad6458cd9cfd0005fbe67aea2df7102809601aefa05d88c54b9f26033843b309253f2cb4c +DIST krita-3.2.0.tar.gz 207016115 SHA256 0891be48a0338e1419d084da594900864b85de89cc4a38c8946d907cc1009356 SHA512 62fc8f333097eb23bd631f4e28a23c38bfffba2206277463454f2b9cd199a2972b185511407d50e62ce069c3dfbcfadcebbbb8faa89484f41bcbed3b352e27d5 WHIRLPOOL 403d0381af6fcf9404b790dc34feb26705629795f77c2fb61d50bfb6691872ffb1d9c56099841088a9d32135fe23ed91cd8f35eb491de2888aa0e6b01c83ef74 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 @@ -0,0 +1,282 @@ +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.txt 2017-08-19 23:45:06.282794913 +0200 ++++ b/plugins/impex/jpeg/CMakeLists.txt 2017-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.txt 2017-08-19 23:45:06.372792429 +0200 ++++ b/plugins/impex/tiff/CMakeLists.txt 2017-08-19 23:45:06.379792236 +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 2017-08-19 23:45:06.387792016 +0200 ++++ b/plugins/extensions/qmic/CMakeLists.txt 2017-08-19 23:45:06.393791850 +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/filters/CMakeLists.txt 2017-08-19 23:45:06.401791629 +0200 ++++ b/plugins/filters/CMakeLists.txt 2017-08-19 23:45:06.408791436 +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 2017-08-19 23:45:06.416791215 +0200 ++++ b/plugins/filters/unsharp/CMakeLists.txt 2017-08-19 23:45:06.422791049 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaunsharpfilter_SOURCES + unsharp.cpp +--- a/plugins/tools/basictools/CMakeLists.txt 2017-08-19 23:45:06.430790829 +0200 ++++ b/plugins/tools/basictools/CMakeLists.txt 2017-08-19 23:45:06.437790636 +0200 +@@ -1,5 +1,7 @@ + if (NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++ add_subdirectory(tests) ++ endif() + endif () + + include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) +--- a/plugins/tools/tool_transform2/CMakeLists.txt 2017-08-19 23:45:06.446790387 +0200 ++++ b/plugins/tools/tool_transform2/CMakeLists.txt 2017-08-19 23:45:06.453790194 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++ add_subdirectory(tests) ++ endif() + endif() + + include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) +--- a/plugins/color/lcms2engine/CMakeLists.txt 2017-08-19 23:45:06.461789973 +0200 ++++ b/plugins/color/lcms2engine/CMakeLists.txt 2017-08-19 23:45:06.468789780 +0200 +@@ -1,6 +1,8 @@ + project( lcmsengine ) + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + include_directories(SYSTEM + ${LCMS2_INCLUDE_DIR} +--- a/plugins/dockers/defaultdockers/CMakeLists.txt 2017-08-19 23:45:06.476789559 +0200 ++++ b/plugins/dockers/defaultdockers/CMakeLists.txt 2017-08-19 23:45:06.483789366 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritadefaultdockers_SOURCES + kis_layer_box.cpp +--- a/plugins/dockers/animation/CMakeLists.txt 2017-08-19 23:45:06.491789145 +0200 ++++ b/plugins/dockers/animation/CMakeLists.txt 2017-08-19 23:45:06.497788980 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++ add_subdirectory(tests) ++ endif() + endif() + + include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) +--- a/plugins/dockers/lut/CMakeLists.txt 2017-08-19 23:45:06.506788731 +0200 ++++ b/plugins/dockers/lut/CMakeLists.txt 2017-08-19 23:45:06.512788565 +0200 +@@ -1,5 +1,7 @@ + if (NOT WIN32 AND NOT APPLE) +- add_subdirectory(tests) ++ if(BUILD_TESTING) ++ add_subdirectory(tests) ++ endif() + endif() + + include_directories(SYSTEM +--- a/libs/store/CMakeLists.txt 2017-08-19 23:45:06.520788345 +0200 ++++ b/libs/store/CMakeLists.txt 2017-08-19 23:45:06.527788151 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritastore_LIB_SRCS + KoDirectoryStore.cpp +--- a/libs/flake/CMakeLists.txt 2017-08-19 23:45:06.536787903 +0200 ++++ b/libs/flake/CMakeLists.txt 2017-08-19 23:45:06.542787737 +0200 +@@ -8,7 +8,9 @@ + ) + + add_subdirectory(styles) ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + set(kritaflake_SRCS + KoGradientHelper.cpp +--- a/libs/widgetutils/CMakeLists.txt 2017-08-19 23:45:06.550787517 +0200 ++++ b/libs/widgetutils/CMakeLists.txt 2017-08-19 23:45:06.557787323 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + + configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h ) + +--- a/libs/odf/CMakeLists.txt 2017-08-19 23:45:06.565787103 +0200 ++++ b/libs/odf/CMakeLists.txt 2017-08-19 23:45:06.572786910 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + set(kritaodf_LIB_SRCS + KoOdf.cpp +--- a/libs/pigment/CMakeLists.txt 2017-08-19 23:45:06.580786689 +0200 ++++ b/libs/pigment/CMakeLists.txt 2017-08-19 23:45:06.587786495 +0200 +@@ -34,7 +34,9 @@ + message(${__per_arch_factory_objs}) + endif() + ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() + add_subdirectory(benchmarks) + + set(kritapigment_SRCS +--- a/libs/widgets/CMakeLists.txt 2017-08-19 23:45:06.595786275 +0200 ++++ b/libs/widgets/CMakeLists.txt 2017-08-19 23:45:06.601786109 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(${CMAKE_CURRENT_BINARY_DIR}) + +--- a/libs/ui/CMakeLists.txt 2017-08-19 23:45:06.610785861 +0200 ++++ b/libs/ui/CMakeLists.txt 2017-08-19 23:45:06.617785667 +0200 +@@ -9,7 +9,9 @@ + ${Boost_INCLUDE_DIRS} + ) + ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + if (APPLE) + find_library(FOUNDATION_LIBRARY Foundation) +--- a/libs/image/CMakeLists.txt 2017-08-19 23:45:06.626785419 +0200 ++++ b/libs/image/CMakeLists.txt 2017-08-19 23:45:06.632785254 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + add_subdirectory( tiles3 ) + +--- a/libs/image/tiles3/CMakeLists.txt 2017-08-19 23:45:06.641785005 +0200 ++++ b/libs/image/tiles3/CMakeLists.txt 2017-08-19 23:45:06.647784839 +0200 +@@ -1,2 +1,4 @@ + include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) ++if(BUILD_TESTING) + add_subdirectory(tests) ++endif() +--- a/libs/brush/CMakeLists.txt 2017-08-19 23:45:06.658784536 +0200 ++++ b/libs/brush/CMakeLists.txt 2017-08-19 23:45:06.665784343 +0200 +@@ -1,4 +1,6 @@ ++if(BUILD_TESTING) + add_subdirectory( tests ) ++endif() + + include_directories(SYSTEM + ${EIGEN3_INCLUDE_DIR} 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 @@ -0,0 +1,69 @@ +From 176546ed492883b63f6b8c274a97ce781af3631c Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +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 @@ -0,0 +1,90 @@ +# 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 GPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc threads curl zlib" + +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtgui '-gles2') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qttest) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + color-management? ( media-libs/opencolorio ) + curl? ( net-misc/curl ) + dev-libs/boost:= + fftw? ( sci-libs/fftw:3.0= ) + gsl? ( sci-libs/gsl:= ) + jpeg? ( virtual/jpeg:0 ) + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + openexr? ( + media-libs/ilmbase:= + media-libs/openexr + ) + pdf? ( app-text/poppler[qt5] ) + qtmedia? ( $(add_qt_dep qtmultimedia) ) + raw? ( media-libs/libraw:= ) + threads? ( dev-libs/libpthread-stubs ) + tiff? ( media-libs/tiff:0 ) + virtual/opengl + x11-apps/xinput + zlib? ( sys-libs/zlib ) +" +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(+)] +" + +PATCHES=( + "${FILESDIR}"/${P}-tests-optional.patch + "${FILESDIR}"/${P}-unused-dep.patch +) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package color-management OCIO) + $(cmake-utils_use_find_package fftw FFTW3) + $(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 +}