commit: d3af6414bfb05efb9ffdd53c71db287b00bed984 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Thu Jun 18 15:33:19 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Thu Jun 18 16:29:10 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3af6414
media-gfx/darktable-3.0.2*: remove automagic dependency on jsonschema Darktable build scripts look for the jsonschema executable and if it is found, call it during installation to validate the noise-profile file - with no option available to control this behaviour. dev-python/jsonschema is not a dependency of media-gfx/darktable in my opinion adding it to release ebuilds doesn't make much sense - the noise-profile file is part of the release tarball, if it is bad there is nothing end users can do about it. Bug: https://bugs.gentoo.org/696996 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> media-gfx/darktable/darktable-3.0.2-r1.ebuild | 1 + media-gfx/darktable/darktable-3.0.2.ebuild | 1 + .../files/darktable-3.0.2_jsonschema-automagic.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) diff --git a/media-gfx/darktable/darktable-3.0.2-r1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild index 298560b890d..b864fc88f76 100644 --- a/media-gfx/darktable/darktable-3.0.2-r1.ebuild +++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild @@ -71,6 +71,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch + "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch ) S="${WORKDIR}/${P/_/~}" diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild index 1ab8842d12a..c0116fa643b 100644 --- a/media-gfx/darktable/darktable-3.0.2.ebuild +++ b/media-gfx/darktable/darktable-3.0.2.ebuild @@ -71,6 +71,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch + "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch ) S="${WORKDIR}/${P/_/~}" diff --git a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch new file mode 100644 index 00000000000..1aa0aec5163 --- /dev/null +++ b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -319,15 +319,7 @@ + message(STATUS "Test-compilation of OpenCL programs is disabled.") + endif() + +-# we need jsonschema to check noiseprofiles.json +-find_program(jsonschema_BIN jsonschema) +-if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND") +- message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed") +- set(VALIDATE_JSON 0) +-else(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND") +- message(STATUS "Found jsonschema") +- set(VALIDATE_JSON 1) +-endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND") ++set(VALIDATE_JSON 0) + + # we need an xslt interpreter to generate preferences_gen.h and darktablerc + find_program(Xsltproc_BIN xsltproc)
