summaryrefslogtreecommitdiff
path: root/extra/openjdk6
diff options
context:
space:
mode:
authorroot <root@rshg047.dnsready.net>2011-06-09 22:46:45 +0000
committerroot <root@rshg047.dnsready.net>2011-06-09 22:46:45 +0000
commit8634a064b17334eb58699897220aeed2fc9a54db (patch)
tree8991573625a440a1f27d8da1abb3ae61fa4d0137 /extra/openjdk6
parent498f3fc095103b2a220a00b27d43f4dae02d5459 (diff)
Thu Jun 9 22:46:45 UTC 2011
Diffstat (limited to 'extra/openjdk6')
-rw-r--r--extra/openjdk6/PKGBUILD10
-rw-r--r--extra/openjdk6/nonreparenting-wm.diff16
2 files changed, 10 insertions, 16 deletions
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
index 306b2e386..6b490bb32 100644
--- a/extra/openjdk6/PKGBUILD
+++ b/extra/openjdk6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126340 2011-06-04 23:48:31Z andyrtr $
+# $Id: PKGBUILD 126852 2011-06-08 05:53:21Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,12 +6,12 @@ pkgname=('openjdk6' 'openjdk6-src')
pkgbase="openjdk6"
#_date=20100715
_javaver=6
-_icedteaver=1.10.1
+_icedteaver=1.10.2
_openjdk_version=b22
_openjdk_date=28_feb_2011
#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=2
+pkgrel=1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
@@ -32,7 +32,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar
openjdk6.profile
openjdk6.profile.csh)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz)
-md5sums=('f3b31b9f591afc752372addacb1eb335'
+md5sums=('83041b2d0de66cb5289813cc6f05af11'
'2d2bbbb0f9b81f1fec41ec730da8a933'
'ef7a8b3624ea904bf584bc46d79b5e75'
'91adfd41e6f001add4f92ae31216b1e3'
@@ -40,7 +40,7 @@ md5sums=('f3b31b9f591afc752372addacb1eb335'
'5da3e39fa60985576c4f37d1491efbe2'
'f7e7a212e50abb56a6ef1a2b1bd27405'
'ee1afda124d5927345014ab382ef581e'
- '409812b5675f9678b1c9e1a12a945a9a'
+ '9b4d368f5ee08de248eaf029303a446c'
'74c4a7adc782edd087802bf92ae3d6d0'
'fdf295e2f186dfa4d308691a3d7ac8c5')
diff --git a/extra/openjdk6/nonreparenting-wm.diff b/extra/openjdk6/nonreparenting-wm.diff
index ec890b434..65fa66e89 100644
--- a/extra/openjdk6/nonreparenting-wm.diff
+++ b/extra/openjdk6/nonreparenting-wm.diff
@@ -2,22 +2,16 @@ diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/clas
index 68d1ff7..878327e 100644
--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -98,11 +98,14 @@ class XWM implements MWMConstants, XUtilConstants {
- ICE_WM = 10,
+@@ -99,7 +99,8 @@
METACITY_WM = 11,
COMPIZ_WM = 12,
-- LG3D_WM = 13;
-+ LG3D_WM = 13,
-+ OTHER_NONREPARENTING_WM = 14;
+ LG3D_WM = 13,
+- MUTTER_WM = 14;
++ MUTTER_WM = 14,
++ OTHER_NONREPARENTING_WM = 15;
public String toString() {
switch (WMID) {
case NO_WM:
- return "NO WM";
-+ case OTHER_NONREPARENTING_WM:
-+ return "Other non-reparenting WM";
- case OTHER_WM:
- return "Other WM";
- case OPENLOOK_WM:
@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
}