extra/openjdk6 to 6.b22_1.10-1

This commit is contained in:
Kevin Mihelich 2011-03-04 19:24:56 -05:00
parent bda4e54b61
commit d36014eee6
2 changed files with 50 additions and 83 deletions

View file

@ -1,38 +1,42 @@
# $Id: PKGBUILD 109497 2011-02-10 07:39:42Z andyrtr $ # $Id: PKGBUILD 111999 2011-03-02 23:26:46Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org>
# PlugApps: Kevin Mihelich <kevin@plugapps.com> # PlugApps: Kevin Mihelich <kevin@plugapps.com>
# - Run autogen.sh instead of configure # - Run autogen.sh, then configure with --enable-zero, make -j1
# - Fix a bunch of random compile-time problems # - Either remove -Werror from makefiles, or #ifndef ARM in ffi.h
# - facedesk x200 # - Fake reporting of total ram if <512MB
# - facedesk a few times
# - Added libffi to package depends
# - Define arm as _arch in package
# - Removed openjdk6-src package, there's no point
# #
# Don't try this at home. # Please, don't try this at home.
plugrel=1 plugrel=1
noautobuild=1 noautobuild=1
pkgname=('openjdk6' 'openjdk6-src') pkgname=('openjdk6')
pkgbase="openjdk6" pkgbase="openjdk6"
#_date=20100715 #_date=20100715
_javaver=6 _javaver=6
_icedteaver=1.9.6 _icedteaver=1.10
_openjdk_version=b20 _openjdk_version=b22
_openjdk_date=21_jun_2010 _openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
pkgrel=1 pkgrel=1
url='http://icedtea.classpath.org' url='http://icedtea.classpath.org'
arch=('i686' 'x86_64') arch=('arm')
license=('custom') license=('custom')
makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2' 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' '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')
options=('!emptydirs') # 'force') # force needed for hg shots 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
#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.xz #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://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
https://jaxp.dev.java.net/files/documents/913/150648/jdk6-jaxp-b20.zip 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/150724/jdk6-jaxws-b20.zip
https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip https://jax-ws.dev.java.net/files/documents/4202/150725/jdk6-jaf-b20.zip
fix_jdk_cmds_path.diff fix_jdk_cmds_path.diff
@ -43,9 +47,9 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar
openjdk6.profile openjdk6.profile
openjdk6.profile.csh) openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
md5sums=('865af3f871ded848f4aa909075ebe856' md5sums=('fd3f35e8a8a2ef9a64c035ed66cea06d'
'0b36adbf67e4f261e1b827ed4be4f447' '2d2bbbb0f9b81f1fec41ec730da8a933'
'22e95fbdb9fb7d8b6b6fc0a1d76d1fbd' 'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3' '91adfd41e6f001add4f92ae31216b1e3'
'bc95c133620bd68c161cac9891592901' 'bc95c133620bd68c161cac9891592901'
'5da3e39fa60985576c4f37d1491efbe2' '5da3e39fa60985576c4f37d1491efbe2'
@ -60,9 +64,9 @@ md5sums=('865af3f871ded848f4aa909075ebe856'
mksource() { mksource() {
mkdir /tmp/icedtea6-${_date} mkdir /tmp/icedtea6-${_date}
pushd /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 # 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* rm -rf icedtea6/.hg*
tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz * tar -cvJf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.xz *
popd popd
@ -75,6 +79,7 @@ build() {
[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
_javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
cd ${srcdir}/icedtea6-${_icedteaver} cd ${srcdir}/icedtea6-${_icedteaver}
@ -91,45 +96,30 @@ build() {
export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
unset MAKEFLAGS unset MAKEFLAGS
if [ -x ${_jvmdir}/bin/javac ]; then ./autogen.sh
JCONF="--with-openjdk" ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
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
./autogen.sh --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
--with-xalan2-jar=/usr/share/java/xalan.jar \ --with-xalan2-jar=/usr/share/java/xalan.jar \
--with-ant-home=/usr/share/java/apache-ant \ --with-ant-home=/usr/share/java/apache-ant \
--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF \ --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
--with-jaxp-drop-zip=${srcdir}/jdk6-jaxp-b20.zip \ --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 \ --with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
--enable-zero --disable-bootstrap --enable-zero
LD_PRELOAD="" make -j1
LD_PRELOAD="" make || return 1
} }
package_openjdk6() { package_openjdk6() {
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
backup=(etc/profile.d/openjdk6.sh) backup=(etc/profile.d/openjdk6.sh)
depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libffi') depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'libffi')
optdepends=('xulrunner: for the browser plugin' optdepends=('icedtea-web: web browser plugin + Java Web Start'
'gtk2: for the browser plugin'
'alsa-lib: for sound' 'alsa-lib: for sound'
'giflib: for gif format support') 'giflib: for gif format support')
conflicts=('java-environment' 'java-runtime') conflicts=('java-environment' 'java-runtime')
provides=('java-environment=6' 'java-runtime=6') provides=('java-environment=6' 'java-runtime=6')
install=openjdk6.install install=openjdk6.install
if [ "${CARCH}" = "x86_64" ]; then
_arch=amd64
else
_arch=arm _arch=arm
fi
_javaver=6 _javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@ -139,49 +129,44 @@ package_openjdk6() {
pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
# Install main files. # Install main files.
cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1 cp -a bin include lib ${pkgdir}/${_jvmdir}/
cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1 cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/
mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src || return 1 ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src
mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc || return 1 ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc
rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
# Install man pages. # Install man pages.
install -m755 -d ${pkgdir}/usr/share/man/man1 install -m755 -d ${pkgdir}/usr/share/man/man1
install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ || return 1 install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/
# Install demos and samples. # Install demos and samples.
cp -a demo ${pkgdir}/${_jvmdir}/ || return 1 cp -a demo ${pkgdir}/${_jvmdir}/
install -m755 -d sample/rmi install -m755 -d sample/rmi
mv bin/java-rmi.cgi sample/rmi || return 1 mv bin/java-rmi.cgi sample/rmi
cp -a sample ${pkgdir}/${_jvmdir}/ || return 1 cp -a sample ${pkgdir}/${_jvmdir}/
popd popd
# Install icons and menu entries. # Install icons and menu entries.
for s in 16 24 32 48 ; do for s in 16 24 32 48 ; do
install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \ install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png || return 1 ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
done done
# Install desktop files. # Install desktop files.
install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} install -m755 -d ${pkgdir}/usr/share/applications
install -m644 javaws.png ${pkgdir}/usr/share/pixmaps || return 1 install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications || return 1
# 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}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
# link binaries into /usr/bin # link binaries into /usr/bin
install -m755 -d ${pkgdir}/usr/bin install -m755 -d ${pkgdir}/usr/bin
pushd ${pkgdir}/${_jvmdir}/bin pushd ${pkgdir}/${_jvmdir}/bin
for file in *; do for file in *; do
ln -sf ${_jvmdir}/bin/${file} \ ln -sf ${_jvmdir}/bin/${file} \
${pkgdir}/usr/bin || return 1 ${pkgdir}/usr/bin
done done
popd popd
@ -191,30 +176,9 @@ package_openjdk6() {
# set some variables # set some variables
install -m755 -d ${pkgdir}/etc/profile.d install -m755 -d ${pkgdir}/etc/profile.d
install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1 install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh
install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh || return 1 install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh
# install license # install license
install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
} }
package_openjdk6-src() {
pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
depends=('openjdk6')
if [ "${CARCH}" = "x86_64" ]; then
_arch=amd64
else
_arch=arm
fi
_javaver=6
_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
cd ${srcdir}/icedtea6-${_icedteaver}
install -m755 -d ${pkgdir}/${_jvmdir}/jre
pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
# Install src.zip file
cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
}

View file

@ -6,6 +6,7 @@ post_install() {
echo "when you use a non-reparenting window manager" echo "when you use a non-reparenting window manager"
echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
echo "/etc/profile.d/openjdk6.sh" echo "/etc/profile.d/openjdk6.sh"
# update-desktop-database -q
} }
post_upgrade() { post_upgrade() {
@ -13,9 +14,11 @@ post_upgrade() {
if [ ! -f /etc/ssl/certs/java/cacerts ]; then if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/sbin/init-jks-keystore /usr/sbin/init-jks-keystore
fi fi
# update-desktop-database -q
} }
post_remove() { post_remove() {
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
# update-desktop-database -q
} }