public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sergey Popov" <pinkbyte@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/
Date: Sat, 15 Sep 2012 09:11:49 +0000 (UTC)	[thread overview]
Message-ID: <1347700196.b8bc3b60812ab76cce6ee20f16fc50486d63bfcb.pinkbyte@gentoo> (raw)

commit:     b8bc3b60812ab76cce6ee20f16fc50486d63bfcb
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 09:09:24 2012 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 09:09:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=b8bc3b60

Bump to new revision, drop old

Add patch that brings back inclusion of rsvg-cairo header file(otherwise compilation with USE="svg" is broken)

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

---
 x11-wm/compiz/ChangeLog                            |   11 +++++++++++
 x11-wm/compiz/Manifest                             |    9 +++++----
 ....8_rc3302.ebuild => compiz-0.9.8_rc3312.ebuild} |    1 +
 ...c3312-conditional-gnome-backend-building.patch} |    0
 .../files/compiz-0.9.8_rc3312-rsvg-cairo.patch     |   12 ++++++++++++
 ...box.patch => compiz-0.9.8_rc3312-sandbox.patch} |    0
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index b5d1529..e18a247 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*compiz-0.9.8_rc3312 (15 Sep 2012)
+
+  15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.8_rc3302.ebuild,
+  +compiz-0.9.8_rc3312.ebuild,
+  -files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch,
+  -files/compiz-0.9.8_rc3302-sandbox.patch,
+  +files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch,
+  +files/compiz-0.9.8_rc3312-rsvg-cairo.patch,
+  +files/compiz-0.9.8_rc3312-sandbox.patch:
+  Bump to new revision, drop old
+
   08 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8_rc3302.ebuild:
   Add x11-themes/hicolor-icon-theme to runtime dependencies of compiz
 

diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index b90e55c..78575bc 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -4,8 +4,9 @@ AUX compiz-0.9.8_rc3275-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da
 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-0.9.8_rc3302-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
-AUX compiz-0.9.8_rc3302-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8
+AUX compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84
+AUX compiz-0.9.8_rc3312-rsvg-cairo.patch 421 SHA256 9257e6eaa78c27d9a91d540eed7707390ca5b7f700d4762b24243ab63cfa79fa SHA512 30e01f7d77e55e5582163ca795eb1ab960beec8ea4a3dc1869d6eda15e8539e662d31d2557fa7f1a4ce5f0731e8eece0fee832a5f2c1c6a0a8237f0bbcd8fd9e WHIRLPOOL 14db5246ef9321fc99d07f6bd9945f35cec70b4a72d9d5ed2eee756b98d3e52e129a80290b43e2d5e943b562fe6b7984cb93adedd5aac1d27d7f963acf778f83
+AUX compiz-0.9.8_rc3312-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
@@ -14,7 +15,7 @@ DIST compiz-core-0.9.2.tar.bz2 861137 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3
 EBUILD compiz-0.9.2.ebuild 2348 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d SHA512 0cdf3d4cc596ce6eda8b625331539f844967c850bb8cb03ca2615f7fc89c5320d78fe7e48bae84a7339ec9f68fff8e4dae9885529d65df7f5f7296fde475d39a WHIRLPOOL 58100cc6ff344b90038dbeab4f3123e8a5ee59ac44383e83c6d5aa98cbb76a4497b02f7a1d69e18a1d42b04a5c7cf9c0f1696f82152d45862b450313be6d2e65
 EBUILD compiz-0.9.8_rc3275.ebuild 3388 SHA256 58916fa39f53e154575faaa005e3cbf2f1d38d0402ed8cf583d788a29e27c2fa SHA512 fd2c4e6542f86c1d35818c028c5d7612e8219c040728fd36d9bbd5e37916315f1340be64048f4a968b3890ed9ca3e40bf30ebe22fe3ce2fe7be5950c92fc192b WHIRLPOOL 6cf42adf03929c5fee406c2a82836c035ad5c178661c065a157ddbd2c1e289969c9c9339f8267fceee8c31785e55764b1c1783f551460352abe25c931eea520e
 EBUILD compiz-0.9.8_rc3282.ebuild 3995 SHA256 4a71b119c25dce6a74a87c6ace0873212ac1ec21ab133948766d7713b22d54dc SHA512 383436ba772b56455f7cc806ec97b2eb289cc8cc6306051fa6cc7b0c3e138c55fa6c57f078ae784a8dd1c163644e015d9af30d2526c047f56505a5c2ca8c8e67 WHIRLPOOL 7d549fdc1be0d28264aff843dc5fc7c0ad29e379a1906aa6136fe43050f6bd237f762153274e7c4abff2de43ac443c523c43dad88e7b94bab9650bac7fb26b75
