Date: Sunday, November 2, 2014 @ 14:38:41 Author: guillaume Revision: 225550
Remove _JAVA_AWT_WM_NONREPARENTING from jre.sh Modified: java-common/trunk/PKGBUILD java-common/trunk/install_java-runtime-common.sh java-common/trunk/profile_jre.csh java-common/trunk/profile_jre.sh --------------------------------+ PKGBUILD | 6 +++--- install_java-runtime-common.sh | 7 +++++++ profile_jre.csh | 3 --- profile_jre.sh | 3 --- 4 files changed, 10 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-02 12:56:47 UTC (rev 225549) +++ PKGBUILD 2014-11-02 13:38:41 UTC (rev 225550) @@ -2,7 +2,7 @@ pkgname=('java-runtime-common' 'java-environment-common') pkgbase=java-common pkgver=2 -pkgrel=1 +pkgrel=2 arch=('any') url='www.archlinux.org' license=('GPL') @@ -13,8 +13,8 @@ test_archlinux-java https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz) -sha256sums=('ab851cd30ee7f5c0d970163afe87f11797148fe8503dc1bd30f8a490e53f1246' - 'e5837f87a6ab42f4f5c53ca5e5c678df67d9ea32611deea58521c144e126695c' +sha256sums=('9d25638cafc2fabd1ba6f2f26aa01233eccf3d31db003d956b571f0ab655dd23' + '519e9881a2a9f4fc3d581ea0ef0da594eedbfdfcf734f9fdc0bb595e8ac77e4c' '272296ec7ca673b4f9f59fb70565328b6daef682c29cd964c988c018090c3fc2' 'c2c413a6b2f8b88ed170a5b19f7cb620518e09686f0d286b4b27d30f571e5050' '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee') Modified: install_java-runtime-common.sh =================================================================== --- install_java-runtime-common.sh 2014-11-02 12:56:47 UTC (rev 225549) +++ install_java-runtime-common.sh 2014-11-02 13:38:41 UTC (rev 225550) @@ -1,3 +1,10 @@ +pre_upgrade() { + if grep -q '^export _JAVA_AWT_WM_NONREPARENTING=1' /etc/profile.d/jre.sh > /dev/null 2>&1; then + echo "Variable '_JAVA_AWT_WM_NONREPARENTING' should not be set in /etc/profile.d/jre.sh any more" + echo "Please declare it in ~/.xinitrc or such" + fi +} + post_install() { echo 'For the complete set of Java binaries to be available in your PATH,' echo 'you need to re-login or source /etc/profile.d/jre.sh' Modified: profile_jre.csh =================================================================== --- profile_jre.csh 2014-11-02 12:56:47 UTC (rev 225549) +++ profile_jre.csh 2014-11-02 13:38:41 UTC (rev 225550) @@ -1,6 +1,3 @@ # Do not change this unless you want to completely by-pass Arch Linux' way # of handling Java versions and vendors. Instead, please use script `archlinux-java` setenv PATH "${PATH}:/usr/lib/jvm/default/bin" - -# Enable this for non-reparenting window managers -#setenv _JAVA_AWT_WM_NONREPARENTING 1 Modified: profile_jre.sh =================================================================== --- profile_jre.sh 2014-11-02 12:56:47 UTC (rev 225549) +++ profile_jre.sh 2014-11-02 13:38:41 UTC (rev 225550) @@ -1,6 +1,3 @@ # Do not change this unless you want to completely by-pass Arch Linux' way # of handling Java versions and vendors. Instead, please use script `archlinux-java` export PATH=${PATH}:/usr/lib/jvm/default/bin - -# Enable this for non-reparenting window managers -#export _JAVA_AWT_WM_NONREPARENTING=1