[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, February 20, 2013 @ 18:00:42
Author: andyrtr
Revision: 178352
upgpkg: openjdk6 6.b27_1.12.3-1
upstream update 1.12.3
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-20 16:20:11 UTC (rev 178351)
+++ PKGBUILD2013-02-20 17:00:42 UTC (rev 178352)
@@ -5,7 +5,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.12.2
+_icedteaver=1.12.3
_openjdk_version=b27
_openjdk_date=26_oct_2012
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -33,8 +33,8 @@
jaxp144_04.zip
jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-sha256sums=('897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794'
-'5f67865307b7ff905304da4dca1fa0511c884480da0ddff269758bada392c8f4'
+sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c'
+'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3'
'044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
'490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Tuesday, February 12, 2013 @ 17:58:33
Author: andyrtr
Revision: 177965
upgpkg: openjdk6 6.b27_1.12.2-1
upstream update 1.12.2
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-12 16:53:44 UTC (rev 177964)
+++ PKGBUILD2013-02-12 16:58:33 UTC (rev 177965)
@@ -5,7 +5,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.12.1
+_icedteaver=1.12.2
_openjdk_version=b27
_openjdk_date=26_oct_2012
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -33,8 +33,8 @@
jaxp144_04.zip
jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-sha256sums=('8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157'
-'a4d9d3e427943efc8715688d58eca6e8e111907f962524af78dd9a71e6892d60'
+sha256sums=('897a8834b8ddd6891f0eef46c0f799d11cbecf168c4383cfb26d0dad80328794'
+'5f67865307b7ff905304da4dca1fa0511c884480da0ddff269758bada392c8f4'
'044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
'490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Tuesday, February 5, 2013 @ 20:25:57
Author: andyrtr
Revision: 177073
upgpkg: openjdk6 6.b27_1.12.1-1
upstream update 1.12.1
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-02-05 18:24:33 UTC (rev 177072)
+++ PKGBUILD2013-02-05 19:25:57 UTC (rev 177073)
@@ -5,7 +5,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.12.0
+_icedteaver=1.12.1
_openjdk_version=b27
_openjdk_date=26_oct_2012
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -33,8 +33,8 @@
jaxp144_04.zip
jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-sha256sums=('4f27f3f42b57836cfb11541736282ccfc22de3f4acc0e540560fcf5512d66ced'
-'e1cf397644e039402c0f86a9fc1a4690d747e0ce347d1d4e8afb8bc5c797f6a2'
+sha256sums=('8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157'
+'a4d9d3e427943efc8715688d58eca6e8e111907f962524af78dd9a71e6892d60'
'044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
'490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Tuesday, January 29, 2013 @ 18:03:39
Author: andyrtr
Revision: 176317
upgpkg: openjdk6 6.b27_1.12.0-1
upstream update 1.12.0
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 25 -
1 file changed, 12 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-01-29 16:33:32 UTC (rev 176316)
+++ PKGBUILD2013-01-29 17:03:39 UTC (rev 176317)
@@ -5,21 +5,21 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.11.5
-_openjdk_version=b24
-_openjdk_date=14_nov_2011
+_icedteaver=1.12.0
+_openjdk_version=b27
+_openjdk_date=26_oct_2012
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
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'
+'nspr' 'zlib' 'freetype2' 'libjpeg=8' 'libx11' 'libcups' 'patch'
'libxt' 'nss' 'libxslt'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio'
'openjdk6' 'inetutils' 'wget')
-options=('!emptydirs') # 'force') # force needed for hg shots
+options=('!emptydirs')
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
- http://icedtea.classpath.org/download/drops/jaxp144_03.zip
+ http://icedtea.classpath.org/download/drops/jaxp144_04.zip
http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff
@@ -30,13 +30,13 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
- jaxp144_03.zip
+ jaxp144_04.zip
jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-sha256sums=('258d81d957f8ab9322fbaf7c90647f27f6b4e675504fa279858e6dfe513f7574'
-'50cd8e6868875b15d0a5652723b58f9d4e0a2f9b24e3a2ef997405670456e96a'
-'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227'
-'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
+sha256sums=('4f27f3f42b57836cfb11541736282ccfc22de3f4acc0e540560fcf5512d66ced'
+'e1cf397644e039402c0f86a9fc1a4690d747e0ce347d1d4e8afb8bc5c797f6a2'
+'044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
+'490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
'78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5'
@@ -66,7 +66,6 @@
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 patches/disable_Werror.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}
@@ -75,7 +74,7 @@
./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
- --with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
+ --with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \
--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
--disable-bootstrap \
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Thursday, October 18, 2012 @ 11:52:09
Author: andyrtr
Revision: 169125
upgpkg: openjdk6 6.b24_1.11.5-1
upstream update 1.11.5
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-18 14:48:10 UTC (rev 169124)
+++ PKGBUILD2012-10-18 15:52:09 UTC (rev 169125)
@@ -5,7 +5,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.11.4
+_icedteaver=1.11.5
_openjdk_version=b24
_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -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' 'inetutils')
+'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio'
'openjdk6' 'inetutils' 'wget')
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
@@ -33,8 +33,8 @@
jaxp144_03.zip
jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-sha256sums=('7bc0037514aedbbd5e65edcb2fa300a18285688d27b359c2144fcf563174e4fd'
-'c01c178077df395974307d534a4535686cc9ab107df998452b6279abab7cdc2e'
+sha256sums=('258d81d957f8ab9322fbaf7c90647f27f6b4e675504fa279858e6dfe513f7574'
+'50cd8e6868875b15d0a5652723b58f9d4e0a2f9b24e3a2ef997405670456e96a'
'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227'
'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD disable_Werror.diff)
Date: Sunday, September 2, 2012 @ 09:57:51
Author: andyrtr
Revision: 165878
upgpkg: openjdk6 6.b24_1.11.4-1
upstream update 1.11.4
Added:
openjdk6/trunk/disable_Werror.diff
Modified:
openjdk6/trunk/PKGBUILD
-+
PKGBUILD| 10 ++
disable_Werror.diff | 11 +++
2 files changed, 17 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-09-02 12:54:03 UTC (rev 165877)
+++ PKGBUILD2012-09-02 13:57:51 UTC (rev 165878)
@@ -5,7 +5,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.11.3
+_icedteaver=1.11.4
_openjdk_version=b24
_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -26,14 +26,15 @@
fix_corba_cmds_path.diff
fontconfig-paths.diff
nonreparenting-wm.diff
+ disable_Werror.diff
openjdk6.profile
openjdk6.profile.csh)
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=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4'
-'31a26872d3f0b96ac075608df13ae635923a0960cdcdb4ecab3fe6482f2ef978'
+sha256sums=('7bc0037514aedbbd5e65edcb2fa300a18285688d27b359c2144fcf563174e4fd'
+'c01c178077df395974307d534a4535686cc9ab107df998452b6279abab7cdc2e'
'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227'
'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
@@ -42,6 +43,7 @@
'7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
+'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
'26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
'0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007')
@@ -63,7 +65,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/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff patches/disable_Werror.diff
# export DISTRIBUTION_PATCHES=patches/fontconfig-paths.diff
patches/nonreparenting-wm.diff
export ALT_PARALLEL_COMPILE_JOBS=${MAKEFLAGS/-j}
Added: disable_Werror.diff
===
--- disable_Werror.diff (rev 0)
+++ disable_Werror.diff 2012-09-02 13:57:51 UTC (rev 165878)
@@ -0,0 +1,11 @@
+--- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07
16:30:51.0 +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
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, June 13, 2012 @ 12:53:45
Author: andyrtr
Revision: 161768
upgpkg: openjdk6 6.b24_1.11.3-1
upstream update 1.11.3
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-06-13 16:27:02 UTC (rev 161767)
+++ PKGBUILD2012-06-13 16:53:45 UTC (rev 161768)
@@ -5,7 +5,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.11.2
+_icedteaver=1.11.3
_openjdk_version=b24
_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -32,8 +32,8 @@
jaxp144_03.zip
jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-sha256sums=('078637dc8323951b18cbb2aac56fd2f24baaa81f0757391aaa17e1b7577e9ce5'
-'1c4b7ae37498c61b18ac5fcf04b3322b4b82afe7e959e5949f05bf252cdf73c7'
+sha256sums=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4'
+'31a26872d3f0b96ac075608df13ae635923a0960cdcdb4ecab3fe6482f2ef978'
'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227'
'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, March 7, 2012 @ 14:16:27
Author: andyrtr
Revision: 152643
upgpkg: openjdk6 6.b24_1.11.1-3
add java-runtime-headless provider
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-07 18:59:20 UTC (rev 152642)
+++ PKGBUILD2012-03-07 19:16:27 UTC (rev 152643)
@@ -9,7 +9,7 @@
_openjdk_version=b24
_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=3
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -88,7 +88,7 @@
'alsa-lib: for sound'
'giflib: for gif format support')
conflicts=('java-environment' 'java-runtime')
- provides=('java-environment=6' 'java-runtime=6')
+ provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6')
install=openjdk6.install
if [ ${CARCH} = x86_64 ]; then
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Saturday, March 3, 2012 @ 13:55:51
Author: andyrtr
Revision: 151906
upgpkg: openjdk6 6.b24_1.11.1-2
add install-abs-dir option that fixes some path settings, FS#28577 + FS#28579
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-03-03 18:29:05 UTC (rev 151905)
+++ PKGBUILD2012-03-03 18:55:51 UTC (rev 151906)
@@ -9,7 +9,7 @@
_openjdk_version=b24
_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -75,7 +75,8 @@
--with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
- --disable-bootstrap
+ --disable-bootstrap \
+ --with-abs-install-dir=${_jvmdir}
LD_PRELOAD= make
}
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, February 15, 2012 @ 05:37:57
Author: andyrtr
Revision: 150231
upgpkg: openjdk6 6.b24_1.11.1-1
upstream update 1.11.1
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 27 ++-
1 file changed, 14 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-02-15 10:37:25 UTC (rev 150230)
+++ PKGBUILD2012-02-15 10:37:57 UTC (rev 150231)
@@ -5,7 +5,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.11
+_icedteaver=1.11.1
_openjdk_version=b24
_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
@@ -17,7 +17,7 @@
'nspr' 'zlib' 'freetype2' 'libjpeg=8' 'libx11' 'libcups' 'patch'
'libxt' 'nss' 'libxslt' #'xalan-java'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio'
'openjdk6')
options=('!emptydirs') # 'force') # force needed for hg shots
-source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+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
http://icedtea.classpath.org/download/drops/jaxp144_03.zip
http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
@@ -32,17 +32,18 @@
jaxp144_03.zip
jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-md5sums=('10c1cea1d24c064572abfe9687567948'
- '0eabdd360169144336e50081b8d01001'
- '9eea471ad474040265c688858fcf09aa'
- '8fd91b09b643a19a912b8a75e7a7a9d5'
- 'bc95c133620bd68c161cac9891592901'
- '5da3e39fa60985576c4f37d1491efbe2'
- 'f7e7a212e50abb56a6ef1a2b1bd27405'
- 'ee1afda124d5927345014ab382ef581e'
- '9b4d368f5ee08de248eaf029303a446c'
- '74c4a7adc782edd087802bf92ae3d6d0'
- 'fdf295e2f186dfa4d308691a3d7ac8c5')
+sha256sums=('bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c'
+'695f6eddaf274a01be8cf0d7a429d268a49db4799aa0d69063061fd73105ef0b'
+'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227'
+'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012'
+'229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
+'78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
+'ad9a23a14893dab3770744cdf684ffc7a7025eeb7149840faefea82e2a8ed3fa'
+'6384026ee4854a4ebcd5203845f0a56126aaf34517e99cfbc16c3ea353c55fe5'
+'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
+'9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
+'26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
+'0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007')
build() {
[arch-commits] Commit in openjdk6/trunk (PKGBUILD glibc2_15.diff)
Date: Tuesday, January 31, 2012 @ 13:27:18
Author: andyrtr
Revision: 148418
upgpkg: openjdk6 6.b24_1.11-1
upstream update 1.11
Modified:
openjdk6/trunk/PKGBUILD
Deleted:
openjdk6/trunk/glibc2_15.diff
+
PKGBUILD | 39 -
glibc2_15.diff | 236 ---
2 files changed, 18 insertions(+), 257 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-31 18:24:08 UTC (rev 148417)
+++ PKGBUILD2012-01-31 18:27:18 UTC (rev 148418)
@@ -5,46 +5,44 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
_javaver=6
-_icedteaver=1.10.5
-_openjdk_version=b22
-_openjdk_date=28_feb_2011
+_icedteaver=1.11
+_openjdk_version=b24
+_openjdk_date=14_nov_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
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'
'xalan-java' 'libxt' 'nss'
+'nspr' 'zlib' 'freetype2' 'libjpeg=8' 'libx11' 'libcups' 'patch'
'libxt' 'nss' 'libxslt' #'xalan-java'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio'
'openjdk6')
options=('!emptydirs') # 'force') # force needed for hg shots
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
- http://icedtea.classpath.org/download/drops/jaxp144_01.zip
- http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
+ http://icedtea.classpath.org/download/drops/jaxp144_03.zip
+
http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff
fix_corba_cmds_path.diff
fontconfig-paths.diff
nonreparenting-wm.diff
openjdk6.profile
- openjdk6.profile.csh
-glibc2_15.diff)
+ openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
- jaxp144_01.zip
- jdk6-jaxws-b20.zip
+ jaxp144_03.zip
+ jdk6-jaxws2_1_6-2011_06_13.zip
jdk6-jaf-b20.zip)
-md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a'
- '2d20f9b81f1fec41ec730da8a933'
- 'ef7a8b3624ea904bf584bc46d79b5e75'
- '91adfd41e6f001add4f92ae31216b1e3'
+md5sums=('10c1cea1d24c064572abfe9687567948'
+ '0eabdd360169144336e50081b8d01001'
+ '9eea471ad474040265c688858fcf09aa'
+ '8fd91b09b643a19a912b8a75e7a7a9d5'
'bc95c133620bd68c161cac9891592901'
'5da3e39fa60985576c4f37d1491efbe2'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'ee1afda124d5927345014ab382ef581e'
'9b4d368f5ee08de248eaf029303a446c'
'74c4a7adc782edd087802bf92ae3d6d0'
- 'fdf295e2f186dfa4d308691a3d7ac8c5'
- '0c8f0a398c88f85e0db44b4417562cf3')
+ 'fdf295e2f186dfa4d308691a3d7ac8c5')
build() {
@@ -64,18 +62,17 @@
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 patches/glibc2_15.diff
+ export DISTRIBUTION_PATCHES=patches/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff
export ALT_PARALLEL_COMPILE_JOBS=${MAKEFLAGS/-j}
export HOTSPOT_BUILD_JOBS=${ALT_PARALLEL_COMPILE_JOBS}
unset MAKEFLAGS
./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
- --with-xalan2-jar=/usr/share/java/xalan.jar \
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
- --with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
- --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+ --with-jaxp-drop-zip=${srcdir}/jaxp144_03.zip \
+ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
--disable-bootstrap
LD_PRELOAD= make
Deleted: glibc2_15.diff
===
--- glibc2_15.diff 2012-01-31 18:24:08 UTC (rev 148417)
+++ glibc2_15.diff 2012-01-31 18:27:18 UTC (rev 148418)
@@ -1,236 +0,0 @@
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and
/usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid oma...@redhat.com
-
-diff -r 2ec638646e86 -r a6eef545f1a2
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Friday, January 20, 2012 @ 10:46:02
Author: andyrtr
Revision: 147003
upgpkg: openjdk6 6.b22_1.10.5-2
libtiff/libpng rebuild
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-20 14:21:18 UTC (rev 147002)
+++ PKGBUILD2012-01-20 15:46:02 UTC (rev 147003)
@@ -9,7 +9,7 @@
_openjdk_version=b22
_openjdk_date=28_feb_2011
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -84,7 +84,7 @@
package_openjdk6() {
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing
binary plugs.'
backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng=1.5.7')
optdepends=('icedtea-web: web browser plugin + Java Web Start'
'alsa-lib: for sound'
'giflib: for gif format support')
[arch-commits] Commit in openjdk6/trunk (PKGBUILD glibc2_15.diff)
Date: Thursday, January 12, 2012 @ 16:44:34
Author: andyrtr
Revision: 146546
upgpkg: openjdk6 6.b22_1.10.5-1
upstream update 1.10.5
Added:
openjdk6/trunk/glibc2_15.diff
Modified:
openjdk6/trunk/PKGBUILD
+
PKGBUILD | 35 ++--
glibc2_15.diff | 236 +++
2 files changed, 247 insertions(+), 24 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-01-12 21:34:33 UTC (rev 146545)
+++ PKGBUILD2012-01-12 21:44:34 UTC (rev 146546)
@@ -4,12 +4,10 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
-#_date=20100715
_javaver=6
-_icedteaver=1.10.4
+_icedteaver=1.10.5
_openjdk_version=b22
_openjdk_date=28_feb_2011
-#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
pkgrel=1
url='http://icedtea.classpath.org'
@@ -17,25 +15,25 @@
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'
'xalan-java' 'libxt' 'nss'
-'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
+'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio'
'openjdk6')
options=('!emptydirs') # 'force') # force needed for hg shots
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
- #ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
http://icedtea.classpath.org/download/drops/jaxp144_01.zip
-
https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip
- https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
+ http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip
+ http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff
fix_corba_cmds_path.diff
fontconfig-paths.diff
nonreparenting-wm.diff
openjdk6.profile
- openjdk6.profile.csh)
+ openjdk6.profile.csh
+glibc2_15.diff)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
jaxp144_01.zip
jdk6-jaxws-b20.zip
jdk6-jaf-b20.zip)
-md5sums=('c381d987f8d2facece8c54e98fd547f8'
+md5sums=('e2316f463b5d9f53f8c5c9020f2a7e5a'
'2d20f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -45,20 +43,9 @@
'ee1afda124d5927345014ab382ef581e'
'9b4d368f5ee08de248eaf029303a446c'
'74c4a7adc782edd087802bf92ae3d6d0'
- 'fdf295e2f186dfa4d308691a3d7ac8c5')
+ 'fdf295e2f186dfa4d308691a3d7ac8c5'
+ '0c8f0a398c88f85e0db44b4417562cf3')
-# source PKGBUILD mksource
-mksource() {
- mkdir /tmp/icedtea6-${_date}
- pushd /tmp/icedtea6-${_date}
- #hg -v clone http://icedtea.classpath.org/hg/icedtea6
- # use specific release branch
- hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/
- rm -rf icedtea6/.hg*
- tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz *
- popd
-}
-
build() {
unset JAVA_HOME
@@ -77,7 +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/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff patches/glibc2_15.diff
export ALT_PARALLEL_COMPILE_JOBS=${MAKEFLAGS/-j}
export HOTSPOT_BUILD_JOBS=${ALT_PARALLEL_COMPILE_JOBS}
@@ -88,7 +75,7 @@
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
--with-jaxp-drop-zip=${srcdir}/jaxp144_01.zip \
- --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
--disable-bootstrap
LD_PRELOAD= make
Added: glibc2_15.diff
===
--- glibc2_15.diff (rev 0)
+++ glibc2_15.diff 2012-01-12 21:44:34 UTC (rev 146546)
@@ -0,0 +1,236 @@
+# HG changeset patch
+# User never
+# Date 1319555835 25200
+# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
+# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
+7103224: collision between __LEAF define in interfaceSupport.hpp and
/usr/include/sys/cdefs.h with gcc
+Reviewed-by: never
+Contributed-by: Omair Majid oma...@redhat.com
+
+diff -r 2ec638646e86 -r a6eef545f1a2 src/share/vm/opto/addnode.cpp
+---
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, October 19, 2011 @ 04:17:34
Author: andyrtr
Revision: 140781
upgpkg: openjdk6 6.b22_1.10.4-1
upstream update 1.10.4
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-10-19 07:52:47 UTC (rev 140780)
+++ PKGBUILD2011-10-19 08:17:34 UTC (rev 140781)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.10.3
+_icedteaver=1.10.4
_openjdk_version=b22
_openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -31,8 +31,11 @@
nonreparenting-wm.diff
openjdk6.profile
openjdk6.profile.csh)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('0a1301785e9826d7c87ed7e8b10a6985'
+noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
+ jaxp144_01.zip
+ jdk6-jaxws-b20.zip
+ jdk6-jaf-b20.zip)
+md5sums=('c381d987f8d2facece8c54e98fd547f8'
'2d20f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -168,7 +171,7 @@
install -m755 ${srcdir}/openjdk6.profile.csh
${pkgdir}/etc/profile.d/openjdk6.csh
# install license
- install -Dm644 ${srcdir}/LICENSE
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
package_openjdk6-src() {
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Thursday, July 21, 2011 @ 13:20:32
Author: andyrtr
Revision: 132227
upgpkg: openjdk6 6.b22_1.10.3-1
upstream update 1.10.3
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-07-21 16:22:56 UTC (rev 132226)
+++ PKGBUILD2011-07-21 17:20:32 UTC (rev 132227)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.10.2
+_icedteaver=1.10.3
_openjdk_version=b22
_openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -32,7 +32,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('83041b2d0de66cb5289813cc6f05af11'
+md5sums=('0a1301785e9826d7c87ed7e8b10a6985'
'2d20f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD nonreparenting-wm.diff)
Date: Wednesday, June 8, 2011 @ 01:53:21
Author: andyrtr
Revision: 126852
upgpkg: openjdk6 6.b22_1.10.2-1
upstream update icedtea 1.10.2
Modified:
openjdk6/trunk/PKGBUILD
openjdk6/trunk/nonreparenting-wm.diff
+
PKGBUILD |8
nonreparenting-wm.diff | 16 +---
2 files changed, 9 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-07 20:03:50 UTC (rev 126851)
+++ PKGBUILD2011-06-08 05:53:21 UTC (rev 126852)
@@ -6,12 +6,12 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.10.1
+_icedteaver=1.10.2
_openjdk_version=b22
_openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -32,7 +32,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('f3b31b9f591afc752372addacb1eb335'
+md5sums=('83041b2d0de66cb5289813cc6f05af11'
'2d20f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -40,7 +40,7 @@
'5da3e39fa60985576c4f37d1491efbe2'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'ee1afda124d5927345014ab382ef581e'
- '409812b5675f9678b1c9e1a12a945a9a'
+ '9b4d368f5ee08de248eaf029303a446c'
'74c4a7adc782edd087802bf92ae3d6d0'
'fdf295e2f186dfa4d308691a3d7ac8c5')
Modified: nonreparenting-wm.diff
===
--- nonreparenting-wm.diff 2011-06-07 20:03:50 UTC (rev 126851)
+++ nonreparenting-wm.diff 2011-06-08 05:53:21 UTC (rev 126852)
@@ -2,22 +2,16 @@
index 68d1ff7..878327e 100644
--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -98,11 +98,14 @@ class XWM implements MWMConstants, XUtilConstants {
- ICE_WM = 10,
+@@ -99,7 +99,8 @@
METACITY_WM = 11,
COMPIZ_WM = 12,
--LG3D_WM = 13;
-+LG3D_WM = 13,
-+OTHER_NONREPARENTING_WM = 14;
+ LG3D_WM = 13,
+-MUTTER_WM = 14;
++MUTTER_WM = 14,
++OTHER_NONREPARENTING_WM = 15;
public String toString() {
switch (WMID) {
case NO_WM:
- return NO WM;
-+ case OTHER_NONREPARENTING_WM:
-+ return Other non-reparenting WM;
- case OTHER_WM:
- return Other WM;
- case OPENLOOK_WM:
@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
}
[arch-commits] Commit in openjdk6/trunk (PKGBUILD aatext_by_default.diff)
Date: Saturday, June 4, 2011 @ 19:48:31
Author: andyrtr
Revision: 126340
upgpkg: openjdk6 6.b22_1.10.1-2
aatext_by_default.diff is obsolet now for some time, code has gone upstream;
FS#23619
Modified:
openjdk6/trunk/PKGBUILD
Deleted:
openjdk6/trunk/aatext_by_default.diff
+
PKGBUILD |6 ++
aatext_by_default.diff | 35 ---
2 files changed, 2 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-06-04 22:38:48 UTC (rev 126339)
+++ PKGBUILD2011-06-04 23:48:31 UTC (rev 126340)
@@ -11,7 +11,7 @@
_openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -27,7 +27,6 @@
https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff
fix_corba_cmds_path.diff
- aatext_by_default.diff
fontconfig-paths.diff
nonreparenting-wm.diff
openjdk6.profile
@@ -40,7 +39,6 @@
'bc95c133620bd68c161cac9891592901'
'5da3e39fa60985576c4f37d1491efbe2'
'f7e7a212e50abb56a6ef1a2b1bd27405'
- 'ef60d567c0d9bad111212851220deafd'
'ee1afda124d5927345014ab382ef581e'
'409812b5675f9678b1c9e1a12a945a9a'
'74c4a7adc782edd087802bf92ae3d6d0'
@@ -76,7 +74,7 @@
autoreconf -i
- export DISTRIBUTION_PATCHES=patches/fix_jdk_cmds_path.diff
patches/aatext_by_default.diff patches/fontconfig-paths.diff
patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff
+ export DISTRIBUTION_PATCHES=patches/fix_jdk_cmds_path.diff
patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff
patches/nonreparenting-wm.diff
export ALT_PARALLEL_COMPILE_JOBS=${MAKEFLAGS/-j}
export HOTSPOT_BUILD_JOBS=${ALT_PARALLEL_COMPILE_JOBS}
Deleted: aatext_by_default.diff
===
--- aatext_by_default.diff 2011-06-04 22:38:48 UTC (rev 126339)
+++ aatext_by_default.diff 2011-06-04 23:48:31 UTC (rev 126340)
@@ -1,35 +0,0 @@
openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old 2008-01-08
20:23:56.0 +0200
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2008-02-24
12:39:19.0 +0200
-@@ -1875,7 +1875,6 @@
- */
- private static boolean useSystemAAFontSettings() {
- if (!checkedSystemAAFontSettings) {
--useSystemAAFontSettings = true; /* initially set this true */
- String systemAAFonts = null;
- Toolkit tk = Toolkit.getDefaultToolkit();
- if (tk instanceof SunToolkit) {
-@@ -1883,20 +1882,10 @@
- (String)AccessController.doPrivileged(
- new
GetPropertyAction(awt.useSystemAAFontSettings));
- }
--if (systemAAFonts != null) {
--useSystemAAFontSettings =
--Boolean.valueOf(systemAAFonts).booleanValue();
--/* If it is anything other than true, then it may be
-- * a hint name , or it may be off, default, etc.
-- */
--if (!useSystemAAFontSettings) {
--desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
--}
--}
--/* If its still true, apply the extra condition */
--if (useSystemAAFontSettings) {
-- useSystemAAFontSettings = lastExtraCondition;
--}
-+if (systemAAFonts == null || Boolean.parseBoolean(systemAAFonts))
-+systemAAFonts = on;
-+desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-+useSystemAAFontSettings = desktopFontHints != null;
- checkedSystemAAFontSettings = true;
- }
- return useSystemAAFontSettings;
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Monday, April 4, 2011 @ 13:40:52
Author: andyrtr
Revision: 117753
upgpkg: openjdk6 6.b22_1.10.1-1
upstream update 1.10.1
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-04-04 17:39:29 UTC (rev 117752)
+++ PKGBUILD2011-04-04 17:40:52 UTC (rev 117753)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.10
+_icedteaver=1.10.1
_openjdk_version=b22
_openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('fd3f35e8a8a2ef9a64c035ed66cea06d'
+md5sums=('f3b31b9f591afc752372addacb1eb335'
'2d20f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Friday, February 18, 2011 @ 17:28:16
Author: andyrtr
Revision: 110347
upgpkg: openjdk6 6.b20_1.9.7-2
fix file conflict #22953
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-18 22:23:25 UTC (rev 110346)
+++ PKGBUILD2011-02-18 22:28:16 UTC (rev 110347)
@@ -11,7 +11,7 @@
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -144,6 +144,9 @@
# Install man pages.
install -m755 -d ${pkgdir}/usr/share/man/man1
install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/
+
+ # https://bugs.archlinux.org/task/22953 - only i686 affected -
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=633
+ rm -f ${pkgdir}/usr/share/man/man1/javaws.1 || /bin/true
# Install demos and samples.
cp -a demo ${pkgdir}/${_jvmdir}/
[arch-commits] Commit in openjdk6/trunk (PKGBUILD openjdk6.install)
Date: Thursday, February 17, 2011 @ 17:49:28
Author: andyrtr
Revision: 110228
upgpkg: openjdk6 6.b20_1.9.7-1
upstream update 1.9.7; upstream moved plugin and webstart to separate
icedtea-web pkg
Modified:
openjdk6/trunk/PKGBUILD
openjdk6/trunk/openjdk6.install
--+
PKGBUILD | 81 -
openjdk6.install |3 +
2 files changed, 46 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-17 19:33:50 UTC (rev 110227)
+++ PKGBUILD2011-02-17 22:49:28 UTC (rev 110228)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9.6
+_icedteaver=1.9.7
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -16,8 +16,8 @@
arch=('i686' 'x86_64')
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'
'xalan-java' 'xulrunner=1.9.2'
-'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
+'nspr' 'zlib' 'freetype2' 'libjpeg=8' 'libx11' 'libcups' 'patch'
'xalan-java' 'libxt' 'nss'
+'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
#'xulrunner=1.9.2'
options=('!emptydirs') # 'force') # force needed for hg shots
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('865af3f871ded848f4aa909075ebe856'
+md5sums=('54a327a9591dab15049b81ec3c0af724'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -50,9 +50,9 @@
mksource() {
mkdir /tmp/icedtea6-${_date}
pushd /tmp/icedtea6-${_date}
- #hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
+ #hg -v clone http://icedtea.classpath.org/hg/icedtea6
# use specific release branch
- hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/ ||
return 1
+ hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/
rm -rf icedtea6/.hg*
tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz *
popd
@@ -64,7 +64,8 @@
unset CLASSPATH
[ -z ${ANT_HOME} ] . /etc/profile.d/apache-ant.sh
-
+
+ _javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
cd ${srcdir}/icedtea6-${_icedteaver}
@@ -81,14 +82,14 @@
export HOTSPOT_BUILD_JOBS=${ALT_PARALLEL_COMPILE_JOBS}
unset MAKEFLAGS
- if [ -x ${_jvmdir}/bin/javac ]; then
-JCONF=--with-openjdk
- elif [ -x /opt/java/bin/javac ]; then
-JCONF=--with-openjdk
- else
-echo No supported java installation found, install either openjdk6 or jdk
-return 1
- fi
+# if [ -x ${_jvmdir}/bin/javac ]; then
+#JCONF=--with-openjdk --with-javac
+# elif [ -x /opt/java/bin/javac ]; then
+#JCONF=--with-openjdk
+# else
+#echo No supported java installation found, install either openjdk6 or
jdk
+#return 1
+# fi
./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
--with-xalan2-jar=/usr/share/java/xalan.jar \
@@ -96,17 +97,19 @@
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF \
--with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-b20.zip \
--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
- --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip
+ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
+ --disable-webstart --disable-plugin --with-openjdk
- LD_PRELOAD= make || return 1
+ LD_PRELOAD= make
}
package_openjdk6() {
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing
binary plugs.'
backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst')
- optdepends=('xulrunner: for the browser plugin'
-'gtk2: for the browser plugin'
+ depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
#'desktop-file-utils'
+ optdepends=( #'xulrunner: for the browser plugin'
+#'gtk2: for the browser plugin'
+ 'icedtea-web: web browser plugin + Java Web Start'
'alsa-lib: for sound'
'giflib: for gif format support')
conflicts=('java-environment' 'java-runtime')
@@ -128,49 +131,51 @@
pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
# Install main files.
- cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
- cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
+
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Thursday, February 10, 2011 @ 02:39:42
Author: andyrtr
Revision: 109497
upgpkg: openjdk6 6.b20_1.9.6-1
upstream update 1.9.6
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-10 07:34:55 UTC (rev 109496)
+++ PKGBUILD2011-02-10 07:39:42 UTC (rev 109497)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9.5
+_icedteaver=1.9.6
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('c526469e8b04c7a5bf97a06909b59378'
+md5sums=('865af3f871ded848f4aa909075ebe856'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Tuesday, February 1, 2011 @ 12:13:57
Author: andyrtr
Revision: 108560
upgpkg: openjdk6 6.b20_1.9.5-1
upstream update 1.9.5
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-01 14:16:53 UTC (rev 108559)
+++ PKGBUILD2011-02-01 17:13:57 UTC (rev 108560)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9.4
+_icedteaver=1.9.5
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('d96d950b76a92e8cd327ae55ca4935e1'
+md5sums=('c526469e8b04c7a5bf97a06909b59378'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD openjdk6.install)
Date: Wednesday, January 19, 2011 @ 00:40:33
Author: andyrtr
Revision: 106787
upgpkg: openjdk6 6.b20_1.9.4-1
upstream update 1.9.4
Modified:
openjdk6/trunk/PKGBUILD
openjdk6/trunk/openjdk6.install
--+
PKGBUILD |4 ++--
openjdk6.install |5 -
2 files changed, 6 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-01-19 04:47:48 UTC (rev 106786)
+++ PKGBUILD2011-01-19 05:40:33 UTC (rev 106787)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9.3
+_icedteaver=1.9.4
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('2fe1d535d55f66d4c370eed1779c8b32'
+md5sums=('d96d950b76a92e8cd327ae55ca4935e1'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
Modified: openjdk6.install
===
--- openjdk6.install2011-01-19 04:47:48 UTC (rev 106786)
+++ openjdk6.install2011-01-19 05:40:33 UTC (rev 106787)
@@ -9,7 +9,10 @@
}
post_upgrade() {
- post_install
+ xdg-icon-resource forceupdate --theme hicolor 2 /dev/null
+ if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+/usr/sbin/init-jks-keystore
+ fi
}
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Thursday, December 2, 2010 @ 07:48:58
Author: andyrtr
Revision: 101910
upgpkg: openjdk6 6.b20_1.9.3-1
new version 1.9.3
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-12-02 12:48:08 UTC (rev 101909)
+++ PKGBUILD2010-12-02 12:48:58 UTC (rev 101910)
@@ -6,12 +6,12 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9.2
+_icedteaver=1.9.3
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('5371bde0a33dc61ee639716c6b8b1af6'
+md5sums=('2fe1d535d55f66d4c370eed1779c8b32'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD openjdk6.profile.csh)
Date: Friday, November 26, 2010 @ 15:22:38
Author: andyrtr
Revision: 100944
upgpkg: openjdk6 6.b20_1.9.2-2
fix profile file for csh; #21836
Modified:
openjdk6/trunk/PKGBUILD
openjdk6/trunk/openjdk6.profile.csh
--+
PKGBUILD |4 ++--
openjdk6.profile.csh |8
2 files changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-11-26 19:53:01 UTC (rev 100943)
+++ PKGBUILD2010-11-26 20:22:38 UTC (rev 100944)
@@ -11,7 +11,7 @@
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=2
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -44,7 +44,7 @@
'ee1afda124d5927345014ab382ef581e'
'409812b5675f9678b1c9e1a12a945a9a'
'74c4a7adc782edd087802bf92ae3d6d0'
- '973de018589b23ade5db94fc70de7cfc')
+ 'fdf295e2f186dfa4d308691a3d7ac8c5')
# source PKGBUILD mksource
mksource() {
Modified: openjdk6.profile.csh
===
--- openjdk6.profile.csh2010-11-26 19:53:01 UTC (rev 100943)
+++ openjdk6.profile.csh2010-11-26 20:22:38 UTC (rev 100944)
@@ -1,6 +1,6 @@
-setenv J2SDKDIR=/usr/lib/jvm/java-6-openjdk
-setenv J2REDIR=$J2SDKDIR/jre
-setenv JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+setenv J2SDKDIR /usr/lib/jvm/java-6-openjdk
+setenv J2REDIR $J2SDKDIR/jre
+setenv JAVA_HOME /usr/lib/jvm/java-6-openjdk
# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING=1
+#setenv _JAVA_AWT_WM_NONREPARENTING 1
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Thursday, November 25, 2010 @ 05:25:07
Author: andyrtr
Revision: 100691
upgpkg: openjdk6 6.b20_1.9.2-1
new version 1.9.2
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-11-25 09:44:31 UTC (rev 100690)
+++ PKGBUILD2010-11-25 10:25:07 UTC (rev 100691)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9.1
+_icedteaver=1.9.2
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -33,7 +33,7 @@
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('8cb71d69a74152b369d3929c5b5badfd'
+md5sums=('5371bde0a33dc61ee639716c6b8b1af6'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -43,7 +43,8 @@
'ef60d567c0d9bad111212851220deafd'
'ee1afda124d5927345014ab382ef581e'
'409812b5675f9678b1c9e1a12a945a9a'
- '10d13b19762218ee157273cee874394e')
+ '74c4a7adc782edd087802bf92ae3d6d0'
+ '973de018589b23ade5db94fc70de7cfc')
# source PKGBUILD mksource
mksource() {
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, October 13, 2010 @ 13:51:03
Author: andyrtr
Revision: 95023
upgpkg: openjdk6 6.b20_1.9.1-1
new version 1.9.1.
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-10-13 17:23:13 UTC (rev 95022)
+++ PKGBUILD2010-10-13 17:51:03 UTC (rev 95023)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
#_date=20100715
_javaver=6
-_icedteaver=1.9
+_icedteaver=1.9.1
_openjdk_version=b20
_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -14,7 +14,7 @@
pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
-license=('GPL2') # + Classpath exception - see
http://icedtea.classpath.org/wiki/FrequentlyAskedQuestions#What_license_is_IcedTea_released_under.3F
+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'
'xalan-java' 'xulrunner=1.9.2'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
@@ -31,8 +31,8 @@
fontconfig-paths.diff
nonreparenting-wm.diff
openjdk6.profile)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('24191e3974ea58cb2bc410590221486c'
+noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
+md5sums=('8cb71d69a74152b369d3929c5b5badfd'
'0b36adbf67e4f261e1b827ed4be4f447'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -68,7 +68,6 @@
cd ${srcdir}/icedtea6-${_icedteaver}
ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
- ln -s ${srcdir}/${_hotspotver}.tar.gz .
cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
@@ -180,6 +179,9 @@
# set some variables
install -m755 -d ${pkgdir}/etc/profile.d
install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh
|| return 1
+
+ # install license
+ install -Dm644 ${srcdir}/LICENSE
${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
package_openjdk6-src() {
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Tuesday, September 28, 2010 @ 14:14:40
Author: andyrtr
Revision: 92068
fix license; #20962
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-09-28 18:09:19 UTC (rev 92067)
+++ PKGBUILD2010-09-28 18:14:40 UTC (rev 92068)
@@ -14,7 +14,7 @@
pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL2') # + Classpath exception - see
http://icedtea.classpath.org/wiki/FrequentlyAskedQuestions#What_license_is_IcedTea_released_under.3F
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'
'xalan-java' 'xulrunner=1.9.2'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Saturday, September 11, 2010 @ 05:09:59
Author: andyrtr
Revision: 90390
prepare 1.9
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 27 +--
1 file changed, 9 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-09-11 08:48:47 UTC (rev 90389)
+++ PKGBUILD2010-09-11 09:09:59 UTC (rev 90390)
@@ -15,8 +15,6 @@
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('GPL')
-# cat src/icedtea6/hotspot.map or what it downlopads itself / remove from
configure to get it
-_hotspotver=62926c7f67a3
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'
'xalan-java' 'xulrunner=1.9.2'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
@@ -24,10 +22,9 @@
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-
http://hg.openjdk.java.net/hsx/hsx16/master/archive/${_hotspotver}.tar.gz
https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip
-
http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaxws-2009_10_27.zip
-
http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaf-2009_10_27.zip
+
https://jax-ws.dev.java.net/files/documents/4202/150724/jdk6-jaxws-b20.zip
+ https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff
fix_corba_cmds_path.diff
aatext_by_default.diff
@@ -37,10 +34,9 @@
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
md5sums=('24191e3974ea58cb2bc410590221486c'
'0b36adbf67e4f261e1b827ed4be4f447'
- 'd683eb501e7ce710198f20f0c127ebbb'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
- '3ea5728706169498b722b898a1008acf'
- '7a50bb540a27cdd0001885630088b758'
+ '91adfd41e6f001add4f92ae31216b1e3'
+ 'bc95c133620bd68c161cac9891592901'
'5da3e39fa60985576c4f37d1491efbe2'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'ef60d567c0d9bad111212851220deafd'
@@ -73,7 +69,6 @@
ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
ln -s ${srcdir}/${_hotspotver}.tar.gz .
-# ln -s ${srcdir}/jdk6-jaxp-b20.zip .
cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
@@ -98,14 +93,10 @@
--with-xalan2-jar=/usr/share/java/xalan.jar \
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF \
- --with-hotspot-src-zip=${_hotspotver}.tar.gz \
- --with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-2009_10_13.zip \
- --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-2009_10_27.zip \
- --with-jaf-drop-zip=${srcdir}/jdk6-jaf-2009_10_27.zip
+ --with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-b20.zip \
+ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-b20.zip \
+ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip
-
-# --enable-visualvm \ --with-additional-vms=cacao,zero,shark \
-
LD_PRELOAD= make || return 1
}
@@ -133,7 +124,7 @@
cd ${srcdir}/icedtea6-${_icedteaver}
install -m755 -d ${pkgdir}/${_jvmdir}/jre
- pushd
${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+ pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
# Install main files.
cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
@@ -207,7 +198,7 @@
cd ${srcdir}/icedtea6-${_icedteaver}
install -m755 -d ${pkgdir}/${_jvmdir}/jre
- pushd
${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+ pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
# Install src.zip file
cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
}
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Thursday, September 9, 2010 @ 15:54:44
Author: andyrtr
Revision: 90244
prepare 1.9
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-09-09 17:06:54 UTC (rev 90243)
+++ PKGBUILD2010-09-09 19:54:44 UTC (rev 90244)
@@ -4,11 +4,11 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
-_date=20100715
+#_date=20100715
_javaver=6
-_icedteaver=1.8.1
-_openjdk_version=b18
-_openjdk_date=16_feb_2010
+_icedteaver=1.9
+_openjdk_version=b20
+_openjdk_date=21_jun_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
pkgrel=1
@@ -25,7 +25,7 @@
#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
http://hg.openjdk.java.net/hsx/hsx16/master/archive/${_hotspotver}.tar.gz
-
https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_13.zip
+ https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip
http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaxws-2009_10_27.zip
http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaf-2009_10_27.zip
fix_jdk_cmds_path.diff
@@ -35,10 +35,10 @@
nonreparenting-wm.diff
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('72d44286d16c948c7b3bb3d545200b76'
- '94db01691ab38f98b7d42b2ebf4d5c0b'
+md5sums=('24191e3974ea58cb2bc410590221486c'
+ '0b36adbf67e4f261e1b827ed4be4f447'
'd683eb501e7ce710198f20f0c127ebbb'
- 'a2f7b972124cd776ff71e7754eb9a429'
+ '22e95fbdb9fb7d8b6b6fc0a1d76d1fbd'
'3ea5728706169498b722b898a1008acf'
'7a50bb540a27cdd0001885630088b758'
'5da3e39fa60985576c4f37d1491efbe2'
@@ -73,6 +73,7 @@
ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
ln -s ${srcdir}/${_hotspotver}.tar.gz .
+# ln -s ${srcdir}/jdk6-jaxp-b20.zip .
cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, July 14, 2010 @ 19:21:56
Author: andyrtr
Revision: 85524
upgpkg: openjdk6 6.b18_0.hg_20100715-1
update to a recent hg shot to get upstream bugfixes
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-07-14 23:12:40 UTC (rev 85523)
+++ PKGBUILD2010-07-14 23:21:56 UTC (rev 85524)
@@ -4,13 +4,13 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
-#_date=20100129
+_date=20100715
_javaver=6
_icedteaver=1.8
_openjdk_version=b18
_openjdk_date=16_feb_2010
-#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
-pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
+pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
+#pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
@@ -20,9 +20,9 @@
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'
'xalan-java' 'xulrunner=1.9.2'
'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
-options=('!emptydirs' 'force')
-source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
- #ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
+options=('!emptydirs' 'force') # force needed for hg shots
+source=(#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+ ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
http://hg.openjdk.java.net/hsx/hsx16/master/archive/${_hotspotver}.tar.gz
https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_13.zip
@@ -35,7 +35,7 @@
nonreparenting-wm.diff
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('e08dd0762749fb50ec6c273c366ee8ae'
+md5sums=('d26a1805100fffa9bf63ab35a0224492'
'94db01691ab38f98b7d42b2ebf4d5c0b'
'd683eb501e7ce710198f20f0c127ebbb'
'a2f7b972124cd776ff71e7754eb9a429'
@@ -54,9 +54,9 @@
pushd /tmp/icedtea6-${_date}
#hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
# use specific release branch
- hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.7/ ||
return 1
+ hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.8/ ||
return 1
rm -rf icedtea6/.hg*
- tar -cvjf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.bz2 *
+ tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz *
popd
}
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Friday, April 16, 2010 @ 17:58:43
Author: jgc
Revision: 77673
add cpio makedepend (FS#19130)
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-16 21:20:52 UTC (rev 77672)
+++ PKGBUILD2010-04-16 21:58:43 UTC (rev 77673)
@@ -19,7 +19,7 @@
_hotspotver=62926c7f67a3
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'
'xalan-java' 'xulrunner=1.9.2'
-'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
+'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio')
options=('!emptydirs' 'force')
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, April 14, 2010 @ 14:44:56
Author: andyrtr
Revision: 77495
upgpkg: openjdk6 6.b18_1.8-1
new icedtea version 1.8 using openjdk source 6.b18
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD | 28 +++-
1 file changed, 19 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-14 17:07:25 UTC (rev 77494)
+++ PKGBUILD2010-04-14 18:44:56 UTC (rev 77495)
@@ -4,11 +4,11 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
-_date=20100129
+#_date=20100129
_javaver=6
-_icedteaver=1.7.3
-_openjdk_version=b17
-_openjdk_date=14_oct_2009
+_icedteaver=1.8
+_openjdk_version=b18
+_openjdk_date=16_feb_2010
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
pkgrel=1
@@ -19,12 +19,15 @@
_hotspotver=62926c7f67a3
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'
'xalan-java' 'xulrunner=1.9.2'
-'apache-ant=1.7.1-3' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
+'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
options=('!emptydirs' 'force')
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
http://hg.openjdk.java.net/hsx/hsx16/master/archive/${_hotspotver}.tar.gz
+
https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_13.zip
+
http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaxws-2009_10_27.zip
+
http://kenai.com/projects/jdk6-drops/downloads/download/jdk6-jaf-2009_10_27.zip
fix_jdk_cmds_path.diff
fix_corba_cmds_path.diff
aatext_by_default.diff
@@ -32,9 +35,12 @@
nonreparenting-wm.diff
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('9ad707a5edc471e883a66c882adeab46'
- '078fe0ab744c98694decc77f2456c560'
+md5sums=('e08dd0762749fb50ec6c273c366ee8ae'
+ '94db01691ab38f98b7d42b2ebf4d5c0b'
'd683eb501e7ce710198f20f0c127ebbb'
+ 'a2f7b972124cd776ff71e7754eb9a429'
+ '3ea5728706169498b722b898a1008acf'
+ '7a50bb540a27cdd0001885630088b758'
'5da3e39fa60985576c4f37d1491efbe2'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'ef60d567c0d9bad111212851220deafd'
@@ -91,8 +97,12 @@
--with-xalan2-jar=/usr/share/java/xalan.jar \
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF \
- --with-hotspot-src-zip=${_hotspotver}.tar.gz
+ --with-hotspot-src-zip=${_hotspotver}.tar.gz \
+ --with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-2009_10_13.zip \
+ --with-jaxws-drop-zip=${srcdir}/jdk6-jaxws-2009_10_27.zip \
+ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-2009_10_27.zip
+
# --enable-visualvm \ --with-additional-vms=cacao,zero,shark \
LD_PRELOAD= make || return 1
@@ -160,7 +170,7 @@
# link the mozilla-plugin - test it here
http://www.java.com/en/download/help/testvm.xml
install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaNPPlugin.so
${pkgdir}/usr/lib/mozilla/plugins/ || return 1
+ ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so
${pkgdir}/usr/lib/mozilla/plugins/ || return 1
# link binaries into /usr/bin
install -m755 -d ${pkgdir}/usr/bin
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Thursday, April 1, 2010 @ 09:37:57
Author: andyrtr
Revision: 75419
upgpkg: openjdk6 6.b17_1.7.3-1
new icedtea version 1.7.3; builds fine now with ant 1.8
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 13:25:21 UTC (rev 75418)
+++ PKGBUILD2010-04-01 13:37:57 UTC (rev 75419)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
_date=20100129
_javaver=6
-_icedteaver=1.7.2
+_icedteaver=1.7.3
_openjdk_version=b17
_openjdk_date=14_oct_2009
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -32,7 +32,7 @@
nonreparenting-wm.diff
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('37debea2dc60ede6c30e80546c03f625'
+md5sums=('9ad707a5edc471e883a66c882adeab46'
'078fe0ab744c98694decc77f2456c560'
'd683eb501e7ce710198f20f0c127ebbb'
'5da3e39fa60985576c4f37d1491efbe2'
@@ -42,9 +42,6 @@
'409812b5675f9678b1c9e1a12a945a9a'
'10d13b19762218ee157273cee874394e')
-
- # PKG won't build with apache-ant 1.8.0-1 -
downgrade it!
-
# source PKGBUILD mksource
mksource() {
mkdir /tmp/icedtea6-${_date}
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, March 31, 2010 @ 14:14:28
Author: andyrtr
Revision: 74597
upgpkg: openjdk6 6.b17_1.7.2-1
new icedtea version 1.7.2
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-03-31 17:57:58 UTC (rev 74596)
+++ PKGBUILD2010-03-31 18:14:28 UTC (rev 74597)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
_date=20100129
_javaver=6
-_icedteaver=1.7.1
+_icedteaver=1.7.2
_openjdk_version=b17
_openjdk_date=14_oct_2009
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -32,7 +32,7 @@
nonreparenting-wm.diff
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('40fb37998d40ee2c9aad6087348c6306'
+md5sums=('37debea2dc60ede6c30e80546c03f625'
'078fe0ab744c98694decc77f2456c560'
'd683eb501e7ce710198f20f0c127ebbb'
'5da3e39fa60985576c4f37d1491efbe2'
[arch-commits] Commit in openjdk6/trunk (PKGBUILD)
Date: Wednesday, March 3, 2010 @ 14:12:13
Author: andyrtr
Revision: 71067
upgpkg: openjdk6 6.b17_1.7.1-1
new version 1.7.1
Modified:
openjdk6/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-03-03 18:29:19 UTC (rev 71066)
+++ PKGBUILD2010-03-03 19:12:13 UTC (rev 71067)
@@ -6,7 +6,7 @@
pkgbase=openjdk6
_date=20100129
_javaver=6
-_icedteaver=1.7
+_icedteaver=1.7.1
_openjdk_version=b17
_openjdk_date=14_oct_2009
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
@@ -32,7 +32,7 @@
nonreparenting-wm.diff
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('56dce477d8363db4e2010167ff06'
+md5sums=('40fb37998d40ee2c9aad6087348c6306'
'078fe0ab744c98694decc77f2456c560'
'd683eb501e7ce710198f20f0c127ebbb'
'5da3e39fa60985576c4f37d1491efbe2'
@@ -43,6 +43,8 @@
'10d13b19762218ee157273cee874394e')
+ # PKG won't build with apache-ant 1.8.0-1 -
downgrade it!
+
# source PKGBUILD mksource
mksource() {
mkdir /tmp/icedtea6-${_date}
@@ -103,7 +105,7 @@
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing
binary plugs.'
backup=(etc/profile.d/openjdk6.sh)
depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java'
'libxtst')
- optdepends=('nspr: for the browser plugin'
+ optdepends=('xulrunner: for the browser plugin'
'gtk2: for the browser plugin'
'alsa-lib: for sound'
'giflib: for gif format support')
[arch-commits] Commit in openjdk6/trunk (PKGBUILD jpeg8.diff)
Date: Monday, January 25, 2010 @ 14:27:24
Author: andyrtr
Revision: 65242
upgpkg: openjdk6 6.b17_0.hg_20100125-1
update snapshot from 1.7 branch, jpeg fix is now upstream
Modified:
openjdk6/trunk/PKGBUILD
Deleted:
openjdk6/trunk/jpeg8.diff
+
PKGBUILD | 52 +++-
jpeg8.diff | 22 --
2 files changed, 31 insertions(+), 43 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-01-25 19:27:23 UTC (rev 65241)
+++ PKGBUILD2010-01-25 19:27:24 UTC (rev 65242)
@@ -4,7 +4,7 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
-_date=20100122
+_date=20100125
_javaver=6
_icedteaver=1.7
_openjdk_version=b17
@@ -29,19 +29,30 @@
aatext_by_default.diff
fontconfig-paths.diff
nonreparenting-wm.diff
- jpeg8.diff
libpng14.diff
icedtea6-1.7-buildfix.patch
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-
+md5sums=('687982de5bd54661496d88bc9ca57296'
+ '078fe0ab744c98694decc77f2456c560'
+ 'd683eb501e7ce710198f20f0c127ebbb'
+ '5da3e39fa60985576c4f37d1491efbe2'
+ 'f7e7a212e50abb56a6ef1a2b1bd27405'
+ 'ef60d567c0d9bad111212851220deafd'
+ 'ee1afda124d5927345014ab382ef581e'
+ '409812b5675f9678b1c9e1a12a945a9a'
+ '6ec02621643aa6a8395af574efea3388'
+ '8be4409457de3ccb2fb50b238bd55501'
+ '10d13b19762218ee157273cee874394e')
+
+
# source PKGBUILD mksource
mksource() {
mkdir /tmp/icedtea6-${_date}
pushd /tmp/icedtea6-${_date}
- hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
+ #hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
# use specific release branch
- # hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.7/ ||
return 1
+ hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.7/ ||
return 1
rm -rf icedtea6/.hg*
tar -cvjf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.bz2 *
popd
@@ -56,15 +67,14 @@
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-# cd ${srcdir}/icedtea6-${_icedteaver}
- cd ${srcdir}/icedtea6
+ cd ${srcdir}/icedtea6-${_icedteaver}
+# cd ${srcdir}/icedtea6
ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
ln -s ${srcdir}/${_hotspotver}.tar.gz .
-# cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
- cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
+ cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+# cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
- patch -Np0 -i ${srcdir}/jpeg8.diff || return 1
patch -Np1 -i ${srcdir}/icedtea6-1.7-buildfix.patch || return 1
sed -i s/libxul-unstable/libxul/ configure.ac
@@ -89,7 +99,7 @@
--with-xalan2-jar=/usr/share/java/xalan.jar \
--with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF \
- --with-hotspot-src-zip=${_hotspotver}.tar.gz --enable-npplugin=yes
+ --with-hotspot-src-zip=${_hotspotver}.tar.gz --enable-npplugin
# --enable-npplugin \
# --enable-visualvm \ --with-additional-vms=cacao,zero,shark \
@@ -114,16 +124,16 @@
else
_arch=i586
fi
-# _javaver=1.6.0
+
_javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-# cd ${srcdir}/icedtea6-${_icedteaver}
- cd ${srcdir}/icedtea6
+ cd ${srcdir}/icedtea6-${_icedteaver}
+# cd ${srcdir}/icedtea6
install -m755 -d ${pkgdir}/${_jvmdir}/jre
-# pushd
${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
- pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
+ pushd
${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+# pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
# Install main files.
cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
@@ -189,16 +199,16 @@
else
_arch=i586
fi
- # _javaver=1.6.0
+
_javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-# cd ${srcdir}/icedtea6-${_icedteaver}
- cd ${srcdir}/icedtea6
+ cd ${srcdir}/icedtea6-${_icedteaver}
+# cd ${srcdir}/icedtea6
install -m755 -d ${pkgdir}/${_jvmdir}/jre
-# pushd
${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
- pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
+ pushd
${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+# pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
# Install src.zip file
cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
}
Deleted: jpeg8.diff
===
---
[arch-commits] Commit in openjdk6/trunk (PKGBUILD security.diff)
Date: Tuesday, November 10, 2009 @ 09:51:43
Author: andyrtr
Revision: 58626
upgpkg: openjdk6 1.6.2-1
new version 1.6.2
Modified:
openjdk6/trunk/PKGBUILD
Deleted:
openjdk6/trunk/security.diff
---+
PKGBUILD | 12 -
security.diff | 606
2 files changed, 4 insertions(+), 614 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2009-11-10 14:12:53 UTC (rev 58625)
+++ PKGBUILD2009-11-10 14:51:43 UTC (rev 58626)
@@ -4,11 +4,11 @@
pkgname=('openjdk6' 'openjdk6-src')
pkgbase=openjdk6
-_icedteaver=1.6.1
+_icedteaver=1.6.2
_openjdk_version=b16
_openjdk_date=24_apr_2009
pkgver=${_icedteaver}
-pkgrel=2
+pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('GPL')
@@ -31,10 +31,9 @@
nonreparenting-wm.diff
libjpeg7.diff
X11.diff
- security.diff
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
${_hotspotver}.tar.gz)
-md5sums=('f1c98bb31de87a5e15550b9672ea4027'
+md5sums=('42d1938453f60f8436d18f878144d2fa'
'850a29b70206bc7fa083cd26acc781f3'
'600284e870609a7531163bf2972c573b'
'5da3e39fa60985576c4f37d1491efbe2'
@@ -44,9 +43,8 @@
'409812b5675f9678b1c9e1a12a945a9a'
'024a266e12d8cd89c38dfd9080573f82'
'509fbe1a3ac27fd50a38f62f501bb429'
- 'c466cbab2ca4cc0265e575f189e6e853'
'10d13b19762218ee157273cee874394e')
-
+
build() {
unset JAVA_HOME
@@ -64,8 +62,6 @@
cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
- # some security fixes
http://icedtea.classpath.org/hg/release/icedtea6-1.6/rev/2c854193cc9d
- patch -Np1 -i ${srcdir}/security.diff || return 1
# http://icedtea.classpath.org/hg/icedtea6/rev/b862917f2b93
patch -Np1 -i ${srcdir}/libjpeg7.diff || return 1
# fix for new Xorg headers
Deleted: security.diff
===
--- security.diff 2009-11-10 14:12:53 UTC (rev 58625)
+++ security.diff 2009-11-10 14:51:43 UTC (rev 58626)
@@ -1,606 +0,0 @@
-# HG changeset patch
-# User Martin Matejovic mmate...@redhat.com
-# Date 1257267020 -3600
-# Node ID 2c854193cc9dfc94c4d26bb4f4b0fca9fa95d0c2
-# Parent 7c131a5e1ccff31714c05376c1c27333283e5d88
-Add latest security patches
-2009-11-03 Martin Matejovic mmate...@redhat.com
- * patches/security/icedtea-6862968.patch
- * patches/security/icedtea-6863503.patch
- * patches/security/icedtea-6864911.patch
- * patches/security/icedtea-6872357.patch
- * patches/security/icedtea-6874643.patch
- * Makefile.am: apply the above
-
a/ChangeLogMon Sep 14 17:40:46 2009 +0100
-+++ b/ChangeLogTue Nov 03 17:50:20 2009 +0100
-@@ -1,3 +1,11 @@ 2009-09-14 Andrew Haley a...@redhat.co
-+2009-11-03 Martin Matejovic mmate...@redhat.com
-+ * patches/security/icedtea-6862968.patch
-+ * patches/security/icedtea-6863503.patch
-+ * patches/security/icedtea-6864911.patch
-+ * patches/security/icedtea-6872357.patch
-+ * patches/security/icedtea-6874643.patch
-+ * Makefile.am: apply the above
-+
- 2009-09-14 Andrew Haley a...@redhat.com
-
- * NEWS: Update.
a/Makefile.am Mon Sep 14 17:40:46 2009 +0100
-+++ b/Makefile.am Tue Nov 03 17:50:20 2009 +0100
-@@ -626,6 +626,11 @@ ICEDTEA_PATCHES = \
- patches/security/icedtea-6830335.patch \
- patches/security/icedtea-6845701.patch \
- patches/security/icedtea-6813167.patch \
-+ patches/security/icedtea-6862968.patch \
-+ patches/security/icedtea-6863503.patch \
-+ patches/security/icedtea-6864911.patch \
-+ patches/security/icedtea-6872357.patch \
-+ patches/security/icedtea-6874643.patch \
- patches/icedtea-jar-misc.patch
-
- if WITH_ALT_HSBUILD
/dev/null Thu Jan 01 00:00:00 1970 +
-+++ b/patches/security/icedtea-6862968.patch Tue Nov 03 17:50:20 2009 +0100
-@@ -0,0 +1,60 @@
-+--- old/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2009-07-29
13:28:11.27220 +0400
- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c
2009-07-29 13:28:10.71060 +0400
-+@@ -685,6 +685,10 @@
-+ #ifdef DEBUG
-+ printf(in setQTables, qlen = %d, write is %d\n, qlen, write);
-+ #endif
-++if (qlen NUM_QUANT_TBLS) {
-++/* Ignore extra qunterization tables. */
-++qlen = NUM_QUANT_TBLS;
-++}
-+ for (i = 0; i qlen; i++) {
-+ table = (*env)-GetObjectArrayElement(env, qtables, i);
-+ qdata = (*env)-GetObjectField(env, table, JPEGQTable_tableID);
-+@@ -736,6 +740,11 @@
-+ hlensBody = (*env)-GetShortArrayElements(env,
-+ huffLens,
-+ NULL);
-++
