diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-17 18:53:45 +0200 |
commit | b84f8dfdf58409163a410c241009870ecbd35952 (patch) | |
tree | 0ae6ab56ed3cbbc209f7ed0691a7fca52dc5d093 /extra/openjdk6 | |
parent | 6feb300093e37e58027d52ca5734624565e09598 (diff) | |
parent | f675762300c4ee2717e029975bb3f94312245276 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ccrtp/PKGBUILD
community/freerdp/PKGBUILD
community/python2-pymongo/PKGBUILD
community/yaz/PKGBUILD
extra/apr/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/perl-ev/PKGBUILD
extra/poppler/PKGBUILD
extra/sqlite/PKGBUILD
extra/vim/PKGBUILD
extra/xfce4-mount-plugin/PKGBUILD
extra/xfce4-mpc-plugin/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
multilib/lib32-atk/PKGBUILD
multilib/lib32-cairo/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-gmp/PKGBUILD
multilib/lib32-libldap/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-openssl/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
testing/glib2/PKGBUILD
testing/openmpi/PKGBUILD
Diffstat (limited to 'extra/openjdk6')
-rw-r--r-- | extra/openjdk6/PKGBUILD | 17 | ||||
-rw-r--r-- | extra/openjdk6/fix_corba_cmds_path.diff | 20 | ||||
-rw-r--r-- | extra/openjdk6/fix_jdk_cmds_path.diff | 20 |
3 files changed, 25 insertions, 32 deletions
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 44352b095..6468fdba8 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 152644 2012-03-07 19:17:54Z andyrtr $ +# $Id: PKGBUILD 158936 2012-05-13 13:26:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.11.1 +_icedteaver=1.11.2 _openjdk_version=b24 _openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=3 +pkgrel=1 url='http://icedtea.classpath.org' arch=('i686' 'x86_64' 'mips64el') 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 @@ -32,14 +32,14 @@ noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_03.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c' - '695f6eddaf274a01be8cf0d7a429d268a49db4799aa0d69063061fd73105ef0b' +sha256sums=('078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5' + '1c4b7ae37498c61b18ac5fcf04b3322b4b82afe7e959e5949f05bf252cdf73c7' 'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227' 'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012' - 'ad9a23a14893dab3770744cdf684ffc7a7025eeb7149840faefea82e2a8ed3fa' - '6384026ee4854a4ebcd5203845f0a56126aaf34517e99cfbc16c3ea353c55fe5' + 'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5' + '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9' '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd' @@ -64,6 +64,7 @@ build() { 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}" diff --git a/extra/openjdk6/fix_corba_cmds_path.diff b/extra/openjdk6/fix_corba_cmds_path.diff index 842657880..7a3db9567 100644 --- a/extra/openjdk6/fix_corba_cmds_path.diff +++ b/extra/openjdk6/fix_corba_cmds_path.diff @@ -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 -@@ -86,10 +86,10 @@ +@@ -76,7 +76,7 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm @@ -8,21 +8,17 @@ +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 -@@ -136,7 +136,7 @@ + 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 -+TR = $(UTILS_COMMAND_PATH)tr +-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 - UNIQ = $(UTILS_USR_BIN_PATH)uniq -@@ -186,7 +186,7 @@ +@@ -176,7 +176,7 @@ # others have it in /usr/bin. SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ $(wildcard $(UTILS_USR_BIN_PATH)sort)) diff --git a/extra/openjdk6/fix_jdk_cmds_path.diff b/extra/openjdk6/fix_jdk_cmds_path.diff index 7e16e1744..bd37dd4ba 100644 --- a/extra/openjdk6/fix_jdk_cmds_path.diff +++ b/extra/openjdk6/fix_jdk_cmds_path.diff @@ -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 -@@ -76,10 +76,10 @@ +@@ -89,7 +89,7 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm @@ -8,21 +8,17 @@ +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 -@@ -126,7 +126,7 @@ + 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 -+TR = $(UTILS_COMMAND_PATH)tr +-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 - UNIQ = $(UTILS_USR_BIN_PATH)uniq -@@ -173,7 +173,7 @@ +@@ -178,7 +178,7 @@ BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \ $(wildcard $(UTILS_USR_BIN_PATH)basename)) |