[arch-commits] Commit in openjdk6/repos (6 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Aug 4 20:55:53 UTC 2009
Date: Tuesday, August 4, 2009 @ 16:55:53
Author: andyrtr
Revision: 49210
Merged revisions 49209 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/openjdk6/trunk
........
r49209 | andyrtr | 2009-08-04 20:55:17 +0000 (Di, 04 Aug 2009) | 2 lines
upgpkg: openjdk6 1.5-5
add hack for libjpeg7 to make some stuff work again and less segfaults FS#15550; add patch for non-reperanting WMs FS#15674
........
Added:
openjdk6/repos/extra-x86_64/libjpeg7.patch
(from rev 49209, openjdk6/trunk/libjpeg7.patch)
openjdk6/repos/extra-x86_64/nonreparenting-wm.diff
(from rev 49209, openjdk6/trunk/nonreparenting-wm.diff)
Modified:
openjdk6/repos/extra-x86_64/ (properties)
openjdk6/repos/extra-x86_64/PKGBUILD
openjdk6/repos/extra-x86_64/openjdk6.install
openjdk6/repos/extra-x86_64/openjdk6.profile
------------------------+
PKGBUILD | 14 +++++++--
libjpeg7.patch | 21 ++++++++++++++
nonreparenting-wm.diff | 66 +++++++++++++++++++++++++++++++++++++++++++++++
openjdk6.install | 3 ++
openjdk6.profile | 4 ++
5 files changed, 104 insertions(+), 4 deletions(-)
Property changes on: openjdk6/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /openjdk6/trunk:1-44444
+ /openjdk6/trunk:1-49209
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-08-04 20:55:17 UTC (rev 49209)
+++ extra-x86_64/PKGBUILD 2009-08-04 20:55:53 UTC (rev 49210)
@@ -8,7 +8,7 @@
pkgver=1.5
_hgver=926c38e2b283 # =hg rc3 tagged, see http://icedtea.classpath.org/hg/icedtea6/summary
_icedteaver=1.5
-pkgrel=4
+pkgrel=5
pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
@@ -35,6 +35,8 @@
fix_corba_cmds_path.diff
aatext_by_default.diff
fontconfig-paths.diff
+ nonreparenting-wm.diff
+ libjpeg7.patch
openjdk6.profile)
noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
md5sums=('a67303675a53781c4e42bdb02ec78e40'
@@ -44,7 +46,9 @@
'f7e7a212e50abb56a6ef1a2b1bd27405'
'ef60d567c0d9bad111212851220deafd'
'ee1afda124d5927345014ab382ef581e'
- 'd0703088e10aa957c037644ab88d716d')
+ '409812b5675f9678b1c9e1a12a945a9a'
+ '2f820743e8ed5540b5667fda33c53d26'
+ '4a081208ff1d99916f604c724af6efe5')
build() {
# for hg checkout install mercurial and
@@ -78,8 +82,12 @@
# cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
# cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_hgver}/patches/
+
+ # workaround for libjpeg .so bump to avoid a few segfaults. some stuff will remain broken
+ patch -Np1 -i ${srcdir}/libjpeg7.patch || return 1
+
# export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
- export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff"
+ export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff "
# ./autogen.sh
# autoreconf # needed due to mercurial build
Copied: openjdk6/repos/extra-x86_64/libjpeg7.patch (from rev 49209, openjdk6/trunk/libjpeg7.patch)
===================================================================
--- extra-x86_64/libjpeg7.patch (rev 0)
+++ extra-x86_64/libjpeg7.patch 2009-08-04 20:55:53 UTC (rev 49210)
@@ -0,0 +1,21 @@
+diff -r -u icedtea6-1.5.orig/patches/icedtea-libraries.patch icedtea6-1.5/patches/icedtea-libraries.patch
+--- icedtea6-1.5.orig/patches/icedtea-libraries.patch 2009-05-19 14:09:16.000000000 +0200
++++ icedtea6-1.5/patches/icedtea-libraries.patch 2009-07-19 13:19:01.000000000 +0200
+@@ -25052,7 +25052,7 @@
+ +METHODDEF(void)
+ +initIDs()
+ +{
+-+ void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
+++ void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
+ +
+ + jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
+ + if (jpegstderror == NULL) {
+@@ -25343,7 +25343,7 @@
+ Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
+ jclass InputStreamClass)
+ {
+-+ void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
+++ void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
+ +
+ + jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
+ + if (jpegstderror == NULL) {
Copied: openjdk6/repos/extra-x86_64/nonreparenting-wm.diff (from rev 49209, openjdk6/trunk/nonreparenting-wm.diff)
===================================================================
--- extra-x86_64/nonreparenting-wm.diff (rev 0)
+++ extra-x86_64/nonreparenting-wm.diff 2009-08-04 20:55:53 UTC (rev 49210)
@@ -0,0 +1,66 @@
+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
+@@ -98,11 +98,14 @@ class XWM implements MWMConstants, XUtilConstants {
+ ICE_WM = 10,
+ METACITY_WM = 11,
+ COMPIZ_WM = 12,
+- LG3D_WM = 13;
++ LG3D_WM = 13,
++ OTHER_NONREPARENTING_WM = 14;
+ 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 {
+ }
+
+ 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;
Modified: extra-x86_64/openjdk6.install
===================================================================
--- extra-x86_64/openjdk6.install 2009-08-04 20:55:17 UTC (rev 49209)
+++ extra-x86_64/openjdk6.install 2009-08-04 20:55:53 UTC (rev 49210)
@@ -3,6 +3,9 @@
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() {
Modified: extra-x86_64/openjdk6.profile
===================================================================
--- extra-x86_64/openjdk6.profile 2009-08-04 20:55:17 UTC (rev 49209)
+++ extra-x86_64/openjdk6.profile 2009-08-04 20:55:53 UTC (rev 49210)
@@ -1,4 +1,6 @@
export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
export J2REDIR=$J2SDKDIR/jre
export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
-#export CLASSPATH="${CLASSPATH:+$CLASSPATH:}$J2SDKDIR/lib:$J2REDIR/lib"
+
+# enable this for non-reparenting window managers
+#_JAVA_AWT_WM_NONREPARENTING=1
\ No newline at end of file
More information about the arch-commits
mailing list