[arch-commits] Commit in openjdk6/trunk (PKGBUILD openjdk6.install)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Feb 17 22:49:28 UTC 2011
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
===================================================================
--- PKGBUILD 2011-02-17 19:33:50 UTC (rev 110227)
+++ PKGBUILD 2011-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
+ cp -a bin include lib ${pkgdir}/${_jvmdir}/
+ cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/
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 \
- ${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.*.properties.src
# Install man pages.
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.
- cp -a demo ${pkgdir}/${_jvmdir}/ || return 1
+ cp -a demo ${pkgdir}/${_jvmdir}/
install -m755 -d sample/rmi
- mv bin/java-rmi.cgi sample/rmi || return 1
- cp -a sample ${pkgdir}/${_jvmdir}/ || return 1
+ mv bin/java-rmi.cgi sample/rmi
+ cp -a sample ${pkgdir}/${_jvmdir}/
popd
# Install icons and menu entries.
for s in 16 24 32 48 ; do
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 \
- ${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
# Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m644 javaws.png ${pkgdir}/usr/share/pixmaps || return 1
- install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications || return 1
+# install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
+ install -m755 -d ${pkgdir}/usr/share/applications
+# install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
+# install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
+ install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
# 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
+# install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
+# ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
# link binaries into /usr/bin
install -m755 -d ${pkgdir}/usr/bin
pushd ${pkgdir}/${_jvmdir}/bin
for file in *; do
ln -sf ${_jvmdir}/bin/${file} \
- ${pkgdir}/usr/bin || return 1
+ ${pkgdir}/usr/bin
done
popd
@@ -180,8 +185,8 @@
# set some variables
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.csh ${pkgdir}/etc/profile.d/openjdk6.csh || 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
# install license
install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
@@ -205,5 +210,5 @@
pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
# Install src.zip file
- cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
+ cp -a src.zip ${pkgdir}/${_jvmdir}/
}
Modified: openjdk6.install
===================================================================
--- openjdk6.install 2011-02-17 19:33:50 UTC (rev 110227)
+++ openjdk6.install 2011-02-17 22:49:28 UTC (rev 110228)
@@ -6,6 +6,7 @@
echo "when you use a non-reparenting window manager"
echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
echo "/etc/profile.d/openjdk6.sh"
+# update-desktop-database -q
}
post_upgrade() {
@@ -13,9 +14,11 @@
if [ ! -f /etc/ssl/certs/java/cacerts ]; then
/usr/sbin/init-jks-keystore
fi
+# update-desktop-database -q
}
post_remove() {
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+# update-desktop-database -q
}
More information about the arch-commits
mailing list