rpms/cairo-dock/F-9 cairo-dock-1.6.0.1-rootwin-destroying.patch, NONE, 1.1 cairo-dock.spec, 1.6, 1.7

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9878/F-9

Modified Files:
	cairo-dock.spec 
Added Files:
	cairo-dock-1.6.0.1-rootwin-destroying.patch 
Log Message:
* Fri Jun 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.1-2.date20080619
- Revert XCompositeRedirectSubwindows() part in 
  cairo-dock-X-utilities.c


cairo-dock-1.6.0.1-rootwin-destroying.patch:

--- NEW FILE cairo-dock-1.6.0.1-rootwin-destroying.patch ---
Index: cairo-dock/src/cairo-dock-X-utilities.c
===================================================================
--- cairo-dock/src/cairo-dock-X-utilities.c	(revision 1112)
+++ cairo-dock/src/cairo-dock-X-utilities.c	(revision 1114)
@@ -622,6 +622,10 @@
 	else
 		return FALSE;
 	
+	int i;
+	for ( int i = 0; i < ScreenCount (s_XDisplay); i++ )
+		XCompositeRedirectSubwindows (s_XDisplay, RootWindow (s_XDisplay, i), CompositeRedirectAutomatic );  // ne fait rien si un gestionnaire de composite l'a deja fait auparavant, et est automatiquement annule a la fin du programme.
+	
 	/*int iDamageError=0;
 	if (! XDamageQueryExtension (s_XDisplay, &g_iDamageEvent, &iDamageError))
 	{


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/F-9/cairo-dock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cairo-dock.spec	19 Jun 2008 04:11:14 -0000	1.6
+++ cairo-dock.spec	19 Jun 2008 19:05:23 -0000	1.7
@@ -9,7 +9,7 @@
 %define		build_gecko	1
 
 
-%define		fedora_rel	1.date%{tarballver}
+%define		fedora_rel	2.date%{tarballver}
 
 
 %if 0%{?fedora} >= 9
@@ -29,6 +29,8 @@
 URL:		http://www.cairo-dock.org/
 Source0:	http://download.berlios.de/cairo-dock/%{name}-sources-%{tarballver}.tar.bz2
 Patch0:		cairo-dock-fix-insecure-tmpfile.patch
+# Reverse this part because this seems to be breaking rootwin
+Patch1:		cairo-dock-1.6.0.1-rootwin-destroying.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	automake
@@ -42,6 +44,7 @@
 BuildRequires:	gtk2-devel
 BuildRequires:	glitz-glx-devel
 BuildRequires:	librsvg2-devel
+BuildRequires:	libXcomposite-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libXtst-devel
 BuildRequires:	perl(XML::Parser)
@@ -133,6 +136,7 @@
 #pushd opt/cairo-dock/trunk/cairo-dock
 pushd .
 %patch0 -p1 -b .tmpuse
+%patch1 -p1 -b .rootwin -R
 
 # A. main
 cd cairo-dock
@@ -209,7 +213,7 @@
 
 # gnome-integration: needs F-9+
 %if 0%{?fedora} < 9
-Subdirs="${Subdirs_2} gnome-integration"
+Subdirs="${Subdirs} gnome-integration"
 %endif
 
 # Register Subdirs
@@ -502,6 +506,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri Jun 20 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.1-2.date20080619
+- Revert XCompositeRedirectSubwindows() part in 
+  cairo-dock-X-utilities.c
+
 * Thu Jun 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.0.1-1.date20080619
 - 1.6.0.1