summaryrefslogtreecommitdiff
path: root/testing/java7-openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'testing/java7-openjdk')
-rw-r--r--testing/java7-openjdk/PKGBUILD346
-rw-r--r--testing/java7-openjdk/fix_corba_cmds_path.diff33
-rw-r--r--testing/java7-openjdk/fontconfig-paths.diff134
-rw-r--r--testing/java7-openjdk/glibc2_15.diff232
-rw-r--r--testing/java7-openjdk/jdk7-openjdk.profile6
-rw-r--r--testing/java7-openjdk/jdk7-openjdk.profile.csh1
-rw-r--r--testing/java7-openjdk/jre7-openjdk-headless.install15
-rw-r--r--testing/java7-openjdk/jre7-openjdk.install18
-rw-r--r--testing/java7-openjdk/jre7-openjdk.profile5
-rw-r--r--testing/java7-openjdk/jre7-openjdk.profile.csh5
-rw-r--r--testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff24
-rw-r--r--testing/java7-openjdk/openjdk7_nonreparenting-wm.diff58
12 files changed, 0 insertions, 877 deletions
diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD
deleted file mode 100644
index e2e70cd57..000000000
--- a/testing/java7-openjdk/PKGBUILD
+++ /dev/null
@@ -1,346 +0,0 @@
-# $Id: PKGBUILD 148171 2012-01-30 18:47:32Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
-
-pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src')
- # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7
-pkgbase=java7-openjdk
-_java_ver=7
-_openjdk_build=b147
-_openjdk_date=27_jun_2011
-_icedtea_ver=2.0
-_date=20110922
-
-# check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=4d9e4fb8af09
-_HOTSPOT_CHANGESET=b28ae681bae0
-_JAXP_CHANGESET=948e734135ea
-_JAXWS_CHANGESET=a2ebfdc9db7e
-_JDK_CHANGESET=2054526dd141
-_LANGTOOLS_CHANGESET=9b85f1265346
-_OPENJDK_CHANGESET=0a76e5390e68
-
-_bootstrap=0 # 0/1 for quick build or full bootstrap
-
-pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=6
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org"
-license=('custom')
-options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
- 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
- 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # fastjar`?
-[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
-
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
- ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz
- ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz
- ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz
- ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz
- ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz # jdk.tar.gz
- ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz
- ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz
- fontconfig-paths.diff
- fix_corba_cmds_path.diff
- openjdk7_fix_jdk_cmds_path.diff
- openjdk7_nonreparenting-wm.diff
- jdk7-openjdk.profile
- jdk7-openjdk.profile.csh
- jre7-openjdk.profile
- jre7-openjdk.profile.csh
- glibc2_15.diff)
-md5sums=('752721a037a625001fad7a5fc2013f60'
- '4c34ddf70124ea90c79201c1afede3e3'
- '8f8d222d0a6d363d06b40576da5f1ea2'
- '4abf34372e34cccd74ad337e487ed790'
- 'f2f40590a83889b8aa1d4631b705092d'
- 'd3beed0118bbd93d4651af762eb748c7'
- 'c8617700b4bd6cd5de1257bc36509bed'
- 'f10b711b0c784df8707808d9d0f52abd'
- 'ee1afda124d5927345014ab382ef581e'
- 'f7e7a212e50abb56a6ef1a2b1bd27405'
- 'c195c4865b84d9e2e0fd71ac6d88eadb'
- '203640d6e79e41b0065e016818c17ccd'
- 'b7b8996448c7b4fa7dd2d744488ed3bd'
- 'cdabafad0ec413d9a983888bf445a443'
- '612b0fec7e0943c37a6de77c43622007'
- '62443459da0cb28181feb260dc0e5ce7'
- 'a4293acadff03bdccbc9b412ad288549')
-
-#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
-
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
- "${_CORBA_CHANGESET}.tar.gz"
- "${_JAXP_CHANGESET}.tar.gz"
- "${_JAXWS_CHANGESET}.tar.gz"
- "${_JDK_CHANGESET}.tar.gz"
- "${_LANGTOOLS_CHANGESET}.tar.gz"
- "${_HOTSPOT_CHANGESET}.tar.gz")
-
- _jvmdir=/usr/lib/jvm/java-7-openjdk
-
- [ "$CARCH" = "x86_64" ] && _JARCH=amd64
- [ "$CARCH" = "i686" ] && _JARCH=i386
-
-build() {
- cd "${srcdir}/icedtea-${_icedtea_ver}"
-
- unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-
- # default is to build with first found java-environment found in our repos - is jdk7-openjdk
- [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh
-
- unset MAKEFLAGS # parallel build is currently broken
- export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
- export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-
- . /etc/profile.d/apache-ant.sh
-
- cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
- export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/glibc2_15.diff"
-
- if [ "$_bootstrap" = "1" ]; then
- BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
- else
- BOOTSTRAPOPT="--disable-bootstrap"
- fi
-
- ./configure \
- $BOOTSTRAPOPT \
- --with-parallel-jobs="${MAKEFLAGS/-j}" \
- --disable-tests \
- --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
- --with-jdk-home=${JAVA_HOME} \
- --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
- --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
- --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
- --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \
- --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
- --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
- --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
- --enable-pulse-java \
- --enable-nss \
- --with-rhino
- #--help
-
-# --enable-systemtap Enable inclusion of SystemTap trace support - needs systemtab from AUR + --with-abs-install-dir=/usr/lib/jvm/java-7-openjdk The absolute path where the j2sdk-image dir will be installed
-
- make
-}
-
-check() {
- cd "${srcdir}/icedtea-${_icedtea_ver}"
- make -k check
-}
-
-package_jre7-openjdk-headless() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs"
- depends=('libjpeg-turbo' 'lcms2' 'nss'
- 'ca-certificates-java' 'rhino')
- optdepends=('libcups: needed for Java Mauve support - libmawt.so'
- 'fontconfig: needed for Java Mauve support - libmawt.so')
- provides=('java-runtime=7')
- conflicts=('java-runtime' 'openjdk6')
- # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos
- backup=(etc/profile.d/jre.sh
- etc/profile.d/jre.csh
- etc/java-7-openjdk/calendars.properties
- etc/java-7-openjdk/content-types.properties
- etc/java-7-openjdk/cursors/cursors.properties
- etc/java-7-openjdk/flavormap.properties
- etc/java-7-openjdk/fontconfig.bfc
- etc/java-7-openjdk/fontconfig.properties
- etc/java-7-openjdk/jvm.cfg
- etc/java-7-openjdk/logging.properties
- etc/java-7-openjdk/management/jmxremote.access
- etc/java-7-openjdk/management/jmxremote.password
- etc/java-7-openjdk/management/management.properties
- etc/java-7-openjdk/management/snmp.acl
- etc/java-7-openjdk/net.properties
- etc/java-7-openjdk/psfont.properties.ja
- etc/java-7-openjdk/psfontj2d.properties
- etc/java-7-openjdk/security/java.policy
- etc/java-7-openjdk/security/java.security
- etc/java-7-openjdk/security/nss.cfg
- etc/java-7-openjdk/sound.properties
- etc/java-7-openjdk/tz.properties)
- install=jre7-openjdk-headless.install
-
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
- mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties
- mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc
- rm -f lib/fontconfig.*.bfc
- rm -f lib/fontconfig.*.properties.src
- rm -f lib/fontconfig.properties.src
-
- install -d -m755 ${pkgdir}/${_jvmdir}/jre/
- cp -a bin lib ${pkgdir}/${_jvmdir}/jre
-
- # Install man pages
- pushd ../../j2re-image/man
- install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/
- install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1
- install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1
- popd
-
- # more files that belong to the desktop package
- mkdir ${srcdir}/tmp-desktop-jre
- for file in \
- "/usr/lib/jvm/java-7-openjdk/jre/bin/policytool" \
- "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libjsoundalsa.so" \
- "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libpulse-java.so" \
- "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/libsplashscreen.so" \
- "/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt/libmawt.so" \
- "/usr/share/man/ja/man1/policytool.1" \
- "/usr/share/man/man1/policytool.1"; do
- dirname=`dirname $file`
- install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true
- # mv file from fakeinstall to pkgdir
- mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file
- done
- rmdir ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/xawt
-
- # Link binaries into /usr/bin
- pushd ${pkgdir}/${_jvmdir}/jre/bin
- install -m755 -d ${pkgdir}/usr/bin/
- for file in *; do
- ln -sf ${_jvmdir}/jre/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}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh
- install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh
-
- # Install license
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
- install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
- ${pkgdir}/usr/share/licenses/${pkgbase}
-
- # Put some more files under backup control
- install -m755 -d ${pkgdir}/etc/java-7-openjdk/
- install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/
- # install dummy links to make them found by JAVA
- cd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/
- for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do
- ln -vsf /etc/java-7-openjdk/`basename $file` .
- done
- # some more
- install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security}
- install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/cursors.properties ${pkgdir}/etc/java-7-openjdk/cursors/
- pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/images/cursors/
- ln -vsf /etc/java-7-openjdk/cursors/cursors.properties .
- popd
- mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/jmxremote.password
- mv ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl.template ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/snmp.acl
- install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} ${pkgdir}/etc/java-7-openjdk/management/
- pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/management
- ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} .
- popd
- install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security/{java.policy,java.security,nss.cfg} ${pkgdir}/etc/java-7-openjdk/security/
- pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/security
- ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} .
- popd
- install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/
- install -m644 ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/
- pushd ${pkgdir}/usr/lib/jvm/java-7-openjdk/jre/lib/${_JARCH}/
- ln -vsf /etc/java-7-openjdk/jvm.cfg .
- popd
-}
-
-package_jre7-openjdk() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs -Full Java runtime environment - needed for executing Java GUI and Webstart programs"
- depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
- optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
- 'alsa-lib: for basic sound support'
- 'giflib: for gif format support'
- 'libpulse: for advanced sound support'
- 'gtk2: for the Gtk+ look and feel - desktop usage')
- install=jre7-openjdk.install
- conflicts=('openjdk6')
-
- mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
- # Link binaries into /usr/bin
- pushd ${pkgdir}/${_jvmdir}/jre/bin
- install -m755 -d ${pkgdir}/usr/bin/
- for file in *; do
- ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
- done
- popd
-
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
-
- # 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 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-}
-
-package_jdk7-openjdk() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
- depends=('jre7-openjdk')
- provides=('java-environment=7')
- conflicts=('java-environment')
- # replaces=('openjdk6')
- backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
-
- cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
-
- # Main files
- install -m755 -d ${pkgdir}/${_jvmdir}/
-
- cp -a demo include lib sample ${pkgdir}/${_jvmdir}
-
- # 'bin' files
- pushd bin
- install -m755 -d ${pkgdir}/${_jvmdir}/bin/ \
- ${pkgdir}/usr/bin/ \
- ${pkgdir}/usr/share/man/{,ja/}man1/
-
- # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
- for b in $(ls | grep -v java-rmi.cgi); do
- if [ -e ../jre/bin/${b} ]; then
- # Provide a link of the jre binary in the jdk/bin/ directory
- ln -s ../jre/bin/${b} ${pkgdir}/${_jvmdir}/bin/${b}
- else
- # Copy binary to jdk/bin/
- install -m755 ${b} ${pkgdir}/${_jvmdir}/bin/${b}
- # Copy man page
- install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
- install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
- # Link from /bin/
- ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
- fi
- done
- popd
-
- # Handling 'java-rmi.cgi' separately
- install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
-
- # Set some variables
- install -m755 -d ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
- install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
-}
-
-package_openjdk7-src() {
- pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
-
- install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
- ${pkgdir}/${_jvmdir}/src.zip
-}
diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/testing/java7-openjdk/fix_corba_cmds_path.diff
deleted file mode 100644
index 842657880..000000000
--- a/testing/java7-openjdk/fix_corba_cmds_path.diff
+++ /dev/null
@@ -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)
diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/testing/java7-openjdk/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/testing/java7-openjdk/fontconfig-paths.diff
+++ /dev/null
@@ -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
-+
diff --git a/testing/java7-openjdk/glibc2_15.diff b/testing/java7-openjdk/glibc2_15.diff
deleted file mode 100644
index c2fd6124b..000000000
--- a/testing/java7-openjdk/glibc2_15.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-
-# HG changeset patch
-# User never
-# Date 1319555835 25200
-# Node ID a6eef545f1a2ceca6aeadf688a965df600ffef28
-# Parent 2ec638646e86e455978c31a9d47fc0ec271ed926
-7103224: collision between __LEAF define in interfaceSupport.hpp and /usr/include/sys/cdefs.h with gcc
-Reviewed-by: never
-Contributed-by: Omair Majid <omajid@redhat.com>
-
---- openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/opto/addnode.cpp Tue Oct 25 08:17:15 2011 -0700
-@@ -33,8 +33,6 @@
- #include "opto/subnode.hpp"
-
- // Portions of code courtesy of Clifford Click
--
--#define MAXFLOAT ((float)3.40282346638528860e+38)
-
- // Classic Add functionality. This covers all the usual 'add' behaviors for
- // an algebraic ring. Add-integer, add-float, add-double, and binary-or are
---- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp Tue Oct 25 08:17:15 2011 -0700
-@@ -107,7 +107,7 @@ extern "C" {
- if (env != xenv) { \
- NativeReportJNIFatalError(thr, warn_wrong_jnienv); \
- } \
-- __ENTRY(result_type, header, thr)
-+ VM_ENTRY_BASE(result_type, header, thr)
-
-
- #define UNCHECKED() (unchecked_jni_NativeInterface)
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl Tue Oct 25 08:17:15 2011 -0700
-@@ -426,7 +426,7 @@ struct jvmtiInterface_1_ jvmti</xsl:text
- <xsl:value-of select="$space"/>
- <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text>
- <xsl:value-of select="$space"/>
-- <xsl:text>__ENTRY(jvmtiError, </xsl:text>
-+ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text>
- <xsl:apply-templates select="." mode="functionid"/>
- <xsl:text> , current_thread)</xsl:text>
- <xsl:value-of select="$space"/>
---- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp Tue Oct 25 08:17:15 2011 -0700
-@@ -173,7 +173,7 @@ JvmtiEnv::GetThreadLocalStorage(jthread
- // from native so as to resolve the jthread.
-
- ThreadInVMfromNative __tiv(current_thread);
-- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
-+ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread)
- debug_only(VMNativeEntryWrapper __vew;)
-
- oop thread_oop = JNIHandles::resolve_external_guard(thread);
---- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp Tue Oct 25 08:17:15 2011 -0700
-@@ -373,7 +373,7 @@ JvmtiExport::get_jvmti_interface(JavaVM
- JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread();
- // transition code: native to VM
- ThreadInVMfromNative __tiv(current_thread);
-- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
-+ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread)
- debug_only(VMNativeEntryWrapper __vew;)
-
- JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version);
---- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 04:07:20 2011 -0700
-+++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp Tue Oct 25 08:17:15 2011 -0700
-@@ -72,9 +72,9 @@ class HandleMarkCleaner: public StackObj
- }
- };
-
--// InterfaceSupport provides functionality used by the __LEAF and __ENTRY
--// macros. These macros are used to guard entry points into the VM and
--// perform checks upon leave of the VM.
-+// InterfaceSupport provides functionality used by the VM_LEAF_BASE and
-+// VM_ENTRY_BASE macros. These macros are used to guard entry points into
-+// the VM and perform checks upon leave of the VM.
-
-
- class InterfaceSupport: AllStatic {
-@@ -433,7 +433,7 @@ class RuntimeHistogramElement : public H
-
- // LEAF routines do not lock, GC or throw exceptions
-
--#define __LEAF(result_type, header) \
-+#define VM_LEAF_BASE(result_type, header) \
- TRACE_CALL(result_type, header) \
- debug_only(NoHandleMark __hm;) \
- /* begin of body */
-@@ -441,7 +441,7 @@ class RuntimeHistogramElement : public H
-
- // ENTRY routines may lock, GC and throw exceptions
-
--#define __ENTRY(result_type, header, thread) \
-+#define VM_ENTRY_BASE(result_type, header, thread) \
- TRACE_CALL(result_type, header) \
- HandleMarkCleaner __hm(thread); \
- Thread* THREAD = thread; \
-@@ -450,7 +450,7 @@ class RuntimeHistogramElement : public H
-
- // QUICK_ENTRY routines behave like ENTRY but without a handle mark
-
--#define __QUICK_ENTRY(result_type, header, thread) \
-+#define VM_QUICK_ENTRY_BASE(result_type, header, thread) \
- TRACE_CALL(result_type, header) \
- debug_only(NoHandleMark __hm;) \
- Thread* THREAD = thread; \
-@@ -463,20 +463,20 @@ class RuntimeHistogramElement : public H
- #define IRT_ENTRY(result_type, header) \
- result_type header { \
- ThreadInVMfromJava __tiv(thread); \
-- __ENTRY(result_type, header, thread) \
-+ VM_ENTRY_BASE(result_type, header, thread) \
- debug_only(VMEntryWrapper __vew;)
-
-
- #define IRT_LEAF(result_type, header) \
- result_type header { \
-- __LEAF(result_type, header) \
-+ VM_LEAF_BASE(result_type, header) \
- debug_only(No_Safepoint_Verifier __nspv(true);)
-
-
- #define IRT_ENTRY_NO_ASYNC(result_type, header) \
- result_type header { \
- ThreadInVMfromJavaNoAsyncException __tiv(thread); \
-- __ENTRY(result_type, header, thread) \
-+ VM_ENTRY_BASE(result_type, header, thread) \
- debug_only(VMEntryWrapper __vew;)
-
- // Another special case for nmethod_entry_point so the nmethod that the
-@@ -487,7 +487,7 @@ class RuntimeHistogramElement : public H
- result_type header { \
- nmethodLocker _nmlock(nm); \
- ThreadInVMfromJavaNoAsyncException __tiv(thread); \
-- __ENTRY(result_type, header, thread)
-+ VM_ENTRY_BASE(result_type, header, thread)
-
- #define IRT_END }
-
-@@ -497,20 +497,20 @@ class RuntimeHistogramElement : public H
- #define JRT_ENTRY(result_type, header) \
- result_type header { \
- ThreadInVMfromJava __tiv(thread); \
-- __ENTRY(result_type, header, thread) \
-+ VM_ENTRY_BASE(result_type, header, thread) \
- debug_only(VMEntryWrapper __vew;)
-
-
- #define JRT_LEAF(result_type, header) \
- result_type header { \
-- __LEAF(result_type, header) \
-+ VM_LEAF_BASE(result_type, header) \
- debug_only(JRT_Leaf_Verifier __jlv;)
-
-
- #define JRT_ENTRY_NO_ASYNC(result_type, header) \
- result_type header { \
- ThreadInVMfromJavaNoAsyncException __tiv(thread); \
-- __ENTRY(result_type, header, thread) \
-+ VM_ENTRY_BASE(result_type, header, thread) \
- debug_only(VMEntryWrapper __vew;)
-
- // Same as JRT Entry but allows for return value after the safepoint
-@@ -543,11 +543,11 @@ extern "C" {
- assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
- ThreadInVMfromNative __tiv(thread); \
- debug_only(VMNativeEntryWrapper __vew;) \
-- __ENTRY(result_type, header, thread)
-+ VM_ENTRY_BASE(result_type, header, thread)
-
-
- // Ensure that the VMNativeEntryWrapper constructor, which can cause
--// a GC, is called outside the NoHandleMark (set via __QUICK_ENTRY).
-+// a GC, is called outside the NoHandleMark (set via VM_QUICK_ENTRY_BASE).
- #define JNI_QUICK_ENTRY(result_type, header) \
- extern "C" { \
- result_type JNICALL header { \
-@@ -555,7 +555,7 @@ extern "C" {
- assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
- ThreadInVMfromNative __tiv(thread); \
- debug_only(VMNativeEntryWrapper __vew;) \
-- __QUICK_ENTRY(result_type, header, thread)
-+ VM_QUICK_ENTRY_BASE(result_type, header, thread)
-
-
- #define JNI_LEAF(result_type, header) \
-@@ -563,7 +563,7 @@ extern "C" {
- result_type JNICALL header { \
- JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
- assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \
-- __LEAF(result_type, header)
-+ VM_LEAF_BASE(result_type, header)
-
-
- // Close the routine and the extern "C"
-@@ -579,7 +579,7 @@ extern "C" {
- JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
- ThreadInVMfromNative __tiv(thread); \
- debug_only(VMNativeEntryWrapper __vew;) \
-- __ENTRY(result_type, header, thread)
-+ VM_ENTRY_BASE(result_type, header, thread)
-
-
- #define JVM_ENTRY_NO_ENV(result_type, header) \
-@@ -588,7 +588,7 @@ extern "C" {
- JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \
- ThreadInVMfromNative __tiv(thread); \
- debug_only(VMNativeEntryWrapper __vew;) \
-- __ENTRY(result_type, header, thread)
-+ VM_ENTRY_BASE(result_type, header, thread)
-
-
- #define JVM_QUICK_ENTRY(result_type, header) \
-@@ -597,14 +597,14 @@ extern "C" {
- JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
- ThreadInVMfromNative __tiv(thread); \
- debug_only(VMNativeEntryWrapper __vew;) \
-- __QUICK_ENTRY(result_type, header, thread)
-+ VM_QUICK_ENTRY_BASE(result_type, header, thread)
-
-
- #define JVM_LEAF(result_type, header) \
- extern "C" { \
- result_type JNICALL header { \
- VM_Exit::block_if_vm_exited(); \
-- __LEAF(result_type, header)
-+ VM_LEAF_BASE(result_type, header)
-
-
- #define JVM_END } }
-
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/testing/java7-openjdk/jdk7-openjdk.profile
deleted file mode 100644
index 91265cc86..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-7-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
-
-# For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING'
-# in /etc/profile.d/jre7.sh
diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/testing/java7-openjdk/jdk7-openjdk.profile.csh
deleted file mode 100644
index cc7dc8ab1..000000000
--- a/testing/java7-openjdk/jdk7-openjdk.profile.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-7-openjdk"
diff --git a/testing/java7-openjdk/jre7-openjdk-headless.install b/testing/java7-openjdk/jre7-openjdk-headless.install
deleted file mode 100644
index 45f52fe32..000000000
--- a/testing/java7-openjdk/jre7-openjdk-headless.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/sbin/init-jks-keystore
- fi
-}
-
-post_upgrade() {
- if [ ! -f /etc/ssl/certs/java/cacerts ]; then
- /usr/sbin/init-jks-keystore
- fi
-}
-
-#post_remove() {
-#
-#}
diff --git a/testing/java7-openjdk/jre7-openjdk.install b/testing/java7-openjdk/jre7-openjdk.install
deleted file mode 100644
index d98e79ec5..000000000
--- a/testing/java7-openjdk/jre7-openjdk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- echo "when you use a non-reparenting window manager"
- echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
- echo "/etc/profile.d/jre.sh"
-# update-desktop-database -q
-}
-
-post_upgrade() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-# update-desktop-database -q
-}
-
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-# update-desktop-database -q
-}
diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/testing/java7-openjdk/jre7-openjdk.profile
deleted file mode 100644
index c86ce857a..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile
+++ /dev/null
@@ -1,5 +0,0 @@
-export J2REDIR=/usr/lib/jvm/java-7-openjdk/jre
-export JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/testing/java7-openjdk/jre7-openjdk.profile.csh
deleted file mode 100644
index a9aed27d1..000000000
--- a/testing/java7-openjdk/jre7-openjdk.profile.csh
+++ /dev/null
@@ -1,5 +0,0 @@
-setenv J2REDIR "/usr/lib/jvm/java-7-openjdk/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-7-openjdk/jre"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
deleted file mode 100644
index c68bd4441..000000000
--- a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,24 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200
-@@ -91,10 +91,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
-@@ -141,7 +141,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
diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
deleted file mode 100644
index ba1a588e1..000000000
--- a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig 2011-08-07 18:45:05.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-08-07 18:45:54.000000000 +0200
-@@ -102,7 +102,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:
-@@ -576,7 +577,7 @@
- // TODO: according to wikipedia, compiz is now reparenting. This should
- // probably be updated.
- 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);
- }
-
- /*
-@@ -762,9 +763,17 @@
- * 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.
-@@ -775,6 +784,8 @@
- 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;
- }
-@@ -1289,6 +1300,7 @@
- res = new Insets(28, 6, 6, 6);
- break;
- case NO_WM:
-+ case OTHER_NONREPARENTING_WM:
- case LG3D_WM:
- res = zeroInsets;
- break;
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-02-16 14:42:52 +0000