Fixed the hardcoded /lib path in compiz-manager. Fixes bug #253246.

Package-Manager: portage-2.2_rc19/cvs/Linux 2.6.28-gentoo x86_64

5 files changed, 170 insertions, 15 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 6908928b626d..8bda8b63475d 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.35 2008/12/03 02:18:35 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.36 2008/12/31 16:44:58 jmbsvicetto Exp $
+
+*compiz-0.7.8-r2 (31 Dec 2008)
+
+  31 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  files/compiz-manager, compiz-0.7.8.ebuild, +compiz-0.7.8-r2.ebuild:
+  Fixed the hardcoded /lib path in compiz-manager. Fixes bug #253246.
 
   03 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   compiz-0.7.8-r1.ebuild:
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index f2e0b8a7b641..87334f88341d 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,7 +1,7 @@
 AUX 0.3.6/compiz-start 1122 RMD160 6e2e0db666a9fd7648e894d9f778dcb1c59bb6c0 SHA1 f710dcfbd6274ff7bed3f264d284a4dcecb27254 SHA256 04a944e8e39ef1a6226b350027a5865bb56b45230aa59eae9574cd6c75529fa4
 AUX compiz-0.6.2-CVE-2007-3920.patch 1019 RMD160 024316c8213df5c68ceb39c404da4227cdfbf21f SHA1 adf6c10f0fa3de040704cd208d09d93b402667b8 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee
 AUX compiz-0.7.8-framesvg.patch 3119 RMD160 315aeb6b97db26af1bc48a2fb66228b402a07823 SHA1 5706c35119691c7b466e4c3b6dc39dd5a463cddf SHA256 9d323dd2ff10848d3c2cac93b00b67cca878f77942443a96f16b82c649535a21
-AUX compiz-manager 9831 RMD160 8ef4f9c669a085c76b391c1bef5788a1c3054bcb SHA1 f57f17a574db09ed602cfd87f4f452ca9de5e86f SHA256 68cfc0039a552d1db15d257b2ba4db6cdd86984015688befdf78b15badecd0d9
+AUX compiz-manager 9821 RMD160 c8329ddd31435e449780a01d8cc6b53ee90cdabb SHA1 40c0ef6ef65e8d5103bed9efbac2cbe96c7ca1de SHA256 3f03d39880bd3802370369f84614f7e48b2687c56c4d99d445a964b98c7fd811
 AUX compiz-no-gconf.patch 630 RMD160 32b6990dff7baf7f3cb04f728ab04d1523f29c46 SHA1 ad1c0a38dcb83c4768031f0b87db4748b2c24b92 SHA256 87467fbe5d4e0d0bb8952f2d5b74d21046d92d49772543aeda137266e055aa67
 DIST compiz-0.5.0.tar.bz2 926090 RMD160 c9b38ea1184e9b897d878c499c883dd388af17bd SHA1 453b4e8423b39d4ec3539817f2846d7ea485749e SHA256 4191745d86bec37de4cdc79bf0031afde1d28079eac2e3fc29aed18cd7a2a4e6
 DIST compiz-0.5.2.tar.gz 1778046 RMD160 9b307090af4717796e092095e7c293350292e30b SHA1 0d0a4a39bfbe0ada770d9206b7a1b6b443c53c29 SHA256 e1cc3f3bd144d32d0ebd1e505a7ea7727fb0246f36e5fcea53b808e27adf197c
@@ -12,6 +12,7 @@ EBUILD compiz-0.5.2.ebuild 1456 RMD160 01aec041dea85b7fdae0420ea322863f742941f6
 EBUILD compiz-0.6.2-r1.ebuild 1719 RMD160 44f0ccbf283f44219e3d124b2a0df9d64dbba538 SHA1 61e009aef49f3121621a1f50decf3ead5b1c7657 SHA256 0e91b045deb0bb68a45be919c8f9aa366df57ead9f1e88a47c747dada39790b8
 EBUILD compiz-0.6.2.ebuild 1455 RMD160 fca32d8b51037dc1aaa01b89ce4ddf9d14e56a25 SHA1 e08804835caece20bc01363c1be8e2b28a5a5d5b SHA256 eba236f002449d04ae58ef2e0103cd30c6feb3d54eb6f8fc52adefe07a0bb102
 EBUILD compiz-0.7.8-r1.ebuild 3284 RMD160 bee61d4814e1665211d2bf658df4396d5c44363e SHA1 ca071bb4d82239e2b75679462f4bc56828b94a0e SHA256 2edcb3f9eb5df274174fa4bfbc6bdb8b42ccd3aa4df0c7840948f4ebfaf818e9
