From 7245ea2af12dbb0d9c4e86e3190fe0d153460b96 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 29 Apr 2013 20:12:27 -0400
Subject: [PATCH] Remove all patches modifying the old build system

---
 java-1.8.0-openjdk-arm-fixes.patch          | 22 --------------------
 java-1.8.0-openjdk-freetype-check-fix.patch | 22 --------------------
 java-1.8.0-openjdk-ppc-zero-corba.patch     | 15 --------------
 java-1.8.0-openjdk-ppc-zero-jdk.patch       | 14 -------------
 java-1.8.0-openjdk.spec                     | 23 ++++-----------------
 5 files changed, 4 insertions(+), 92 deletions(-)
 delete mode 100644 java-1.8.0-openjdk-arm-fixes.patch
 delete mode 100644 java-1.8.0-openjdk-freetype-check-fix.patch
 delete mode 100644 java-1.8.0-openjdk-ppc-zero-corba.patch
 delete mode 100644 java-1.8.0-openjdk-ppc-zero-jdk.patch

diff --git a/java-1.8.0-openjdk-arm-fixes.patch b/java-1.8.0-openjdk-arm-fixes.patch
deleted file mode 100644
index de6cc2f..0000000
--- a/java-1.8.0-openjdk-arm-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up jdk8/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh
---- jdk8/jdk/make/jdk_generic_profile.sh.sav	2012-02-14 16:12:48.000000000 -0500
-+++ jdk8/jdk/make/jdk_generic_profile.sh	2012-03-07 17:31:26.154840740 -0500
-@@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then
- 
-   # ZERO_ENDIANNESS is the endianness of the processor
-   case "${ZERO_LIBARCH}" in
--    i386|amd64|ia64)
-+    i386|amd64|ia64|arm)
-       ZERO_ENDIANNESS=little
-       ;;
-     ppc*|s390*|sparc*|alpha)
-@@ -307,6 +307,9 @@ if [ "${ZERO_BUILD}" = true ] ; then
-     s390)
-       ZERO_ARCHFLAG="-m31"
-       ;;
-+    arm)
-+      ZERO_ARCHFLAG="-D_LITTLE_ENDIAN"
-+      ;;
-     *)
-       ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}"
-   esac
diff --git a/java-1.8.0-openjdk-freetype-check-fix.patch b/java-1.8.0-openjdk-freetype-check-fix.patch
deleted file mode 100644
index a671cce..0000000
--- a/java-1.8.0-openjdk-freetype-check-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up jdk8/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
---- jdk8/jdk/make/common/shared/Sanity.gmk.sav	2012-02-14 16:12:48.000000000 -0500
-+++ jdk8/jdk/make/common/shared/Sanity.gmk	2012-03-07 17:31:26.153840755 -0500
-@@ -814,12 +814,12 @@ ifdef OPENJDK
- 	@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
- 	    $(ECHO) "Failed to build freetypecheck." ) > $@
- 
--    sane-freetype: $(TEMPDIR)/freetypeinfo
--	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
--	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
--	          " or higher is required. \n" \
--		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
--	fi
-+#    sane-freetype: $(TEMPDIR)/freetypeinfo
-+#	@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
-+#	  $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
-+#	          " or higher is required. \n" \
-+#		  "`$(CAT) $<`  \n" >> $(ERROR_FILE) ; \
-+#	fi
-   else
-     #do nothing  (cross-compiling)
-     sane-freetype: 
diff --git a/java-1.8.0-openjdk-ppc-zero-corba.patch b/java-1.8.0-openjdk-ppc-zero-corba.patch
deleted file mode 100644
index c5b68c8..0000000
--- a/java-1.8.0-openjdk-ppc-zero-corba.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up jdk8/corba/make/common/shared/Defs-java.gmk.ppc openjdk/corba/make/common/shared/Defs-java.gmk
---- jdk8/corba/make/common/shared/Defs-java.gmk.ppc	2012-03-24 11:44:34.450072733 +0100
-+++ jdk8/corba/make/common/shared/Defs-java.gmk	2012-03-24 11:44:53.300073137 +0100
-@@ -79,9 +79,9 @@ JAVAC_JVM_FLAGS =
- 
- # 64-bit builds require a larger thread stack size.
- ifeq ($(ARCH_DATA_MODEL), 32)
--  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
-+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1152
- else
--  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
-+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
- endif
- JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
- 
diff --git a/java-1.8.0-openjdk-ppc-zero-jdk.patch b/java-1.8.0-openjdk-ppc-zero-jdk.patch
deleted file mode 100644
index 82026a9..0000000
--- a/java-1.8.0-openjdk-ppc-zero-jdk.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- jdk8/jdk/make/common/shared/Defs-java.gmk	2012-03-23 10:56:45.000000000 -0400
-+++ jdk8/jdk/make/common/shared/Defs-java.gmk	2012-03-23 10:56:45.000000000 -0400
-@@ -83,9 +83,9 @@
- 
- # 64-bit builds require a larger thread stack size.
- ifeq ($(ARCH_DATA_MODEL), 32)
--  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=768
-+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1152
- else
--  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1536
-+  JAVAC_JVM_FLAGS    += -J-XX:ThreadStackSize=1664
- endif
- JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
- 
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 2e5abac..a755327 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -196,16 +196,10 @@ Patch100: rhino.patch
 Patch101: %{name}-bitmap.patch
 Patch102: %{name}-size_t.patch
 
-# Patches for Arm
-Patch103: %{name}-arm-fixes.patch
-
 # Patch for PPC/PPC64
-Patch104: %{name}-ppc-zero-jdk.patch
-Patch105: %{name}-ppc-zero-hotspot.patch
-Patch106: %{name}-ppc-zero-corba.patch
+Patch103: %{name}-ppc-zero-hotspot.patch
 
-Patch107: %{name}-freetype-check-fix.patch
-Patch109: disable-werror.patch
+Patch104: disable-werror.patch
 
 Patch200: system-giflib.patch
 Patch201: system-libjpeg.patch
@@ -358,7 +352,7 @@ The OpenJDK API documentation.
 cp %{SOURCE2} .
 
 # OpenJDK patches
-%patch109
+%patch104
 
 # Rhino patch
 %patch100
@@ -381,18 +375,9 @@ sh %{SOURCE12}
 %patch102
 %endif
 
-# Arm fixes
-%ifarch %{arm}
-%patch103
-%endif
-
-%patch107
-
 %ifarch ppc %{power64}
 # PPC fixes
-%patch104
-%patch105
-%patch106
+%patch103
 %endif