Tue Jul 9 01:22:19 PDT 2013

3 files changed, 17 insertions, 94 deletions

diff --git a/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff
deleted file mode 100644
index bb588a072..000000000
--- a/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig	2013-05-19 20:01:25.676093296 +0000
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2013-05-19 20:01:54.312572109 +0000
-@@ -98,9 +98,9 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
--CPIO           = $(UTILS_COMMAND_PATH)cpio
-+CPIO           = $(UTILS_USR_BIN_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
-@@ -108,13 +108,13 @@
- DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
- DUMP           = $(UTILS_CCS_BIN_PATH)dump
- ECHO           = $(UTILS_COMMAND_PATH)echo
--EGREP          = $(UTILS_COMMAND_PATH)egrep
-+EGREP          = $(UTILS_USR_BIN_PATH)egrep
- EXPR           = $(UTILS_USR_BIN_PATH)expr
- FILE           = $(UTILS_USR_BIN_PATH)file
- FIND           = $(UTILS_USR_BIN_PATH)find
- FMT            = $(UTILS_COMMAND_PATH)fmt
- GDB            = $(UTILS_USR_BIN_PATH)gdb
--GREP           = $(UTILS_COMMAND_PATH)grep
-+GREP           = $(UTILS_USR_BIN_PATH)grep
- GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
- # GZIP is used for solaris. Linux and windows use tar czf
- GZIP           = $(UTILS_COMMAND_PATH)gzip
-@@ -148,7 +148,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
diff --git a/extra/java7-openjdk/02_fix_corba_cmds_path.diff b/extra/java7-openjdk/02_fix_corba_cmds_path.diff
deleted file mode 100644
index 8a22e3229..000000000
--- a/extra/java7-openjdk/02_fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.orig	2013-05-19 19:57:58.530784147 +0000
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2013-05-19 19:58:44.777147938 +0000
-@@ -83,9 +83,9 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
--CPIO           = $(UTILS_COMMAND_PATH)cpio
-+CPIO           = $(UTILS_USR_BIN_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
- DATE           = $(UTILS_COMMAND_PATH)date
- DF             = $(UTILS_COMMAND_PATH)df
-@@ -131,7 +131,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -182,7 +182,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
-                    $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index a5f225cca..1b803b403 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188157 2013-06-10 20:38:57Z guillaume $
+# $Id: PKGBUILD 189830 2013-07-08 20:27:27Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -8,17 +8,17 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk'
 pkgbase=java7-openjdk
 _java_ver=7
 _updatever=u40
-_icedtea_ver=2.4.0
+_icedtea_ver=2.4.1
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_CORBA_CHANGESET=71d5ec2f3dfb
-_JAXP_CHANGESET=5eaf3bca7f68
-_JAXWS_CHANGESET=9d2007a13c02
-_JDK_CHANGESET=29ce11184945
-_LANGTOOLS_CHANGESET=ffb1b6bc4750
-_OPENJDK_CHANGESET=9c74cb4a3ae8
+_CORBA_CHANGESET=23ae4e0e0cce
+_JAXP_CHANGESET=5be6b670d08b
+_JAXWS_CHANGESET=c0e48fdfb695
+_JDK_CHANGESET=65d95818d79e
+_LANGTOOLS_CHANGESET=91c95fd8eea8
+_OPENJDK_CHANGESET=ae86c6974e8e
 
-_HOTSPOT_CHANGESET=c67fd7874b1a # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_HOTSPOT_CHANGESET=5f53e7717116 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -43,24 +43,20 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
         ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
         fontconfig-paths.diff
-        01_fix_openjdk_cmds_path.diff
-        02_fix_corba_cmds_path.diff
         openjdk7_nonreparenting-wm.diff
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('be030583f0216151bd4b67b354085bf957b532d7bd2d67f14166bb6a1fc5497a'
-            '4adfde4b056ea8f35b639156c7cad8bac140ba7957ea8ce49b440089babc6579'
-            '0191c678935dac77c0ad085bedb59e6bcc93e0712c3a4ef2b7171562e129807c'
-            '25bb13db8a426c2d84e13eed0d598c88c447af41de3f678a70680897c38083fd'
-            '4cff8300b4c23e9327607f7c09295a99ef7d1032d8397429c7879ba489d14456'
-            '13024c623bb37c4d44cb3b724876d7827924868fb8f94428faa87ddb11492352'
-            '80cbe75f7c268e97619e8007f8d29ecbbb7584062c1286c8b470f875526028f3'
-            '34e60aba6db2f7a5cac7861058db283bd1edcdd9194a5490114cf76edd71696d'
+sha256sums=('65142e19ee14c28106345b30b6181f5a4926dd20be599c536d778e31a8a5812a'
+            'f9f2925af3eac91ec4b0389b5316f840239558048569db2193b9e2ae34ffe32a'
+            '618bb237f262a4a703edb88bd873fd80fe33d7fb07b8a113bfc701227b748395'
+            'df2d15089890a7565b0dd89f867d7b2931839652d29029d63f8201358b0ecd34'
+            '972de06b968a6da85b1d9216c5617325135fc63c90ffb5e1d7721dce5843b037'
+            '97edcd78d316f33a43278c5549cb58a06f67305b63ad51b7c1a1fca7c45c6432'
+            '6ff5cdcca8184526a5928bb8ff0bcc38b897d463559cc9f2b10e439931a8f561'
+            'f2cfd6da6ff85dff4e6f5d40e21bc48cf15325bcd69d6c36e8f27e1fca74bd42'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9'
-            'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3'
             'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
@@ -90,8 +86,6 @@ build() {
 
   cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/01_fix_openjdk_cmds_path.diff \
-                               patches/02_fix_corba_cmds_path.diff \
                                patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then