Mon Jun 4 00:01:23 UTC 2012

4 files changed, 77 insertions, 87 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index b6577ff1d..8d4259c1a 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152428 2012-03-06 20:36:57Z andyrtr $
+# $Id: PKGBUILD 160627 2012-06-02 21:15:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Guillaume ALAUX <guillaume@archlinux.org>
@@ -7,34 +7,37 @@ 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
+_updatever=u4
+_openjdk_build=b21
 _openjdk_date=27_jun_2011
-_icedtea_ver=2.1
+_icedtea_ver=2.2
 _date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=5617f6c5cc94
-_HOTSPOT_CHANGESET=0e651e004747
-_JAXP_CHANGESET=1cf75c0e2c96
-_JAXWS_CHANGESET=7edfbfe974f2
-_JDK_CHANGESET=50f6f276a06c
-_LANGTOOLS_CHANGESET=b534c4c6cd9b
-_OPENJDK_CHANGESET=22cc03983e20
+_CORBA_CHANGESET=3231f3e9c517
+_HOTSPOT_CHANGESET=bfe5efd70bce
+_JAXP_CHANGESET=0036fe6fe7dc
+_JAXWS_CHANGESET=abfb890c262a
+_JDK_CHANGESET=839d0155f7cc
+_LANGTOOLS_CHANGESET=f855bdb37537
+_OPENJDK_CHANGESET=49a6fc8f712f
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
-pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=3
+pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
+pkgrel=1
 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') # 'inetutils' 'grep') # fastjar`?
