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

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

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

Add patch for optional building of gconf/gsettings backends for compiz 0.9.8

(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           |    1 +
 ...rc3275-conditional-gnome-backend-building.patch |   13 +++++++++++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 6c31828..0104287 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-conditional-gnome-backend-building.patch:
+  Add patch for optional building of gconf/gsettings backends for compiz 0.9.8
+
   04 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3275.ebuild:
   ccsm in compiz 0.9.8 needs dev-python/pygtk to run
 

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 7ff845d..a0c1d85 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,3 +1,4 @@
+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-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
@@ -6,7 +7,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 3320 SHA256 0c238b8968773968a3c8c3ce1988fd1d73a8601e43d42ba73980859af1aa645a SHA512 42440f9614263caa429db9c175386a3279426cb260c2c3c4754621ce46c4c49d6f10ca51b8788343489a0f42752605fa662c5f683c588c5e683d31058db934f0 WHIRLPOOL e68e664b3f1d423b8cc3cb131b26c9f0a2cc2b95540fbca12035bf4994104e688f0d2f4d611e17cbf10f1fd77b19e757a4d1de50133f7165c250335403bd47d2
+EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 ad90f16e6d7e51114b0287089e6baccddd2caf7609bb5e409014f12d369fd393 SHA512 ad08592af0a73f0d8626fd3e1958f51d2782e3fe116483a00d5c774f70d5383eee01b055888e9d9f1436040f2cb9c86a8eb24692b617b4032dd6eddd798f5abd WHIRLPOOL 755b0e6fb57a7cccdf1567525265b9ecd8a1c5549d5aa066094f60e1db7b554c520bd3aaf0024da04dab56a57ae56f5e1b153e3056c286a25e889fcc1543d32d
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 14334 SHA256 f2b78e975e0e9f0151873912cc35bf71fd00c2e4c78432c5b2ca53f98f7496e0 SHA512 8f7321dd939c78cec537af846a3c4a302872cf25bcfc5108826386e4b39b110904ff4dd2b3ad6d36131d17c8af96b3d8d223cc8fdf09285d8d0b62eda10ce18f WHIRLPOOL 3694ec9fddda5a7d04085958dbaa1c9d71eca039d740ba5ca8181b9933e38f9d7c4a3f06389d5a8c32551e2d114077e0375e64f30ae6e593d278f658fd74c951
+MISC ChangeLog 14563 SHA256 472ad54acfc57bb725e9edb24f3c726d809e906731129d84f84ed204d1c2bd51 SHA512 bc15cdabbb3e2770446b773bbbe85ba007d76e18e1ac81f534347f4614f3327d0cfd8092d0d5455aa5a4abb8b016f8caf2e8f45d7e08502d53f61112b4766aa2 WHIRLPOOL a3218014f6fb9df3b6350605927221b882f48796e4d45643cc880c62d363b1908ceea92537a7f8aebfb8cf986a2461a6ce84beb92e8e07e73cfe5c0735e47798
 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 ddad0ea..7f1895d 100644
--- a/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8_rc3275.ebuild
@@ -99,6 +99,7 @@ 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"

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3275-conditional-gnome-backend-building.patch
new file mode 100644
index 0000000..a2c5925
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3275-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)
+