1 |
jmbsvicetto 08/12/31 16:44:58 |
2 |
|
3 |
Modified: ChangeLog compiz-0.7.8.ebuild |
4 |
Added: compiz-0.7.8-r2.ebuild |
5 |
Log: |
6 |
Fixed the hardcoded /lib path in compiz-manager. Fixes bug #253246. |
7 |
(Portage version: 2.2_rc19/cvs/Linux 2.6.28-gentoo x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.36 x11-wm/compiz/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?rev=1.36&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?rev=1.36&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/ChangeLog?r1=1.35&r2=1.36 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v |
19 |
retrieving revision 1.35 |
20 |
retrieving revision 1.36 |
21 |
diff -u -r1.35 -r1.36 |
22 |
--- ChangeLog 3 Dec 2008 02:18:35 -0000 1.35 |
23 |
+++ ChangeLog 31 Dec 2008 16:44:58 -0000 1.36 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for x11-wm/compiz |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.35 2008/12/03 02:18:35 jmbsvicetto Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.36 2008/12/31 16:44:58 jmbsvicetto Exp $ |
29 |
+ |
30 |
+*compiz-0.7.8-r2 (31 Dec 2008) |
31 |
+ |
32 |
+ 31 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
33 |
+ files/compiz-manager, compiz-0.7.8.ebuild, +compiz-0.7.8-r2.ebuild: |
34 |
+ Fixed the hardcoded /lib path in compiz-manager. Fixes bug #253246. |
35 |
|
36 |
03 Dec 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
37 |
compiz-0.7.8-r1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.5 x11-wm/compiz/compiz-0.7.8.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild?rev=1.5&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild?rev=1.5&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild?r1=1.4&r2=1.5 |
46 |
|
47 |
Index: compiz-0.7.8.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild,v |
50 |
retrieving revision 1.4 |
51 |
retrieving revision 1.5 |
52 |
diff -u -r1.4 -r1.5 |
53 |
--- compiz-0.7.8.ebuild 2 Dec 2008 16:46:31 -0000 1.4 |
54 |
+++ compiz-0.7.8.ebuild 31 Dec 2008 16:44:58 -0000 1.5 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2008 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild,v 1.4 2008/12/02 16:46:31 jmbsvicetto Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.7.8.ebuild,v 1.5 2008/12/31 16:44:58 jmbsvicetto Exp $ |
60 |
|
61 |
EAPI="2" |
62 |
|
63 |
@@ -109,6 +109,9 @@ |
64 |
# Add the full-path to lspci |
65 |
sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" |
66 |
|
67 |
+ # Fix the hardcoded lib paths |
68 |
+ sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" |
69 |
+ |
70 |
# Create gentoo's config file |
71 |
dodir /etc/xdg/compiz |
72 |
|
73 |
|
74 |
|
75 |
|
76 |
1.1 x11-wm/compiz/compiz-0.7.8-r2.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.7.8-r2.ebuild?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/compiz/compiz-0.7.8-r2.ebuild?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: compiz-0.7.8-r2.ebuild |
82 |
=================================================================== |
83 |
# Copyright 1999-2008 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $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 $ |
86 |
|
87 |
EAPI="2" |
88 |
|
89 |
inherit autotools eutils gnome2-utils multilib |
90 |
|
91 |
DESCRIPTION="3D composite and windowmanager" |
92 |
HOMEPAGE="http://www.compiz.org/" |
93 |
SRC_URI="http://xorg.freedesktop.org/archive/individual/app/${P}.tar.gz" |
94 |
|
95 |
LICENSE="GPL-2 LGPL-2.1 MIT" |
96 |
SLOT="0" |
97 |
KEYWORDS="~amd64 ~x86" |
98 |
IUSE="+cairo dbus fuse gnome gtk kde kde4 +svg" |
99 |
|
100 |
DEPEND=" |
101 |
dev-libs/glib:2 |
102 |
dev-libs/libxml2 |
103 |
dev-libs/libxslt |
104 |
>=media-libs/glitz-0.5.6 |
105 |
media-libs/libpng |
106 |
>=media-libs/mesa-6.5.1-r1 |
107 |
>=x11-base/xorg-server-1.1.1-r1 |
108 |
x11-libs/libX11[xcb] |
109 |
x11-libs/libxcb |
110 |
x11-libs/libXcomposite |
111 |
x11-libs/libXdamage |
112 |
x11-libs/libXinerama |
113 |
x11-libs/libXrandr |
114 |
x11-libs/libICE |
115 |
x11-libs/libSM |
116 |
>=x11-libs/libXrender-0.8.4 |
117 |
>=x11-libs/startup-notification-0.7 |
118 |
cairo? ( |
119 |
x11-libs/cairo[X] |
120 |
) |
121 |
dbus? ( >=sys-apps/dbus-1.0 ) |
122 |
fuse? ( sys-fs/fuse ) |
123 |
gnome? ( |
124 |
>=gnome-base/gnome-control-center-2.16.1:2 |
125 |
gnome-base/gnome-desktop |
126 |
gnome-base/gconf:2 |
127 |
) |
128 |
gtk? ( |
129 |
>=x11-libs/gtk+-2.8.0:2 |
130 |
>=x11-libs/libwnck-2.18.3 |
131 |
x11-libs/pango |
132 |
) |
133 |
kde? ( |
134 |
|| ( kde-base/kwin:3.5 |
135 |
kde-base/kdebase:3.5 |
136 |
) |
137 |
dev-libs/dbus-qt3-old |
138 |
) |
139 |
kde4? ( |
140 |
|| ( |
141 |
kde-base/kwin:4.2 |
142 |
kde-base/kwin:live |
143 |
) |
144 |
) |
145 |
svg? ( |
146 |
>=gnome-base/librsvg-2.14.0:2 |
147 |
>=x11-libs/cairo-1.0 |
148 |
) |
149 |
" |
150 |
|
151 |
RDEPEND="${DEPEND} |
152 |
x11-apps/mesa-progs |
153 |
x11-apps/xvinfo" |
154 |
|
155 |
DEPEND="${DEPEND} |
156 |
dev-util/pkgconfig |
157 |
x11-proto/damageproto |
158 |
x11-proto/xineramaproto" |
159 |
|
160 |
src_prepare() { |
161 |
|
162 |
use kde4 && epatch "${FILESDIR}/${P}-framesvg.patch" |
163 |
use gnome || { |
164 |
epatch "${FILESDIR}"/${PN}-no-gconf.patch |
165 |
ln -s "${ROOT}"/usr/share/aclocal/gconf-2.m4 acinclude.m4 |
166 |
|
167 |
# required to apply the above patch |
168 |
intltoolize --copy --force || die "intltoolize failed" |
169 |
eautoreconf || die "eautoreconf failed" |
170 |
} |
171 |
} |
172 |
|
173 |
src_configure() { |
174 |
econf \ |
175 |
--disable-gnome-keybindings \ |
176 |
--enable-librsvg \ |
177 |
--with-default-plugins \ |
178 |
$(use_enable cairo annotate) \ |
179 |
$(use_enable dbus) \ |
180 |
$(use_enable dbus dbus-glib) \ |
181 |
$(use_enable fuse) \ |
182 |
$(use_enable gnome) \ |
183 |
$(use_enable gnome gconf) \ |
184 |
$(use_enable gnome metacity) \ |
185 |
$(use_enable gtk) \ |
186 |
$(use_enable kde) \ |
187 |
$(use_enable kde4) \ |
188 |
|| die "econf failed" |
189 |
} |
190 |
|
191 |
src_install() { |
192 |
emake DESTDIR="${D}" install || die "emake install failed" |
193 |
|
194 |
# Install compiz-manager |
195 |
dobin "${FILESDIR}/compiz-manager" || die "dobin failed" |
196 |
|
197 |
# Add the full-path to lspci |
198 |
sed -i "s#lspci#/usr/sbin/lspci#" "${D}/usr/bin/compiz-manager" |
199 |
|
200 |
# Fix the hardcoded lib paths |
201 |
sed -i "s#/lib/#/$(get_libdir)/#g" "${D}/usr/bin/compiz-manager" |
202 |
|
203 |
# Create gentoo's config file |
204 |
dodir /etc/xdg/compiz |
205 |
|
206 |
cat <<- EOF > "${D}/etc/xdg/compiz/compiz-manager" |
207 |
COMPIZ_BIN_PATH="/usr/bin/" |
208 |
PLUGIN_PATH="/usr/$(get_libdir)/compiz/" |
209 |
LIBGL_NVIDIA="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" |
210 |
LIBGL_FGLRX="/usr/$(get_libdir)/opengl/xorg-x11/libGL.so.1.2" |
211 |
KWIN="$(type -p kwin)" |
212 |
METACITY="$(type -p metacity)" |
213 |
SKIP_CHECKS="yes" |
214 |
EOF |
215 |
|
216 |
dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed" |
217 |
} |
218 |
|
219 |
pkg_postinst() { |
220 |
use gnome && gnome2_gconf_install |
221 |
|
222 |
ewarn "If you update to x11-wm/metacity-2.24 after you install ${P}," |
223 |
ewarn "gtk-window-decorator will crash until you reinstall ${PN} again." |
224 |
} |
225 |
|
226 |
pkg_prerm() { |
227 |
use gnome && gnome2_gconf_uninstall |
228 |
} |