[java-1.7.0-openjdk/f20] Reverted RH661505 patch

[jiri vanek]

commit c0e5da8093cbcf3ec91673d2b4284b3b4a06e790
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date:   Fri Sep 6 15:51:14 2013 +0200

    Reverted  RH661505 patch

 RH661505-toBeReverted.patch |   38 ++++++++++++++++++++++++++++++++++++++
 java-1.7.0-openjdk.spec     |    4 ++++
 2 files changed, 42 insertions(+), 0 deletions(-)
---
diff --git a/RH661505-toBeReverted.patch b/RH661505-toBeReverted.patch
new file mode 100644
index 0000000..a3476a4
--- /dev/null
+++ b/RH661505-toBeReverted.patch
@@ -0,0 +1,38 @@
+# HG changeset patch
+# User andrew
+# Date 1378467880 -3600
+# Node ID 3372405e49a9e5cd27af64e16eb7e44539ea3339
+# Parent  b2611b1a750cf38b795d1df24c5bea9b9c246e0f
+RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
+
+diff -r b2611b1a750c -r 3372405e49a9 src/share/native/sun/awt/image/jpeg/imageioJPEG.c
+--- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Wed Sep 04 18:20:38 2013 +0100
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Fri Sep 06 12:44:40 2013 +0100
+@@ -1454,6 +1454,8 @@
+                                                     "[S");
+ }
+ 
++#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
++
+ JNIEXPORT jlong JNICALL
+ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader
+     (JNIEnv *env,
+@@ -1507,6 +1509,7 @@
+ 
+     // Set up to keep any APP2 markers, as these might contain ICC profile
+     // data
++    jpegsavemarkers(cinfo, JPEG_APP1, 0xFFFF);
+     jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
+ 
+     /*
+@@ -1569,8 +1572,6 @@
+     imageio_init_source((j_decompress_ptr) cinfo);
+ }
+ 
+-#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
+-
+ /*
+  * For EXIF images, the APP1 will appear immediately after the SOI,
+  * so it's safe to only look at the first marker in the list.
+
+
diff --git a/java-1.7.0-openjdk.spec b/java-1.7.0-openjdk.spec
index fa7db82..0161ab1 100644
--- a/java-1.7.0-openjdk.spec
+++ b/java-1.7.0-openjdk.spec
@@ -263,6 +263,7 @@ Patch401: 657854-openjdk7.patch
 Patch402: gstackbounds.patch
 Patch4020: gstackbounds-2.3.patch
 Patch403: PStack-808293.patch
+Patch404: RH661505-toBeReverted.patch
 # End of tmp patches
 
 # Temporary backport of patches already upstream but not in a icedtea7-2.3.X release yet
@@ -549,6 +550,8 @@ tar xzf %{SOURCE7}
 %patch502
 %patch503
 %patch504
+%else
+%patch404 -R
 %endif
 
 %build
@@ -1342,6 +1345,7 @@ exit 0
 - removed upstreamed patch404  aarch64.patch
 - adapted patch104 java-1.7.0-openjdk-ppc-zero-jdk.patch
 - adapted patch105 java-1.7.0-openjdk-ppc-zero-hotspot.patch
+- added patch404 RH661505-toBeReverted.patch, to be *reverted* during prep for non arm32 tarball
 - buildver bumbed to 60
 
 * Mon Sep 03 2013 Jiri Vanek <jvanek at redhat.com> - 1.7.0.25-2.4.1.4.f20