diff options
Diffstat (limited to 'abs/extra/openjdk6')
-rw-r--r-- | abs/extra/openjdk6/PKGBUILD | 155 | ||||
-rw-r--r-- | abs/extra/openjdk6/aatext_by_default.diff | 35 | ||||
-rw-r--r-- | abs/extra/openjdk6/fix_corba_cmds_path.diff | 33 | ||||
-rw-r--r-- | abs/extra/openjdk6/fix_jdk_cmds_path.diff | 33 | ||||
-rw-r--r-- | abs/extra/openjdk6/fontconfig-paths.diff | 43 | ||||
-rw-r--r-- | abs/extra/openjdk6/gcjwebplugin_xulrunner.diff | 11 | ||||
-rw-r--r-- | abs/extra/openjdk6/openjdk6.install | 12 | ||||
-rw-r--r-- | abs/extra/openjdk6/openjdk6.profile | 4 |
8 files changed, 326 insertions, 0 deletions
diff --git a/abs/extra/openjdk6/PKGBUILD b/abs/extra/openjdk6/PKGBUILD new file mode 100644 index 0000000..22ee813 --- /dev/null +++ b/abs/extra/openjdk6/PKGBUILD @@ -0,0 +1,155 @@ +# $Id: PKGBUILD 29222 2009-03-06 20:55:45Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=openjdk6 +pkgver=1.5 +_icedteaver=1.5pre +pkgrel=0.1 +_date=20090305 +pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.' +url='http://icedtea.classpath.org' +arch=('i686' 'x86_64') +license=('GPL') +_openjdk_version=b14 +_openjdk_date=25_nov_2008 +_hotspotver=fc6a5ae3fef5 # what it downlopads itself / remove from configure to get it +depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme') +makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.3' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial') +conflicts=('java-environment' 'java-runtime') +provides=('java-environment=6' 'java-runtime=6') +options=(!emptydirs) +install=openjdk6.install +source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz + #http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz + ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2 + http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz + fix_jdk_cmds_path.diff + fix_corba_cmds_path.diff + gcjwebplugin_xulrunner.diff + aatext_by_default.diff + fontconfig-paths.diff + openjdk6.profile) +noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz) +md5sums=('9f9773a822156dd3d576d83d794364ce' + 'd57bf545dc50d41588b43112393dac26' + '1c3510387dccdb4907d0fd2f1c58e372' + '5da3e39fa60985576c4f37d1491efbe2' + 'f7e7a212e50abb56a6ef1a2b1bd27405' + 'ed2e808df2d2fc2ea7dae5139d475192' + 'ef60d567c0d9bad111212851220deafd' + '104380f0b900c840141e572a7fb70c27' + 'd0703088e10aa957c037644ab88d716d') + +build() { + # for hg checkout install mercurial and +# mkdir ${srcdir}/icedtea6-${_date} +# cd ${srcdir}/icedtea6-${_date} +# hg clone http://icedtea.classpath.org/hg/icedtea6 || return 1 +# tar -cvjf ../../icedtea6-${_date}.tar.bz2 * +# return 1 + + unset JAVA_HOME + unset CLASSPATH + if [ "${CARCH}" = "x86_64" ]; then + _arch=amd64 + else + _arch=i586 + fi + _javaver=1.6.0 + _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk + + cd ${srcdir}/icedtea6 +# cd ${srcdir}/icedtea6-${_icedteaver} + ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz . + ln -s ${srcdir}/${_hotspotver}.tar.gz . + + # fix xulrunner linking + patch -Np0 -i ${srcdir}/gcjwebplugin_xulrunner.diff || return 1 + + cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/ +# cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/ + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff" + + ./autogen.sh + autoreconf # needed due to mercurial build + + export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" + export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" + unset MAKEFLAGS + + if [ -x ${_jvmdir}/bin/javac ]; then + JCONF="--with-openjdk --with-openjdk-home=${_jvmdir}" + elif [ -x /opt/java/bin/javac ]; then + JCONF="--with-openjdk --with-openjdk-home=/opt/java" + elif [ -x /usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/bin/javac ]; then + JCONF="--with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 --with-javac" + elif [ -x /usr/lib/java-${_javaver}-openjdk/bin/javac ]; then + JCONF="--with-openjdk --with-openjdk-home=/usr/lib/java-${_javaver}-openjdk" + # ^ only fallback to build with broken 1.2-3, can be removed later + else + echo "No supported java installation found, install either openjdk6, jdk or java-gcj-compat" + return 1 + fi + + ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \ + --with-xalan2-jar=/usr/share/java/xalan.jar \ + --with-hotspot-src-zip=${_hotspotver}.tar.gz \ + --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF + LD_PRELOAD="" make || return 1 + + install -m755 -d ${pkgdir}/${_jvmdir}/jre + + pushd ${srcdir}/icedtea6/openjdk/control/build/linux-${_arch}/j2sdk-image +# pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/control/build/linux-${_arch}/j2sdk-image + # Install main files. + cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1 + cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1 + + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src || return 1 + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ + ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc || return 1 + 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 demos and samples. + cp -a demo ${pkgdir}/${_jvmdir}/ || return 1 + install -m755 -d sample/rmi + mv bin/java-rmi.cgi sample/rmi || return 1 + cp -a sample ${pkgdir}/${_jvmdir}/ || return 1 + 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 + 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 + + # link the mozilla-plugin + 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 + install -m755 -d ${pkgdir}/usr/bin + pushd ${pkgdir}/${_jvmdir}/bin + for file in *; do + ln -sf ${_jvmdir}/bin/${file} \ + ${pkgdir}/usr/bin || return 1 + done + popd + + # set some variables + install -m755 -d ${pkgdir}/etc/profile.d + install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1 +} diff --git a/abs/extra/openjdk6/aatext_by_default.diff b/abs/extra/openjdk6/aatext_by_default.diff new file mode 100644 index 0000000..268ea99 --- /dev/null +++ b/abs/extra/openjdk6/aatext_by_default.diff @@ -0,0 +1,35 @@ +--- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old 2008-01-08 20:23:56.000000000 +0200 ++++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2008-02-24 12:39:19.000000000 +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; diff --git a/abs/extra/openjdk6/fix_corba_cmds_path.diff b/abs/extra/openjdk6/fix_corba_cmds_path.diff new file mode 100644 index 0000000..8426578 --- /dev/null +++ b/abs/extra/openjdk6/fix_corba_cmds_path.diff @@ -0,0 +1,33 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 +@@ -86,10 +86,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -136,7 +136,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq +@@ -186,7 +186,7 @@ + # others have it in /usr/bin. + SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ + $(wildcard $(UTILS_USR_BIN_PATH)sort)) +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UTILS_COMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/abs/extra/openjdk6/fix_jdk_cmds_path.diff b/abs/extra/openjdk6/fix_jdk_cmds_path.diff new file mode 100644 index 0000000..7e16e17 --- /dev/null +++ b/abs/extra/openjdk6/fix_jdk_cmds_path.diff @@ -0,0 +1,33 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:33:23.000000000 +0300 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2008-04-14 15:37:34.000000000 +0300 +@@ -76,10 +76,10 @@ + CHMOD = $(UTILS_COMMAND_PATH)chmod + CMP = $(UTILS_USR_BIN_PATH)cmp + COMM = $(UTILS_USR_BIN_PATH)comm +-COMPRESS = $(UTILS_USR_BIN_PATH)compress ++COMPRESS = $(UTILS_COMMAND_PATH)compress + CP = $(UTILS_COMMAND_PATH)cp + CPIO = $(UTILS_COMMAND_PATH)cpio +-CUT = $(UTILS_USR_BIN_PATH)cut ++CUT = $(UTILS_COMMAND_PATH)cut + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df + DIFF = $(UTILS_USR_BIN_PATH)diff +@@ -126,7 +126,7 @@ + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test + TOUCH = $(UTILS_COMMAND_PATH)touch +-TR = $(UTILS_USR_BIN_PATH)tr ++TR = $(UTILS_COMMAND_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname + UNIQ = $(UTILS_USR_BIN_PATH)uniq +@@ -173,7 +173,7 @@ + BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \ + $(wildcard $(UTILS_USR_BIN_PATH)basename)) + +- NAWK = $(USRBIN_PATH)gawk ++ NAWK = $(UTILS_COMMAND_PATH)gawk + # Intrinsic unix command, with backslash-escaped character interpretation + ECHO = /bin/echo -e + # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not) diff --git a/abs/extra/openjdk6/fontconfig-paths.diff b/abs/extra/openjdk6/fontconfig-paths.diff new file mode 100644 index 0000000..77d3e03 --- /dev/null +++ b/abs/extra/openjdk6/fontconfig-paths.diff @@ -0,0 +1,43 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig 2008-08-06 14:11:55.000000000 +0200 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2008-08-06 14:15:36.000000000 +0200 +@@ -128,23 +128,23 @@ + + # Font File Names + +-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf +-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf +-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf +-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf ++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf ++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf ++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf ++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf + +-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf +-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf +-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf +-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf ++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf ++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf ++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf + +-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf +-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf +-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf +-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf ++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf ++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf ++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf ++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf + +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf +-filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf +-filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf ++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic-subst.ttf ++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho-subst.ttf ++filename.AR_PL_ZenKai_Uni=/usr/share/fonts/TTF/ukai.ttf ++filename.Baekmuk_Dotum=/usr/share/fonts/TTF/dotum.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf diff --git a/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff b/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff new file mode 100644 index 0000000..0ed9209 --- /dev/null +++ b/abs/extra/openjdk6/gcjwebplugin_xulrunner.diff @@ -0,0 +1,11 @@ +--- Makefile.am 2008-07-21 15:12:07.000000000 +0000 ++++ Makefile.am.new 2008-07-22 08:37:49.000000000 +0000 +@@ -1176,7 +1176,7 @@ + # gcjwebplugin.so. + gcjwebplugin.so: gcjwebplugin.cc + $(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \ +- $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \ ++ $(MOZILLA_LIBS) -Wl,-R/usr/lib/xulrunner-1.9 $(GLIB_CFLAGS) $(GLIB_LIBS) \ + $(GTK_CFLAGS) $(GTK_LIBS) \ + -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \ + -fpic -shared -o $@ $< diff --git a/abs/extra/openjdk6/openjdk6.install b/abs/extra/openjdk6/openjdk6.install new file mode 100644 index 0000000..3557847 --- /dev/null +++ b/abs/extra/openjdk6/openjdk6.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + post_install +} + + +post_remove() { + post_install +} diff --git a/abs/extra/openjdk6/openjdk6.profile b/abs/extra/openjdk6/openjdk6.profile new file mode 100644 index 0000000..4af417f --- /dev/null +++ b/abs/extra/openjdk6/openjdk6.profile @@ -0,0 +1,4 @@ +export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk +export J2REDIR=$J2SDKDIR/jre +export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk +#export CLASSPATH="${CLASSPATH:+$CLASSPATH:}$J2SDKDIR/lib:$J2REDIR/lib" |