================================
gnome-volume-manager:source=1.5.7-0.1 (previous: 1.5.3-0.1)
cvc rdiff gnome-volume-manager -1 /[EMAIL PROTECTED]:devel//[EMAIL 
PROTECTED]:desktop/1.5.7-0.1
================================
1.5.7-0.1 Gil Hamlin ([EMAIL PROTECTED]) Sun Jan  8 08:36:11 2006
    Update to 1.5.7 - new patch
    
gnome-volume-manager.recipe: changed
Index: gnome-volume-manager.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- gnome-volume-manager.recipe /[EMAIL PROTECTED]:devel//[EMAIL 
PROTECTED]:desktop/1.5.3-0.1
+++ gnome-volume-manager.recipe /[EMAIL PROTECTED]:devel//[EMAIL 
PROTECTED]:desktop/1.5.7-0.1
@@ -10,24 +10,30 @@
                'pango:devel', 'popt:devel' ])
 
     name = 'gnome-volume-manager'
-    version = '1.5.3'
+    version = '1.5.7'
 
     #externalArchive = 
'http://primates.ximian.com/~fejj/gvm/%(name)s-%(version)s.tar.gz'
         
     def unpack(r):
        GnomePackageRecipe.unpack(r)
        r.extraConfig += ' --with-mount-command="/usr/bin/pmount-hal %%h; 
/usr/bin/pmount %%d" --with-unmount-command="/usr/bin/pumount %%d"'
+        r.macros.optflags = '-g -Os'
 
        r.addPatch('defaults.patch')
         r.addPatch('gnome-volume-manager-0.9.10.add-to-base.patch', level=1)
        #r.addPatch('multiseat.patch')
        #r.addPatch('01_fix_nonmountable_media.patch')
        #r.addPatch('03_kernel_hint.patch')
-       r.addPatch('04_reconnect_on_dbus_exit.patch')
+
+        #Removed by Gil - any alternative available? :
+       #r.addPatch('04_reconnect_on_dbus_exit.patch')
+
        r.addPatch('05_mount_at_start.patch')
        #r.addPatch('06_pmount_crypt.patch')
        #r.addPatch('07_automount_enabled_hint.patch')
        #r.addPatch('99_autotools.patch')
+        r.addPatch('gnome-volume-manager-1.5.7-array-pointer-fix.patch', 
level=1)
+        
 
     def install(r):
        GnomePackageRecipe.install(r)


gnome-volume-manager-1.5.7.tar.bz2: new
gnome-volume-manager-1.5.7-array-pointer-fix.patch: new
--- gnome-volume-manager-1.5.7/src/manager.c.array-pointer-fix  2006-01-04 
20:38:50.000000000 -0500
+++ gnome-volume-manager-1.5.7/src/manager.c    2006-01-04 20:40:05.000000000 
-0500
@@ -1243,7 +1243,8 @@
        dbus_uint64_t size;
        int noptions = 0;
        DBusError error;
-       
+       char **poptions;
+               
        dbg ("mounting %s...\n", udi);
        
        if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi,
@@ -1261,9 +1262,10 @@
        if (size <= (256 * 1024 * 1024))
                options[noptions++] = "sync";
        options[noptions] = NULL;
-       
+
+       poptions = options;
        if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, 
DBUS_TYPE_STRING, &fstype,
-                                      DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, 
&options, noptions,
+                                      DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, 
&poptions, noptions,
                                       DBUS_TYPE_INVALID)) {
                dbg ("mount failed for %s: could not append args to dbus 
message\n", udi);
                dbus_message_unref (dmesg);

gnome-volume-manager-1.5.3.tar.bz2: removed

Committed by: gil
_______________________________________________
Desktop-commits mailing list
[email protected]
http://lists.bizrace.com/mailman/listinfo/desktop-commits

Reply via email to