← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libiscwt-java/trusty

« back to all changes in this revision

Viewing changes to debian/patches/java7-compat.patch

  • Committer: Package Import Robot
  • Author(s): ShuxiongYe, Miguel Landaeta, James Page, ShuxiongYe
  • Date: 2013-07-05 18:59:40 UTC
  • Revision ID: package-import@ubuntu.com-20130705185940-xxf5x7yj3ed930aa
Tags: 5.3.20100629-3
http://bugs.debian.org/678032
https://launchpad.net/bugs/888963
[ Miguel Landaeta ]
* Team upload.
* Bump Standards-Version to 3.9.4. No changes were required.
* Fix vcs-field-not-canonical lintian warning.
* Fix extended-description-is-probably-too-short lintian warning.
* Fix needless-dependency-on-jre lintian warning.

[ James Page ]
* Fix FTBFS with openjdk-7 as default-jdk (LP: #888963) (Closes: 678032):
  - d/patches/java7-compat.patch: Update usage of FontManager for
    Java 7.

[ ShuxiongYe ]
* Compatible with both openjdk-6 and openjdk-7
  - debian/patch/java6andjava7-compat.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/java7-compat.patch
 
1
Description: Compatibility patch for Java 7
 
2
Origin: http://sourceforge.net/projects/jpodrenderer/forums/forum/841333/topic/5320298
 
3
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libiscwt-java/+bug/888963
 
4
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678032
 
5
 
 
6
--- a/src/de/intarsys/cwt/font/FontEnvironment.java     2010-06-25 02:47:34.000000000 -0430
 
7
+++ b/src/de/intarsys/cwt/font/FontEnvironment.java     2012-08-14 21:21:18.000000000 -0430
 
8
@@ -102,7 +102,7 @@
 
9
                String definition = null;
 
10
                // force FontManager initialization
 
11
                Font.decode("dummy").getFamily(); //$NON-NLS-1$
 
12
-               definition = FontManager.getFontPath(true);
 
13
+               definition = sun.font.SunFontManager.getInstance().getPlatformFontPath(true);
 
14
                if (definition == null) {
 
15
                        return new File[0];
 
16
                }