Sat Jun 16 00:01:25 UTC 2012

2 files changed, 34 insertions, 21 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 8d4259c1a..9148b09f6 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160627 2012-06-02 21:15:26Z andyrtr $
+# $Id: PKGBUILD 161798 2012-06-14 14:46:00Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Guillaume ALAUX <guillaume@archlinux.org>
@@ -7,20 +7,20 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src')
  # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
 pkgbase=java7-openjdk
 _java_ver=7
-_updatever=u4
+_updatever=u5
 _openjdk_build=b21
 _openjdk_date=27_jun_2011
-_icedtea_ver=2.2
+_icedtea_ver=2.2.1
 _date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=3231f3e9c517
-_HOTSPOT_CHANGESET=bfe5efd70bce
-_JAXP_CHANGESET=0036fe6fe7dc
-_JAXWS_CHANGESET=abfb890c262a
-_JDK_CHANGESET=839d0155f7cc
-_LANGTOOLS_CHANGESET=f855bdb37537
-_OPENJDK_CHANGESET=49a6fc8f712f
+_CORBA_CHANGESET=38deb372c569
+_HOTSPOT_CHANGESET=889dffcf4a54
+_JAXP_CHANGESET=335fb0b059b7
+_JAXWS_CHANGESET=5471e01ef43b
+_JDK_CHANGESET=6c3b742b735d
+_LANGTOOLS_CHANGESET=beea46c7086b
+_OPENJDK_CHANGESET=0b776ef59474
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -50,23 +50,25 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         fix_corba_cmds_path.diff
         openjdk7_fix_jdk_cmds_path.diff
         openjdk7_nonreparenting-wm.diff
+        disable_Werror.diff
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5'
-            '9a5e9342111263f76aae4b86ac38e912b60cd81fb49943c3868c8f63e2e21130'
-            '26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54'
-            '9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274'
-            '245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2'
-            'e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a'
-            '19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7'
-            'd46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19'
-            '86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514'
+sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6'
+            '0c987bff8e490a57d1e16e328a54665073ef920166342a0a08e5593aa20cd215'
+            '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe'
+            'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93'
+            'ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd'
+            '1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d'
+            '48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e'
+            '17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb'
+            'b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
             'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
+            'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
             '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
             'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
@@ -93,7 +95,7 @@ build() {
   # default is to build with first found java-environment found in our repos - is jdk7-openjdk
   [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
   
-  unset MAKEFLAGS # parallel build is currently broken 
+#  unset MAKEFLAGS # parallel build is currently broken 
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -101,7 +103,7 @@ build() {
   . /etc/profile.d/apache-ant.sh
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/disable_Werror.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
diff --git a/extra/java7-openjdk/disable_Werror.diff b/extra/java7-openjdk/disable_Werror.diff
new file mode 100644
index 000000000..fa8887a10
--- /dev/null
+++ b/extra/java7-openjdk/disable_Werror.diff
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make	2012-06-07 16:30:51.000000000 +0200
++++ openjdk/hotspot/make/linux/makefiles/gcc.make.new	2012-06-14 15:32:44.967695139 +0200
+@@ -150,7 +150,7 @@
+ endif
+ 
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++#WARNINGS_ARE_ERRORS = -Werror
+ 
+ # Except for a few acceptable ones
+ # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit