← Back to team overview

compiz team mailing list archive

[Merge] lp:~sil2100/libcompizconfig-backend-gconf/release into lp:~compiz/libcompizconfig-backend-gconf/ubuntu

 

Łukasz Zemczak has proposed merging lp:~sil2100/libcompizconfig-backend-gconf/release into lp:~compiz/libcompizconfig-backend-gconf/ubuntu.

Requested reviews:
  compiz packagers (compiz)

For more details, see:
https://code.launchpad.net/~sil2100/libcompizconfig-backend-gconf/release/+merge/98620

Cherry picked a recent fix from lp:compiz-compizconfig-gconf (LP: #953214).
-- 
https://code.launchpad.net/~sil2100/libcompizconfig-backend-gconf/release/+merge/98620
Your team compiz packagers is requested to review the proposed merge of lp:~sil2100/libcompizconfig-backend-gconf/release into lp:~compiz/libcompizconfig-backend-gconf/ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-23 21:30:00 +0000
+++ debian/changelog	2012-03-21 12:28:17 +0000
@@ -1,3 +1,11 @@
+compizconfig-backend-gconf (0.9.5.92-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/fix_953214.patch
+    - Cherry-picked the patch for fixing SEGFAULTS in Glib::Source::prepare_vfunc()
+      (LP: #953214)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@xxxxxxxxxxxxx>  Mon, 19 Mar 2012 19:14:10 +0100
+
 compizconfig-backend-gconf (0.9.5.92-0ubuntu2) oneiric; urgency=low
 
   * debian/control: require the current libcompizconfig

=== added file 'debian/patches/fix_953214.patch'
--- debian/patches/fix_953214.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_953214.patch	2012-03-21 12:28:17 +0000
@@ -0,0 +1,21 @@
+=== modified file 'src/gconf.c'
+--- src/gconf.c	2011-09-09 09:33:52 +0000
++++ src/gconf.c	2012-03-19 18:18:20 +0000
+@@ -1958,8 +1958,6 @@
+ static Bool
+ finiBackend (CCSContext * context)
+ {
+-    processEvents (0);
+-
+     gconf_client_clear_cache (client);
+     finiClient ();
+ 
+@@ -1972,7 +1970,6 @@
+     gconf_engine_unref (conf);
+     conf = NULL;
+ 
+-    processEvents (0);
+     return TRUE;
+ }
+ 
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-07-18 18:11:50 +0000
+++ debian/patches/series	2012-03-21 12:28:17 +0000
@@ -1,1 +1,2 @@
 01_add_transition_gconf.patch
+fix_953214.patch


Follow ups