* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-09-15 12:06 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-15 12:06 UTC (permalink / raw
To: gentoo-commits
commit: 4ada271328d523a1b8f89c3c9550b63a24656688
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 12:04:12 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 12:04:12 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=4ada2713
Compiz 0.9.8.0 and higher can be build only with gcc version 4.6 or higher
(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)
---
x11-wm/compiz/ChangeLog | 3 +++
x11-wm/compiz/Manifest | 4 ++--
x11-wm/compiz/compiz-0.9.8.2.ebuild | 8 ++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 90df952..a96458f 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
+ Compiz 0.9.8.0 and higher can be build only with gcc version 4.6 or higher
+
15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-0.9.2.ebuild,
-files/compiz.desktop, -files/compiz-manager, -files/compiz-no-gconf.patch:
Drop 0.9.2 and old files
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 3cef0ea..66280bc 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,7 +1,7 @@
AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
-EBUILD compiz-0.9.8.2.ebuild 3778 SHA256 b34e7abe511fcbc6009b44d991ec8bed02675d99744194a346df9ff0cc95354a SHA512 c4386989ec285510b8463f835dec8f3ed8e81362e08f5fe9d12e0dc14a1931544853856ad71dfd3ab51c93aa54d92dd37da42ae21a9eaf28d195072d6cc5e887 WHIRLPOOL 0985666763bd24c5d97222133f8ce86ba65fd3809118e8ba628153c370393f3cbaea56edca3560596ba0bdcf4c16f8bd7bb96b94135fccc718d16fd1a265a84c
+EBUILD compiz-0.9.8.2.ebuild 4008 SHA256 4c59d40fa8d12cb4364828e876e30a59d38f85c283a79be136d414cc22bff286 SHA512 52082a8a74ac7da77136aee02365fa5dea9df0de8d4585c1c3ff48b0978002741c4fb7540c7daf5d2175e74519afa92055cd45d005fe36fabdcd15fe389e6d2a WHIRLPOOL e9faf8c5dad0bf0c9334b4b214572a61769e246b9dda881fb7bc69f04cb26a4a173f41a10b22edd7688a51d574cbb0d88835517886f9ac9cd81ebbf1fd8421a9
EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 13262 SHA256 ec1b6cc51d1a10c45f753b1e3f925b4623081a132809c78ec389ca00e4339a81 SHA512 ea55cf8fc682d206fe9c92a49c1cf0596669a03dc2a059b7b051507a96102200d888c9896fb926ba2fc12bcb8c26432386b737907a539e45d8eee733ddb12cd1 WHIRLPOOL 3ffcfbc6ee270d22ea988889148113e16059a96e1b7356ae3d81dce8701e05ac6c11cd9980922f7681265add790745a278d85f31f79ce73e177a6b1ae18680e3
+MISC ChangeLog 13413 SHA256 e80d8a7b9c794bf1fa836118074efc2b67b633216e2131542a4f608f5ddf77d3 SHA512 96c8ed0990ea074c3dbf86b120edbffbf1994b9c4446e8c7306cbc328daa554bcc7b61ea328c533e1edff2f9b7603c1705a4a9199edd095e25c94ba4aa78dc8d WHIRLPOOL 0717dc6c93eaee68c70a4835fdd9ae64e51b3ebe78d6474c39665d6916392ae64b32f0828f7dbeae4be8574333193f074895e9e73059a5f5d5ac2765a9f79a88
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-0.9.8.2.ebuild b/x11-wm/compiz/compiz-0.9.8.2.ebuild
index 863516d..86e4298 100644
--- a/x11-wm/compiz/compiz-0.9.8.2.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8.2.ebuild
@@ -95,6 +95,14 @@ RDEPEND="${COMMONDEPEND}
# plugins
# tests - ?
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+ && die "Sorry, but gcc 4.6 or higher is required."
+ fi
+}
+
src_prepare() {
epatch "${FILESDIR}/${P}-sandbox.patch"
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-12-31 10:09 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-12-31 10:09 UTC (permalink / raw
To: gentoo-commits
commit: 550070056dea1c8bcb6290cb1daba3fc93fd0172
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 10:09:37 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Dec 31 10:09:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=55007005
Version bump
Package-Manager: portage-2.2.0_alpha144
---
x11-wm/compiz/ChangeLog | 5 +
x11-wm/compiz/Manifest | 4 +-
x11-wm/compiz/compiz-0.9.8.6.ebuild | 183 +++++++++++++++++++++++++++++++++++
3 files changed, 191 insertions(+), 1 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 35334da..be5ca14 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*compiz-0.9.8.6 (31 Dec 2012)
+
+ 31 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.9.8.6.ebuild:
+ Version bump
+
03 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-9999.ebuild:
Remove old compiz live ebuild
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index ac402af..a9a307f 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,7 +1,9 @@
AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
+DIST compiz-0.9.8.6.tar.bz2 4337444 SHA256 66dabe751a414ffed9a7dcb33f2c456198456be479fcadc78433731a822eff29 SHA512 f1aa7b2d3ece2622670c04036f8e5a9703c7cb241c96b68ecb4ae8aafcc06b7228484553f474cd496239858599e20e28f90d7358428ad876beda7f62e244a9fa WHIRLPOOL cb304b43d3ff4afbec463967006b0fa97c80ea95d577b6ffe210b1f4ac0f154543c3d88c21c7e9eac2c40cf4f072cc76bdf5404b8d2f3eb1e0d86e046f4c79b0
EBUILD compiz-0.9.8.2.ebuild 4166 SHA256 23577874dc5cd113a2d1389b2a1b0077a4bf2600b384bcf5220c1f9844034490 SHA512 ff15426d78d0568a7c45e5901f66bc0fc35f1d581aab9484a692b0f03d5a43f350aabd6172ba11ff2157b57ffed48b2de3309d69b0266073f04e1c9b60e58126 WHIRLPOOL 2be035ec5697f68768eb4385617024fb422e15b1017058f5322c9d783e117a331c296e55173eaefd7a8fc5585bebe78361c1400d5f7b5df29c6c4add30f2b5f5
+EBUILD compiz-0.9.8.6.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f
EBUILD compiz-0.9.8.9999.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f
-MISC ChangeLog 14193 SHA256 1444c51853a776764578b0847f32378608535030e6899a422ed84d883f14b0a6 SHA512 b8abe89961196e6886706818f7a46db3d011cb2b95ef2a0d8d3a0f81fdc6035bdf26159fd3803ec28e39d1d101dd8cda92034642197f48090b3cb4ca758e65a8 WHIRLPOOL f615f72947146eff1148e844c913bf7485ce8a32ba883e118c35383e406bd14acc88eb47613779f6e2a073be1e317916512b8fecb6a0003822a1b87501b9ab33
+MISC ChangeLog 14314 SHA256 720d08127a1b04f706c3edf45a799dd19f295bd6a229de72027e0bd452456705 SHA512 f8aa49ecdb766ae26b05728d9713d48e169b92b59ebaf3aec5c399aa871bf24724657027297272cb05c1a32b3808d1fa2ab58b1b7dda3a274aaf86e48220c1a8 WHIRLPOOL c201f9173207a06d44ad1ad5655302f9aba0b5d87021f70be320bd2f03b5694b5865947fe9e5b179794f2409d682ff435da9d2f1757142ab1bf6bf314118c00f
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-0.9.8.6.ebuild b/x11-wm/compiz/compiz-0.9.8.6.ebuild
new file mode 100644
index 0000000..033f027
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.9.8.6.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit versionator
+
+MINOR_VERSION=$(get_version_component_range 4)
+MAJOR_BRANCH=$(get_version_component_range 1-3)
+
+if [[ ${MINOR_VERSION} == 9999 ]]; then
+ EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MAJOR_BRANCH}"
+ inherit bzr
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="http://launchpad.net/${PN}/${MAJOR_BRANCH}/${PV}/+download/${P}.tar.bz2"
+fi
+
+inherit eutils cmake-utils gnome2-utils toolchain-funcs
+
+DESCRIPTION="OpenGL compositing window manager."
+HOMEPAGE="https://launchpad.net/compiz"
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0.9"
+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
+ dev-libs/glib:2
+ dev-cpp/glibmm
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-python/pyrex
+ dev-libs/protobuf
+ media-libs/libpng
+ x11-base/xorg-server
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXinerama
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/startup-notification
+ virtual/opengl
+ virtual/glu
+ 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
+ )
+ )
+ kde? ( kde-base/kwin:4 )
+ svg? (
+ gnome-base/librsvg:2
+ x11-libs/cairo
+ )
+ dbus? ( sys-apps/dbus )"
+
+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
+ x11-themes/hicolor-icon-theme"
+
+# TODO:
+# - Remove automagic dependency for coverage report generation tools
+# - Fix Xig-0 automagic resolving('CMake Warning at tests/integration/xig/CMakeLists.txt:30 (message): Xig not found, you will not be able to run X Server integration tests')
+# - Check proper compilation with missing gettext/intltool
+# - CFLAGS are NOT respected, this needs to be fixed
+# - Default decorator exec command in ccsm is bad
+# - Check all dependencies once more
+# - Check CMakeFiles.txt this subdirectories :
+# cmake - ?
+# src
+# compizconfig
+# plugins
+# tests - ?
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+ && die "Sorry, but gcc 4.6 or higher is required."
+ fi
+}
+
+src_unpack() {
+ if [[ ${MINOR_VERSION} == 9999 ]]; then
+ bzr_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.9.8.2-sandbox.patch"
+
+ echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
+ echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+
+ # Fix wrong path for icons
+ sed -i 's:DataDir = "@prefix@/share":DataDir = "/usr/share":' compizconfig/ccsm/ccm/Constants.py.in
+
+ base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "$(cmake-utils_use_use gnome GCONF)"
+ "$(cmake-utils_use_use gnome GNOME)"
+ "$(cmake-utils_use_use gnome GSETTINGS)"
+ "$(cmake-utils_use_use gtk GTK)"
+ "$(cmake-utils_use_use kde KDE4)"
+ "$(cmake-utils_use test COMPIZ_BUILD_TESTING)"
+ "-DCMAKE_INSTALL_PREFIX=/usr"
+ "-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"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ pushd "${CMAKE_BUILD_DIR}"
+ # Fix paths to avoid sandbox access violation
+ # 'emake DESTDIR=${D} install' does not work with compiz cmake files!
+ for i in `find . -type f -name "cmake_install.cmake"`;do
+ sed -e "s|/usr|${D}/usr|g" -i "${i}" || die "sed failed"
+ done
+ emake install
+ popd
+}
+
+pkg_preinst() {
+ use gnome && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+ use gnome && gnome2_gconf_install
+ if use dbus; then
+ ewarn "The dbus plugin is known to crash compiz in this version. Disable"
+ ewarn "it if you experience crashes when plugins are enabled/disabled."
+ fi
+}
+
+pkg_prerm() {
+ use gnome && gnome2_gconf_uninstall
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-10-03 13:50 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-10-03 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 413ac245caa712aee4930cb20e8103b505653898
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 3 13:50:00 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Oct 3 13:50:00 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=413ac245
Remove old compiz live ebuild
(Portage version: 2.2.0_alpha132/git/Linux x86_64, unsigned Manifest commit)
---
x11-wm/compiz/ChangeLog | 3 +
x11-wm/compiz/Manifest | 3 +-
x11-wm/compiz/compiz-9999.ebuild | 128 --------------------------------------
3 files changed, 4 insertions(+), 130 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index b8df84a..35334da 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> -compiz-9999.ebuild:
+ Remove old compiz live ebuild
+
*compiz-0.9.8.9999 (25 Sep 2012)
25 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.9.8.9999.ebuild:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 708c731..ac402af 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -3,6 +3,5 @@ AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d75
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
EBUILD compiz-0.9.8.2.ebuild 4166 SHA256 23577874dc5cd113a2d1389b2a1b0077a4bf2600b384bcf5220c1f9844034490 SHA512 ff15426d78d0568a7c45e5901f66bc0fc35f1d581aab9484a692b0f03d5a43f350aabd6172ba11ff2157b57ffed48b2de3309d69b0266073f04e1c9b60e58126 WHIRLPOOL 2be035ec5697f68768eb4385617024fb422e15b1017058f5322c9d783e117a331c296e55173eaefd7a8fc5585bebe78361c1400d5f7b5df29c6c4add30f2b5f5
EBUILD compiz-0.9.8.9999.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f
-EBUILD compiz-9999.ebuild 2347 SHA256 47c70cdcf0b0c4221d0eceeb189576e55ebb0b3bf52cfddf5d69d60a1a60bf61 SHA512 8a4b83c66886e8982200e71f30a27c4bee9d08c901eb95c478c8dd700d5f65398141feee364b30732f7047975500077b8bd2fe7ea72a65be71ce578a9c4c6cff WHIRLPOOL 0a72cc1004191fb3133a34905360fc317df168f4861c0a93c2dc26668ef8c52a35e44f4f356b2ff21de61dcab7040e8da4488a3ef4a442fe2ff5f069fd14dcc0
-MISC ChangeLog 14089 SHA256 a5324292cf73e6a1c5b7d94a084529d986679faeafeae8d9b2816594acf9a98f SHA512 65aaa7495527c4b6c986dd440c39ebab40b645e18d327d01e8ba81182bc2696c88462e233d5561ca35127a4753e29525b351dda301254159f875422c663ba1af WHIRLPOOL 26ecd9c1f2f02f42f1b9338e07ac444e3488577f425be769ffe976ac5413140795903a11edf4a0ae72ac18d0e37513076c74cc3dd02ed2cd1a4d24ae7c1106fb
+MISC ChangeLog 14193 SHA256 1444c51853a776764578b0847f32378608535030e6899a422ed84d883f14b0a6 SHA512 b8abe89961196e6886706818f7a46db3d011cb2b95ef2a0d8d3a0f81fdc6035bdf26159fd3803ec28e39d1d101dd8cda92034642197f48090b3cb4ca758e65a8 WHIRLPOOL f615f72947146eff1148e844c913bf7485ce8a32ba883e118c35383e406bd14acc88eb47613779f6e2a073be1e317916512b8fecb6a0003822a1b87501b9ab33
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
deleted file mode 100644
index 1f8399b..0000000
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://releases.compiz.org/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="~x86 ~amd64"
- MY_PN="${PN}-core"
- MY_P="${MY_PN}-${PV}"
- S="${WORKDIR}/${MY_P}"
-else
- GIT_ECLASS="git-2"
- EGIT_REPO_URI="git://anongit.compiz-fusion.org/${PN}/core"
- SRC_URI=""
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-fi
-
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils
-
-DESCRIPTION="OpenGL window and compositing manager"
-HOMEPAGE="http://www.compiz.org/"
-
-LICENSE="GPL-2 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="gnome gtk kde +svg"
-
-COMMONDEPEND="
- !x11-libs/compiz-bcop
- >=dev-libs/boost-1.34.0
- dev-libs/glib:2
- dev-libs/libxml2
- dev-libs/libxslt
- 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
- x11-libs/libXinerama
- x11-libs/libICE
- x11-libs/libSM
- >=x11-libs/startup-notification-0.7
- gtk? (
- >=x11-libs/gtk+-2.8.0
- x11-libs/libwnck
- x11-libs/pango
- gnome? (
- gnome-base/gnome-desktop
- gnome-base/gconf
- x11-wm/metacity
- )
- )
- kde? (
- || (
- >=kde-base/kwin-4.2.0
- kde-base/kwin:live
- )
- )
- svg? (
- >=gnome-base/librsvg-2.14.0:2
- >=x11-libs/cairo-1.0
- )
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig
- x11-proto/damageproto
- x11-proto/xineramaproto
-"
-RDEPEND="${COMMONDEPEND}
- x11-apps/mesa-progs
- x11-apps/xvinfo
-"
-
-src_unpack() {
- if [[ ${PV} != *9999* ]]; then
- default
- else
- git-2_src_unpack
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-desktop-gnome-or-not.patch"
-}
-
-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)"
- "-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 findcompiz_install
- emake install
- popd ${CMAKE_BUILD_DIR}
-}
-
-pkg_preinst() {
- use gnome && gnome2_gconf_savelist
-}
-
-pkg_postinst() {
- use gnome && gnome2_gconf_install
-}
-
-pkg_prerm() {
- use gnome && gnome2_gconf_uninstall
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-09-25 16:27 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-25 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 0ae9137700d59d6b0b762c24e9222b488c3f1fc0
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 16:27:11 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 16:27:11 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=0ae91377
Add live ebuild for monolithic compiz
(Portage version: 2.2.0_alpha132/git/Linux x86_64, unsigned Manifest commit)
---
x11-wm/compiz/ChangeLog | 5 +
x11-wm/compiz/Manifest | 3 +-
x11-wm/compiz/compiz-0.9.8.9999.ebuild | 183 ++++++++++++++++++++++++++++++++
3 files changed, 190 insertions(+), 1 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 8bbe1fc..b8df84a 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*compiz-0.9.8.9999 (25 Sep 2012)
+
+ 25 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> +compiz-0.9.8.9999.ebuild:
+ Add live ebuild for monolithic compiz
+
24 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
Correct opengl dependencies. Thanks to renesanso for discovering this issue
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 3b84d95..708c731 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -2,6 +2,7 @@ AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
EBUILD compiz-0.9.8.2.ebuild 4166 SHA256 23577874dc5cd113a2d1389b2a1b0077a4bf2600b384bcf5220c1f9844034490 SHA512 ff15426d78d0568a7c45e5901f66bc0fc35f1d581aab9484a692b0f03d5a43f350aabd6172ba11ff2157b57ffed48b2de3309d69b0266073f04e1c9b60e58126 WHIRLPOOL 2be035ec5697f68768eb4385617024fb422e15b1017058f5322c9d783e117a331c296e55173eaefd7a8fc5585bebe78361c1400d5f7b5df29c6c4add30f2b5f5
+EBUILD compiz-0.9.8.9999.ebuild 4527 SHA256 7f1ca1cfc05abdafe082b8987061654e23e210ce9c7a32005be533aa309ff0d6 SHA512 c3bccc80973f2183e705b1c348824d14e7f824ed3e103febdcd712c516b2e90edf845f42371a4481ac8ceb5ffd3e28d2cc4166ddc4815b2f32d46928516ae29f WHIRLPOOL 71325a4c4edf46d7f0923df899e65cc870633303cd1897d0f17ad53ceca285963bc3d57af2af39c8b6217f705a45cb755ff33e692435b96c04fffe27bbd1a13f
EBUILD compiz-9999.ebuild 2347 SHA256 47c70cdcf0b0c4221d0eceeb189576e55ebb0b3bf52cfddf5d69d60a1a60bf61 SHA512 8a4b83c66886e8982200e71f30a27c4bee9d08c901eb95c478c8dd700d5f65398141feee364b30732f7047975500077b8bd2fe7ea72a65be71ce578a9c4c6cff WHIRLPOOL 0a72cc1004191fb3133a34905360fc317df168f4861c0a93c2dc26668ef8c52a35e44f4f356b2ff21de61dcab7040e8da4488a3ef4a442fe2ff5f069fd14dcc0
-MISC ChangeLog 13937 SHA256 8b6d607a68825594030179157af6190e36a66e80d1e039f8537dd223feba4df7 SHA512 20b07e049857c0d5af76720248d1419a15d42c1a8075ce13b90ada820c7d2059381c1044a8c4c8ccced44f1b17867fbd87b1e55ab7d8a74466d3795c763d64c0 WHIRLPOOL f631adefe08c7139b3d0962ffba7b0fa5d34469d4c2716684f256dd90c595022f32f15265ebfa66add3fc125d918b7bc0dc6ab00988c87f87b15538ad4419844
+MISC ChangeLog 14089 SHA256 a5324292cf73e6a1c5b7d94a084529d986679faeafeae8d9b2816594acf9a98f SHA512 65aaa7495527c4b6c986dd440c39ebab40b645e18d327d01e8ba81182bc2696c88462e233d5561ca35127a4753e29525b351dda301254159f875422c663ba1af WHIRLPOOL 26ecd9c1f2f02f42f1b9338e07ac444e3488577f425be769ffe976ac5413140795903a11edf4a0ae72ac18d0e37513076c74cc3dd02ed2cd1a4d24ae7c1106fb
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-0.9.8.9999.ebuild b/x11-wm/compiz/compiz-0.9.8.9999.ebuild
new file mode 100644
index 0000000..033f027
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.9.8.9999.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit versionator
+
+MINOR_VERSION=$(get_version_component_range 4)
+MAJOR_BRANCH=$(get_version_component_range 1-3)
+
+if [[ ${MINOR_VERSION} == 9999 ]]; then
+ EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MAJOR_BRANCH}"
+ inherit bzr
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="http://launchpad.net/${PN}/${MAJOR_BRANCH}/${PV}/+download/${P}.tar.bz2"
+fi
+
+inherit eutils cmake-utils gnome2-utils toolchain-funcs
+
+DESCRIPTION="OpenGL compositing window manager."
+HOMEPAGE="https://launchpad.net/compiz"
+LICENSE="GPL-2 LGPL-2.1 MIT"
+SLOT="0.9"
+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
+ dev-libs/glib:2
+ dev-cpp/glibmm
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-python/pyrex
+ dev-libs/protobuf
+ media-libs/libpng
+ x11-base/xorg-server
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXinerama
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/startup-notification
+ virtual/opengl
+ virtual/glu
+ 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
+ )
+ )
+ kde? ( kde-base/kwin:4 )
+ svg? (
+ gnome-base/librsvg:2
+ x11-libs/cairo
+ )
+ dbus? ( sys-apps/dbus )"
+
+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
+ x11-themes/hicolor-icon-theme"
+
+# TODO:
+# - Remove automagic dependency for coverage report generation tools
+# - Fix Xig-0 automagic resolving('CMake Warning at tests/integration/xig/CMakeLists.txt:30 (message): Xig not found, you will not be able to run X Server integration tests')
+# - Check proper compilation with missing gettext/intltool
+# - CFLAGS are NOT respected, this needs to be fixed
+# - Default decorator exec command in ccsm is bad
+# - Check all dependencies once more
+# - Check CMakeFiles.txt this subdirectories :
+# cmake - ?
+# src
+# compizconfig
+# plugins
+# tests - ?
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+ && die "Sorry, but gcc 4.6 or higher is required."
+ fi
+}
+
+src_unpack() {
+ if [[ ${MINOR_VERSION} == 9999 ]]; then
+ bzr_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-0.9.8.2-sandbox.patch"
+
+ echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
+ echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+
+ # Fix wrong path for icons
+ sed -i 's:DataDir = "@prefix@/share":DataDir = "/usr/share":' compizconfig/ccsm/ccm/Constants.py.in
+
+ base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "$(cmake-utils_use_use gnome GCONF)"
+ "$(cmake-utils_use_use gnome GNOME)"
+ "$(cmake-utils_use_use gnome GSETTINGS)"
+ "$(cmake-utils_use_use gtk GTK)"
+ "$(cmake-utils_use_use kde KDE4)"
+ "$(cmake-utils_use test COMPIZ_BUILD_TESTING)"
+ "-DCMAKE_INSTALL_PREFIX=/usr"
+ "-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"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ pushd "${CMAKE_BUILD_DIR}"
+ # Fix paths to avoid sandbox access violation
+ # 'emake DESTDIR=${D} install' does not work with compiz cmake files!
+ for i in `find . -type f -name "cmake_install.cmake"`;do
+ sed -e "s|/usr|${D}/usr|g" -i "${i}" || die "sed failed"
+ done
+ emake install
+ popd
+}
+
+pkg_preinst() {
+ use gnome && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+ use gnome && gnome2_gconf_install
+ if use dbus; then
+ ewarn "The dbus plugin is known to crash compiz in this version. Disable"
+ ewarn "it if you experience crashes when plugins are enabled/disabled."
+ fi
+}
+
+pkg_prerm() {
+ use gnome && gnome2_gconf_uninstall
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-09-24 10:13 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-24 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 2835ce917105eebe2ff11db06b80b0f99da8ba64
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 24 10:13:06 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 10:13:06 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=2835ce91
Correct opengl dependencies. Thanks to renesanso for discovering this issue
(Portage version: 2.2.0_alpha130/git/Linux x86_64, unsigned Manifest commit)
---
x11-wm/compiz/ChangeLog | 3 +++
x11-wm/compiz/Manifest | 4 ++--
x11-wm/compiz/compiz-0.9.8.2.ebuild | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index bf01f6b..8bbe1fc 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
+ Correct opengl dependencies. Thanks to renesanso for discovering this issue
+
16 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
Fix issue with icons not being displayed in ccsm
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 24d2e77..3b84d95 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,7 +1,7 @@
AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
-EBUILD compiz-0.9.8.2.ebuild 4154 SHA256 ec48051251feaa1e0dd75564b2cd3047ae48d299fa589bad54d1daccdd787288 SHA512 76338dcca07ccc12902b84b70e586d883123b5a008cc45e067b4b567bc0720e840ac5107a4ac14673b0ec9dd9752aca5b8fde77a706609992efecdf14b173e27 WHIRLPOOL beb77cfbe72e9cdc33a49f9fe127024d9ff6ef8b5cde2afe7649560fb2f7d3c9d7087a12df4e96aa6cb443cd69d5bd3697afcb76fa64bf741e7808bad9b50a7a
+EBUILD compiz-0.9.8.2.ebuild 4166 SHA256 23577874dc5cd113a2d1389b2a1b0077a4bf2600b384bcf5220c1f9844034490 SHA512 ff15426d78d0568a7c45e5901f66bc0fc35f1d581aab9484a692b0f03d5a43f350aabd6172ba11ff2157b57ffed48b2de3309d69b0266073f04e1c9b60e58126 WHIRLPOOL 2be035ec5697f68768eb4385617024fb422e15b1017058f5322c9d783e117a331c296e55173eaefd7a8fc5585bebe78361c1400d5f7b5df29c6c4add30f2b5f5
EBUILD compiz-9999.ebuild 2347 SHA256 47c70cdcf0b0c4221d0eceeb189576e55ebb0b3bf52cfddf5d69d60a1a60bf61 SHA512 8a4b83c66886e8982200e71f30a27c4bee9d08c901eb95c478c8dd700d5f65398141feee364b30732f7047975500077b8bd2fe7ea72a65be71ce578a9c4c6cff WHIRLPOOL 0a72cc1004191fb3133a34905360fc317df168f4861c0a93c2dc26668ef8c52a35e44f4f356b2ff21de61dcab7040e8da4488a3ef4a442fe2ff5f069fd14dcc0
-MISC ChangeLog 13785 SHA256 b497e6c2af47ddea3274ff424c248d88ffc97a1b8377310663104dd43e009a99 SHA512 e9a1f9b8fca1d2ae92ada725a6835c1765f8e34a19440439aa9d1f0940ad6bbc16c05714551e99ff688f5aefe6b5c317de0060d8a109f9def8a6fc23ab68b2c4 WHIRLPOOL b4c170b474fd3349eb0539a0cac21f28283163bbb39870491e5e064b76588474d7ae4bdc5ba97b3c17d863b4e7546519a3cf35116ecaa93e3881632c51120390
+MISC ChangeLog 13937 SHA256 8b6d607a68825594030179157af6190e36a66e80d1e039f8537dd223feba4df7 SHA512 20b07e049857c0d5af76720248d1419a15d42c1a8075ce13b90ada820c7d2059381c1044a8c4c8ccced44f1b17867fbd87b1e55ab7d8a74466d3795c763d64c0 WHIRLPOOL f631adefe08c7139b3d0962ffba7b0fa5d34469d4c2716684f256dd90c595022f32f15265ebfa66add3fc125d918b7bc0dc6ab00988c87f87b15538ad4419844
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-0.9.8.2.ebuild b/x11-wm/compiz/compiz-0.9.8.2.ebuild
index 13a3db5..5516394 100644
--- a/x11-wm/compiz/compiz-0.9.8.2.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8.2.ebuild
@@ -34,7 +34,6 @@ COMMONDEPEND="
dev-python/pyrex
dev-libs/protobuf
media-libs/libpng
- media-libs/mesa
x11-base/xorg-server
x11-libs/libX11
x11-libs/libXcomposite
@@ -46,6 +45,8 @@ COMMONDEPEND="
x11-libs/libICE
x11-libs/libSM
x11-libs/startup-notification
+ virtual/opengl
+ virtual/glu
cairo? ( x11-libs/cairo[X] )
fuse? ( sys-fs/fuse )
gtk? (
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-09-16 16:48 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-16 16:48 UTC (permalink / raw
To: gentoo-commits
commit: ec3ad4ae34aebb7f7d90f08cf20263c78ff5d9d7
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 16:48:14 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 16:48:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=ec3ad4ae
Fix issue with icons not being displayed in ccsm
(Portage version: 2.2.0_alpha128/git/Linux x86_64, unsigned Manifest commit)
---
x11-wm/compiz/ChangeLog | 3 +++
x11-wm/compiz/Manifest | 4 ++--
x11-wm/compiz/compiz-0.9.8.2.ebuild | 3 +++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 809aaad..bf01f6b 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
+ Fix issue with icons not being displayed in ccsm
+
15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
Add missing inheritance on toolchain-funcs eclass
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index b96ed46..24d2e77 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,7 +1,7 @@
AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
-EBUILD compiz-0.9.8.2.ebuild 4024 SHA256 d690b8c32f8ef6ad3adcaaa30ea50b78f9e3cbebf303e09a668193cfa611bd5b SHA512 39f9a6ff3f04e52396c70ef3f3c64a09267263369769035ce9a4f31d6ec78b777269d19ffaac5acb83b77688772e8a314346e366f271eb804f4e76510f3bf4a1 WHIRLPOOL edd2712c8e7fa1cb834f429399e2a5611f90772cdb28836bc8d3e3849602ed0773e66051fe0f2aa75aa49895183b773e606fae0ca644744e3e654798fd6b61c8
+EBUILD compiz-0.9.8.2.ebuild 4154 SHA256 ec48051251feaa1e0dd75564b2cd3047ae48d299fa589bad54d1daccdd787288 SHA512 76338dcca07ccc12902b84b70e586d883123b5a008cc45e067b4b567bc0720e840ac5107a4ac14673b0ec9dd9752aca5b8fde77a706609992efecdf14b173e27 WHIRLPOOL beb77cfbe72e9cdc33a49f9fe127024d9ff6ef8b5cde2afe7649560fb2f7d3c9d7087a12df4e96aa6cb443cd69d5bd3697afcb76fa64bf741e7808bad9b50a7a
EBUILD compiz-9999.ebuild 2347 SHA256 47c70cdcf0b0c4221d0eceeb189576e55ebb0b3bf52cfddf5d69d60a1a60bf61 SHA512 8a4b83c66886e8982200e71f30a27c4bee9d08c901eb95c478c8dd700d5f65398141feee364b30732f7047975500077b8bd2fe7ea72a65be71ce578a9c4c6cff WHIRLPOOL 0a72cc1004191fb3133a34905360fc317df168f4861c0a93c2dc26668ef8c52a35e44f4f356b2ff21de61dcab7040e8da4488a3ef4a442fe2ff5f069fd14dcc0
-MISC ChangeLog 13660 SHA256 8a3724e9f4699492ff765a73fe37402c2742334fc1f13090f886818911ecb35b SHA512 1a63822f155cdbab61eb1cc53a194772bd85200f588e12178054ffc5f65bf11e17cc3bea4c3a8eea69a3123d145cb2371d1a28e9d69987638710b7feeefba5b8 WHIRLPOOL 4dfbaf57d7de015598b86f90d76d76524b93e2120f7ee33f868d50fff5f48d5292139ac0d21982005822e5b186808407a53055a964eae7ea573758ec6acaa22b
+MISC ChangeLog 13785 SHA256 b497e6c2af47ddea3274ff424c248d88ffc97a1b8377310663104dd43e009a99 SHA512 e9a1f9b8fca1d2ae92ada725a6835c1765f8e34a19440439aa9d1f0940ad6bbc16c05714551e99ff688f5aefe6b5c317de0060d8a109f9def8a6fc23ab68b2c4 WHIRLPOOL b4c170b474fd3349eb0539a0cac21f28283163bbb39870491e5e064b76588474d7ae4bdc5ba97b3c17d863b4e7546519a3cf35116ecaa93e3881632c51120390
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-0.9.8.2.ebuild b/x11-wm/compiz/compiz-0.9.8.2.ebuild
index 2b1092e..13a3db5 100644
--- a/x11-wm/compiz/compiz-0.9.8.2.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8.2.ebuild
@@ -109,6 +109,9 @@ src_prepare() {
echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip"
echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip"
+ # Fix wrong path for icons
+ sed -i 's:DataDir = "@prefix@/share":DataDir = "/usr/share":' compizconfig/ccsm/ccm/Constants.py.in
+
base_src_prepare
}
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-09-15 12:26 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-15 12:26 UTC (permalink / raw
To: gentoo-commits
commit: b4f65620d6f202e1e73909a1ae2c600b835bf650
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 12:26:50 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 12:26:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=b4f65620
Add missing inheritance on toolchain-funcs eclass
(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)
---
x11-wm/compiz/ChangeLog | 3 +++
x11-wm/compiz/Manifest | 4 ++--
x11-wm/compiz/compiz-0.9.8.2.ebuild | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index ee4e02b..809aaad 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
+ Add missing inheritance on toolchain-funcs eclass
+
15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-9999.ebuild:
QA fix: dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 0528784..b96ed46 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,7 +1,7 @@
AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b9668850ca8eca6c30b8be0460a138 SHA512 5b637165e8739e7e60314ee84db02da6d9f9834cfe28b6c0f97482204f19dcca678a3ea38be80d57ad2d42fcce38f32e9f8a3919c22f9c45cb6dc47cd69a382b WHIRLPOOL 229b0728affccaf83aaa99beaecd74cacd757c316126201f29f59b2f49cea8eb4d17c8dc20f4f217ec7505e4f02a201f7f91ebdb7739db1ddd0c8ab822410c4e
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
-EBUILD compiz-0.9.8.2.ebuild 4008 SHA256 4c59d40fa8d12cb4364828e876e30a59d38f85c283a79be136d414cc22bff286 SHA512 52082a8a74ac7da77136aee02365fa5dea9df0de8d4585c1c3ff48b0978002741c4fb7540c7daf5d2175e74519afa92055cd45d005fe36fabdcd15fe389e6d2a WHIRLPOOL e9faf8c5dad0bf0c9334b4b214572a61769e246b9dda881fb7bc69f04cb26a4a173f41a10b22edd7688a51d574cbb0d88835517886f9ac9cd81ebbf1fd8421a9
+EBUILD compiz-0.9.8.2.ebuild 4024 SHA256 d690b8c32f8ef6ad3adcaaa30ea50b78f9e3cbebf303e09a668193cfa611bd5b SHA512 39f9a6ff3f04e52396c70ef3f3c64a09267263369769035ce9a4f31d6ec78b777269d19ffaac5acb83b77688772e8a314346e366f271eb804f4e76510f3bf4a1 WHIRLPOOL edd2712c8e7fa1cb834f429399e2a5611f90772cdb28836bc8d3e3849602ed0773e66051fe0f2aa75aa49895183b773e606fae0ca644744e3e654798fd6b61c8
EBUILD compiz-9999.ebuild 2347 SHA256 47c70cdcf0b0c4221d0eceeb189576e55ebb0b3bf52cfddf5d69d60a1a60bf61 SHA512 8a4b83c66886e8982200e71f30a27c4bee9d08c901eb95c478c8dd700d5f65398141feee364b30732f7047975500077b8bd2fe7ea72a65be71ce578a9c4c6cff WHIRLPOOL 0a72cc1004191fb3133a34905360fc317df168f4861c0a93c2dc26668ef8c52a35e44f4f356b2ff21de61dcab7040e8da4488a3ef4a442fe2ff5f069fd14dcc0
-MISC ChangeLog 13534 SHA256 a7597a33ffe7ad82d121549d2f6f5b89f1dab0278a6850d4c31d6c88fdc60ba7 SHA512 82534fa90d40cfea7acb9214fb4199d18a0c4bb98f39767ec8a93169edc0056c6ae28f79595c0deb42dcb48ffe7b7dda7bc564595ef912e7a93359c2324dfb2c WHIRLPOOL df077d39893c721d0256e3a209b4771dc60021eb19fd65fd89150f96bc37e6e0b1fd892bb22ea5d3b614b734b25f169bb5b3c55b1047da006dfa24112c2550b5
+MISC ChangeLog 13660 SHA256 8a3724e9f4699492ff765a73fe37402c2742334fc1f13090f886818911ecb35b SHA512 1a63822f155cdbab61eb1cc53a194772bd85200f588e12178054ffc5f65bf11e17cc3bea4c3a8eea69a3123d145cb2371d1a28e9d69987638710b7feeefba5b8 WHIRLPOOL 4dfbaf57d7de015598b86f90d76d76524b93e2120f7ee33f868d50fff5f48d5292139ac0d21982005822e5b186808407a53055a964eae7ea573758ec6acaa22b
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-0.9.8.2.ebuild b/x11-wm/compiz/compiz-0.9.8.2.ebuild
index 86e4298..2b1092e 100644
--- a/x11-wm/compiz/compiz-0.9.8.2.ebuild
+++ b/x11-wm/compiz/compiz-0.9.8.2.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit eutils cmake-utils gnome2-utils versionator
+inherit eutils cmake-utils gnome2-utils toolchain-funcs versionator
DESCRIPTION="OpenGL compositing window manager."
HOMEPAGE="https://launchpad.net/compiz"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-09-15 12:06 Sergey Popov
0 siblings, 0 replies; 9+ messages in thread
From: Sergey Popov @ 2012-09-15 12:06 UTC (permalink / raw
To: gentoo-commits
commit: 3c98b4dfa58e8f575c20f512693a3cb0d254bc45
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 12:06:13 2012 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 12:06:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=3c98b4df
QA fix: dev-util/pkgconfig -> virtual/pkgconfig
(Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit)
---
x11-wm/compiz/ChangeLog | 3 +++
x11-wm/compiz/Manifest | 4 ++--
x11-wm/compiz/compiz-9999.ebuild | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index a96458f..ee4e02b 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-9999.ebuild:
+ QA fix: dev-util/pkgconfig -> virtual/pkgconfig
+
15 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.9.8.2.ebuild:
Compiz 0.9.8.0 and higher can be build only with gcc version 4.6 or higher
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 66280bc..0528784 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -2,6 +2,6 @@ AUX compiz-0.9.8.2-sandbox.patch 1473 SHA256 8888c6ac65503f064f4ce9d48e1c0cb8d7b
AUX compiz-desktop-gnome-or-not.patch 1527 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8 SHA512 54dd727584c57db136fce6c0a7b7e5c08650057e3dbd9c254ad2f29ea0a78b834dd2f332f605e992c9acc6863ac1de7fcc09efff9dd583f6f8ade65fbdf22353 WHIRLPOOL 2ffa6d128895163e5514ffe3368fa30f12d45341f35a037fbe86c91061071d29e58d7511e67090c92ee71de44bfba724c7e0ac9285156a5d0f7b60f37939c729
DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9
EBUILD compiz-0.9.8.2.ebuild 4008 SHA256 4c59d40fa8d12cb4364828e876e30a59d38f85c283a79be136d414cc22bff286 SHA512 52082a8a74ac7da77136aee02365fa5dea9df0de8d4585c1c3ff48b0978002741c4fb7540c7daf5d2175e74519afa92055cd45d005fe36fabdcd15fe389e6d2a WHIRLPOOL e9faf8c5dad0bf0c9334b4b214572a61769e246b9dda881fb7bc69f04cb26a4a173f41a10b22edd7688a51d574cbb0d88835517886f9ac9cd81ebbf1fd8421a9
-EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f
-MISC ChangeLog 13413 SHA256 e80d8a7b9c794bf1fa836118074efc2b67b633216e2131542a4f608f5ddf77d3 SHA512 96c8ed0990ea074c3dbf86b120edbffbf1994b9c4446e8c7306cbc328daa554bcc7b61ea328c533e1edff2f9b7603c1705a4a9199edd095e25c94ba4aa78dc8d WHIRLPOOL 0717dc6c93eaee68c70a4835fdd9ae64e51b3ebe78d6474c39665d6916392ae64b32f0828f7dbeae4be8574333193f074895e9e73059a5f5d5ac2765a9f79a88
+EBUILD compiz-9999.ebuild 2347 SHA256 47c70cdcf0b0c4221d0eceeb189576e55ebb0b3bf52cfddf5d69d60a1a60bf61 SHA512 8a4b83c66886e8982200e71f30a27c4bee9d08c901eb95c478c8dd700d5f65398141feee364b30732f7047975500077b8bd2fe7ea72a65be71ce578a9c4c6cff WHIRLPOOL 0a72cc1004191fb3133a34905360fc317df168f4861c0a93c2dc26668ef8c52a35e44f4f356b2ff21de61dcab7040e8da4488a3ef4a442fe2ff5f069fd14dcc0
+MISC ChangeLog 13534 SHA256 a7597a33ffe7ad82d121549d2f6f5b89f1dab0278a6850d4c31d6c88fdc60ba7 SHA512 82534fa90d40cfea7acb9214fb4199d18a0c4bb98f39767ec8a93169edc0056c6ae28f79595c0deb42dcb48ffe7b7dda7bc564595ef912e7a93359c2324dfb2c WHIRLPOOL df077d39893c721d0256e3a209b4771dc60021eb19fd65fd89150f96bc37e6e0b1fd892bb22ea5d3b614b734b25f169bb5b3c55b1047da006dfa24112c2550b5
MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index 32b745e..1f8399b 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -68,7 +68,7 @@ COMMONDEPEND="
)
"
DEPEND="${COMMONDEPEND}
- dev-util/pkgconfig
+ virtual/pkgconfig
x11-proto/damageproto
x11-proto/xineramaproto
"
^ permalink raw reply related [flat|nested] 9+ messages in thread* [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/
@ 2012-02-05 13:09 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 9+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-02-05 13:09 UTC (permalink / raw
To: gentoo-commits
commit: 4f27dcb6e6cc21c38e498b2cdddc847db0797290
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 13:06:35 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 13:06:35 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=4f27dcb6
[x11-wm/compiz] Unify release and live ebuilds. Fix git-2 inherit and use EAPI-4.
Apply boost dep patch from bug 378453 - thanks to Ihor Kaharlichenko.
(Portage version: 2.2.0_alpha84/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
x11-wm/compiz/ChangeLog | 8 +++++++-
x11-wm/compiz/Manifest | 26 +++++++++++++++++++++++---
x11-wm/compiz/compiz-0.9.2.ebuild | 30 +++++++++++++++++++++---------
x11-wm/compiz/compiz-9999.ebuild | 23 +++++++++++++++--------
4 files changed, 66 insertions(+), 21 deletions(-)
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index e77b821..d51af8b 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for x11-wm/compiz
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Feb 2012; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ compiz-0.9.2.ebuild, compiz-9999.ebuild:
+ [x11-wm/compiz] Unify release and live ebuilds. Fix git-2 inherit and use
+ EAPI-4.
+ Apply boost dep patch from bug 378453 - thanks to Ihor Kaharlichenko.
+
10 Nov 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
compiz-0.9.2.ebuild, -files/compiz-0.9.2-desktop-gnome-or-not.patch,
compiz-9999.ebuild, +files/compiz-desktop-gnome-or-not.patch:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index b539998..d2d4730 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,9 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX compiz-desktop-gnome-or-not.patch 1527 RMD160 cd9cf5fa4e972c542ea9447ef3d0a706bd9da238 SHA1 c2d7ac28eea2b921aecbc2055775f263459763a0 SHA256 dc5f859f397ab97a07f1f848742d752605ea8a5a2b4ca1a953b024ad44b7ebd8
AUX compiz-manager 9831 RMD160 8ef4f9c669a085c76b391c1bef5788a1c3054bcb SHA1 f57f17a574db09ed602cfd87f4f452ca9de5e86f SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9
AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
AUX compiz.desktop 273 RMD160 704f0e631cd41d810af323b5fabbbf7eac5a943b SHA1 e244587cc28613ab92568846754e91bb193f0e85 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb
DIST compiz-core-0.9.2.tar.bz2 861137 RMD160 43d8f011f1ddc7dc7c1cbce82dcd49432b71a35b SHA1 f0fb9495013c38c86515b7ca6914607910266bf7 SHA256 ed630c7836bf6bd47a8aef7509d8ca5c8d3357890af4ecbf3bd0da304020fa44
-EBUILD compiz-0.9.2.ebuild 2245 RMD160 0ac5e1cb542c9aecad3468be9543c2060fa59d09 SHA1 78f454a2dbc93f1405e13c6164e56bd523e2e17b SHA256 d1e9384c8ce364434668052ae6782e108c935a5021c3e56124bdd84f348fdecb
-EBUILD compiz-9999.ebuild 2279 RMD160 2578f6788821971841667ee8a7e18010032244c3 SHA1 29161b30ed72235d15eb9e53e4331a8532c751ac SHA256 56d7391b972aab99c11f9d45899218cab97609dd8dd5709f2da1f20ab06c7eea
-MISC ChangeLog 12576 RMD160 9af0c00bf03e83b54225e37a140919162a0a856a SHA1 fb55bd6133c552401ced397bead81b41d2d0c0f6 SHA256 43321b50ff315674b7c3c7e153adb02a4b2fe34cb370c9a428884056d5e302c2
+EBUILD compiz-0.9.2.ebuild 2348 RMD160 5f58038aec2498905687f0a92467908bd1d517e7 SHA1 67e115421c623380fabec31166cc907db1632a75 SHA256 cc2906f7cfaef1fa70ec11852c8524ca7b8c21c5d26bbc995680d6d45ff3128d
+EBUILD compiz-9999.ebuild 2348 RMD160 06ec408805ffa376f632d5682a739a96c10728d8 SHA1 425d3f6ed70a6402b38fc6267d3571dfe8db7cf1 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b
+MISC ChangeLog 12845 RMD160 79d8b94a9772bca3db09017f4088bef00decf415 SHA1 2650ad62426a9cf71426782fa9d2bf8188622a50 SHA256 09e617215d8ed88b8fd9a6701a469e4994297c624294e1b3472df9ecfdec7ba9
MISC metadata.xml 534 RMD160 0bfee331a6814b68bc3e42b8b6ebc2403cb0b87c SHA1 694e5ed4a9e9492e6490c75b2ca2f59908a4accd SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPLn7bAAoJEC8ZTXQF1qEPx3kP/3yUxpPyT38rfndiSGogNiY7
+Me0AuFHQj+r7rsxFv26tEhkJ0Ki2j+LNUUjusxVqonLLQQGsL9wL21UJlriii1MC
+q/Lci0eDSygzcQnasn34fS4OpG4rF5MP9cL4J5DUlR3npkEM/EACCStFzZLxZbQh
+MYiS8729ebnP575lgtPw27q9iFW8Ugvdjf/c9ZvKPOWr7tdJ/YJTwfemUAhWB1pi
+BIRQu4tDAM+jkDOIJnpyaBWsc1fqhiTeFAiKJA9W1jytC6tkUq0FDVrivQrve3lz
+X0AK9j5GpkclJUp9kcdi9oo4tGrSanFnqrF9shaP5CQsaI2SZrwuVTG78aLa13Pt
+1q3NqhEitGeNr1Ekoi9heL9sbBxhKDuMBDu+/DhPLvFVHhiOt/Cw58r8+q6ps74F
+rTJ/UE2vWHTrYl7tgAzL4ENdoJqZTFfJeCFYE3k1SQYjKbFvIIQ8yE4ec7mTM5Az
+GGmAK3289xP1DjvuUjpYqgsA1dYtz4iJY65bndzr5Jh4GoDnQ/AO9cAEvUxOwXLS
+pU7CTxd5AZVxGykfRjelJashx0XLo/RM9UzC6PQgnjUnqsIQfr+vFSOWthm7XsG0
+6xAxI/Oa6YikT6Sw1PUE6fvdpNluuyEtNHKlvnTKzcuxxF6ag+/Xocfo8sI9Ls8j
+7EaZHm2bj7B+WjZkIoTn
+=0REB
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/compiz/compiz-0.9.2.ebuild b/x11-wm/compiz/compiz-0.9.2.ebuild
index f3cd24c..aa5ffcb 100644
--- a/x11-wm/compiz/compiz-0.9.2.ebuild
+++ b/x11-wm/compiz/compiz-0.9.2.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
-
-MY_PN="${PN}-core"
-MY_P="${MY_PN}-${PV}"
+EAPI=4
if [[ ${PV} != *9999* ]]; then
+ MY_PN="${PN}-core"
+ MY_P="${MY_PN}-${PV}"
SRC_URI="http://releases.compiz.org/${PV}/${MY_P}.tar.bz2"
KEYWORDS="~x86 ~amd64"
+ S="${WORKDIR}/${MY_P}"
else
- GIT_ECLASS="git"
+ GIT_ECLASS="git-2"
EGIT_REPO_URI="git://anongit.compiz-fusion.org/${PN}/core"
SRC_URI=""
KEYWORDS=""
+ S="${WORKDIR}/${PN}"
fi
inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils
@@ -28,6 +29,7 @@ IUSE="gnome gtk kde +svg"
COMMONDEPEND="
!x11-libs/compiz-bcop
+ >=dev-libs/boost-1.34.0
dev-libs/glib:2
dev-libs/libxml2
dev-libs/libxslt
@@ -75,7 +77,13 @@ RDEPEND="${COMMONDEPEND}
x11-apps/xvinfo
"
-S="${WORKDIR}/${MY_P}"
+src_unpack() {
+ if [[ ${PV} != *9999* ]]; then
+ default
+ else
+ git-2_src_unpack
+ fi
+}
src_prepare() {
epatch "${FILESDIR}/${PN}-desktop-gnome-or-not.patch"
@@ -95,11 +103,15 @@ src_configure() {
cmake-utils_src_configure
}
+src_compile() {
+ cmake-utils_src_compile
+}
+
src_install() {
pushd ${CMAKE_BUILD_DIR}
dodir /usr/share/cmake/Modules
- emake findcompiz_install || die "Failed to install FindCompiz cmake module"
- emake install || die "Failed to install"
+ emake findcompiz_install
+ emake install
popd ${CMAKE_BUILD_DIR}
}
diff --git a/x11-wm/compiz/compiz-9999.ebuild b/x11-wm/compiz/compiz-9999.ebuild
index f028ac3..32b745e 100644
--- a/x11-wm/compiz/compiz-9999.ebuild
+++ b/x11-wm/compiz/compiz-9999.ebuild
@@ -1,17 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI=4
if [[ ${PV} != *9999* ]]; then
SRC_URI="http://releases.compiz.org/${PV}/${MY_P}.tar.bz2"
KEYWORDS="~x86 ~amd64"
+ MY_PN="${PN}-core"
+ MY_P="${MY_PN}-${PV}"
+ S="${WORKDIR}/${MY_P}"
else
- GIT_ECLASS="git"
+ GIT_ECLASS="git-2"
EGIT_REPO_URI="git://anongit.compiz-fusion.org/${PN}/core"
SRC_URI=""
KEYWORDS=""
+ S="${WORKDIR}/${PN}"
fi
inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils
@@ -25,6 +29,7 @@ IUSE="gnome gtk kde +svg"
COMMONDEPEND="
!x11-libs/compiz-bcop
+ >=dev-libs/boost-1.34.0
dev-libs/glib:2
dev-libs/libxml2
dev-libs/libxslt
@@ -72,10 +77,12 @@ RDEPEND="${COMMONDEPEND}
x11-apps/xvinfo
"
-S="${WORKDIR}/${PN}"
-
src_unpack() {
- git_src_unpack
+ if [[ ${PV} != *9999* ]]; then
+ default
+ else
+ git-2_src_unpack
+ fi
}
src_prepare() {
@@ -103,8 +110,8 @@ src_compile() {
src_install() {
pushd ${CMAKE_BUILD_DIR}
dodir /usr/share/cmake/Modules
- emake findcompiz_install || die "Failed to install FindCompiz cmake module"
- emake install || die "Failed to install"
+ emake findcompiz_install
+ emake install
popd ${CMAKE_BUILD_DIR}
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-12-31 10:10 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-15 12:06 [gentoo-commits] proj/desktop-effects:master commit in: x11-wm/compiz/ Sergey Popov
-- strict thread matches above, loose matches on Subject: below --
2012-12-31 10:09 Sergey Popov
2012-10-03 13:50 Sergey Popov
2012-09-25 16:27 Sergey Popov
2012-09-24 10:13 Sergey Popov
2012-09-16 16:48 Sergey Popov
2012-09-15 12:26 Sergey Popov
2012-09-15 12:06 Sergey Popov
2012-02-05 13:09 Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox