Date: Saturday, June 14, 2014 @ 14:09:30
Author: guillaume
Revision: 215110
Icedtea release. Build against giflib 5.0.6
Modified:
java7-openjdk/trunk/PKGBUILD
----------+
PKGBUILD | 85 +++++++++++++++++++++++++------------------------------------
1 file changed, 36 insertions(+), 49 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-06-14 10:57:01 UTC (rev 215109)
+++ PKGBUILD 2014-06-14 12:09:30 UTC (rev 215110)
@@ -6,24 +6,15 @@
pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src'
'openjdk7-doc')
pkgbase=java7-openjdk
_java_ver=7
-_icedtea_ver=2.4.7
+_icedtea_ver=2.5.0
# check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=55
+_JDK_UPDATE_VERSION=60
-_CORBA_CHANGESET=e6ad5b912691
-_JAXP_CHANGESET=94b7e8e0d96f
-_JAXWS_CHANGESET=bd9a50a78d04
-_JDK_CHANGESET=9448fff93286
-_LANGTOOLS_CHANGESET=8c26a3c39128
-_OPENJDK_CHANGESET=13970e76b784
-
-_HOTSPOT_CHANGESET=69b542696e5b # see
"${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
-
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org";
license=('custom')
@@ -33,46 +24,45 @@
'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar'
'wget'
'eclipse-ecj')
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3}
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-
openjdk-${_OPENJDK_CHANGESET}.tar.gz::${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz
-
corba-${_CORBA_CHANGESET}.tar.gz::${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz
-
jaxp-${_JAXP_CHANGESET}.tar.gz::${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
-
jaxws-${_JAXWS_CHANGESET}.tar.gz::${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
-
jdk-${_JDK_CHANGESET}.tar.gz::${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz
-
langtools-${_LANGTOOLS_CHANGESET}.tar.gz::${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
-
hotspot-${_HOTSPOT_CHANGESET}.tar.gz::${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
+_icedtea_url=http://icedtea.classpath.org/download
+_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver:0:3}
+source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
+ ${_drops_url}/openjdk.tar.bz2
+ ${_drops_url}/corba.tar.bz2
+ ${_drops_url}/jaxp.tar.bz2
+ ${_drops_url}/jaxws.tar.bz2
+ ${_drops_url}/jdk.tar.bz2
+ ${_drops_url}/langtools.tar.bz2
+ ${_drops_url}/hotspot.tar.bz2
fontconfig-paths.diff
openjdk7_nonreparenting-wm.diff
- giflib_5.1.diff
jdk7-openjdk.profile
jdk7-openjdk.profile.csh
jre7-openjdk.profile
jre7-openjdk.profile.csh)
-sha256sums=('754350cbd704b22b7ba3d14c8283eb2d896d137824f95a9e6a2b34678658ade1'
- 'bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b'
- 'cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674'
- '3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea'
- '3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d'
- '9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be'
- '5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b'
- 'e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65'
+sha256sums=('4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100'
+ '9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859'
+ '1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253'
+ '59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488'
+ 'ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028'
+ '508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83'
+ '0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659'
+ '645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
- '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9'
'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
'3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
'89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
-noextract=("openjdk-${_OPENJDK_CHANGESET}.tar.gz"
- "corba-${_CORBA_CHANGESET}.tar.gz"
- "jaxp-${_JAXP_CHANGESET}.tar.gz"
- "jaxws-${_JAXWS_CHANGESET}.tar.gz"
- "jdk-${_JDK_CHANGESET}.tar.gz"
- "langtools-${_LANGTOOLS_CHANGESET}.tar.gz"
- "hotspot-${_HOTSPOT_CHANGESET}.tar.gz")
+noextract=(openjdk.tar.gz
+ corba.tar.gz
+ jaxp.tar.gz
+ jaxws.tar.gz
+ jdk.tar.gz
+ langtools.tar.gz
+ hotspot.tar.gz)
[ "$CARCH" = "x86_64" ] && _JARCH=amd64
[ "$CARCH" = "i686" ] && _JARCH=i386
@@ -81,7 +71,6 @@
_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
_nonheadless=(bin/policytool
lib/${_JARCH}/libjsoundalsa.so
- lib/${_JARCH}/libpulse-java.so
lib/${_JARCH}/libsplashscreen.so
lib/${_JARCH}/xawt/libmawt.so)
@@ -95,8 +84,7 @@
cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
- patches/openjdk7_nonreparenting-wm.diff \
- patches/giflib_5.1.diff"
+ patches/openjdk7_nonreparenting-wm.diff"
if [ "$_bootstrap" = "1" ]; then
BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
@@ -111,14 +99,13 @@
--disable-downloading --disable-Werror \
--with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
--with-jdk-home=${JAVA_HOME} \
-
--with-openjdk-src-zip="${srcdir}/openjdk-${_OPENJDK_CHANGESET}.tar.gz" \
-
--with-hotspot-src-zip="${srcdir}/hotspot-${_HOTSPOT_CHANGESET}.tar.gz" \
- --with-corba-src-zip="${srcdir}/corba-${_CORBA_CHANGESET}.tar.gz" \
- --with-jaxp-src-zip="${srcdir}/jaxp-${_JAXP_CHANGESET}.tar.gz" \
- --with-jaxws-src-zip="${srcdir}/jaxws-${_JAXWS_CHANGESET}.tar.gz" \
- --with-jdk-src-zip="${srcdir}/jdk-${_JDK_CHANGESET}.tar.gz" \
-
--with-langtools-src-zip="${srcdir}/langtools-${_LANGTOOLS_CHANGESET}.tar.gz" \
- --enable-pulse-java \
+ --with-openjdk-src-zip="${srcdir}/openjdk.tar.bz2" \
+ --with-hotspot-src-zip="${srcdir}/hotspot.tar.bz2" \
+ --with-corba-src-zip="${srcdir}/corba.tar.bz2" \
+ --with-jaxp-src-zip="${srcdir}/jaxp.tar.bz2" \
+ --with-jaxws-src-zip="${srcdir}/jaxws.tar.bz2" \
+ --with-jdk-src-zip="${srcdir}/jdk.tar.bz2" \
+ --with-langtools-src-zip="${srcdir}/langtools.tar.bz2" \
--enable-nss \
--with-rhino \
--with-abs-install-dir=${_jvmdir}
