rpms/compiz/F-12 compiz-0.8.2-unloadpluginfix.patch, NONE, 1.1 compiz-0.8.2-wall.patch, 1.3, 1.4 compiz.spec, 1.187, 1.188

[drago01]

Author: drago01

Update of /cvs/pkgs/rpms/compiz/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3589

Modified Files:
	compiz-0.8.2-wall.patch compiz.spec 
Added Files:
	compiz-0.8.2-unloadpluginfix.patch 
Log Message:
fix crash

compiz-0.8.2-unloadpluginfix.patch:
 gconf.c |    2 ++
 glib.c  |    2 ++
 2 files changed, 4 insertions(+)

--- NEW FILE compiz-0.8.2-unloadpluginfix.patch ---
diff -upNr compiz-0.8.2.orign/plugins/gconf.c compiz-0.8.2/plugins/gconf.c
--- compiz-0.8.2.orign/plugins/gconf.c	2009-02-15 10:10:23.000000000 +0100
+++ compiz-0.8.2/plugins/gconf.c	2009-11-30 16:48:44.694223679 +0100
@@ -802,6 +802,8 @@ gconfFiniObject (CompPlugin *p,
 static Bool
 gconfInit (CompPlugin *p)
 {
+    dlopen ("libgconf-2.so.4", RTLD_LAZY);
+
     if (!compInitPluginMetadataFromInfo (&gconfMetadata, p->vTable->name,
 					 0, 0, 0, 0))
 	return FALSE;
diff -upNr compiz-0.8.2.orign/plugins/glib.c compiz-0.8.2/plugins/glib.c
--- compiz-0.8.2.orign/plugins/glib.c	2009-02-15 10:10:23.000000000 +0100
+++ compiz-0.8.2/plugins/glib.c	2009-11-30 16:50:01.246415814 +0100
@@ -192,6 +192,8 @@ glibInitDisplay (CompPlugin  *p,
 {
     GLibDisplay *gd;
 
+    dlopen ("libglib-2.0.so.0", RTLD_LAZY);
+
     if (!checkPluginABI ("core", CORE_ABIVERSION))
 	return FALSE;
 

compiz-0.8.2-wall.patch:
 metadata/Makefile.am   |    1 
 metadata/wall.xml.in   |  357 +++++++
 plugins/Makefile.am    |    7 
 plugins/wall.c         | 2216 +++++++++++++++++++++++++++++++++++++++++++++++++
 plugins/wall_options.c | 1936 ++++++++++++++++++++++++++++++++++++++++++
 plugins/wall_options.h |  375 ++++++++
 6 files changed, 4891 insertions(+), 1 deletion(-)

Index: compiz-0.8.2-wall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz-0.8.2-wall.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- compiz-0.8.2-wall.patch	11 Jul 2009 08:37:25 -0000	1.3
+++ compiz-0.8.2-wall.patch	30 Nov 2009 15:57:14 -0000	1.4
@@ -2591,6 +2591,7 @@ diff -upNr compiz-0.8.2.orign/plugins/wa
 +static Bool
 +wallInit (CompPlugin *p)
 +{
++   dlopen ("libcairo.so.2", RTLD_LAZY);
 +    WallCorePrivateIndex = allocateCorePrivateIndex ();
 +    if (WallCorePrivateIndex < 0)
 +	return FALSE;


Index: compiz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/compiz/F-12/compiz.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -p -r1.187 -r1.188
--- compiz.spec	30 Oct 2009 08:22:44 -0000	1.187
+++ compiz.spec	30 Nov 2009 15:57:14 -0000	1.188
@@ -13,7 +13,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.2
-Release:        19%{?dist}
+Release:        20%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -73,6 +73,8 @@ Patch127: unknown-key.patch
 
 Patch128: compiz-0.8.2-keybinding-lables.patch
 
+Patch129: compiz-0.8.2-unloadpluginfix.patch
+
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
 managers for the X Window System. The integration allows it to perform
@@ -143,6 +145,7 @@ and other kde integration related stuff.
 %patch126 -p1 -b .gconf
 %patch127 -p1 -b .unknown-key
 %patch128 -p1 -b .keybinding-lables
+%patch129 -p1 -b .unload-plugin
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -321,6 +324,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 30 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-20
+- Fix unloading of certain plugins resulting into a crash
+- RH #531714
+
 * Fri Oct 30 2009 Adel Gadllah <adel.gadllah at gmail.com> - 0.8.2-17
 - Use better lables for keybindings