[Pkg-cli-libs-commits] r3709 - in /packages/evolution-sharp/trunk/debian: changelog patches/00list patches/fix_get_uid-crasher.dpatch

[jsogo at users.alioth.debian.org]

Author: jsogo
Date: Fri May  2 10:21:05 2008
New Revision: 3709

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3709
Log:
Patch to fix beagle crashers (#475640)

Added:
    packages/evolution-sharp/trunk/debian/patches/fix_get_uid-crasher.dpatch   (with props)
Modified:
    packages/evolution-sharp/trunk/debian/changelog
    packages/evolution-sharp/trunk/debian/patches/00list

Modified: packages/evolution-sharp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/changelog?rev=3709&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/changelog (original)
+++ packages/evolution-sharp/trunk/debian/changelog Fri May  2 10:21:05 2008
@@ -1,3 +1,17 @@
+evolution-sharp (0.17.1-2) unstable; urgency=low
+
+  * debian/patches:
+    + fix_get_uid-crasher: apply patch from SVN (r174) to fix crashes in
+    beagle-backend-evolution (Closes: #475640)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Fri, 02 May 2008 12:18:08 +0200
+
+evolution-sharp (0.17.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat, 26 Apr 2008 00:16:07 +0200
+
 evolution-sharp (0.16.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/evolution-sharp/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/patches/00list?rev=3709&op=diff
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/00list (original)
+++ packages/evolution-sharp/trunk/debian/patches/00list Fri May  2 10:21:05 2008
@@ -1,2 +1,3 @@
 evolution-sharp.pc
 fix-dllmappings
+fix_get_uid-crasher

Added: packages/evolution-sharp/trunk/debian/patches/fix_get_uid-crasher.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/evolution-sharp/trunk/debian/patches/fix_get_uid-crasher.dpatch?rev=3709&op=file
==============================================================================
--- packages/evolution-sharp/trunk/debian/patches/fix_get_uid-crasher.dpatch (added)
+++ packages/evolution-sharp/trunk/debian/patches/fix_get_uid-crasher.dpatch Fri May  2 10:21:05 2008
@@ -1,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_get_uid-crasher.dpatch by  <jose at gimli.tribulaciones.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix for bug #475640. From evolution-sharp SVN r174
+
+ at DPATCH@
+diff -urNad evolution-sharp-0.17.1~/evolution/src/CalComponent.cs evolution-sharp-0.17.1/evolution/src/CalComponent.cs
+--- evolution-sharp-0.17.1~/evolution/src/CalComponent.cs	2008-03-02 07:17:27.000000000 +0100
++++ evolution-sharp-0.17.1/evolution/src/CalComponent.cs	2008-05-02 12:14:41.000000000 +0200
+@@ -181,15 +181,17 @@
+ 		}
+ 
+ 		[DllImport("ecal")]
+-			static extern void e_cal_component_get_uid (IntPtr handle, out string uid);
++			static extern void e_cal_component_get_uid (IntPtr handle, out IntPtr uid);
+ 		[DllImport("ecal")]
+ 			static extern void e_cal_component_set_uid (IntPtr handle, string uid);
+ 		
+ 		public string Uid {
+ 			get {
+-				string uid = "";
+-				e_cal_component_get_uid (Handle, out uid);
+-				return uid;
++				IntPtr uid;
++			    	e_cal_component_get_uid (Handle, out uid);
++			    	string managed_uid = Marshal.PtrToStringAnsi (uid);
++
++			    	return managed_uid;
+ 			}
+ 			set {
+ 				e_cal_component_set_uid (Handle, value);
+@@ -271,15 +273,17 @@
+ 		}
+ 
+ 		[DllImport("ecal")]
+-			static extern void e_cal_component_get_location (IntPtr raw, out string location);
++			static extern void e_cal_component_get_location (IntPtr raw, out IntPtr location);
+ 		[DllImport("ecal")]
+ 			static extern void e_cal_component_set_location (IntPtr raw, string location);
+ 
+ 		public string Location {
+ 			get {
+-				string location = "";
++				IntPtr location;
+ 				e_cal_component_get_location (Handle, out location);
+-				return location;
++				string managed_location = Marshal.PtrToStringAnsi (location);
++
++				return managed_location;
+ 			}
+ 			set {
+ 				e_cal_component_set_location (Handle, value);

Propchange: packages/evolution-sharp/trunk/debian/patches/fix_get_uid-crasher.dpatch
------------------------------------------------------------------------------
    svn:executable = *