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 | |
| 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')
| -rw-r--r-- | x11-wm/compiz/Manifest | 4 | ||||
| -rw-r--r-- | x11-wm/compiz/compiz-0.9.13.9999.ebuild | 1 | ||||
| -rw-r--r-- | x11-wm/compiz/files/access_violation.patch | 13 |
3 files changed, 6 insertions, 12 deletions
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index fc67d88..2faaede 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -1,2 +1,2 @@ -AUX access_violation.patch 1456 BLAKE2B 4f41e05f549cec2cc4fe234f9c6a97d49a2dfc8c3b0536d2245253afaba96520f083694dffd2c9d58c71f3040ff967c82923c216fad25775287b6c1c5018e1d0 SHA512 04af43f754aca8490e8462562311372e12306bb89aa3c9ed4ac466c65827f17a9f379c1250ad0881c0b3db18a068fd458a7275c8184851d72519a71f1e4fc3f1 -EBUILD compiz-0.9.13.9999.ebuild 3611 BLAKE2B c815399e13331fd85454f14cea076751e4309862e5adc571a753681ec7dd9cae1ab685a47632c647bfa82726afd730a8ea34f15240eba92f4946dd43751ceb6b SHA512 cb168c754c2678ec1e6fd067113f62201577b32fe133d6e797508383fb215be26b9187374e4ea3072c505854898d22e66831747e867f54eba81726f3e306ab9a +AUX access_violation.patch 974 BLAKE2B 9b226e3d7255073bff22448f096fc19f743b97582b2e4de2725c7df84f0895bb63b7eee25d3b82f08090b19b5ea9c1179d57d1eaf994bfabc42e4e04e8f1ec33 SHA512 0d91b71ad9c2646745d91a8a6b3d9228a23dccb3971abf69094ca4f6b3055f92570f01eb6dda62acab8630c05cc9480e846b59bd3b6044a73b31510d72a8f800 +EBUILD compiz-0.9.13.9999.ebuild 3636 BLAKE2B ad8141a2d9d323ca091b122af0c2c8e110563d5c41f99d6b5ea53ce8707f9db639dd5b8705faf4c70bb68ca9f4b37e4429a5700db829d14f9c637b955c1af3d1 SHA512 5ed76b241fae11650c1b78d03853fe1cc7fd64f43529a9f93ca7cfe6cd670ab8074ebe588f258d24fbb5eaf741947fe1ba97e0ff03b8924720e208d0f74d8819 diff --git a/x11-wm/compiz/compiz-0.9.13.9999.ebuild b/x11-wm/compiz/compiz-0.9.13.9999.ebuild index 68a9345..5556ab9 100644 --- a/x11-wm/compiz/compiz-0.9.13.9999.ebuild +++ b/x11-wm/compiz/compiz-0.9.13.9999.ebuild @@ -110,6 +110,7 @@ src_unpack() { } src_prepare() { + cmake-utils_src_prepare sed -i -e 's/CYTHON_BIN cython3/CYTHON_BIN cython/' compizconfig/compizconfig-python/CMakeLists.txt epatch "${FILESDIR}"/access_violation.patch eapply_user 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 @@ |