+             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`?
 [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
 
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1
+#http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
+
+_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig}
         ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
         ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
@@ -51,26 +54,24 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6'
-            '8d127e8397a0af3ffd8d1d96102a053d065d5507946f5c7118c0427668ac4227'
-            'ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7'
-            '963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3'
-            '8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e'
-            '823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa'
-            '5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d'
-            'c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c'
-            'd68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1'
+sha256sums=('98bc5a0d789a686cb7a1209a8945c314e801a931b2b6004a33dfe692e93626d5'
+            '9a5e9342111263f76aae4b86ac38e912b60cd81fb49943c3868c8f63e2e21130'
+            '26b9a5b546dfa66ae070ed7863a6580e054d7c5691472273540009cf3f172b54'
+            '9e26ea18aff308f636199e9cd822a1af078570221e8b76bbce1dea90d8ac6274'
+            '245b30d3ac0fe45aa4c2a3d451029107b16fd0b74830d432b45448676aa86ee2'
+            'e800972666fadd0235d9a4d30df7778ec502a4761dc33467e9c80fffc6289c8a'
+            '19dbbf2e370ee89703305c561b3fdd174e949b041484ab515138b72d16fbd7e7'
+            'd46ab00352ee74b9d18e5daf38a10f6a31288e38583675c2b2eb58a16e154d19'
+            '86d2f78025d5781222bcab985b93c97af7a114bdf7ac03b2a7abf7e0fce8a514'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '6384026ee4854a4ebcd5203845f0a56126aaf34517e99cfbc16c3ea353c55fe5'
-            '9b3aa677773356d8b67300f99ad21118426e83f092392096726fcf123173008c'
-            '14cf334b7e79e0086b446ba1b172b7cc4ad09668f52c9b12077020a3ded3c3e7'
+            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
+            'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
+            'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
             '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
             'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a'
             '84d3b91cc57c67b2cf2ddb7fe5abcf1e88b5a151565aaecf4b595c7ce8f3fee9')
 
-#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"
@@ -126,10 +127,9 @@ build() {
         --with-rhino \
         --with-abs-install-dir=${_jvmdir}
 	#--help
+	#--enable-systemtap      Enable inclusion of SystemTap trace support - needs systemtab from AUR
 
-#     --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
+    make
 }
 
 check() {
@@ -140,7 +140,7 @@ 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')
+           'ca-certificates-java' 'java-rhino')
   optdepends=('libcups: needed for Java Mauve support - libmawt.so'
               'fontconfig: needed for Java Mauve support - libmawt.so')
   provides=('java-runtime-headless=7')
@@ -291,7 +291,7 @@ package_jre7-openjdk() {
   
   # Install desktop files.
   install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/{jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
+  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications
 }
 
 package_jdk7-openjdk() {
@@ -332,6 +332,10 @@ package_jdk7-openjdk() {
   done
   popd
 
+  # Install desktop files.
+  install -m755 -d ${pkgdir}/usr/share/applications
+  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications
+
   # Handling 'java-rmi.cgi' separately
   install -m755 -D bin/java-rmi.cgi ${pkgdir}/${_jvmdir}/bin/java-rmi.cgi
 
diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/fix_corba_cmds_path.diff
index 842657880..7a3db9567 100644
--- a/extra/java7-openjdk/fix_corba_cmds_path.diff
+++ b/extra/java7-openjdk/fix_corba_cmds_path.diff
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -76,7 +76,7 @@
  CHMOD          = $(UTILS_COMMAND_PATH)chmod
  CMP            = $(UTILS_USR_BIN_PATH)cmp
  COMM           = $(UTILS_USR_BIN_PATH)comm
@@ -8,21 +8,17 @@
 +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 @@
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+@@ -125,7 +125,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
  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
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
  TRUE           = $(UTILS_COMMAND_PATH)true
  UNAME          = $(UTILS_COMMAND_PATH)uname
- UNIQ           = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
+@@ -176,7 +176,7 @@
    # others have it in /usr/bin.
    SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
  		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
index ee434246a..6cac91dd6 100644
--- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
+++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -91,7 +91,7 @@
  CHMOD          = $(UTILS_COMMAND_PATH)chmod
  CMP            = $(UTILS_USR_BIN_PATH)cmp
  COMM           = $(UTILS_USR_BIN_PATH)comm
@@ -8,34 +8,8 @@
 +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
---- openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-02-15 14:16:25.000000000 +0100
-+++ openjdk/jdk/make/common/shared//Defs-utils.gmk.new	2012-02-15 15:06:26.400107173 +0100
-@@ -107,7 +107,7 @@
- FIND           = $(UTILS_USR_BIN_PATH)find
- FMT            = $(UTILS_COMMAND_PATH)fmt
- GDB            = $(UTILS_USR_BIN_PATH)gdb
--GREP           = $(UTILS_COMMAND_PATH)grep
-+GREP           = $(UTILS_USR_BIN_PATH)grep
- GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
- # GZIP is used for solaris. Linux and windows use tar czf
- GZIP           = $(UTILS_COMMAND_PATH)gzip
---- openjdk/jdk/make/common/shared/Defs-utils.gmk	2012-02-15 15:11:27.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk.new	2012-02-15 15:14:09.504446263 +0100
-@@ -101,7 +101,7 @@
+ CUT            = $(UTILS_USR_BIN_PATH)cut
+@@ -101,13 +101,13 @@
  DIRNAME        = $(UTILS_USR_BIN_PATH)dirname
  DUMP           = $(UTILS_CCS_BIN_PATH)dump
  ECHO           = $(UTILS_COMMAND_PATH)echo
@@ -44,3 +18,19 @@
  EXPR           = $(UTILS_USR_BIN_PATH)expr
  FILE           = $(UTILS_USR_BIN_PATH)file
  FIND           = $(UTILS_USR_BIN_PATH)find
+ FMT            = $(UTILS_COMMAND_PATH)fmt
+ GDB            = $(UTILS_USR_BIN_PATH)gdb
+-GREP           = $(UTILS_COMMAND_PATH)grep
++GREP           = $(UTILS_USR_BIN_PATH)grep
+ GUNZIP         = $(UTILS_COMMAND_PATH)gunzip
+ # GZIP is used for solaris. Linux and windows use tar czf
+ GZIP           = $(UTILS_COMMAND_PATH)gzip
+@@ -140,7 +140,7 @@
+ TAIL           = $(UTILS_USR_BIN_PATH)tail
+ TAR            = $(UTILS_COMMAND_PATH)tar
+ TEST           = $(UTILS_USR_BIN_PATH)test
+-TOUCH          = $(UTILS_COMMAND_PATH)touch
++TOUCH          = $(UTILS_USR_BIN_PATH)touch
+ TR             = $(UTILS_USR_BIN_PATH)tr
+ TRUE           = $(UTILS_COMMAND_PATH)true
+ UNAME          = $(UTILS_COMMAND_PATH)uname
diff --git a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
index ba1a588e1..22d54fc42 100644
--- a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
@@ -1,25 +1,25 @@
 --- 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,
+@@ -103,7 +103,8 @@
          COMPIZ_WM = 12,
          LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
+         CWM_WM = 14,
+-        MUTTER_WM = 15;
++        MUTTER_WM = 15,
++        OTHER_NONREPARENTING_WM = 16;
      public String toString() {
          switch  (WMID) {
            case NO_WM:
-@@ -576,7 +577,7 @@
+@@ -583,7 +584,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);
+-        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
++        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
      }
  
      /*
-@@ -762,9 +763,17 @@
+@@ -771,9 +772,17 @@
               * supports WIN or _NET wm spec.
               */
              else if (l_net_protocol.active()) {
@@ -28,18 +28,18 @@
 +                    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 @@
+@@ -784,6 +793,8 @@
                  awt_wmgr = XWM.MOTIF_WM;
              } else if (isOpenLook()) {
                  awt_wmgr = XWM.OPENLOOK_WM;
@@ -48,7 +48,7 @@
              } else {
                  awt_wmgr = XWM.OTHER_WM;
              }
-@@ -1289,6 +1300,7 @@
+@@ -1298,6 +1309,7 @@
                    res = new Insets(28, 6, 6, 6);
                    break;
                case NO_WM: