From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 66DD8138010 for ; Sat, 15 Sep 2012 11:31:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07085E0665; Sat, 15 Sep 2012 11:31:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BEBC121C061 for ; Sat, 15 Sep 2012 11:31:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0AE3F33CE33 for ; Sat, 15 Sep 2012 11:31:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1CF3AE5444 for ; Sat, 15 Sep 2012 11:31:07 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1347708653.cecf3d46f232c5406257e79bf4a12d8c3d906be6.pinkbyte@gentoo> Subject: [gentoo-commits] proj/desktop-effects:v0.9.8-test commit in: x11-wm/compiz/files/, x11-wm/compiz/ X-VCS-Repository: proj/desktop-effects X-VCS-Files: x11-wm/compiz/ChangeLog x11-wm/compiz/Manifest x11-wm/compiz/compiz-0.9.8.2.ebuild x11-wm/compiz/compiz-0.9.8_rc3316.ebuild x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch X-VCS-Directories: x11-wm/compiz/files/ x11-wm/compiz/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: cecf3d46f232c5406257e79bf4a12d8c3d906be6 X-VCS-Branch: v0.9.8-test Date: Sat, 15 Sep 2012 11:31:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1183e4d3-f407-4f13-b46f-1b2266725bce X-Archives-Hash: f16400808faaa51a8583f466637441c1 commit: cecf3d46f232c5406257e79bf4a12d8c3d906be6 Author: Sergey Popov gentoo org> AuthorDate: Sat Sep 15 11:30:53 2012 +0000 Commit: Sergey Popov gentoo org> CommitDate: Sat Sep 15 11:30:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/desktop-effects.git;a=commit;h=cecf3d46 Compiz 0.9.8.2 release ebuild, drop snapshots (Portage version: 2.2.0_alpha125/git/Linux x86_64, unsigned Manifest commit) --- x11-wm/compiz/ChangeLog | 9 ++ x11-wm/compiz/Manifest | 9 +- ...z-0.9.8_rc3316.ebuild => compiz-0.9.8.2.ebuild} | 80 ++++++++------------ x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch | 26 +++++++ ...rc3316-conditional-gnome-backend-building.patch | 13 --- .../files/compiz-0.9.8_rc3316-rsvg-cairo.patch | 12 --- .../compiz/files/compiz-0.9.8_rc3316-sandbox.patch | 42 ---------- 7 files changed, 70 insertions(+), 121 deletions(-) diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog index d69380d..b332c1f 100644 --- a/x11-wm/compiz/ChangeLog +++ b/x11-wm/compiz/ChangeLog @@ -2,6 +2,15 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*compiz-0.9.8.2 (15 Sep 2012) + + 15 Sep 2012; Sergey Popov -compiz-0.9.8_rc3316.ebuild, + -files/compiz-0.9.8_rc3316-rsvg-cairo.patch, +compiz-0.9.8.2.ebuild, + -files/compiz-0.9.8_rc3316-sandbox.patch, + +files/compiz-0.9.8.2-sandbox.patch, + -files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch: + Compiz 0.9.8.2 release ebuild, drop snapshots + *compiz-0.9.8_rc3316 (15 Sep 2012) 15 Sep 2012; Sergey Popov -compiz-0.9.8_rc3312.ebuild, diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest index 15e8e53..8edc2bb 100644 --- a/x11-wm/compiz/Manifest +++ b/x11-wm/compiz/Manifest @@ -1,13 +1,12 @@ -AUX compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch 383 SHA256 b0c5ff41dfbea91121246afdc3a0c27fd5da3b505873a65f90c306b71b4b5460 SHA512 1ac6eb627802a27a727f8be4a04d44ee1da838186382bac7ecee8eecf0ab79f5d296050b8c30e811be9f05070ed71a8dd0a402e6618681151a12d5166ac63700 WHIRLPOOL fe0e261984902471499be00dfb7b415287f9b1e7f925eb36653baa3aa5fff0a3a6aa53404b5593ae342bd8c72a72900896f26570912b8bf9e3cfc32571878b84 -AUX compiz-0.9.8_rc3316-rsvg-cairo.patch 421 SHA256 9257e6eaa78c27d9a91d540eed7707390ca5b7f700d4762b24243ab63cfa79fa SHA512 30e01f7d77e55e5582163ca795eb1ab960beec8ea4a3dc1869d6eda15e8539e662d31d2557fa7f1a4ce5f0731e8eece0fee832a5f2c1c6a0a8237f0bbcd8fd9e WHIRLPOOL 14db5246ef9321fc99d07f6bd9945f35cec70b4a72d9d5ed2eee756b98d3e52e129a80290b43e2d5e943b562fe6b7984cb93adedd5aac1d27d7f963acf778f83 -AUX compiz-0.9.8_rc3316-sandbox.patch 2502 SHA256 03aae4a9e056b501e45f3b1ed798da826fd9111d61c60c7d60be8329b0778346 SHA512 9ecad269052838e34892d2d428ad2003b389880b498203780c712ddc23eec5fd3dacb5743e1e6874ad95ffd0e2730bb0efaa1ac726092f6e0b96d1ca2c17d679 WHIRLPOOL 37975d879f41008f7fa3b66f5d0deaebce7d08b05043d88b8e43e1b0cbbcf3e339fbcd7a5803935b22fa7158a5a061917a3feb543acc584da0a37791d37efef8 +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 AUX compiz-manager 9831 SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9 SHA512 ee933c297e20942d26a196a36e4819474875fb3c89682ef7b46e0afc15381c86c885abada89afc11240bda732459b5ce71e4fa4f4cfc59242f4f87f2b0a2aab3 WHIRLPOOL 5fa8432d51e4aeeeeb717faf4c4454460d55fc535eb0940c1a1d8120e54b8c0e6cb18fe800bf541ae2776192514f5bb56a708ba876df8a972d4fd99e8ac4ee6a AUX compiz-no-gconf.patch 630 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67 SHA512 3c3789852db56be06d553dcdddb68c94e68b9290c74e5a9e642f266d1688c18eb4ce01b6835f267c84d3a213ec61266159d5891b10d80cb79e17bc9683163bf9 WHIRLPOOL 7341780992eed62a36bfa8be0e8f22c4f54ecda555f8af87ea76f585f4fcbcb76f31bb79269a01ff5c5eabe7d6796a233d7efa8baf35720a09085f53af3b1da6 AUX compiz.desktop 273 SHA256 28a5459148c7733cdd82e3ecc1f584231d2619c7305b8bf71060db331bf081fb SHA512 60189c33d9190934195dace88a88571e79af2be06be0df9db96f7f332798cb8b3d7c0e4bacacb3413ea381c9418415932ae895e75547568eb38d12e3800cf427 WHIRLPOOL c8f068a5e254e74285ced96236a98cd4b5724c630342a19df1defb19f14755e83ce5e6d86688066dbbeee43e8c1d89640756d9427af996fa261f31630c6893af +DIST compiz-0.9.8.2.tar.bz2 4301066 SHA256 db2dba06d3a25b64678f3feb7470b8348cf07fa8b6be17628cc5fbe1f0508ee1 SHA512 33f69faf91d203db34872202ac180152944579dde8fa8eb1603d45af043ce7eb6cdd9e096b811ad513ca8c07516d1cc1c41f4e238b8b64109141bb7284b21f8b WHIRLPOOL 49eee71363ecb610467e1424cdbf01745f6a9e0ae15e10326e3a6ff22e58b6f83a8cc3e61e3eb56aaa97400e38c0c69db64a34b3cd33d29fb969faf708e878d9 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_rc3316.ebuild 4049 SHA256 4f70ddac1b1295ba99d4f8b31c0527528989f9181d090975024418792c4e9f6f SHA512 c60c4b4b862754944d2b2e65a4ee43ebdc36ebbdaa636b6dbfa333ee7acf0927dc72800e4a9063567e6391bf0587899a56fe74773090868b1bbaf5e1b5d5713f WHIRLPOOL e8828c28e0fa0a36d1f09ba849099e1fef2c68c495e4f3a68b51123be4273163390abf35068b0472905ce14ba40610711982cdc5a39cbbf28fa8f3624f27a1d7 +EBUILD compiz-0.9.8.2.ebuild 3778 SHA256 b34e7abe511fcbc6009b44d991ec8bed02675d99744194a346df9ff0cc95354a SHA512 c4386989ec285510b8463f835dec8f3ed8e81362e08f5fe9d12e0dc14a1931544853856ad71dfd3ab51c93aa54d92dd37da42ae21a9eaf28d195072d6cc5e887 WHIRLPOOL 0985666763bd24c5d97222133f8ce86ba65fd3809118e8ba628153c370393f3cbaea56edca3560596ba0bdcf4c16f8bd7bb96b94135fccc718d16fd1a265a84c EBUILD compiz-9999.ebuild 2348 SHA256 b8b7cb68671b077977aa6f464bfd4475ebaad5471f7868a423fa8af1ae9f267b SHA512 1cff9947c3cea6aceb953179f244587a3686a1344c0deb9642633f032c2012b109744e0473ab637d26d4e99ee3f4060394ba4702c1e54eb19acb9e69b4f121f8 WHIRLPOOL c5649376103a993ed46031004c0c35ab9058a99626ad45e0f860eea7a5e3dbfeb398d64b7b2fe47926257dd5f99bbb29a2a0d85fedfbb0eb5b5967ec10d83b1f -MISC ChangeLog 17040 SHA256 04b47e3e7e487a371460c80ac651e8cba5780e86369a075f58e7c169e1377b2b SHA512 64789dcf894a6af543f0f0bf8994273028b834b745033bc5ad50487dd98fcb8f9261e18a19a7e35fadbbe8c517d9ee043fd4383ead8200794edbed3485c51111 WHIRLPOOL eeb36f9bd7a189252117b955380a3003284f152a4a41e1124fb7f67b598d5f48229f1217fbd8ddc1bc58805ce2e32893c32554a1e43543e1826ea3e21eeac3d3 +MISC ChangeLog 17424 SHA256 fd5e58bcb6fd4336ee7bba717124b577a123f79455a8a068a5c31d177e49b1ea SHA512 f54f7d4a66b60942941a637ceb420a5fa6f69ea0888a1afe754af9ef493d5f9db9653548c5651ec3c1a75a4cb372d15733ab9f621774afe44678cf340cfe6ecb WHIRLPOOL 1c56588c7a3fe26c78d253d16fa5678e9a301c7a9b2a3e1e33643520035f7884627408fc85e0d7a55330442ffc04e3316d3ac632e15a8118d2907e2ce9e43157 MISC metadata.xml 534 SHA256 bfe2f2903a5d830f39e2d18d4c7c64d9f5caaa2a85a8eeda80fff0b2a3a0c027 SHA512 b740b4a6df487096c047c5c3ef5964555423d5f4a01dbe223757884182c48e4c91f598569ab978f926899a6a62394648a2de2946a816ffd34f39e15992940eb1 WHIRLPOOL 22e956efd7794c27cda3dedf7b2e878b1ae19e1585264fed04b03d0a578d06ab06c2cbab156db4e36ea87aaff1ee94ead55d6f1e521755a5541819d30550c42d diff --git a/x11-wm/compiz/compiz-0.9.8_rc3316.ebuild b/x11-wm/compiz/compiz-0.9.8.2.ebuild similarity index 69% rename from x11-wm/compiz/compiz-0.9.8_rc3316.ebuild rename to x11-wm/compiz/compiz-0.9.8.2.ebuild index 6027908..863516d 100644 --- a/x11-wm/compiz/compiz-0.9.8_rc3316.ebuild +++ b/x11-wm/compiz/compiz-0.9.8.2.ebuild @@ -4,19 +4,13 @@ EAPI=4 -MY_PV="${PV%_*}" - -SRC_URI="" -EBZR_REPO_URI="http://bazaar.launchpad.net/~compiz-team/compiz/${MY_PV}" -EBZR_REVISION="${PV#*_rc}" - -inherit eutils bzr cmake-utils gnome2-utils flag-o-matic +inherit eutils cmake-utils gnome2-utils versionator DESCRIPTION="OpenGL compositing window manager." HOMEPAGE="https://launchpad.net/compiz" - +SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-3)/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0.9.8" +SLOT="0.9" KEYWORDS="~amd64 ~x86" IUSE="+cairo debug dbus fuse gnome gtk kde +svg test" @@ -32,29 +26,27 @@ COMMONDEPEND=" !x11-apps/ccsm !dev-python/compizconfig-python !x11-apps/fusion-icon - >=dev-libs/boost-1.34.0 - >=dev-libs/glib-2.30.0 + 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 - >=media-libs/mesa-6.5.1-r1 - >=x11-base/xorg-server-1.1.1-r1 + media-libs/mesa + x11-base/xorg-server x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXrandr - >=x11-libs/libXrender-0.9.3 + x11-libs/libXrender x11-libs/libXinerama x11-libs/libICE x11-libs/libSM - >=x11-libs/startup-notification-0.7 - cairo? ( - x11-libs/cairo[X] - ) + x11-libs/startup-notification + cairo? ( x11-libs/cairo[X] ) fuse? ( sys-fs/fuse ) gtk? ( >=x11-libs/gtk+-2.18.0 @@ -63,17 +55,15 @@ COMMONDEPEND=" gnome? ( gnome-base/gnome-desktop gnome-base/gconf - >=x11-wm/metacity-2.23.2 + x11-wm/metacity ) ) - kde? ( - >=kde-base/kwin-4.3.0:4 - ) + kde? ( kde-base/kwin:4 ) svg? ( - >=gnome-base/librsvg-2.14.0:2 - >=x11-libs/cairo-1.0 + gnome-base/librsvg:2 + x11-libs/cairo ) - dbus? ( >=sys-apps/dbus-1.0 )" + dbus? ( sys-apps/dbus )" DEPEND="${COMMONDEPEND} app-admin/chrpath @@ -97,7 +87,7 @@ RDEPEND="${COMMONDEPEND} # - Check proper compilation with missing gettext/intltool # - CFLAGS are NOT respected, this needs to be fixed # - Default decorator exec command in ccsm is bad -# - 0.9.8.0 release does not build - need to walk through commits and find out why +# - Check all dependencies once more # - Check CMakeFiles.txt this subdirectories : # cmake - ? # src @@ -105,19 +95,13 @@ RDEPEND="${COMMONDEPEND} # plugins # tests - ? -src_unpack() { - bzr_src_unpack -} - src_prepare() { - bzr_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" + + base_src_prepare } src_configure() { @@ -128,31 +112,25 @@ src_configure() { "$(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" - "-DCOMPIZ_DESTDIR=${D}" ) - cmake-utils_src_configure } -src_compile() { - cmake-utils_src_compile -} - src_install() { - pushd ${CMAKE_BUILD_DIR} - dodir /usr/share/cmake/Modules - emake DESTDIR="${D}" findcompiz_install - emake DESTDIR="${D}" install - popd ${CMAKE_BUILD_DIR} - chrpath -d "${D}/usr/lib64/python2.7/site-packages/compizconfig.so" - - ewarn "The dbus plugin is known to crash compiz in this version. Disable" - ewarn "it if you experience crashes when plugins are enabled/disabled." + 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() { @@ -161,6 +139,10 @@ pkg_preinst() { 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() { diff --git a/x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch new file mode 100644 index 0000000..da43346 --- /dev/null +++ b/x11-wm/compiz/files/compiz-0.9.8.2-sandbox.patch @@ -0,0 +1,26 @@ +--- compiz-0.9.8.2/cmake/base.cmake~ 2012-09-12 14:29:09.000000000 +0000 ++++ compiz-0.9.8.2/cmake/base.cmake 2012-09-12 14:29:09.000000000 +0000 +@@ -53,11 +53,11 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCompiz.cmake + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindOpenGLES2.cmake + DESTINATION +- ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/) ++ ${D}/${CMAKE_INSTALL_PREFIX}/share/cmake/) + add_custom_target (findcompiz_install + ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && +- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules +- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${CMAKE_ROOT}/Modules ++ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${D}/${CMAKE_ROOT}/Modules ++ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${D}/${CMAKE_ROOT}/Modules + ) + find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN}) + if (NOT _find_compizconfig) +@@ -70,7 +70,7 @@ + install (FILES + ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake + DESTINATION +- ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/) ++ ${D}/${CMAKE_INSTALL_PREFIX}/share/cmake/) + add_custom_target ( + findcompizconfig_install + ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch deleted file mode 100644 index a2c5925..0000000 --- a/x11-wm/compiz/files/compiz-0.9.8_rc3316-conditional-gnome-backend-building.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- compizconfig/CMakeLists.txt.orig 2012-09-04 14:56:20.082299507 +0400 -+++ compizconfig/CMakeLists.txt 2012-09-04 14:56:31.109299403 +0400 -@@ -7,8 +7,10 @@ - add_subdirectory (libcompizconfig) - add_subdirectory (compizconfig-python) - add_subdirectory (ccsm) -+if (USE_GNOME) - add_subdirectory (gconf) - add_subdirectory (gsettings) -+endif (USE_GNOME) - - add_custom_target (pyclean) - diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch deleted file mode 100644 index ad484f5..0000000 --- a/x11-wm/compiz/files/compiz-0.9.8_rc3316-rsvg-cairo.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 - #include -+#include - - #include - #include diff --git a/x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch b/x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch deleted file mode 100644 index 55bde3e..0000000 --- a/x11-wm/compiz/files/compiz-0.9.8_rc3316-sandbox.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -urN a/cmake/base.cmake b/cmake/base.cmake ---- a/cmake/base.cmake 2012-06-29 02:33:47.076801000 -0500 -+++ b/cmake/base.cmake 2012-06-29 22:47:06.868740002 -0500 -@@ -53,8 +53,8 @@ - DESTINATION - ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/) - add_custom_target (findcompiz_install -- ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && -- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${CMAKE_ROOT}/Modules -+ ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules && -+ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules - ) - find_file (_find_compizconfig FindCompizConfig.cmake PATHS ${CMAKE_ROOT}/Modules ${ARGN}) - if (NOT _find_compizconfig) -@@ -70,8 +70,8 @@ - ${CMAKE_INSTALL_PREFIX}/share/cmake-${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}/) - add_custom_target ( - findcompizconfig_install -- ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && -- ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${CMAKE_ROOT}/Modules -+ ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules && -+ ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig/libcompizconfig/cmake/FindCompizConfig.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules - ) - endfunction () - -diff -urN a/compizconfig/libcompizconfig/config/CMakeLists.txt b/compizconfig/libcompizconfig/config/CMakeLists.txt ---- a/compizconfig/libcompizconfig/config/CMakeLists.txt 2012-06-29 02:33:51.195800999 -0500 -+++ b/compizconfig/libcompizconfig/config/CMakeLists.txt 2012-06-29 22:48:56.602740000 -0500 -@@ -1,10 +1,10 @@ - set (_config_file - config) - --compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}) -+compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file}) - - add_custom_target ( - config_install -- ${CMAKE_COMMAND} -E make_directory ${CMAKE_ROOT}/Modules && -- ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file} -+ ${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules && -+ ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/config/${_config_file} ${COMPIZ_DESTDIR}${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file} - )