-EBUILD compiz-0.7.8.ebuild 3190 RMD160 37389a225a8e5cd67136c64410846fead96b1ae1 SHA1 1f669e3ea51566a5fc52ff587f4e44fb0436f4ef SHA256 05de90edb293df365e72a3fa551dafb200f7599b1526966f23ed16502b72cd30
-MISC ChangeLog 5723 RMD160 c4617ae1edefa992921c3d78158f5399db51f779 SHA1 76ac91178227bd9a42ae6a636ddac473d90ed74e SHA256 d7ab5d5b4a33280f1a120239a83ab494ba3181be0fdf72129bdc104dbcbf8a65
+EBUILD compiz-0.7.8-r2.ebuild 3382 RMD160 bca21f843b98f70387f2ebec62026301ac10f807 SHA1 7bdfc3eb34f731981260bc30d80e246a0f6a83e1 SHA256 cc9cab88aef7a2985d17e83bb3f4714f3ed29001093146b16b714fedd10f015e
+EBUILD compiz-0.7.8.ebuild 3288 RMD160 dc6c926f34efacff5ac966568c1439fbf586e84c SHA1 5a833772b5fce95d207adc54f1f280a49b57c0e0 SHA256 335d0cd5876325cdb977818ce02c3bc551cb0ad54aa9d055f7ad20dda8e42302
+MISC ChangeLog 5963 RMD160 b3c2af03247124dfe76f3bb981c2ac66eb8439ad SHA1 07818738b27766ec7e039b884bdd8cd71e51ad5d SHA256 41e732d24eed23b2eadc64b37e915809b5b3297fbdefb89f3bdfb92555ecc355
 MISC metadata.xml 595 RMD160 e354511f8cf82c440781b7d2f2f48af495ac0ae2 SHA1 82abd21f65ca6e7275bc32aee890fe124ade7092 SHA256 977b829df1bda476da07f5be78d64cf40f86c5e3232e2f72554c3112d1621acb
diff --git a/x11-wm/compiz/compiz-0.7.8-r2.ebuild b/x11-wm/compiz/compiz-0.7.8-r2.ebuild
new file mode 100644
index 000000000000..aac7ef6a54fb
--- /dev/null
+++ b/x11-wm/compiz/compiz-0.7.8-r2.ebuild
@@ -0,0 +1,146 @@
+# 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.7.8-r2.ebuild,v 1.1 2008/12/31 16:44:58 jmbsvicetto Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2-utils multilib
+
+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 ~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 kde4 &&	epatch "${FILESDIR}/${P}-framesvg.patch"
+	use gnome || {
+		epatch "${FILESDIR}"/${PN}-no-gconf.patch
+		ln -s "${ROOT}"/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/compiz-0.7.8.ebuild b/x11-wm/compiz/compiz-0.7.8.ebuild
index 3c7361a232c7..a82e6c813ba7 100644
--- a/x11-wm/compiz/compiz-0.7.8.ebuild
+++ b/x11-wm/compiz/compiz-0.7.8.ebuild
@@ -1,6 +1,6 @@
 # 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.7.8.ebuild,v 1.4 2008/12/02 16:46:31 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild,v 1.5 2008/12/31 16:44:58 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -109,6 +109,9 @@ src_install() {
 	# 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
 
diff --git a/x11-wm/compiz/files/compiz-manager b/x11-wm/compiz/files/compiz-manager
index 3fbae21c0080..6e8fa5796474 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 <kristian@bohemians.org>
 #
 # 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,4 +381,3 @@ 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
-