← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to debian/patches/kaffe-cast.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2005-06-29 13:09:32 UTC
  • mfrom: (1.1.1 upstream) (0.1.2 sarge)
  • Revision ID: james.westby@ubuntu.com-20050629130932-vzt4595e7q8wtfqy
Tags: 1.2.0-1ubuntu1
Resynchronise with Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kaffe-cast.patch
1
 
diff -u subversion-1.1.0/subversion/bindings/java/javahl/native-old/CommitMessage.cpp subversion-1.1.0/subversion/bindings/java/javahl/native/CommitMessage.cpp
2
 
--- subversion-1.1.0/subversion/bindings/java/javahl/native-old/CommitMessage.cpp       2004-07-11 19:38:18.000000000 +0200
3
 
+++ subversion-1.1.0/subversion/bindings/java/javahl/native/CommitMessage.cpp   2004-10-29 11:24:09.000000000 +0200
 
1
Index: subversion/bindings/java/javahl/native/CommitMessage.cpp
 
2
===================================================================
 
3
--- subversion/bindings/java/javahl/native/CommitMessage.cpp.orig       2005-03-28 01:00:37.000000000 -0800
 
4
+++ subversion/bindings/java/javahl/native/CommitMessage.cpp    2005-06-11 08:43:42.241020748 -0700
4
5
@@ -103,7 +103,7 @@
5
6
         return NULL;
6
7
     }
10
11
     if(JNIUtil::isExceptionThrown())
11
12
     {
12
13
         return NULL;
13
 
diff -u subversion-1.1.0/subversion/bindings/java/javahl/native-old/JNIByteArray.cpp subversion-1.1.0/subversion/bindings/java/javahl/native/JNIByteArray.cpp
14
 
--- subversion-1.1.0/subversion/bindings/java/javahl/native-old/JNIByteArray.cpp        2004-06-12 17:48:55.000000000 +0200
15
 
+++ subversion-1.1.0/subversion/bindings/java/javahl/native/JNIByteArray.cpp    2004-10-29 11:35:43.000000000 +0200
 
14
Index: subversion/bindings/java/javahl/native/JNIByteArray.cpp
 
15
===================================================================
 
16
--- subversion/bindings/java/javahl/native/JNIByteArray.cpp.orig        2004-06-12 08:48:55.000000000 -0700
 
17
+++ subversion/bindings/java/javahl/native/JNIByteArray.cpp     2005-06-11 08:43:42.251020507 -0700
16
18
@@ -77,7 +77,7 @@
17
19
  */
18
20
 const signed char * JNIByteArray::getBytes()
22
24
 }
23
25
 /**
24
26
  * returns is the byte array was not set
25
 
diff -u subversion-1.1.0/subversion/bindings/java/javahl/native-old/SVNClient.cpp subversion-1.1.0/subversion/bindings/java/javahl/native/SVNClient.cpp
26
 
--- subversion-1.1.0/subversion/bindings/java/javahl/native-old/SVNClient.cpp   2004-08-09 23:58:00.000000000 +0200
27
 
+++ subversion-1.1.0/subversion/bindings/java/javahl/native/SVNClient.cpp       2004-10-29 11:45:41.000000000 +0200
28
 
@@ -168,7 +168,7 @@
 
27
Index: subversion/bindings/java/javahl/native/SVNClient.cpp
 
28
===================================================================
 
29
--- subversion/bindings/java/javahl/native/SVNClient.cpp.orig   2005-04-04 05:04:39.000000000 -0700
 
30
+++ subversion/bindings/java/javahl/native/SVNClient.cpp        2005-06-11 08:43:42.270020048 -0700
 
31
@@ -182,7 +182,7 @@
29
32
         {
30
33
             return NULL;
31
34
         }
34
37
         if(JNIUtil::isJavaExceptionThrown())
35
38
         {
36
39
             return NULL;
37
 
@@ -282,7 +282,7 @@
38
 
         {
39
 
             return NULL;
40
 
         }
41
 
-        jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
42
 
+        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
43
 
         if(JNIUtil::isJavaExceptionThrown())
44
 
         {
45
 
             return NULL;
46
 
@@ -438,7 +438,7 @@
47
 
         {
48
 
             return NULL;
49
 
         }
50
 
-        jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
51
 
+        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
52
 
         if(JNIUtil::isJavaExceptionThrown())
53
 
         {
54
 
             return NULL;
55
 
@@ -1046,7 +1046,7 @@
 
40
@@ -303,7 +303,7 @@
 
41
         {
 
42
             return NULL;
 
43
         }
 
44
-        jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
 
45
+        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
 
46
         if(JNIUtil::isJavaExceptionThrown())
 
47
         {
 
48
             return NULL;
 
49
@@ -473,7 +473,7 @@
 
50
         {
 
51
             return NULL;
 
52
         }
 
53
-        jobjectArray ret = env->NewObjectArray(size, clazz, NULL);
 
54
+        jobjectArray ret = (_jobjectArray*)env->NewObjectArray(size, clazz, NULL);
 
55
         if(JNIUtil::isJavaExceptionThrown())
 
56
         {
 
57
             return NULL;
 
58
@@ -1331,7 +1331,7 @@
56
59
         {
57
60
             return NULL;
58
61
         }
61
64
         if(JNIUtil::isJavaExceptionThrown())
62
65
         {
63
66
             return NULL;
64
 
@@ -1687,7 +1687,7 @@
 
67
@@ -2067,7 +2067,7 @@
65
68
         sorted_paths = svn_sort__hash (changed_paths,
66
69
                                      svn_sort_compare_items_as_paths, pool);
67
70