-EBUILD compiz-0.9.8_rc3302.ebuild 4005 SHA256 fb9f3632c7d64d2805379dac2b2eb4a337ef0627cd313fd0abf284c123bae0d6 SHA512 4f3e70e92c495ec18f2fc97696da538080628cf7dfbdee8c0ec9af40bf3bd6e60bdaa5bf73ab2fc3ebf344cbc59f7afeff301de2bb8fbdd72a5415cb230ef972 WHIRLPOOL 0f3c9beb8e9907f8c4bc29d63c7401c7671ee7c9306b6023d68719c95ed3373ad600960dda6d942c066bd95a344b1faadfa2021c30f7039b329045572e13a1ad
+EBUILD compiz-0.9.8_rc3312.ebuild 4049 SHA256 4f70ddac1b1295ba99d4f8b31c0527528989f9181d090975024418792c4e9f6f SHA512 c60c4b4b862754944d2b2e65a4ee43ebdc36ebbdaa636b6dbfa333ee7acf0927dc72800e4a9063567e6391bf0587899a56fe74773090868b1bbaf5e1b5d5713f WHIRLPOOL e8828c28e0fa0a36d1f09ba849099e1fef2c68c495e4f3a68b51123be4273163390abf35068b0472905ce14ba40610711982cdc5a39cbbf28fa8f3624f27a1d7
 EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 15616 SHA256 ae9e4d109ab3e6f9ea8e20b2111087a638f6fed41b8f9807466f20d75f9da8d5 SHA512 60ad46d1c5a735c650834383299509e658981224325baa34b0dcaf8824445925cf64e6fc7fca21f4f91a8708f8fd6578cde86f58a9cafce2a5cac6f6831d8515 WHIRLPOOL fe3b7079d25cd74e28ead5abe75e09f4db521affd87bd92eeabb89990e7ef9c74401f7404c3cb44ecbfa8627145836a4211d3c7b5c1514d8b68d63dad028819b
+MISC ChangeLog 16073 SHA256 1c8bcf1f9dc335c1849e1df7a4b67ddd787dd179f1ca0f343f95ba60e99393d1 SHA512 988b1b3989b40690ab59e7c88857c4de305093b3710b30c5820d84d318f8809766d0596104eead5a15a49b7ef918a1f637da3f810154e43708b1831c52f14819 WHIRLPOOL a2f501e32ad1f94bc6a1c01e2ccedf33b4b1282afcecca2516e7f0f24dc107ddd0ac714623f8082cd8431397686c0c0ae092ea30db94c92cb0981c4ff1510510
 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d

diff --git a/x11-wm/compiz/compiz-0.9.8_rc3302.ebuild b/x11-wm/compiz/compiz-0.9.8_rc3312.ebuild
similarity index 98%
rename from x11-wm/compiz/compiz-0.9.8_rc3302.ebuild
rename to x11-wm/compiz/compiz-0.9.8_rc3312.ebuild
index c3d0ab0..6027908 100644
--- a/x11-wm/compiz/compiz-0.9.8_rc3302.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8_rc3312.ebuild
@@ -114,6 +114,7 @@ src_prepare() {
 
 	epatch "${FILESDIR}/${P}-sandbox.patch"
 	epatch "${FILESDIR}"/${P}-conditional-gnome-backend-building.patch
+	epatch "${FILESDIR}"/${P}-rsvg-cairo.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_rc3302-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch
similarity index 100%
rename from x11-wm/compiz/files/compiz-0.9.8_rc3302-conditional-gnome-backend-building.patch
rename to x11-wm/compiz/files/compiz-0.9.8_rc3312-conditional-gnome-backend-building.patch

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch
new file mode 100644
index 0000000..ad484f5
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-0.9.8_rc3312-rsvg-cairo.patch
@@ -0,0 +1,12 @@
+Revert back commit from revision 3309(http://bazaar.launchpad.net/~compiz-team/compiz/0.9.8/revision/3309)
+
+--- plugins/imgsvg/src/imgsvg.h.orig	2012-09-15 13:03:21.776447000 +0400
++++ plugins/imgsvg/src/imgsvg.h	2012-09-15 13:03:33.383185000 +0400
+@@ -35,6 +35,7 @@
+ 
+ #include <cairo/cairo-xlib.h>
+ #include <librsvg/rsvg.h>
++#include <librsvg/rsvg-cairo.h>
+ 
+ #include <X11/Xatom.h>
+ #include <X11/extensions/shape.h>

diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3302-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3312-sandbox.patch
similarity index 100%
rename from x11-wm/compiz/files/compiz-0.9.8_rc3302-sandbox.patch
rename to x11-wm/compiz/files/compiz-0.9.8_rc3312-sandbox.patch


             reply	other threads:[~2012-09-15  9:12 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-15  9:11 Sergey Popov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-09-15 11:31 [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/ Sergey Popov
2012-09-15 11:31 Sergey Popov
2012-09-15  9:11 Sergey Popov
2012-09-08  9:28 Sergey Popov
2012-09-04 12:21 Sergey Popov
2012-09-04 12:01 Sergey Popov
2012-09-04  8:25 Sergey Popov
2012-09-04  8:25 Sergey Popov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1347700196.b8bc3b60812ab76cce6ee20f16fc50486d63bfcb.pinkbyte@gentoo \
    --to=pinkbyte@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox