[arch-commits] Commit in openjdk6/trunk (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun May 13 13:24:59 UTC 2012
Date: Sunday, May 13, 2012 @ 09:24:59
Author: andyrtr
Revision: 158935
upgpkg: openjdk6 6.b24_1.11.2-1
upstream update 1.11.2; fix some more binary locations
Modified:
openjdk6/trunk/PKGBUILD
openjdk6/trunk/fix_corba_cmds_path.diff
openjdk6/trunk/fix_jdk_cmds_path.diff
--------------------------+
PKGBUILD | 7 ++++---
fix_corba_cmds_path.diff | 14 ++++----------
fix_jdk_cmds_path.diff | 14 ++++----------
3 files changed, 12 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-05-13 13:15:10 UTC (rev 158934)
+++ PKGBUILD 2012-05-13 13:24:59 UTC (rev 158935)
@@ -15,7 +15,7 @@
license=('custom')
makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt' #'xalan-java'
- 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6')
+ 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils')
options=('!emptydirs') # 'force') # force needed for hg shots
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
@@ -38,8 +38,8 @@
'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
'78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
- '3353abef5d2d01171cf63ba7aa520c78850adc51fa42903a092a9f52b719ac80'
- 'e9f4b2559d26056be61af76752ae97fbde5daad535c2441fea3c8d10a931aefb'
+ 'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5'
+ '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
'26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
@@ -64,6 +64,7 @@
autoreconf -i
export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff"
+# export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/nonreparenting-wm.diff"
export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
Modified: fix_corba_cmds_path.diff
===================================================================
--- fix_corba_cmds_path.diff 2012-05-13 13:15:10 UTC (rev 158934)
+++ fix_corba_cmds_path.diff 2012-05-13 13:24:59 UTC (rev 158935)
@@ -1,6 +1,6 @@
--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300
+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300
-@@ -76,10 +76,10 @@
+@@ -76,7 +76,7 @@
CHMOD = $(UTILS_COMMAND_PATH)chmod
CMP = $(UTILS_USR_BIN_PATH)cmp
COMM = $(UTILS_USR_BIN_PATH)comm
@@ -8,22 +8,16 @@
+COMPRESS = $(UTILS_COMMAND_PATH)compress
CP = $(UTILS_COMMAND_PATH)cp
CPIO = $(UTILS_COMMAND_PATH)cpio
--CUT = $(UTILS_USR_BIN_PATH)cut
-+CUT = $(UTILS_COMMAND_PATH)cut
- DATE = $(UTILS_COMMAND_PATH)date
- DF = $(UTILS_COMMAND_PATH)df
- DIFF = $(UTILS_USR_BIN_PATH)diff
-@@ -125,8 +125,8 @@
+ CUT = $(UTILS_USR_BIN_PATH)cut
+@@ -125,7 +125,7 @@
TAIL = $(UTILS_USR_BIN_PATH)tail
TAR = $(UTILS_COMMAND_PATH)tar
TEST = $(UTILS_USR_BIN_PATH)test
-TOUCH = $(UTILS_COMMAND_PATH)touch
--TR = $(UTILS_USR_BIN_PATH)tr
+TOUCH = $(UTILS_USR_BIN_PATH)touch
-+TR = $(UTILS_COMMAND_PATH)tr
+ TR = $(UTILS_USR_BIN_PATH)tr
TRUE = $(UTILS_COMMAND_PATH)true
UNAME = $(UTILS_COMMAND_PATH)uname
- UNIQ = $(UTILS_USR_BIN_PATH)uniq
@@ -176,7 +176,7 @@
# others have it in /usr/bin.
SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
Modified: fix_jdk_cmds_path.diff
===================================================================
--- fix_jdk_cmds_path.diff 2012-05-13 13:15:10 UTC (rev 158934)
+++ fix_jdk_cmds_path.diff 2012-05-13 13:24:59 UTC (rev 158935)
@@ -1,6 +1,6 @@
--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:33:23.000000000 +0300
+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2008-04-14 15:37:34.000000000 +0300
-@@ -89,10 +89,10 @@
+@@ -89,7 +89,7 @@
CHMOD = $(UTILS_COMMAND_PATH)chmod
CMP = $(UTILS_USR_BIN_PATH)cmp
COMM = $(UTILS_USR_BIN_PATH)comm
@@ -8,22 +8,16 @@
+COMPRESS = $(UTILS_COMMAND_PATH)compress
CP = $(UTILS_COMMAND_PATH)cp
CPIO = $(UTILS_COMMAND_PATH)cpio
--CUT = $(UTILS_USR_BIN_PATH)cut
-+CUT = $(UTILS_COMMAND_PATH)cut
- DATE = $(UTILS_COMMAND_PATH)date
- DF = $(UTILS_COMMAND_PATH)df
- DIFF = $(UTILS_USR_BIN_PATH)diff
-@@ -137,8 +137,8 @@
+ CUT = $(UTILS_USR_BIN_PATH)cut
+@@ -137,7 +137,7 @@
TAIL = $(UTILS_USR_BIN_PATH)tail
TAR = $(UTILS_COMMAND_PATH)tar
TEST = $(UTILS_USR_BIN_PATH)test
-TOUCH = $(UTILS_COMMAND_PATH)touch
--TR = $(UTILS_USR_BIN_PATH)tr
+TOUCH = $(UTILS_USR_BIN_PATH)touch
-+TR = $(UTILS_COMMAND_PATH)tr
+ TR = $(UTILS_USR_BIN_PATH)tr
TRUE = $(UTILS_COMMAND_PATH)true
UNAME = $(UTILS_COMMAND_PATH)uname
- UNIQ = $(UTILS_USR_BIN_PATH)uniq
@@ -178,7 +178,7 @@
BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
$(wildcard $(UTILS_USR_BIN_PATH)basename))
More information about the arch-commits
mailing list