mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-05 03:47:13 +08:00
Removing openjdk6 from the repository.
This commit is contained in:
Daniele
parent
181aa65b44
commit
c05261d0d4
@ -1,184 +0,0 @@
|
||||
#
|
||||
# Chakra Packages for Chakra, part of chakra-project.org
|
||||
#
|
||||
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
|
||||
|
||||
pkgname=('openjdk6' 'openjdk6-src')
|
||||
pkgbase="openjdk6"
|
||||
_javaver=6
|
||||
_icedteaver=1.11.1
|
||||
_openjdk_version=b24
|
||||
_openjdk_date=14_nov_2011
|
||||
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
|
||||
pkgrel=1
|
||||
url='http://icedtea.classpath.org'
|
||||
arch=('i686' 'x86_64')
|
||||
license=('GPL')
|
||||
# cat src/icedtea6/hotspot.map or what it downlopads itself / remove from configure to get it
|
||||
#_hotspotver=62926c7f67a3
|
||||
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' 'fastjar' 'openjdk6')
|
||||
options=('!emptydirs') # 'force') # force needed for hg shots
|
||||
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_03.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
|
||||
openjdk6.profile
|
||||
openjdk6.profile.csh)
|
||||
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
|
||||
jaxp144_03.zip
|
||||
jdk6-jaxws2_1_6-2011_06_13.zip
|
||||
jdk6-jaf-b20.zip)
|
||||
md5sums=('e51d9d2f0328cc5aa7a00943abd96ed6'
|
||||
'4c3f0144c62599ce19a08d3b42f33d29'
|
||||
'0eabdd360169144336e50081b8d01001'
|
||||
'9eea471ad474040265c688858fcf09aa'
|
||||
'8fd91b09b643a19a912b8a75e7a7a9d5'
|
||||
'bc95c133620bd68c161cac9891592901'
|
||||
'5da3e39fa60985576c4f37d1491efbe2'
|
||||
'f7e7a212e50abb56a6ef1a2b1bd27405'
|
||||
'ee1afda124d5927345014ab382ef581e'
|
||||
'9b4d368f5ee08de248eaf029303a446c'
|
||||
'74c4a7adc782edd087802bf92ae3d6d0'
|
||||
'fdf295e2f186dfa4d308691a3d7ac8c5')
|
||||
|
||||
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"
|
||||
|
||||
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=Chakra-Linux-${pkgver}-${pkgrel}-$CARCH \
|
||||
--with-jaxp-drop-zip=${srcdir}/jaxp144_03.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
|
||||
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')
|
||||
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')
|
||||
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}/
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
--- 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)
|
||||
@ -1,33 +0,0 @@
|
||||
--- 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)
|
||||
@ -1,134 +0,0 @@
|
||||
--- 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
|
||||
+
|
||||
@ -1,60 +0,0 @@
|
||||
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;
|
||||
@ -1,18 +0,0 @@
|
||||
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"
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
|
||||
|
||||
post_remove() {
|
||||
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
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
|
||||
@ -1,6 +0,0 @@
|
||||
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
|
||||
Loading…
Reference in New Issue
Block a user