Olivier Sallou pushed to branch master at Debian Med / pixelmed
Commits:
dcc2e8d9 by Olivier Sallou at 2018-12-19T16:37:25Z
update patch to add jaxb-api to additional makefile
- - - - -
036f3840 by Olivier Sallou at 2018-12-19T16:44:37Z
move sun.misc ref to jdk.internal.ref
- - - - -
9bfe80ef by Olivier Sallou at 2018-12-19T16:57:28Z
add vecmath to classpath for compilation
- - - - -
fa5413c2 by Olivier Sallou at 2018-12-19T17:22:52Z
fix javadoc generation
- - - - -
1 changed file:
- debian/patches/jaxb-api.patch
Changes:
=====================================
debian/patches/jaxb-api.patch
=====================================
@@ -5,12 +5,45 @@ Last-Update: Wed, 19 Dec 2018 08:53:43 +0100
--- a/Makefile.common.mk
+++ b/Makefile.common.mk
-@@ -65,7 +65,7 @@ JAVACOPTIONS = -O ${JAVACTARGETOPTIONS}
+@@ -65,7 +65,7 @@
.java.class:
export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac
${JAVACOPTIONS} \
- -classpath
${PATHTOROOT}:${DICOMADDITIONALJARS}:${VIEWERADDITIONALJARS}:${FTPADDITIONALJARS}:${JUNITJAR}
\
-+ -classpath
${PATHTOROOT}:${DICOMADDITIONALJARS}:${VIEWERADDITIONALJARS}:${FTPADDITIONALJARS}:${JUNITJAR}:/usr/share/java/jaxb-api.jar
\
++ -classpath
${PATHTOROOT}:${DICOMADDITIONALJARS}:${VIEWERADDITIONALJARS}:${FTPADDITIONALJARS}:${JUNITJAR}:/usr/share/java/jaxb-api.jar:/usr/share/java/vecmath.jar
\
-sourcepath ${PATHTOROOT} $<
.png.ico:
+--- a/com/pixelmed/utils/Makefile
++++ b/com/pixelmed/utils/Makefile
+@@ -34,7 +34,7 @@
+ # override javac command in Makefile.common.mk to add jars needed for
CapabilitiesAvailable
+ .java.class:
+ export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac
${JAVACOPTIONS} \
+- -classpath ${PATHTOROOT}:${JPEGBLOCKREDACTIONJAR} \
++ -classpath
${PATHTOROOT}:${JPEGBLOCKREDACTIONJAR}:/usr/share/java/jaxb-api.jar \
+ -sourcepath ${PATHTOROOT} $<
+
+ archive:
+--- a/com/pixelmed/display/SourceImage.java
++++ b/com/pixelmed/display/SourceImage.java
+@@ -1623,7 +1623,7 @@
+ try {
+ java.lang.reflect.Method
getCleanerMethod = object.getClass().getMethod("cleaner",new Class[0]);
+
getCleanerMethod.setAccessible(true);
+- sun.misc.Cleaner cleaner =
(sun.misc.Cleaner)getCleanerMethod.invoke(object,new Object[0]);
++ jdk.internal.ref.Cleaner
cleaner = (jdk.internal.ref.Cleaner)getCleanerMethod.invoke(object,new
Object[0]);
+ cleaner.clean();
+ }
+ catch(Exception e) {
+--- a/Makefile
++++ b/Makefile
+@@ -962,7 +962,7 @@
+ javadoc:
+ rm -rf docs/javadoc
+ javadoc \
+- -classpath
.:lib/additional/commons-compress.jar:lib/additional/hsqldb.jar:lib/additional/vecmath.jar:lib/additional/commons-codec.jar:lib/additional/commons-net.jar:lib/additional/jmdns.jar:lib/additional/jpedalSTD.jar:lib/junit/junit4.jar:lib/additional/javax.json-api-1.0.jar
\
++ -classpath
.:/usr/share/java/commons-compress.jar:/usr/share/java/hsqldb.jar:/usr/share/java/vecmath.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-net.jar:/usr/share/java/jmdns.jar:lib/additional/jpedalSTD.jar:/usr/share/java/junit4.jar:/usr/share/java/javax.json-api.jar
\
+ -link http://docs.oracle.com/javase/7/docs/api/ \
+ -link http://jpedal.org/javadoc/ \
+ -link http://www.hsqldb.org/doc/src/ \
View it on GitLab:
https://salsa.debian.org/med-team/pixelmed/compare/2a1d3c418b0ac9d09d71d99166047d3d3eef708d...fa5413c202716aa54bc8d324225ca8fcb73af172
--
View it on GitLab:
https://salsa.debian.org/med-team/pixelmed/compare/2a1d3c418b0ac9d09d71d99166047d3d3eef708d...fa5413c202716aa54bc8d324225ca8fcb73af172
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
