diff options
Diffstat (limited to 'pcr')
-rw-r--r-- | pcr/openjdk6/PKGBUILD | 184 | ||||
-rw-r--r-- | pcr/openjdk6/disable_Werror.diff | 11 | ||||
-rw-r--r-- | pcr/openjdk6/fix_corba_cmds_path.diff | 29 | ||||
-rw-r--r-- | pcr/openjdk6/fix_jdk_cmds_path.diff | 29 | ||||
-rw-r--r-- | pcr/openjdk6/fontconfig-paths.diff | 134 | ||||
-rw-r--r-- | pcr/openjdk6/nonreparenting-wm.diff | 60 | ||||
-rw-r--r-- | pcr/openjdk6/openjdk6.install | 24 | ||||
-rw-r--r-- | pcr/openjdk6/openjdk6.profile | 6 | ||||
-rw-r--r-- | pcr/openjdk6/openjdk6.profile.csh | 6 |
9 files changed, 483 insertions, 0 deletions
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD new file mode 100644 index 000000000..b552f272c --- /dev/null +++ b/pcr/openjdk6/PKGBUILD @@ -0,0 +1,184 @@ +# $Id: PKGBUILD 178352 2013-02-20 17:00:42Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=('openjdk6' 'openjdk6-src') +pkgbase="openjdk6" +_javaver=6 +_icedteaver=1.12.3 +_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' + 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget') +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_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 + 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_04.zip + jdk6-jaxws2_1_6-2011_06_13.zip + jdk6-jaf-b20.zip) +sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c' + 'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3' + '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0' + '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c' + '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' + '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012' + 'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5' + '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' + '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' + '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9' + 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' + '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd' + '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007') + +build() { + + unset JAVA_HOME + unset CLASSPATH + + [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + + _javaver=6 + _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk + + cd ${srcdir}/icedtea6-${_icedteaver} + + ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz . + + cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/ + + 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 ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" + export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" + unset MAKEFLAGS + + ./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_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 \ + --with-abs-install-dir=${_jvmdir} + 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' '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') + conflicts=('java-environment' 'java-runtime') + provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6') + install=openjdk6.install + + if [ "${CARCH}" = "x86_64" ]; then + _arch=amd64 + else + _arch=i586 + 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 main files. + 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 + mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \ + ${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/ + + # Install demos and samples. + cp -a demo ${pkgdir}/${_jvmdir}/ + install -m755 -d sample/rmi + 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 + done + + # Install desktop files. + install -m755 -d ${pkgdir}/usr/share/applications + install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications + + # 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 + done + popd + + # link JKS keystore from ca-certificates-java + rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts" + + # set some variables + install -m755 -d ${pkgdir}/etc/profile.d + 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}//icedtea6-${_icedteaver}/openjdk/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=i586 + 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}/ +} diff --git a/pcr/openjdk6/disable_Werror.diff b/pcr/openjdk6/disable_Werror.diff new file mode 100644 index 000000000..fa8887a10 --- /dev/null +++ b/pcr/openjdk6/disable_Werror.diff @@ -0,0 +1,11 @@ +--- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +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 diff --git a/pcr/openjdk6/fix_corba_cmds_path.diff b/pcr/openjdk6/fix_corba_cmds_path.diff new file mode 100644 index 000000000..7a3db9567 --- /dev/null +++ b/pcr/openjdk6/fix_corba_cmds_path.diff @@ -0,0 +1,29 @@ +--- 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 +@@ -76,7 +76,7 @@ + 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 +@@ -125,7 +125,7 @@ + TAIL = $(UTILS_USR_BIN_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test +-TOUCH = $(UTILS_COMMAND_PATH)touch ++TOUCH = $(UTILS_USR_BIN_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname +@@ -176,7 +176,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/pcr/openjdk6/fix_jdk_cmds_path.diff b/pcr/openjdk6/fix_jdk_cmds_path.diff new file mode 100644 index 000000000..bd37dd4ba --- /dev/null +++ b/pcr/openjdk6/fix_jdk_cmds_path.diff @@ -0,0 +1,29 @@ +--- 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 +@@ -89,7 +89,7 @@ + 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 +@@ -137,7 +137,7 @@ + TAIL = $(UTILS_USR_BIN_PATH)tail + TAR = $(UTILS_COMMAND_PATH)tar + TEST = $(UTILS_USR_BIN_PATH)test +-TOUCH = $(UTILS_COMMAND_PATH)touch ++TOUCH = $(UTILS_USR_BIN_PATH)touch + TR = $(UTILS_USR_BIN_PATH)tr + TRUE = $(UTILS_COMMAND_PATH)true + UNAME = $(UTILS_COMMAND_PATH)uname +@@ -178,7 +178,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/pcr/openjdk6/fontconfig-paths.diff b/pcr/openjdk6/fontconfig-paths.diff new file mode 100644 index 000000000..fa08db629 --- /dev/null +++ b/pcr/openjdk6/fontconfig-paths.diff @@ -0,0 +1,134 @@ +--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2009-05-29 22:45:23.024341869 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new 2009-05-29 22:55:13.681366890 +0000 +@@ -275,73 +275,61 @@ + + # 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_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_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.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc +-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf +- +-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf +-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf +-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf +-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf +-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf +-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf +-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf +-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf +-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf +-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf +-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf +-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf +-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf +- +-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf +-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf +-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf +-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf +-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf +-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf +-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf +-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf +-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf +-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf +- +-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf +-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf +-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf +-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf +-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf +-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf +-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf +-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf +-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf +-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf +-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf +-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf +- +-# AWT X11 font paths +-awtfontpath.latin-1=/usr/share/fonts/X11/Type1 +-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic +-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic +-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic +-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic +-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy +-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi +-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami +-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic +-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk +-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts ++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/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/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.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf ++ ++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf ++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf ++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf ++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf ++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf ++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf ++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf ++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf ++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf ++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf ++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf ++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf ++ ++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf ++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf ++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf ++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf ++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf ++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf ++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf ++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf ++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf ++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf ++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf ++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf ++ diff --git a/pcr/openjdk6/nonreparenting-wm.diff b/pcr/openjdk6/nonreparenting-wm.diff new file mode 100644 index 000000000..65fa66e89 --- /dev/null +++ b/pcr/openjdk6/nonreparenting-wm.diff @@ -0,0 +1,60 @@ +diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java +index 68d1ff7..878327e 100644 +--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java +@@ -99,7 +99,8 @@ + METACITY_WM = 11, + COMPIZ_WM = 12, + LG3D_WM = 13, +- MUTTER_WM = 14; ++ MUTTER_WM = 14, ++ OTHER_NONREPARENTING_WM = 15; + public String toString() { + switch (WMID) { + case NO_WM: +@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants { + } + + static boolean isNonReparentingWM() { +- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM); ++ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); + } + + /* +@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants { + * supports WIN or _NET wm spec. + */ + else if (l_net_protocol.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } else if (win.active()) { +- awt_wmgr = XWM.OTHER_WM; ++ if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; ++ } else { ++ awt_wmgr = XWM.OTHER_WM; ++ } + } + /* + * Check for legacy WMs. +@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants { + awt_wmgr = XWM.MOTIF_WM; + } else if (isOpenLook()) { + awt_wmgr = XWM.OPENLOOK_WM; ++ } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { ++ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; + } else { + awt_wmgr = XWM.OTHER_WM; + } +@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants { + res = new Insets(28, 6, 6, 6); + break; + case NO_WM: ++ case OTHER_NONREPARENTING_WM: + case LG3D_WM: + res = zeroInsets; + break; diff --git a/pcr/openjdk6/openjdk6.install b/pcr/openjdk6/openjdk6.install new file mode 100644 index 000000000..653c8fe2f --- /dev/null +++ b/pcr/openjdk6/openjdk6.install @@ -0,0 +1,24 @@ +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 + 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() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + 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 +} diff --git a/pcr/openjdk6/openjdk6.profile b/pcr/openjdk6/openjdk6.profile new file mode 100644 index 000000000..9da4421ef --- /dev/null +++ b/pcr/openjdk6/openjdk6.profile @@ -0,0 +1,6 @@ +export J2SDKDIR=/usr/lib/jvm/java-6-openjdk +export J2REDIR=$J2SDKDIR/jre +export JAVA_HOME=/usr/lib/jvm/java-6-openjdk + +# enable this for non-reparenting window managers +#export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/pcr/openjdk6/openjdk6.profile.csh b/pcr/openjdk6/openjdk6.profile.csh new file mode 100644 index 000000000..3cb15fd49 --- /dev/null +++ b/pcr/openjdk6/openjdk6.profile.csh @@ -0,0 +1,6 @@ +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 |