diff options
author | Marcin Deranek <gringo@slonko.net> | 2019-03-06 22:31:52 +0100 |
---|---|---|
committer | Marcin Deranek <gringo@slonko.net> | 2019-03-06 22:31:52 +0100 |
commit | f752136b3dcfd700117d6ed5a0a51a77cf146a8c (patch) | |
tree | 86c086cca9c4ffef07d068472007ecf0f0125a29 /x11-wm/compiz/files | |
parent | 45de337f66da1ed5962694649b5e1e5ad441dfb4 (diff) | |
download | portage-f752136b3dcfd700117d6ed5a0a51a77cf146a8c.tar.gz portage-f752136b3dcfd700117d6ed5a0a51a77cf146a8c.tar.bz2 portage-f752136b3dcfd700117d6ed5a0a51a77cf146a8c.zip |
Build fixes for latest code changes
Diffstat (limited to 'x11-wm/compiz/files')
-rw-r--r-- | x11-wm/compiz/files/access_violation.patch | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/x11-wm/compiz/files/access_violation.patch b/x11-wm/compiz/files/access_violation.patch index 98e8966..92af367 100644 --- a/x11-wm/compiz/files/access_violation.patch +++ b/x11-wm/compiz/files/access_violation.patch @@ -1,18 +1,11 @@ --- compizconfig/libcompizconfig/config/CMakeLists.txt.old 2015-02-03 12:09:12.000000000 +0100 +++ compizconfig/libcompizconfig/config/CMakeLists.txt 2015-06-14 13:12:15.009100624 +0200 -@@ -4,10 +4,10 @@ +@@ -4,4 +4,4 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config_test ${CMAKE_CURRENT_BINARY_DIR}/compiz-1/compizconfig/config) --compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}) -+compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} \"$ENV{DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}\") - - add_custom_target ( - config_install - ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && -- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file} -+ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} \"$ENV{DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}\" - ) +-install (FILES ${_config_file} DESTINATION ${COMPIZCONFIG_CONFIG_DIR}) ++install (FILES ${_config_file} DESTINATION $ENV{DESTDIR}${COMPIZCONFIG_CONFIG_DIR}) --- cmake/recompile_gsettings_schemas_in_dir_user_env.cmake.orig 2016-08-01 22:56:04.317994940 +0200 +++ cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2016-08-01 22:58:03.707528553 +0200 @@ -18,6 +18,6 @@ |