From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 55ABC138010 for ; Tue, 4 Sep 2012 12:21:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1386FE0027; Tue, 4 Sep 2012 12:21:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BBF16E001E for ; Tue, 4 Sep 2012 12:21:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08CAA33D866 for ; Tue, 4 Sep 2012 12:21:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BAB20E543D for ; Tue, 4 Sep 2012 12:21:41 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1346761363.825113e12e61e07e6b04c0249a0599d1ba8acdf7.pinkbyte@gentoo> Subject: [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/ X-VCS-Repository: proj/desktop-effects X-VCS-Files: x11-wm/compiz/ChangeLog x11-wm/compiz/Manifest x11-wm/compiz/compiz-0.9.8_rc3282.ebuild x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch X-VCS-Directories: x11-wm/compiz/files/ x11-wm/compiz/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 825113e12e61e07e6b04c0249a0599d1ba8acdf7 X-VCS-Branch: v0.9.8-test Date: Tue, 4 Sep 2012 12:21:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c82b7347-c1d3-45f4-99a1-b334ac7415b0 X-Archives-Hash: 73f38da5bc6696cd46b23cebd0dc39bb commit: 825113e12e61e07e6b04c0249a0599d1ba8acdf7 Author: Sergey Popov gentoo org> AuthorDate: Tue Sep 4 12:22:43 2012 +0000 Commit: Sergey Popov gentoo org> CommitDate: Tue Sep 4 12:22:43 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=825113e1 Bump new snapshot of compiz 0.9.8 (Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit) --- x11-wm/compiz/ChangeLog | 8 + x11-wm/compiz/Manifest | 6 +- x11-wm/compiz/compiz-0.9.8_rc3282.ebuild | 152 ++++++++++++++++++++ ...rc3282-conditional-gnome-backend-building.patch | 13 ++ ...mpiz-0.9.8_rc3282-remove-coverage-support.patch | 43 ++++++ .../compiz/files/compiz-0.9.8_rc3282-sandbox.patch | 42 ++++++ 6 files changed, 263 insertions(+), 1 deletions(-) diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog index 0104287..2bae528 100644 --- a/x11-wm/compiz/ChangeLog +++ b/x11-wm/compiz/ChangeLog @@ -2,6 +2,14 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*compiz-0.9.8_rc3282 (04 Sep 2012) + + 04 Sep 2012; Sergey Popov +compiz-0.9.8_rc3282.ebuild, + +files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch, + +files/compiz-0.9.8_rc3282-remove-coverage-support.patch, + +files/compiz-0.9.8_rc3282-sandbox.patch: + Bump new snapshot of compiz 0.9.8 + 04 Sep 2012; Sergey Popov compiz-0.9.8_rc3275.ebuild, +files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch: Add patch for optional building of gconf/gsettings backends for compiz 0.9.8 diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index a0c1d85..92a342d 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -1,6 +1,9 @@ AUX compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84 AUX compiz-0.9.8_rc3275-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4 AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8 +AUX compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84 +AUX compiz-0.9.8_rc3282-remove-coverage-support.patch 1767 SHA256 d9facd2dbb8695ad8e108b21829eddd68161ffa7a52ea2232fe7a60a91889882 SHA512 2da2d993d36ad04ec2b158ad2416ef23011808061e593c434def8a6f61b3b4179cad6b00378c041811a5c2d7f72814bc6c9a8454e12ef1b46bde0964c945ea94 WHIRLPOOL 6745945b670e4b28d5472f51dc1e439dafcf72dd5b6d436df4a5bbda3d369c01c0243a9b64e79a90b0659256bb9e2a1b9aad83d1f267d1322e0290183ef899f4 +AUX compiz-0.9.8_rc3282-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8 AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6 @@ -8,6 +11,7 @@ AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf710 DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65 EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 ad90f16e6d7e51114b0287089e6baccddd2caf7609bb5e409014f12d369fd393 SHA512 ad08592af0a73f0d8626fd3e1958f51d2782e3fe116483a00d5c774f70d5383eee01b055888e9d9f1436040f2cb9c86a8eb24692b617b4032dd6eddd798f5abd WHIRLPOOL 755b0e6fb57a7cccdf1567525265b9ecd8a1c5549d5aa066094f60e1db7b554c520bd3aaf0024da04dab56a57ae56f5e1b153e3056c286a25e889fcc1543d32d +EBUILD compiz-0.9.8_rc3282.ebuild 3388 SHA256 ad90f16e6d7e51114b0287089e6baccddd2caf7609bb5e409014f12d369fd393 SHA512 ad08592af0a73f0d8626fd3e1958f51d2782e3fe116483a00d5c774f70d5383eee01b055888e9d9f1436040f2cb9c86a8eb24692b617b4032dd6eddd798f5abd WHIRLPOOL 755b0e6fb57a7cccdf1567525265b9ecd8a1c5549d5aa066094f60e1db7b554c520bd3aaf0024da04dab56a57ae56f5e1b153e3056c286a25e889fcc1543d32d EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f -MISC ChangeLog 14563 SHA256 472ad54acfc57bb725e9edb24f3c726d809e906731129d84f84ed204d1c2bd51 SHA512 bc15cdabbb3e2770446b773bbbe85ba007d76e18e1ac81f534347f4614f3327d0cfd8092d0d5455aa5a4abb8b016f8caf2e8f45d7e08502d53f61112b4766aa2 WHIRLPOOL a3218014f6fb9df3b6350605927221b882f48796e4d45643cc880c62d363b1908ceea92537a7f8aebfb8cf986a2461a6ce84beb92e8e07e73cfe5c0735e47798 +MISC ChangeLog 14890 SHA256 4b769a66e0ee5c95b798d38ef31560584cb7ca0a5df8fa571560ed85a09d5242 SHA512 4fdc5c06c9072faf1e5d3faa37d9f986e9ae0488fdc733a4923eff48602671baad6e63a46c77a13c0ecb7504e7830687935ca434800fb58e28fa66e0a93a1616 WHIRLPOOL d5cce2b462cb262f39aacd424abd6fd71e88b0c10bb5975955a0f42bd513186da3b696af931141d322508be049813b29192b0ff3180b1648799230aad356713c MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d diff --git a/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild new file mode 100644 index 0000000..7f1895d --- /dev/null +++ b/x11-wm/compiz/compiz-0.9.8_rc3282.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +MY_PV="${PV%_*}" + +SRC_URI="" +EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MY_PV}" +EBZR_REVISION="${PV#*_rc}" + +inherit eutils bzr cmake-utils gnome2-utils flag-o-matic + +DESCRIPTION="OpenGL compositing window manager." +HOMEPAGE="https://launchpad.net/compiz" + +LICENSE="GPL-2 LGPL-2.1 MIT" +SLOT="0.9.8" +KEYWORDS="~amd64 ~x86" +IUSE="+cairo debug dbus fuse gnome gtk kde +svg test" + +COMMONDEPEND=" + !x11-wm/compiz-fusion + !x11-libs/compiz-bcop + !x11-libs/libcompizconfig + !x11-libs/compizconfig-backend-gconf + !x11-libs/compizconfig-backend-kconfig4 + !x11-plugins/compiz-plugins-main + !x11-plugins/compiz-plugins-extra + !x11-plugins/compiz-plugins-unsupported + !x11-apps/ccsm + !dev-python/compizconfig-python + !x11-apps/fusion-icon + >=dev-libs/boost-1.34.0 + >=dev-libs/glib-2.30.0 + dev-cpp/glibmm + dev-libs/libxml2 + dev-libs/libxslt + dev-python/pyrex + dev-libs/protobuf + media-libs/libpng + >=media-libs/mesa-6.5.1-r1 + >=x11-base/xorg-server-1.1.1-r1 + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXrandr + >=x11-libs/libXrender-0.9.3 + x11-libs/libXinerama + x11-libs/libICE + x11-libs/libSM + >=x11-libs/startup-notification-0.7 + cairo? ( + x11-libs/cairo[X] + ) + fuse? ( sys-fs/fuse ) + gtk? ( + >=x11-libs/gtk+-2.18.0 + >=x11-libs/libwnck-2.19.4 + x11-libs/pango + gnome? ( + gnome-base/gnome-desktop + gnome-base/gconf + >=x11-wm/metacity-2.23.2 + ) + ) + kde? ( + >=kde-base/kwin-4.3.0:4 + ) + svg? ( + >=gnome-base/librsvg-2.14.0:2 + >=x11-libs/cairo-1.0 + ) + dbus? ( >=sys-apps/dbus-1.0 )" + +DEPEND="${COMMONDEPEND} + app-admin/chrpath + virtual/pkgconfig + x11-proto/damageproto + x11-proto/xineramaproto + test? ( + dev-cpp/gtest + dev-cpp/gmock + )" + +RDEPEND="${COMMONDEPEND} + dev-python/pygtk + x11-apps/mesa-progs + x11-apps/xvinfo" + +src_unpack() { + bzr_src_unpack +} + +src_prepare() { + bzr_src_prepare + + epatch "${FILESDIR}/${P}-sandbox.patch" + epatch "${FILESDIR}"/${P}-remove-coverage-support.patch + epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch + + echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip" + echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip" +} + +src_configure() { + local mycmakeargs=( + "$(cmake-utils_use_use gnome GCONF)" + "$(cmake-utils_use_use gnome GNOME)" + "$(cmake-utils_use_use gtk GTK)" + "$(cmake-utils_use_use kde KDE4)" + "${cmake-utils_use test COMPIZ_BUILD_TESTING}" + "-DCMAKE_C_FLAGS=$(usex debug '-DDEBUG -ggdb' '')" + "-DCMAKE_CXX_FLAGS=$(usex debug '-DDEBUG -ggdb' '')" + "-DCOMPIZ_DEFAULT_PLUGINS=ccp" + "-DCOMPIZ_DISABLE_SCHEMAS_INSTALL=ON" + "-DCOMPIZ_PACKAGING_ENABLED=ON" + "-DCOMPIZ_DESTDIR=${D}" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + pushd ${CMAKE_BUILD_DIR} + dodir /usr/share/cmake/Modules + emake DESTDIR="${D}" findcompiz_install + emake DESTDIR="${D}" install + popd ${CMAKE_BUILD_DIR} + chrpath -d "${D}/usr/lib64/python2.7/site-packages/compizconfig.so" + + ewarn "The dbus plugin is known to crash compiz in this version. Disable" + ewarn "it if you experience crashes when plugins are enabled/disabled." +} + +pkg_preinst() { + use gnome && gnome2_gconf_savelist +} + +pkg_postinst() { + use gnome && gnome2_gconf_install +} + +pkg_prerm() { + use gnome && gnome2_gconf_uninstall +} diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch new file mode 100644 index 0000000..a2c5925 --- /dev/null +++ b/x11-wm/compiz/files/compiz-0.9.8_rc3282-conditional-gnome-backend-building.patch @@ -0,0 +1,13 @@ +--- compizconfig/CMakeLists.txt.orig 2012-09-04 14:56:20.082299507 +0400 ++++ compizconfig/CMakeLists.txt 2012-09-04 14:56:31.109299403 +0400 +@@ -7,8 +7,10 @@ + add_subdirectory (libcompizconfig) + add_subdirectory (compizconfig-python) + add_subdirectory (ccsm) ++if (USE_GNOME) + add_subdirectory (gconf) + add_subdirectory (gsettings) ++endif (USE_GNOME) + + add_custom_target (pyclean) + diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch new file mode 100644 index 0000000..9859ad3 --- /dev/null +++ b/x11-wm/compiz/files/compiz-0.9.8_rc3282-remove-coverage-support.patch @@ -0,0 +1,43 @@ +--- CMakeLists.txt.orig 2012-09-04 12:12:58.603375058 +0400 ++++ CMakeLists.txt 2012-09-04 12:13:12.550374932 +0400 +@@ -21,24 +21,6 @@ + + enable_testing() + +-# Import macro for doing coverage reporting +-include(EnableCoverageReport) +- +-##################################################################### +-# Enable code coverage calculation with gcov/gcovr/lcov +-# Usage: +-# * Switch build type to coverage (use ccmake or cmake-gui) +-# * Invoke make, make test, make coverage +-# * Find html report in subdir coveragereport +-# * Find xml report feasible for jenkins in coverage.xml +-##################################################################### +-IF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE]) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs" ) +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs" ) +- SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" ) +- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" ) +-ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE]) +- + #set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRe" CACHE INTERNAL "" FORCE) + #if (NOT CMAKE_BUILD_TYPE) + # set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE) +@@ -196,7 +178,3 @@ + + _check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG}) + +-# Enable coverage reporting for compiz +-enable_coverage_report() +- +- +--- src/CMakeLists.txt.orig 2012-09-04 12:22:06.860370828 +0400 ++++ src/CMakeLists.txt 2012-09-04 12:22:12.375370782 +0400 +@@ -193,5 +193,3 @@ + TARGETS compiz + RUNTIME DESTINATION ${exec_prefix} + ) +- +-enable_coverage_report( TARGETS compiz ) diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch new file mode 100644 index 0000000..55bde3e --- /dev/null +++ b/x11-wm/compiz/files/compiz-0.9.8_rc3282-sandbox.patch @@ -0,0 +1,42 @@ +diff -urN a/cmake/base.cmake b/cmake/base.cmake +--- a/cmake/base.cmake 2012-06-29 02:33:47.076801000 -0500 ++++ b/cmake/base.cmake 2012-06-29 22:47:06.868740002 -0500 +@@ -53,8 +53,8 @@ + DESTINATION + ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/) + add_custom_target (findcompiz_install +- ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && +- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules ++ ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules && ++ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules + ) + find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN}) + if (NOT _find_compizconfig) +@@ -70,8 +70,8 @@ + ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/) + add_custom_target ( + findcompizconfig_install +- ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && +- ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules ++ ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules && ++ ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules + ) + endfunction () + +diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt +--- a/compizconfig/libcompizconfig/config/CMakeLists.txt 2012-06-29 02:33:51.195800999 -0500 ++++ b/compizconfig/libcompizconfig/config/CMakeLists.txt 2012-06-29 22:48:56.602740000 -0500 +@@ -1,10 +1,10 @@ + set (_config_file + 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} ${COMPIZ_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 make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules && ++ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file} + )