Date: Wed, 26 Aug 2015 17:04:13 +0000 (UTC) From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395382 - head/graphics/darktable/files Message-ID: <201508261704.t7QH4DJt054444@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dumbbell (src committer) Date: Wed Aug 26 17:04:12 2015 New Revision: 395382 URL: https://svnweb.freebsd.org/changeset/ports/395382 Log: graphics/darktable: Add patches to fix build with Ninja 1.6.0 PR: 202399 Reviewed by: bapt, kwm Approved by: bapt Differential Revision: https://reviews.freebsd.org/D3247 Added: head/graphics/darktable/files/patch-data_CMakeLists.txt (contents, props changed) head/graphics/darktable/files/patch-doc_CMakeLists.txt (contents, props changed) Added: head/graphics/darktable/files/patch-data_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/darktable/files/patch-data_CMakeLists.txt Wed Aug 26 17:04:12 2015 (r395382) @@ -0,0 +1,38 @@ +--- data/CMakeLists.txt.orig 2015-07-26 11:47:47 UTC ++++ data/CMakeLists.txt +@@ -39,21 +39,21 @@ if(USE_LUA) + # + # lua system scripts + # +-install(DIRECTORY "lua" DESTINATION ${SHARE_INSTALL}/darktable/) +-install(FILES luarc DESTINATION ${SHARE_INSTALL}/darktable/) ++install(DIRECTORY "lua" DESTINATION ${SHARE_INSTALL}/darktable) ++install(FILES luarc DESTINATION ${SHARE_INSTALL}/darktable) + endif(USE_LUA) + # + # Install (and generate when necessary) other system shares + # + file(GLOB PO_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../po/*.po") + add_custom_command( +- OUTPUT darktable.desktop +- SOURCE darktable.desktop.in ++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop ++ SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in + COMMAND ${intltool_merge_BIN} -d ${CMAKE_CURRENT_SOURCE_DIR}/../po ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/darktable.desktop.in + DEPENDS ${PO_FILES} + ) +-add_custom_target(darktable.desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop) ++add_custom_target(darktable.desktop_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktable.desktop DESTINATION ./share/applications) + install(FILES darktable.appdata.xml DESTINATION ./share/appdata) + +@@ -116,7 +116,7 @@ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltp + endif(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND") + endif(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND") + +-add_custom_target(darktablerc ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc) ++add_custom_target(darktablerc_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc) + + # first of all install darktablerc file into share as template + # postinst script should copy this into users homedirectory Added: head/graphics/darktable/files/patch-doc_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/darktable/files/patch-doc_CMakeLists.txt Wed Aug 26 17:04:12 2015 (r395382) @@ -0,0 +1,11 @@ +--- doc/CMakeLists.txt.orig 2015-07-26 11:47:47 UTC ++++ doc/CMakeLists.txt +@@ -58,7 +58,7 @@ else(NOT ${Xsltproc_BIN} STREQUAL "Xsltp + endif(NOT ${Saxon_BIN} STREQUAL "Saxon_BIN-NOTFOUND") + endif(NOT ${Xsltproc_BIN} STREQUAL "Xsltproc_BIN-NOTFOUND") + +-add_custom_target(darktablerc.html ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html) ++add_custom_target(darktablerc.html_file ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/darktablerc.html DESTINATION ${SHARE_INSTALL}/doc/darktable/) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508261704.t7QH4DJt054444>