diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-03 13:17:07 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-11-03 13:17:07 -0200 |
| commit | b3ede9b279f1f6b3c79a1831a14e62599e3018ed (patch) | |
| tree | 83edfe32ffb2d95c3dfe52c4e8075bb616079fc2 | |
| parent | cb68c6e03ffbe93d3338acab9005e00a87861be2 (diff) | |
| download | abslibre-b3ede9b279f1f6b3c79a1831a14e62599e3018ed.tar.gz abslibre-b3ede9b279f1f6b3c79a1831a14e62599e3018ed.tar.bz2 abslibre-b3ede9b279f1f6b3c79a1831a14e62599e3018ed.zip | |
java-runtime-common-2-2.parabola1: remove _JAVA_AWT_WM_NONREPARENTING from jre.sh
| -rw-r--r-- | libre/java-common/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/java-common/install_java-runtime-common.sh | 7 | ||||
| -rw-r--r-- | libre/java-common/profile_jre.csh | 3 | ||||
| -rw-r--r-- | libre/java-common/profile_jre.sh | 3 |
4 files changed, 10 insertions, 9 deletions
diff --git a/libre/java-common/PKGBUILD b/libre/java-common/PKGBUILD index a20014359..982d1f881 100644 --- a/libre/java-common/PKGBUILD +++ b/libre/java-common/PKGBUILD @@ -3,7 +3,7 @@ pkgname=java-runtime-common pkgbase=java-common pkgver=2 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc='Common files for Java Runtime Environments (Parabola rebranded)' arch=('any') url='www.parabola.nu' @@ -20,8 +20,8 @@ source=(profile_jre.csh test_parabola-java https://shunit2.googlecode.com/files/shunit2-2.1.6.tgz) -sha256sums=('769f9d2e58388aafb83f6493b0aed0b851c43ec8ffc1c23241825347a4c413ec' - 'e80a98ee72d0b7cb9f4471590217be21281aa7029b55bd538e963812f1b820a7' +sha256sums=('fb981764fbdcb33976085405d002a1427b5401da5f13f1dd00008dbe8306583a' + '36e07f9387f24ff0c6dff1b4c6d9011eedef4bd22634e0c5a6335817991dc151' '103e0cbd0dd3b11376ba61e743f481f1a720c336f7b67d09a6b189f988e2fe6e' '6e0f4173d4cfaad5ab0ed953fad770ee70b355349304c3bd34043edf0b6a7ab5' '65a313a76fd5cc1c58c9e19fbc80fc0e418a4cbfbd46d54b35ed5b6e0025d4ee') diff --git a/libre/java-common/install_java-runtime-common.sh b/libre/java-common/install_java-runtime-common.sh index 0c9ae502e..9aebc7502 100644 --- a/libre/java-common/install_java-runtime-common.sh +++ b/libre/java-common/install_java-runtime-common.sh @@ -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' diff --git a/libre/java-common/profile_jre.csh b/libre/java-common/profile_jre.csh index 7cd51e95d..77030c7ab 100644 --- a/libre/java-common/profile_jre.csh +++ b/libre/java-common/profile_jre.csh @@ -1,6 +1,3 @@ # Do not change this unless you want to completely by-pass Parabola' way # of handling Java versions and vendors. Instead, please use script `parabola-java` setenv PATH "${PATH}:/usr/lib/jvm/default/bin" - -# Enable this for non-reparenting window managers -#setenv _JAVA_AWT_WM_NONREPARENTING 1 diff --git a/libre/java-common/profile_jre.sh b/libre/java-common/profile_jre.sh index 9e44dc9e1..3ee622239 100644 --- a/libre/java-common/profile_jre.sh +++ b/libre/java-common/profile_jre.sh @@ -1,6 +1,3 @@ # Do not change this unless you want to completely by-pass Parabola' way # of handling Java versions and vendors. Instead, please use script `parabola-java` export PATH=${PATH}:/usr/lib/jvm/default/bin - -# Enable this for non-reparenting window managers -#export _JAVA_AWT_WM_NONREPARENTING=1 |