[compiz] - Don't rely on deprecated gdk symbol gdk_display. - Add Br libxslt-devel and dbus-devel - add patch
leigh123linux
leigh123linux at fedoraproject.org
Thu Oct 14 18:03:15 UTC 2010
commit 9bd036c7a831cea29f02e24fe3d3d0e79b5a8928
Author: leigh scott <leigh123linux at googlemail.com>
Date: Thu Oct 14 19:03:06 2010 +0100
- Don't rely on deprecated gdk symbol gdk_display.
- Add Br libxslt-devel and dbus-devel
- add patch to fix dbus build error
compiz.spec | 8 ++++++--
dbus_build.patch | 11 +++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/compiz.spec b/compiz.spec
index e09f599..c367f33 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -65,6 +65,9 @@ Patch115: compiz-0.8.6-focus-denied-stacking-fix.patch
#http://gitweb.compiz.org/?p=compiz/core;a=commit;h=5ea5e2130c56d405fcccd63932918fc49ca1f1b9
Patch116: gdk_display_deprecated.patch
+#build patch
+Patch120: dbus_build.patch
+
%description
Compiz is one of the first OpenGL-accelerated compositing window
managers for the X Window System. The integration allows it to perform
@@ -134,6 +137,7 @@ and other kde integration related stuff.
%patch114 -p1 -b .map-request
%patch115 -p1 -b .focus-denied-stacking
%patch116 -p1 -b .gdk_display_deprecated
+%patch120 -p1 -b .dbus_build
%build
rm -rf $RPM_BUILD_ROOT
@@ -149,7 +153,7 @@ libtoolize
aclocal
autoconf
automake
-%configure GTK_WINDOW_DECORATOR_CFLAGS=` -I/usr/include/dbus-1.0` \
+%configure \
--enable-gconf \
--enable-dbus \
--enable-place \
@@ -292,7 +296,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Oct 14 2010 leigh scott <leigh123linux at googlemail.com> - 0.8.6-5
- Don't rely on deprecated gdk symbol gdk_display.
- Add Br libxslt-devel and dbus-devel
-- add flag to configure command so gtk decorator builds
+- add patch to fix dbus build error
* Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.8.6-4
- Remove kde-desktop-effects.sh ("Compiz Switcher"), use System Settings instead
diff --git a/dbus_build.patch b/dbus_build.patch
new file mode 100644
index 0000000..37e9f6a
--- /dev/null
+++ b/dbus_build.patch
@@ -0,0 +1,11 @@
+--- compiz-0.8.6/gtk/Makefile.in.orig 2010-03-28 13:28:53.000000000 +0100
++++ compiz-0.8.6/gtk/Makefile.in 2010-10-14 18:53:38.634400786 +0100
+@@ -153,7 +153,7 @@ GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BIN
+ GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@
+ GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@
+ GREP = @GREP@
+-GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@
++GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ -I/usr/include/dbus-1.0
+ GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
More information about the scm-commits
mailing list