[gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/

["Sergey Popov" <pinkbyte@gentoo.org>]

commit:     c4687e246867c9b471b66fa6a52169d9998d6ef4
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 08:24:35 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 08:24:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=c4687e24

Add patch to remove coverage automagic support

(Portage version: 2.2.0_alpha123/git/Linux x86_64, unsigned Manifest commit)

---
 x11-wm/compiz/ChangeLog                            |    4 ++
 x11-wm/compiz/Manifest                             |    5 +-
 x11-wm/compiz/compiz-0.9.8_rc3275.ebuild           |    2 +
 ...mpiz-0.9.8_rc3275-remove-coverage-support.patch |   43 ++++++++++++++++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index c9625cd..149d013 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3275.ebuild,
+  +files/compiz-0.9.8_rc3275-remove-coverage-support.patch:
+  Add patch to remove coverage automagic support
+
   04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org>
   +files/compiz-0.9.8_rc3275-sandbox.patch:
   Add missing sandbox patch for compiz 0.9.8

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 5295bb0..cd46c76 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,4 @@
+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-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a
@@ -5,7 +6,7 @@ AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772
 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af
 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 3174 SHA256 34da3540dc8a701f9a07b3b8e4e38265f63ea96c374285cb9186bcd61159a64e SHA512 0e11da0cf0440999a423a71e5369180a52bfd8fb10c24e1d4b72a5dd0c4e41a20a15c2ca28e0e875cc4ac028c0779230b7de5603002a587d146359f97aad2893 WHIRLPOOL cccf91a67f4eeac16a5327fdaee4ed91da4a78b888c2ddaa42ac88007d207b7d7cf26bd2441e3688308d1d5bdf0ec5d41bab3b500670c21957e99b9303f2f230
+EBUILD compiz-0.9.8_rc3275.ebuild 3247 SHA256 818e9c55171606662ceeba6206e6ce4cfe2727af120ce3ce09caa4be4a1ef7d9 SHA512 7262dc5c98b1cdebadfd38b28586235a7046ea6e77ede293b8d864f0c3e9ccb20a248508362dca70a425baed1236415af822d9ee4d701e906c82636bd329a0d8 WHIRLPOOL 7412300c23c23901a5dd14fad9307b2ed0238dd659c0710c8726afb944398c80d1edf74774325ab934a25b92ec138f91041a02fee9e6615efcdf6479d412688e
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 13580 SHA256 22645880b4cd259f75835c1f29041c76c32519d7401e632335ccd4c2af47445a SHA512 7dfeaffd4d5ac93c58a390b762504a3b5ab02998826f56b6600e73e0c5f3c7a3e52e669ff095872024a430b35d810ca064a3b6404ab9fe2c492067cd7e5d894a WHIRLPOOL 54c0651e72de6cf748749306b2690ae8021cdf1c5ad422157320448dbe643cb8aa4088fa8198305ebec4574cb301f92c624694c696b9bbe0b88bfca9baba1cf3
+MISC ChangeLog 13768 SHA256 744faeeec4004e7f32f7732b66d7290f1b101176711c34dd55df95c66803ea50 SHA512 36e9ee8de258c247d15f21350c66a65a9f677f0ed5d1603c7ad9b169ba06c2bb843ff406c0f81fd248cec1ddd50c1bd141a320426433496458f24ebf04aea6af WHIRLPOOL 7ebc745bc8f0ac2eb4de8c23e89eb79931484b4482de1b46f5e59f9e5261b99974ad474d65b7598a3a5e9c6257100a8ca41917ee65232ee0ef9bd0088b32d6df
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
index 003f138..4c53130 100644
--- a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
@@ -34,6 +34,7 @@ COMMONDEPEND="
 	!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
@@ -96,6 +97,7 @@ src_prepare() {
 	bzr_src_prepare
 
 	epatch "${FILESDIR}/${P}-sandbox.patch"
+	epatch "${FILESDIR}"/${P}-remove-coverage-support.patch
 
 	echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
 	echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-remove-coverage-support.patch
new file mode 100644
index 0000000..9859ad3
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3275-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 )