[patch] Patch providing header files

219959a.patch (text/plain), 7.11 KB, created by Martin von Gagern on 2008-05-02 10:13:53 UTC

Patch to provide header files for nested classes.
This is needed as javah from jdk 1.4 doesn't seem to generate these.
The patch also adds comments to the header files where these constants
originated. This ensures that the patch will fail when constants are modified.
See https://bugs.gentoo.org/show_bug.cgi?id=219959
2008-05-02 Martin von Gagern

diff -NurF class --exclude='*~' subversion-1.5.0-rc4.orig/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h subversion-1.5.0-rc4/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h
--- subversion-1.5.0-rc4.orig/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h	1970-01-01 01:00:00.000000000 +0100
+++ subversion-1.5.0-rc4/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Action.h	2008-05-02 11:54:43.000000000 +0200
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_tigris_subversion_javahl_ConflictDescriptor_Action */
+
+#ifndef _Included_org_tigris_subversion_javahl_ConflictDescriptor_Action
+#define _Included_org_tigris_subversion_javahl_ConflictDescriptor_Action
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_edit
+#define org_tigris_subversion_javahl_ConflictDescriptor_Action_edit 0L
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_add
+#define org_tigris_subversion_javahl_ConflictDescriptor_Action_add 1L
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Action_delete
+#define org_tigris_subversion_javahl_ConflictDescriptor_Action_delete 2L
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -NurF class --exclude='*~' subversion-1.5.0-rc4.orig/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Kind.h subversion-1.5.0-rc4/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Kind.h
--- subversion-1.5.0-rc4.orig/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Kind.h	1970-01-01 01:00:00.000000000 +0100
+++ subversion-1.5.0-rc4/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Kind.h	2008-05-02 11:54:43.000000000 +0200
@@ -0,0 +1,17 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_tigris_subversion_javahl_ConflictDescriptor_Kind */
+
+#ifndef _Included_org_tigris_subversion_javahl_ConflictDescriptor_Kind
+#define _Included_org_tigris_subversion_javahl_ConflictDescriptor_Kind
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Kind_text
+#define org_tigris_subversion_javahl_ConflictDescriptor_Kind_text 0L
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Kind_property
+#define org_tigris_subversion_javahl_ConflictDescriptor_Kind_property 1L
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -NurF class --exclude='*~' subversion-1.5.0-rc4.orig/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h subversion-1.5.0-rc4/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h
--- subversion-1.5.0-rc4.orig/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h	1970-01-01 01:00:00.000000000 +0100
+++ subversion-1.5.0-rc4/subversion/bindings/javahl/include/org_tigris_subversion_javahl_ConflictDescriptor_Reason.h	2008-05-02 11:54:43.000000000 +0200
@@ -0,0 +1,23 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_tigris_subversion_javahl_ConflictDescriptor_Reason */
+
+#ifndef _Included_org_tigris_subversion_javahl_ConflictDescriptor_Reason
+#define _Included_org_tigris_subversion_javahl_ConflictDescriptor_Reason
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_edited
+#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_edited 0L
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_obstructed
+#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_obstructed 1L
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_deleted
+#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_deleted 2L
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_missing
+#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_missing 3L
+#undef org_tigris_subversion_javahl_ConflictDescriptor_Reason_unversioned
+#define org_tigris_subversion_javahl_ConflictDescriptor_Reason_unversioned 4L
+#ifdef __cplusplus
+}
+#endif
+#endif
diff -NurF class --exclude='*~' subversion-1.5.0-rc4.orig/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java subversion-1.5.0-rc4/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
--- subversion-1.5.0-rc4.orig/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java	2008-05-02 11:52:21.000000000 +0200
+++ subversion-1.5.0-rc4/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java	2008-05-02 11:57:05.000000000 +0200
@@ -171,12 +171,12 @@     public final class Kind
         /**
          * Attempting to change text or props.
          */
-        public static final int text = 0;
+        public static final int text = 0; // used in native code
 
         /**
          * Attempting to add object.
          */
-        public static final int property = 1;
+        public static final int property = 1; // used in native code
     }
 
     /**
@@ -187,17 +187,17 @@     public final class Action
         /**
          * Attempting to change text or props.
          */
-        public static final int edit = 0;
+        public static final int edit = 0; // used in native code
 
         /**
          * Attempting to add object.
          */
-        public static final int add = 1;
+        public static final int add = 1; // used in native code
 
         /**
          * Attempting to delete object.
          */
-        public static final int delete = 2;
+        public static final int delete = 2; // used in native code
     }
 
     /**
@@ -208,26 +208,26 @@     public final class Reason
         /**
          * Local edits are already present.
          */
-        public static final int edited = 0;
+        public static final int edited = 0; // used in native code
 
         /**
          * Another object is in the way.
          */
-        public static final int obstructed = 1;
+        public static final int obstructed = 1; // used in native code
 
         /**
          * Object is already schedule-delete.
          */
-        public static final int deleted = 2;
+        public static final int deleted = 2; // used in native code
 
         /**
          * Object is unknown or missing.
          */
-        public static final int missing = 3;
+        public static final int missing = 3; // used in native code
 
         /**
          * Object is unversioned.
          */
-        public static final int unversioned = 4;
+        public static final int unversioned = 4; // used in native code
     }
 }