From 59985e27dd4f7b2ca38e0ca889ad321f52e4b590 Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sat, 29 Aug 2009 12:28:11 +0000 Subject: Fix libGL.so.1.2 path in compiz-manager (bug #274762), update KDE4 dependencies (bug #277016), fix missing gconf flags in gnome plugin (bug #282807). Fix QA warnings, Drop old revisions. (Portage version: 2.2_rc40/cvs/Linux x86_64) --- x11-wm/compiz/ChangeLog | 13 +- x11-wm/compiz/compiz-0.6.2-r1.ebuild | 72 ---------- x11-wm/compiz/compiz-0.8.2-r1.ebuild | 155 --------------------- x11-wm/compiz/compiz-0.8.2-r2.ebuild | 154 -------------------- x11-wm/compiz/compiz-0.8.2-r3.ebuild | 151 ++++++++++++++++++++ x11-wm/compiz/compiz-0.8.2.ebuild | 145 ------------------- ...ompiz-0.8.2-gtk-gnome-missing-gconf-flags.patch | 33 +++++ x11-wm/compiz/files/compiz-manager | 19 +-- x11-wm/compiz/metadata.xml | 2 +- 9 files changed, 207 insertions(+), 537 deletions(-) delete mode 100644 x11-wm/compiz/compiz-0.6.2-r1.ebuild delete mode 100644 x11-wm/compiz/compiz-0.8.2-r1.ebuild delete mode 100644 x11-wm/compiz/compiz-0.8.2-r2.ebuild create mode 100644 x11-wm/compiz/compiz-0.8.2-r3.ebuild delete mode 100644 x11-wm/compiz/compiz-0.8.2.ebuild create mode 100644 x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch (limited to 'x11-wm/compiz') diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog index 082071db314c..d8e05737dc59 100644 --- a/x11-wm/compiz/ChangeLog +++ b/x11-wm/compiz/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for x11-wm/compiz # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.43 2009/06/12 03:09:39 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.44 2009/08/29 12:28:11 mrpouet Exp $ + +*compiz-0.8.2-r3 (29 Aug 2009) + + 29 Aug 2009; Romain Perier + -compiz-0.6.2-r1.ebuild, -compiz-0.8.2.ebuild, -compiz-0.8.2-r1.ebuild, + -compiz-0.8.2-r2.ebuild, +compiz-0.8.2-r3.ebuild, + +files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch, files/compiz-manager, + metadata.xml: + Fix libGL.so.1.2 path in compiz-manager (bug #274762), update KDE4 + dependencies (bug #277016), fix missing gconf flags in gnome plugin (bug + #282807), fix QA warnings, Drop old revisions. *compiz-0.8.2-r2 (12 Jun 2009) diff --git a/x11-wm/compiz/compiz-0.6.2-r1.ebuild b/x11-wm/compiz/compiz-0.6.2-r1.ebuild deleted file mode 100644 index 78d0e2b701d6..000000000000 --- a/x11-wm/compiz/compiz-0.6.2-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.6.2-r1.ebuild,v 1.6 2008/08/29 02:06:46 flameeyes Exp $ - -EAPI=1 - -inherit gnome2 eutils - -DESCRIPTION="3D composite- and windowmanager" -HOMEPAGE="http://www.compiz.org/" -SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.gz" -LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="dbus gnome kde svg" - -DEPEND=">=media-libs/mesa-6.5.1-r1 - >=media-libs/glitz-0.5.6 - >=x11-base/xorg-server-1.1.1-r1 - x11-libs/libXdamage - x11-libs/libXrandr - x11-libs/libXcomposite - x11-libs/libXinerama - media-libs/libpng - >=x11-libs/gtk+-2.0 - x11-libs/pango - x11-libs/startup-notification - gnome-base/gconf - >=x11-libs/libwnck-2.18.3 - dev-libs/libxslt - gnome? ( >=gnome-base/gnome-control-center-2.16.1 ) - svg? ( gnome-base/librsvg ) - dbus? ( >=sys-apps/dbus-1.0 - dev-libs/dbus-glib ) - kde? ( - || ( kde-base/kwin:3.5 kde-base/kdebase:3.5 ) - dev-libs/dbus-qt3-old )" - -RDEPEND="${DEPEND} - x11-apps/mesa-progs" - -DEPEND="${DEPEND} - dev-util/pkgconfig - x11-proto/xineramaproto - x11-proto/damageproto" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/compiz-0.6.2-CVE-2007-3920.patch" -} - -src_compile() { - econf --with-default-plugins \ - --enable-gtk \ - --enable-gconf \ - --disable-fuse \ - `use_enable gnome` \ - `use_enable gnome metacity` \ - `use_enable kde` \ - `use_enable svg librsvg` \ - `use_enable dbus` \ - `use_enable dbus dbus-glib` || die - - emake || die -} - -src_install() { - emake DESTDIR="${D}" install || die - dobin "${FILESDIR}/0.3.6/compiz-start" || die - dodoc AUTHORS ChangeLog NEWS README TODO || die -} diff --git a/x11-wm/compiz/compiz-0.8.2-r1.ebuild b/x11-wm/compiz/compiz-0.8.2-r1.ebuild deleted file mode 100644 index fb65f036ee2a..000000000000 --- a/x11-wm/compiz/compiz-0.8.2-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r1.ebuild,v 1.2 2009/04/26 13:59:27 jmbsvicetto Exp $ - -EAPI="2" - -inherit autotools eutils gnome2-utils multilib - -DESCRIPTION="3D composite and windowmanager" -HOMEPAGE="http://www.compiz.org/" -SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg" - -DEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/libxslt - >=media-libs/glitz-0.5.6 - media-libs/libpng - >=media-libs/mesa-6.5.1-r1 - >=x11-base/xorg-server-1.1.1-r1 - x11-libs/libX11[xcb] - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libICE - x11-libs/libSM - >=x11-libs/libXrender-0.8.4 - >=x11-libs/startup-notification-0.7 - cairo? ( - x11-libs/cairo[X] - ) - dbus? ( >=sys-apps/dbus-1.0 ) - fuse? ( sys-fs/fuse ) - gnome? ( - >=gnome-base/gnome-control-center-2.16.1:2 - gnome-base/gnome-desktop - gnome-base/gconf:2 - ) - gtk? ( - >=x11-libs/gtk+-2.8.0:2 - >=x11-libs/libwnck-2.18.3 - x11-libs/pango - ) - kde? ( - || ( kde-base/kwin:3.5 - kde-base/kdebase:3.5 - ) - dev-libs/dbus-qt3-old - ) - kde4? ( - || ( - kde-base/kwin:4.2 - kde-base/kwin:live - ) - ) - svg? ( - >=gnome-base/librsvg-2.14.0:2 - >=x11-libs/cairo-1.0 - ) -" - -RDEPEND="${DEPEND} - x11-apps/mesa-progs - x11-apps/xvinfo" - -DEPEND="${DEPEND} - dev-util/pkgconfig - x11-proto/damageproto - x11-proto/xineramaproto" - -src_prepare() { - - echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip" - echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip" - - use gnome || { - epatch "${FILESDIR}"/${PN}-no-gconf.patch - ln -s /usr/share/aclocal/gconf-2.m4 acinclude.m4 - - # required to apply the above patch - intltoolize --copy --force || die "intltoolize failed" - eautoreconf || die "eautoreconf failed" - } -} - -src_configure() { - econf \ - --disable-gnome-keybindings \ - --enable-librsvg \ - --with-default-plugins \ - $(use_enable cairo annotate) \ - $(use_enable dbus) \ - $(use_enable dbus dbus-glib) \ - $(use_enable fuse) \ - $(use_enable gnome) \ - $(use_enable gnome gconf) \ - $(use_enable gnome metacity) \ - $(use_enable gtk) \ - $(use_enable kde) \ - $(use_enable kde4) \ - || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Install compiz-manager - dobin "${FILESDIR}/compiz-manager" || die "dobin failed" - - # Add the full-path to lspci - sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" - - # Fix the hardcoded lib paths - sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" - - # Create gentoo's config file - dodir /etc/xdg/compiz - - cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager" - COMPIZ_BIN_PATH="/usr/bin/" - PLUGIN_PATH="/usr/$(get_libdir)/compiz/" - LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" - LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" - KWIN="$(type -p kwin)" - METACITY="$(type -p metacity)" - SKIP_CHECKS="yes" - EOF - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - insinto "/usr/share/applications" - doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop" -} - -pkg_preinst() { - use gnome && gnome2_gconf_savelist -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - - ewarn "If you update to x11-wm/metacity-2.24 after you install ${P}," - ewarn "gtk-window-decorator will crash until you reinstall ${PN} again." -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} diff --git a/x11-wm/compiz/compiz-0.8.2-r2.ebuild b/x11-wm/compiz/compiz-0.8.2-r2.ebuild deleted file mode 100644 index 8f773e4c0b60..000000000000 --- a/x11-wm/compiz/compiz-0.8.2-r2.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r2.ebuild,v 1.1 2009/06/12 03:09:39 jmbsvicetto Exp $ - -EAPI="2" - -inherit autotools eutils gnome2-utils multilib - -DESCRIPTION="3D composite and windowmanager" -HOMEPAGE="http://www.compiz.org/" -SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg" - -DEPEND=" - 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[xcb] - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libICE - x11-libs/libSM - >=x11-libs/libXrender-0.8.4 - >=x11-libs/startup-notification-0.7 - cairo? ( - x11-libs/cairo[X] - ) - dbus? ( >=sys-apps/dbus-1.0 ) - fuse? ( sys-fs/fuse ) - gnome? ( - >=gnome-base/gnome-control-center-2.16.1:2 - gnome-base/gnome-desktop - gnome-base/gconf:2 - ) - gtk? ( - >=x11-libs/gtk+-2.8.0:2 - >=x11-libs/libwnck-2.18.3 - x11-libs/pango - ) - kde? ( - || ( kde-base/kwin:3.5 - kde-base/kdebase:3.5 - ) - dev-libs/dbus-qt3-old - ) - kde4? ( - || ( - kde-base/kwin:4.2 - kde-base/kwin:live - ) - ) - svg? ( - >=gnome-base/librsvg-2.14.0:2 - >=x11-libs/cairo-1.0 - ) -" - -RDEPEND="${DEPEND} - x11-apps/mesa-progs - x11-apps/xvinfo" - -DEPEND="${DEPEND} - dev-util/pkgconfig - x11-proto/damageproto - x11-proto/xineramaproto" - -src_prepare() { - - echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip" - echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip" - - use gnome || { - epatch "${FILESDIR}"/${PN}-no-gconf.patch - ln -s /usr/share/aclocal/gconf-2.m4 acinclude.m4 - - # required to apply the above patch - intltoolize --copy --force || die "intltoolize failed" - eautoreconf || die "eautoreconf failed" - } -} - -src_configure() { - econf \ - --disable-gnome-keybindings \ - --enable-librsvg \ - --with-default-plugins \ - $(use_enable cairo annotate) \ - $(use_enable dbus) \ - $(use_enable dbus dbus-glib) \ - $(use_enable fuse) \ - $(use_enable gnome) \ - $(use_enable gnome gconf) \ - $(use_enable gnome metacity) \ - $(use_enable gtk) \ - $(use_enable kde) \ - $(use_enable kde4) \ - || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Install compiz-manager - dobin "${FILESDIR}/compiz-manager" || die "dobin failed" - - # Add the full-path to lspci - sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" - - # Fix the hardcoded lib paths - sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" - - # Create gentoo's config file - dodir /etc/xdg/compiz - - cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager" - COMPIZ_BIN_PATH="/usr/bin/" - PLUGIN_PATH="/usr/$(get_libdir)/compiz/" - LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" - LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" - KWIN="$(type -p kwin)" - METACITY="$(type -p metacity)" - SKIP_CHECKS="yes" - EOF - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" - - insinto "/usr/share/applications" - doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop" -} - -pkg_preinst() { - use gnome && gnome2_gconf_savelist -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - - ewarn "If you update to x11-wm/metacity-2.24 after you install ${P}," - ewarn "gtk-window-decorator will crash until you reinstall ${PN} again." -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} diff --git a/x11-wm/compiz/compiz-0.8.2-r3.ebuild b/x11-wm/compiz/compiz-0.8.2-r3.ebuild new file mode 100644 index 000000000000..8d64182381d8 --- /dev/null +++ b/x11-wm/compiz/compiz-0.8.2-r3.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2-r3.ebuild,v 1.1 2009/08/29 12:28:11 mrpouet Exp $ + +EAPI="2" + +inherit autotools eutils gnome2-utils + +DESCRIPTION="3D composite and windowmanager" +HOMEPAGE="http://www.compiz.org/" +SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1 MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="+cairo dbus fuse gnome gtk kde kde3 +svg" + +DEPEND=" + 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[xcb] + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libICE + x11-libs/libSM + >=x11-libs/libXrender-0.8.4 + >=x11-libs/startup-notification-0.7 + cairo? ( + x11-libs/cairo[X] + ) + dbus? ( >=sys-apps/dbus-1.0 ) + fuse? ( sys-fs/fuse ) + gnome? ( + >=gnome-base/gnome-control-center-2.16.1:2 + gnome-base/gnome-desktop + gnome-base/gconf:2 + ) + gtk? ( + >=x11-libs/gtk+-2.8.0:2 + >=x11-libs/libwnck-2.18.3 + x11-libs/pango + ) + kde? ( + || ( + >=kde-base/kwin-4.2.0 + kde-base/kwin:live + ) + ) + kde3? ( + || ( kde-base/kwin:3.5 + kde-base/kdebase:3.5 + ) + dev-libs/dbus-qt3-old + ) + svg? ( + >=gnome-base/librsvg-2.14.0:2 + >=x11-libs/cairo-1.0 + ) +" + +RDEPEND="${DEPEND} + x11-apps/mesa-progs + x11-apps/xvinfo" + +DEPEND="${DEPEND} + dev-util/pkgconfig + x11-proto/damageproto + x11-proto/xineramaproto" + +src_prepare() { + + echo "gtk/gnome/compiz-wm.desktop.in" >> "${S}/po/POTFILES.skip" + echo "metadata/core.xml.in" >> "${S}/po/POTFILES.skip" + + # Missing gconf flags, fix bug #282807 + epatch "${FILESDIR}"/${P}-gtk-gnome-missing-gconf-flags.patch + + if ! use gnome; then + epatch "${FILESDIR}"/${PN}-no-gconf.patch + fi + eautoreconf +} + +src_configure() { + econf --disable-gnome-keybindings \ + --enable-librsvg \ + --with-default-plugins \ + $(use_enable cairo annotate) \ + $(use_enable dbus) \ + $(use_enable dbus dbus-glib) \ + $(use_enable fuse) \ + $(use_enable gnome) \ + $(use_enable gnome gconf) \ + $(use_enable gnome metacity) \ + $(use_enable gtk) \ + $(use_enable kde kde4) \ + $(use_enable kde3 kde) +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + # Install compiz-manager + dobin "${FILESDIR}/compiz-manager" || die "dobin failed" + + # Add the full-path to lspci + sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" || die "sed 1 failed" + + # Fix the hardcoded lib paths + sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" || die "sed 2 failed" + + # Create gentoo's config file + dodir /etc/xdg/compiz || die "dodir failed" + + cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager" + COMPIZ_BIN_PATH="/usr/bin/" + PLUGIN_PATH="/usr/$(get_libdir)/compiz/" + LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2" + LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.so.1.2" + KWIN="$(type -p kwin)" + METACITY="$(type -p metacity)" + SKIP_CHECKS="yes" + EOF + + dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" + + insinto "/usr/share/applications" + doins "${FILESDIR}/compiz.desktop" || die "Failed to install compiz.desktop" +} + +pkg_preinst() { + use gnome && gnome2_gconf_savelist +} + +pkg_postinst() { + use gnome && gnome2_gconf_install + + ewarn "If you update to x11-wm/metacity-2.24 after you install ${P}," + ewarn "gtk-window-decorator will crash until you reinstall ${PN} again." +} + +pkg_prerm() { + use gnome && gnome2_gconf_uninstall +} diff --git a/x11-wm/compiz/compiz-0.8.2.ebuild b/x11-wm/compiz/compiz-0.8.2.ebuild deleted file mode 100644 index 145ab2b108f0..000000000000 --- a/x11-wm/compiz/compiz-0.8.2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.2.ebuild,v 1.3 2009/04/25 16:06:37 ranger Exp $ - -EAPI="2" - -inherit autotools eutils gnome2-utils multilib - -DESCRIPTION="3D composite and windowmanager" -HOMEPAGE="http://www.compiz.org/" -SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg" - -DEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/libxslt - >=media-libs/glitz-0.5.6 - media-libs/libpng - >=media-libs/mesa-6.5.1-r1 - >=x11-base/xorg-server-1.1.1-r1 - x11-libs/libX11[xcb] - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libICE - x11-libs/libSM - >=x11-libs/libXrender-0.8.4 - >=x11-libs/startup-notification-0.7 - cairo? ( - x11-libs/cairo[X] - ) - dbus? ( >=sys-apps/dbus-1.0 ) - fuse? ( sys-fs/fuse ) - gnome? ( - >=gnome-base/gnome-control-center-2.16.1:2 - gnome-base/gnome-desktop - gnome-base/gconf:2 - ) - gtk? ( - >=x11-libs/gtk+-2.8.0:2 - >=x11-libs/libwnck-2.18.3 - x11-libs/pango - ) - kde? ( - || ( kde-base/kwin:3.5 - kde-base/kdebase:3.5 - ) - dev-libs/dbus-qt3-old - ) - kde4? ( - || ( - kde-base/kwin:4.2 - kde-base/kwin:live - ) - ) - svg? ( - >=gnome-base/librsvg-2.14.0:2 - >=x11-libs/cairo-1.0 - ) -" - -RDEPEND="${DEPEND} - x11-apps/mesa-progs - x11-apps/xvinfo" - -DEPEND="${DEPEND} - dev-util/pkgconfig - x11-proto/damageproto - x11-proto/xineramaproto" - -src_prepare() { - - use gnome || { - epatch "${FILESDIR}"/${PN}-no-gconf.patch - ln -s /usr/share/aclocal/gconf-2.m4 acinclude.m4 - - # required to apply the above patch - intltoolize --copy --force || die "intltoolize failed" - eautoreconf || die "eautoreconf failed" - } -} - -src_configure() { - econf \ - --disable-gnome-keybindings \ - --enable-librsvg \ - --with-default-plugins \ - $(use_enable cairo annotate) \ - $(use_enable dbus) \ - $(use_enable dbus dbus-glib) \ - $(use_enable fuse) \ - $(use_enable gnome) \ - $(use_enable gnome gconf) \ - $(use_enable gnome metacity) \ - $(use_enable gtk) \ - $(use_enable kde) \ - $(use_enable kde4) \ - || die "econf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - # Install compiz-manager - dobin "${FILESDIR}/compiz-manager" || die "dobin failed" - - # Add the full-path to lspci - sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" - - # Fix the hardcoded lib paths - sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" - - # Create gentoo's config file - dodir /etc/xdg/compiz - - cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager" - COMPIZ_BIN_PATH="/usr/bin/" - PLUGIN_PATH="/usr/$(get_libdir)/compiz/" - LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" - LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" - KWIN="$(type -p kwin)" - METACITY="$(type -p metacity)" - SKIP_CHECKS="yes" - EOF - - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" -} - -pkg_postinst() { - use gnome && gnome2_gconf_install - - ewarn "If you update to x11-wm/metacity-2.24 after you install ${P}," - ewarn "gtk-window-decorator will crash until you reinstall ${PN} again." -} - -pkg_prerm() { - use gnome && gnome2_gconf_uninstall -} diff --git a/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch b/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch new file mode 100644 index 000000000000..e9888c3ff2c7 --- /dev/null +++ b/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch @@ -0,0 +1,33 @@ +Author: Romain Perier +Subject: Missing gconf flags for gnome plugin, fix bug #282807 +Date: 2009-08-29 12:25 + +--- + gtk/gnome/Makefile.am | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/gtk/gnome/Makefile.am b/gtk/gnome/Makefile.am +index 208318a..d0a7c54 100644 +--- a/gtk/gnome/Makefile.am ++++ b/gtk/gnome/Makefile.am +@@ -2,7 +2,7 @@ moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings + + if USE_GNOME + libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir) +-libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@ ++libcompiz_la_LIBADD = @GNOME_WINDOW_SETTINGS_LIBS@ @GCONF_LIBS@ + libcompiz_la_SOURCES = \ + compiz-window-manager.c \ + compiz-window-manager.h +@@ -76,8 +76,9 @@ if USE_GNOME_KEYBINDINGS + endif + endif + +-INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \ +- -DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \ ++INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \ ++ @GCONF_CFLAGS@ \ ++ -DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \ + -DLOCALEDIR="\"@datadir@/locale"\" + + noinst_LTLIBRARIES = \ diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager index 6e8fa5796474..3fbae21c0080 100644 --- a/x11-wm/compiz/files/compiz-manager +++ b/x11-wm/compiz/files/compiz-manager @@ -1,6 +1,6 @@ #!/bin/sh # Compiz Manager wrapper script -# +# # Copyright (c) 2007 Kristian Lyngstøl # # This program is free software; you can redistribute it and/or modify @@ -24,15 +24,15 @@ # Much of this code is based on Beryl code, also licensed under the GPL. # This script will detect what options we need to pass to compiz to get it # started, and start a default plugin and possibly window decorator. -# +# COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz -PLUGIN_PATH="/usr/lib/compiz/" +PLUGIN_PATH="/usr/lib/compiz/" GLXINFO="/usr/bin/glxinfo" KWIN="/usr/bin/kwin" METACITY="/usr/bin/metacity" -COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) +COMPIZ_NAME="compiz" # Final name for compiz (compiz.real) # For Xgl LD_PRELOAD LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa" @@ -53,7 +53,7 @@ FALLBACKWM_OPTIONS="--replace $@" # Driver whitelist WHITELIST="nvidia intel ati radeon i810" -# blacklist based on the pci ids +# blacklist based on the pci ids # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details T=" 1002:5954 1002:5854 1002:5955" # ati rs480 T="$T 1002:4153" # ATI Rv350 @@ -122,10 +122,10 @@ check_fbconfig() { verbose "Checking for FBConfig: " if [ "$INDIRECT" = "yes" ]; then - $GLXINFO -i | grep -q GLX.*fbconfig + $GLXINFO -i | grep -q GLX.*fbconfig FB=$? else - $GLXINFO | grep -q GLX.*fbconfig + $GLXINFO | grep -q GLX.*fbconfig FB=$? fi @@ -250,7 +250,7 @@ running_under_whitelisted_driver() fi for DRV in ${WHITELIST}; do if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG && - ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; + ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; then return 0 fi @@ -341,7 +341,7 @@ if ! check_xgl; then if ! running_under_whitelisted_driver || have_blacklisted_pciid; then abort_with_fallback_wm fi - # check if we have the required bits to run compiz and if not, + # check if we have the required bits to run compiz and if not, # fallback if ! check_tfp || ! check_npot_texture || ! check_composite || ! check_texture_size; then abort_with_fallback_wm @@ -381,3 +381,4 @@ elif [ -x ${COMPIZ_BIN_PATH}kde-window-decorator ] && [ -n "$KDE_FULL_SESSION" ] fi ${COMPIZ_BIN_PATH}${COMPIZ_NAME} $COMPIZ_OPTIONS "$@" $COMPIZ_PLUGINS || exec $FALLBACKWM $FALLBACKWM_OPTIONS + diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml index 2a128a53d67a..093c470babae 100644 --- a/x11-wm/compiz/metadata.xml +++ b/x11-wm/compiz/metadata.xml @@ -3,7 +3,7 @@ Enables support for the filesystem in userspace plugin through sys-fs/fuse. - Compile the kde4 window decorator and add support for kde-base/kdebase-startkde:4.1. + Compile the kde3 window decorator and add support for KDE3 desktop-effects -- cgit v1.2.3-65-gdbad