diff -u openjdk-7-7~u3-2.1.1~pre1/debian/control openjdk-7-7~u3-2.1.1~pre1/debian/control --- openjdk-7-7~u3-2.1.1~pre1/debian/control +++ openjdk-7-7~u3-2.1.1~pre1/debian/control @@ -1,7 +1,8 @@ Source: openjdk-7 Section: java Priority: optional -Maintainer: OpenJDK Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: OpenJDK Team Uploaders: Torsten Werner , Matthias Klose , Damien Raude-Morvan Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, fastjar (>= 2:0.96-0ubuntu2), autoconf, automake, autotools-dev, ant, ant-optional, libtool, libtool, g++-4.6, ecj-gcj [alpha amd64 armel armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64], gcj-jdk [alpha amd64 armel armhf hppa i386 ia64 lpia powerpc powerpcspe ppc64 m68k mips mipsel sh4 sparc sparc64 s390 s390x kfreebsd-i386 kfreebsd-amd64], libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libfreetype6-dev (>= 2.2.1), libgtk2.0-dev, libxinerama-dev, xsltproc, librhino-java (>= 1.7R3~), fonts-ipafont-mincho, libffi-dev, zlib1g-dev, libattr1-dev, libpng-dev, libjpeg8-dev, libgif-dev, libpulse-dev (>= 0.9.12), libnss3-dev (>= 3.12.9+ckbi-1.82-0ubuntu4), mauve, xvfb, xauth, xfonts-base, libgl1-mesa-dri, metacity | twm, dbus-x11, x11-xkb-utils, Standards-Version: 3.9.3 diff -u openjdk-7-7~u3-2.1.1~pre1/debian/control.in openjdk-7-7~u3-2.1.1~pre1/debian/control.in --- openjdk-7-7~u3-2.1.1~pre1/debian/control.in +++ openjdk-7-7~u3-2.1.1~pre1/debian/control.in @@ -1,7 +1,8 @@ Source: @basename@ Section: java Priority: optional -Maintainer: OpenJDK Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: OpenJDK Team Uploaders: Torsten Werner , Matthias Klose , Damien Raude-Morvan Build-Depends: debhelper (>= 5), binutils-dev [armel armhf], m4, lsb-release, wget, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, time, wdiff, @bd_fastjar@ @bd_compress@ @bd_autotools@ @bd_ant@ @bd_cacao@ @bd_jamvm@ @bd_gcc@ @bd_bootstrap@ @bd_openjdk@ @bd_zero@ @bd_shark@ @bd_syslibs@ @bd_pulsejava@ @bd_nss@ @bd_systemtap@ @bd_mauve@ @bd_xvfb@ Standards-Version: 3.9.3 diff -u openjdk-7-7~u3-2.1.1~pre1/debian/rules openjdk-7-7~u3-2.1.1~pre1/debian/rules --- openjdk-7-7~u3-2.1.1~pre1/debian/rules +++ openjdk-7-7~u3-2.1.1~pre1/debian/rules @@ -368,6 +368,7 @@ debian/patches/hotspot-s390.diff \ debian/patches/s390_hotspot_fix.diff \ debian/patches/hotspot-sparc.diff \ + debian/patches/icc_loading_with_symlink.diff \ debian/patches/hotspot-sparc-arch.diff \ debian/patches/sparc-trapsfix.patch \ debian/patches/sparc-stubgenerator.diff \ diff -u openjdk-7-7~u3-2.1.1~pre1/debian/changelog openjdk-7-7~u3-2.1.1~pre1/debian/changelog --- openjdk-7-7~u3-2.1.1~pre1/debian/changelog +++ openjdk-7-7~u3-2.1.1~pre1/debian/changelog @@ -1,3 +1,10 @@ +openjdk-7 (7~u3-2.1.1~pre1-1ubuntu4) quantal; urgency=low + + * Cherry picked patch from openjdk-6 to fix handling of + ICC profiles (LP: #888123, #888129). + + -- James Page Wed, 30 May 2012 16:55:20 +0100 + openjdk-7 (7~u3-2.1.1~pre1-1ubuntu3) precise-proposed; urgency=low * Default to the ARM assembler interpreter instead to JamVM on only in patch2: unchanged: --- openjdk-7-7~u3-2.1.1~pre1.orig/debian/patches/icc_loading_with_symlink.diff +++ openjdk-7-7~u3-2.1.1~pre1/debian/patches/icc_loading_with_symlink.diff @@ -0,0 +1,37 @@ +Description: Allow loading of ICC profiles when jre/lib/cmm is a + symlink by disabling call to isChildOf(f, dir) in getStandardProfileFile + and getProfileFile methods. + . + isChildOf method try to ensures f.getCanonicalPath start with + dir.getCanonicalPath but, on openjdk-6, dir.getCanonicalPath + will resolve to realpath and so won't match. + . + It should fix "Cannot open file sRGB.pf" errors. +Author: Damien Raude-Morvan +Last-Update: 2012-05-18 +Bug-Debian: http://bugs.debian.org/641530 +Forwarded: not-yet + +Index: openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java +=================================================================== +--- openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java.orig ++++ openjdk/jdk/src/share/classes/java/awt/color/ICC_Profile.java +@@ -1821,9 +1821,6 @@ + dir = st.nextToken(); + fullPath = dir + File.separatorChar + fileName; + f = new File(fullPath); +- if (!isChildOf(f, dir)) { +- f = null; +- } + } + } + +@@ -1860,7 +1857,7 @@ + File.separatorChar + "lib" + File.separatorChar + "cmm"; + String fullPath = dir + File.separatorChar + fileName; + File f = new File(fullPath); +- return (f.isFile() && isChildOf(f, dir)) ? f : null; ++ return (f.isFile()) ? f : null; + } + + /**