This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository camljava.
commit bf93f04f5e1a7e46665f0aecaebb8d24b51e1ac6
Author: Stephane Glondu <st...@glondu.net>
Date: Tue Jul 18 09:32:23 2017 +0200
Refresh patches
---
debian/patches/0001-ldflags-for-recent-JDK.patch | 7 +++----
debian/patches/0002-Makefile-misc-fixes.patch | 9 ++++-----
debian/patches/0003-GC-global-reference-fix-for-JDK-1.6.patch | 7 +++----
.../0004-enforce-callback-invocation-from-main-thread.patch | 7 +++----
.../patches/0005-debugging-facility-for-Java-exceptions.patch | 9 ++++-----
.../0006-ability-to-inhibit-automatic-string-convertion.patch | 11 +++++------
debian/patches/05cd8336a76065cd89474d339d555abdade1a299.patch | 5 ++---
debian/patches/series | 2 +-
8 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/debian/patches/0001-ldflags-for-recent-JDK.patch
b/debian/patches/0001-ldflags-for-recent-JDK.patch
index 72b44c7..be01146 100644
--- a/debian/patches/0001-ldflags-for-recent-JDK.patch
+++ b/debian/patches/0001-ldflags-for-recent-JDK.patch
@@ -1,10 +1,10 @@
From: Stefano Zacchiroli <z...@upsilon.cc>
Date: Thu, 26 Nov 2009 13:55:49 +0100
-Subject: [PATCH] ldflags for recent JDK
+Subject: ldflags for recent JDK
---
- Makefile.config | 17 ++++++++++++-----
- 1 files changed, 12 insertions(+), 5 deletions(-)
+ Makefile.config | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/Makefile.config b/Makefile.config
index 5cd82d8..133cd2d 100644
@@ -41,4 +41,3 @@ index 5cd82d8..133cd2d 100644
# Additional options when compiling the OCaml-JNI C stubs.
# -DJDK122_LINUX_HACK works around a nasty thread-related bug of
---
diff --git a/debian/patches/0002-Makefile-misc-fixes.patch
b/debian/patches/0002-Makefile-misc-fixes.patch
index 12499eb..a0582e6 100644
--- a/debian/patches/0002-Makefile-misc-fixes.patch
+++ b/debian/patches/0002-Makefile-misc-fixes.patch
@@ -1,13 +1,13 @@
From: Stefano Zacchiroli <z...@upsilon.cc>
Date: Thu, 26 Nov 2009 14:01:59 +0100
-Subject: [PATCH] Makefile misc fixes
+Subject: Makefile misc fixes
- ensure files created during build are removed upon clean
- split byte/opt targets to ease build and install on non-native archs
---
- Makefile | 2 ++
- lib/Makefile | 5 +++--
- test/Makefile | 3 ++-
+ Makefile | 2 ++
+ lib/Makefile | 5 +++--
+ test/Makefile | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -66,4 +66,3 @@ index 78eca4c..2e1be64 100644
clean::
rm -f *.cm?
+ rm -f *.class
---
diff --git a/debian/patches/0003-GC-global-reference-fix-for-JDK-1.6.patch
b/debian/patches/0003-GC-global-reference-fix-for-JDK-1.6.patch
index cd7cec5..5520f52 100644
--- a/debian/patches/0003-GC-global-reference-fix-for-JDK-1.6.patch
+++ b/debian/patches/0003-GC-global-reference-fix-for-JDK-1.6.patch
@@ -1,6 +1,6 @@
From: Gregoire Henry <gregoire.he...@pps.jussieu.fr>
Date: Thu, 26 Nov 2009 14:15:43 +0100
-Subject: [PATCH] GC global reference fix for JDK 1.6
+Subject: GC global reference fix for JDK 1.6
Starting from JDK 1.6, local references might be cleaned up by the Garbage
Collector at the end of native methods. Since classes representing OCaml types
@@ -9,8 +9,8 @@ be collected.
This fix turns references to OCaml type classes into global references.
---
- lib/jnistubs.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ lib/jnistubs.c | 1 +
+ 1 file changed, 1 insertion(+)
diff --git a/lib/jnistubs.c b/lib/jnistubs.c
index 368c03e..5d6b92e 100644
@@ -24,4 +24,3 @@ index 368c03e..5d6b92e 100644
if (cls == NULL) return -1; \
fld = (*env)->GetFieldID(env, cls, "contents", fsig); \
if (fld == NULL) return -1;
---
diff --git
a/debian/patches/0004-enforce-callback-invocation-from-main-thread.patch
b/debian/patches/0004-enforce-callback-invocation-from-main-thread.patch
index 7db57d7..ce27f8c 100644
--- a/debian/patches/0004-enforce-callback-invocation-from-main-thread.patch
+++ b/debian/patches/0004-enforce-callback-invocation-from-main-thread.patch
@@ -1,12 +1,12 @@
From: Gregoire Henry <gregoire.he...@pps.jussieu.fr>
Date: Thu, 26 Nov 2009 18:00:50 +0100
-Subject: [PATCH] enforce callback invocation from main thread
+Subject: enforce callback invocation from main thread
ensure that all callbacks are executed from the main thread
(patch from O'Jacare)
---
- lib/jnistubs.c | 22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ lib/jnistubs.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
diff --git a/lib/jnistubs.c b/lib/jnistubs.c
index 5d6b92e..e1659f8 100644
@@ -55,4 +55,3 @@ index 5d6b92e..e1659f8 100644
if (!caml_classes_initialized) {
if (init_caml_classes(env) == -1) return -1;
caml_classes_initialized = 1;
---
diff --git a/debian/patches/0005-debugging-facility-for-Java-exceptions.patch
b/debian/patches/0005-debugging-facility-for-Java-exceptions.patch
index f54d37a..4077c34 100644
--- a/debian/patches/0005-debugging-facility-for-Java-exceptions.patch
+++ b/debian/patches/0005-debugging-facility-for-Java-exceptions.patch
@@ -1,12 +1,12 @@
From: Gregoire Henry <gregoire.he...@pps.jussieu.fr>
Date: Sat, 28 Nov 2009 10:15:23 +0100
-Subject: [PATCH] debugging facility for Java exceptions
+Subject: debugging facility for Java exceptions
debugging is togglable at runtime, without needing to recompile CamlJava
---
- lib/jni.mli | 2 ++
- lib/jni.mlp | 2 ++
- lib/jnistubs.c | 15 +++++++++++----
+ lib/jni.mli | 2 ++
+ lib/jni.mlp | 2 ++
+ lib/jnistubs.c | 15 +++++++++++----
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/jni.mli b/lib/jni.mli
@@ -68,4 +68,3 @@ index e1659f8..27ff365 100644
(*jenv)->ExceptionClear(jenv);
/* TODO: check Caml exception embedded into Java exception */
if (camljava_raise_exception == NULL) {
---
diff --git
a/debian/patches/0006-ability-to-inhibit-automatic-string-convertion.patch
b/debian/patches/0006-ability-to-inhibit-automatic-string-convertion.patch
index d1c6f35..28bcba8 100644
--- a/debian/patches/0006-ability-to-inhibit-automatic-string-convertion.patch
+++ b/debian/patches/0006-ability-to-inhibit-automatic-string-convertion.patch
@@ -1,6 +1,6 @@
From: Stefano Zacchiroli <z...@upsilon.cc>
Date: Sat, 28 Nov 2009 10:38:01 +0100
-Subject: [PATCH] ability to inhibit automatic string convertion
+Subject: ability to inhibit automatic string convertion
Rationale: automatic convertion of Java string to OCaml string is not always
desirable (e.g. because Java strings are real Unicode string whereas OCaml's
@@ -9,10 +9,10 @@ CamlJava users.
This ability is used by O'Jacare.
---
- lib/jni.mli | 2 ++
- lib/jni.mlp | 2 ++
- lib/jnistubs.c | 12 +++++++++++-
- 3 files changed, 15 insertions(+), 1 deletions(-)
+ lib/jni.mli | 2 ++
+ lib/jni.mlp | 2 ++
+ lib/jnistubs.c | 12 +++++++++++-
+ 3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/lib/jni.mli b/lib/jni.mli
index ad829b3..db71589 100644
@@ -70,4 +70,3 @@ index 27ff365..bfc6c9d 100644
carg = extract_java_string(env, (jstring) arg);
else
carg = alloc_jobject(arg);
---
diff --git a/debian/patches/05cd8336a76065cd89474d339d555abdade1a299.patch
b/debian/patches/05cd8336a76065cd89474d339d555abdade1a299.patch
index 0d61914..da3981a 100644
--- a/debian/patches/05cd8336a76065cd89474d339d555abdade1a299.patch
+++ b/debian/patches/05cd8336a76065cd89474d339d555abdade1a299.patch
@@ -1,7 +1,6 @@
-From 05cd8336a76065cd89474d339d555abdade1a299 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.le...@inria.fr>
Date: Wed, 28 Dec 2016 11:35:43 +0100
-Subject: [PATCH] Export the exception "Exception". Quick 2016 upgrade.
+Subject: Export the exception "Exception". Quick 2016 upgrade.
---
Changes | 6 ++++++
@@ -51,7 +50,7 @@ index 133cd2d..cdb5211 100644
# Additional link-time options to pass to $(CC) when linking with $(JNILIBS)
JNILIBOPTS=-L$(JDKHOME)/jre/lib/$(ARCH)/ \
diff --git a/lib/jni.mli b/lib/jni.mli
-index a4ebd1f..c449ae0 100644
+index db71589..8f50b71 100644
--- a/lib/jni.mli
+++ b/lib/jni.mli
@@ -28,6 +28,9 @@ exception Null_pointer
diff --git a/debian/patches/series b/debian/patches/series
index 1db8a81..21d6221 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@
0004-enforce-callback-invocation-from-main-thread.patch
0005-debugging-facility-for-Java-exceptions.patch
0006-ability-to-inhibit-automatic-string-convertion.patch
-05cd8336a76065cd89474d339d555abdade1a299.patch
\ No newline at end of file
+05cd8336a76065cd89474d339d555abdade1a299.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/camljava.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
