1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## use_libapr1.dpatch by Mirco Bauer <meebey@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs
--- monodevelop-0.18.1+dfsg~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs 2007-12-20 20:04:42.000000000 +0100
+++ monodevelop-0.18.1+dfsg/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs 2007-12-25 18:56:29.000000000 +0100
@@ -14,15 +14,6 @@
public static LibApr GetLib (int ver)
{
try {
- if (ver == 0)
- return new LibApr0 ();
- else if (ver == 1)
- return new LibApr1 ();
-
- try {
- return new LibApr0 ();
- } catch {}
-
return new LibApr1 ();
}
catch {
@@ -63,37 +54,6 @@
public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
}
- public class LibApr0: LibApr
- {
- private const string aprlib = "libapr-0.so.0";
-
- public override void initialize() { apr_initialize (); }
- public override IntPtr pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
- public override void pool_destroy(IntPtr pool) { apr_pool_destroy (pool); }
- public override IntPtr hash_first(IntPtr pool, IntPtr hash) { return apr_hash_first (pool, hash); }
- public override IntPtr hash_next(IntPtr hashindex) { return apr_hash_next(hashindex); }
- public override void hash_this(IntPtr hashindex, out IntPtr key, out int keylen, out IntPtr val) { apr_hash_this(hashindex, out key, out keylen, out val); }
- public override IntPtr array_make(IntPtr pool, int nelts, int elt_size) { return apr_array_make(pool, nelts, elt_size); }
- public override IntPtr array_push(IntPtr arr) { return apr_array_push (arr); }
- public override IntPtr pstrdup(IntPtr pool, string s) { return apr_pstrdup(pool, s); }
- public override IntPtr pcalloc (IntPtr pool, [MarshalAs (UnmanagedType.SysInt)] int size) { return apr_pcalloc (pool, size); }
- public override int file_open(ref IntPtr newf, string fname, int flag, int perm, IntPtr pool) { return apr_file_open(ref newf, fname, flag, perm, pool); }
- public override int file_close (IntPtr file) { return apr_file_close (file); }
-
- [DllImport(aprlib)] static extern void apr_initialize();
- [DllImport(aprlib)] static extern IntPtr apr_pool_create_ex(out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator);
- [DllImport(aprlib)] static extern void apr_pool_destroy(IntPtr pool);
- [DllImport(aprlib)] static extern IntPtr apr_hash_first(IntPtr pool, IntPtr hash);
- [DllImport(aprlib)] static extern IntPtr apr_hash_next(IntPtr hashindex);
- [DllImport(aprlib)] static extern void apr_hash_this(IntPtr hashindex, out IntPtr key, out int keylen, out IntPtr val);
- [DllImport(aprlib)] static extern IntPtr apr_array_make(IntPtr pool, int nelts, int elt_size);
- [DllImport(aprlib)] static extern IntPtr apr_array_push(IntPtr arr);
- [DllImport(aprlib)] static extern IntPtr apr_pstrdup(IntPtr pool, string s);
- [DllImport(aprlib)] static extern IntPtr apr_pcalloc(IntPtr pool, [MarshalAs (UnmanagedType.SysInt)] int size);
- [DllImport(aprlib)] static extern int apr_file_open(ref IntPtr newf, string fname, int flag, int perm, IntPtr pool);
- [DllImport(aprlib)] static extern int apr_file_close (IntPtr file);
- }
-
public class LibApr1: LibApr
{
private const string aprlib = "libapr-1.so.0";
|