Author: malat
Date: 2013-04-25 08:21:39 +0000 (Thu, 25 Apr 2013)
New Revision: 13409
Added:
trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
Modified:
trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Target java 1.7
Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series 2013-04-25 06:34:17 UTC
(rev 13408)
+++ trunk/packages/pixelmed/trunk/debian/patches/series 2013-04-25 08:21:39 UTC
(rev 13409)
@@ -8,3 +8,4 @@
addmanifest.patch
fixfonts.patch
removetest.patch
+target_java_1.7.patch
Added: trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
(rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch
2013-04-25 08:21:39 UTC (rev 13409)
@@ -0,0 +1,46 @@
+Description: Update java to use version 1.7 instead of 1.5.
+This patch updates the Makefiles to use Java 1.7. This fixes some issues
+but causes an issue in com.pixelmed.display.ApplicationFrame. This issue
+is due to a deprecated library to be used when writing and encoding files.
+This has been updated to use the ImageIO library.
+
+Author: Chris J Arges <chris.j.ar...@canonical.com>
+Bug-Ubuntu: https://launchpad.net/bugs/888993
+Last-Update: 2012-06-28
+
+---
+
+Index: pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java
+===================================================================
+--- pixelmed-20130220.orig/com/pixelmed/display/ApplicationFrame.java
2013-04-25 10:18:12.000000000 +0200
++++ pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java
2013-04-25 10:18:23.521821760 +0200
+@@ -9,6 +9,7 @@
+ import java.awt.event.*;
+ import java.util.*;
+ import java.io.*;
++import javax.imageio.*;
+ import javax.swing.*;
+ import javax.swing.event.*;
+
+@@ -163,7 +164,7 @@
+ try {
+ snapShotFile = File.createTempFile("snap",".jpg",new
File(System.getProperty("user.home")));
+ java.awt.image.BufferedImage snapShotImage = new
Robot().createScreenCapture(extent);
+-
com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(new
FileOutputStream(snapShotFile)).encode(snapShotImage);
++ ImageIO.write(snapShotImage, "jpeg", snapShotFile);
+ }
+ catch (Exception ex) {
+ ex.printStackTrace();
+Index: pixelmed-20130220/Makefile.common.mk
+===================================================================
+--- pixelmed-20130220.orig/Makefile.common.mk 2013-04-25 10:18:10.000000000
+0200
++++ pixelmed-20130220/Makefile.common.mk 2013-04-25 10:20:10.789820553
+0200
+@@ -41,7 +41,7 @@
+
+ SERVERADDITIONALJARS = ${VIEWERADDITIONALJARS}
+
+-JAVAVERSIONTARGET=1.5
++JAVAVERSIONTARGET=1.7
+
+ JAVACTARGETOPTIONS=-target ${JAVAVERSIONTARGET} -source ${JAVAVERSIONTARGET}
+
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
