Thu Oct 20 23:14:58 UTC 2011

1 files changed, 51 insertions, 54 deletions

diff --git a/testing/java7-openjdk/PKGBUILD b/testing/java7-openjdk/PKGBUILD
index 7db99b002..219c5588f 100644
--- a/testing/java7-openjdk/PKGBUILD
+++ b/testing/java7-openjdk/PKGBUILD
@@ -11,31 +11,31 @@ _icedtea_ver=2.0
 _date=20110922
 
 # check "${srcdir}/icedtea7"/Makefile.am
-_CORBA_CHANGESET=616c760dc288
-_HOTSPOT_CHANGESET=1dd9b3d73b22
-_JAXP_CHANGESET=c40983d6ae70
-_JAXWS_CHANGESET=83db5e316798
-_JDK_CHANGESET=0cb15650412a
-_LANGTOOLS_CHANGESET=fb7fb3071b64
-_OPENJDK_CHANGESET=3defd24c2671
+_CORBA_CHANGESET=4d9e4fb8af09
+_HOTSPOT_CHANGESET=b28ae681bae0
+_JAXP_CHANGESET=948e734135ea
+_JAXWS_CHANGESET=a2ebfdc9db7e
+_JDK_CHANGESET=2054526dd141
+_LANGTOOLS_CHANGESET=9b85f1265346
+_OPENJDK_CHANGESET=0a76e5390e68
 
 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver}
-pkgrel=0.20110922.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
-makedepends=('eclipse-ecj' 'libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2'
+makedepends=('libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' #'eclipse-ecj' only for bootstrapping
              'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib'
              'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
+source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
+	http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
 	http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz			# openjdk.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz		# corba.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz			# jaxp.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz		# jaxws.tar.gz
-        http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz		# jdk.tar.gz
+        http://icedtea.classpath.org/hg/icedtea7-forest/jdk/archive/${_JDK_CHANGESET}.tar.gz			# jdk.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz        # langtools.tar.gz
         http://icedtea.classpath.org/hg/icedtea7-forest/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz	        # hotspot.tar.gz
-        http://icedtea.classpath.org/download/drops/{jdk7-jaf-2010_08_19.zip,jdk7-jaxws2_2_4-b03-2011_05_27.zip,jaxp145_01.zip}
         fontconfig-paths.diff
         fix_corba_cmds_path.diff
         openjdk7_fix_jdk_cmds_path.diff
@@ -46,27 +46,6 @@ source=(ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz
         jre7-openjdk.profile.csh
         jconsole.desktop
         policytool.desktop)
-sha1sums=('e569c8a1265d30856caa646d101ce3e1e4a2a69f'
-          '51dafe7367732d58a5ee531f5840fe1ab9c9d2bf'
-          'c246e4a01d11bdbe4fb23f1bd3819456d1446f52'
-          '8a286c9314f47f7bb6c59b8e8b4560db81019a83'
-          'c0e7e9b99d4de220ef3346f3da942a4a39bb8b71'
-          '6a115a71c94b4de1ad4e9c00fe3994bc31acd943'
-          '29f8481fd98d709c72a81d5d742097455f38af7d'
-          'a8a199fb4c908852a0afdd76937ad194191d20f7'
-          '63ea970dcf129fbbba39a132d8f71add19fbf1f0'
-          '539bcf80b9a86c97406a3c79e7d10684b213a4be'
-          '106db88c8e53abb1a064e83d41cc7acd16b7713c'
-          '00ae05d9c8679deb72c0a9008a670daafeb21565'
-          'e551b40820393c4cab3a82154f51b55577644ba1'
-          'fe04691f0a23f43a8d9017f7c5fccd4620bc9019'
-          'ab22e135916786c181be66be39acd7954175bb9c'
-          'b2dbb1a8a7264db229d6888467ed3f2799a007b0'
-          '344f7e911ab52e38f1ff237ed770bec362d79f79'
-          '683cbb342c8d3077b43b31be700864379c0aa54b'
-          '2a12035cc3e586131952cbb78d9885f6dc10d1b2'
-          '2e7827f47b9190dcc0697752b0f799caea872239'
-          '0bc35e5436f1663f5251b8f8c159a04088a09484')
 
 #http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip
 
@@ -76,10 +55,25 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz"
            "${_JAXWS_CHANGESET}.tar.gz"
            "${_JDK_CHANGESET}.tar.gz"
            "${_LANGTOOLS_CHANGESET}.tar.gz"
-           "${_HOTSPOT_CHANGESET}.tar.gz"
-           "jdk7-jaf-2010_08_19.zip"
-           "jdk7-jaxws2_2_4-b03-2011_05_27.zip"
-	   "jaxp145_01.zip")
+           "${_HOTSPOT_CHANGESET}.tar.gz")
+md5sums=('752721a037a625001fad7a5fc2013f60'
+         'ffb12013564794e9abbffbbbd0c58502'
+         '8f8d222d0a6d363d06b40576da5f1ea2'
+         '4abf34372e34cccd74ad337e487ed790'
+         'f2f40590a83889b8aa1d4631b705092d'
+         'd3beed0118bbd93d4651af762eb748c7'
+         'c8617700b4bd6cd5de1257bc36509bed'
+         'f10b711b0c784df8707808d9d0f52abd'
+         'ee1afda124d5927345014ab382ef581e'
+         'f7e7a212e50abb56a6ef1a2b1bd27405'
+         'c195c4865b84d9e2e0fd71ac6d88eadb'
+         '203640d6e79e41b0065e016818c17ccd'
+         'fe39da48a62b1fdd8fc24de0e0c4b525'
+         'cdabafad0ec413d9a983888bf445a443'
+         '612b0fec7e0943c37a6de77c43622007'
+         '62443459da0cb28181feb260dc0e5ce7'
+         '8e346f19a69b11b8dc4fcd8ea9d9d8f1'
+         'b6357228d29836504a90abe006d86e56')
 
 # source PKGBUILD && mksource
 #makedepends+=('mercurial')
@@ -93,27 +87,31 @@ mksource() {
 }
 
 build() {
-  cd "${srcdir}/icedtea7"
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
 
   unset JAVA_HOME
   unset CLASSPATH
+  # default is to build with first found java-environment found in our repos - is jdk7-openjdk
+  [ -f /etc/profile.d/jdk7-openjdk.sh ] && . /etc/profile.d/jdk7-openjdk.sh
+  
   unset MAKEFLAGS
-
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
   . /etc/profile.d/apache-ant.sh
 
-  cp ${srcdir}/*.diff ${srcdir}/icedtea7/patches
+  cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
 
   # Bootstrap IcedTea with ecj and a GNU Classpath-based JDK:
-  autoreconf --force --install
+#  autoreconf --force --install
 
   ./configure \
 	--disable-bootstrap \
+	--with-parallel-jobs="${MAKEFLAGS/-j}" \
         --disable-tests \
         --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \
+	--with-jdk-home=${JAVA_HOME} \
         --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
         --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
         --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
@@ -121,24 +119,23 @@ build() {
         --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
         --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
         --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
-        --with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
-        --with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
-        --with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
-        --enable-pulse-java #--help
+        --enable-pulse-java \
+#	--with-rhino #--help
+
+        #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \
+        #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \
+        #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \
 
-#        
 	
 #	  --enable-systemtap      Enable inclusion of SystemTap trace support
 #	  --enable-nss            Enable inclusion of NSS security provider
 #	  --with-abs-install-dir  The absolute path where the j2sdk-image dir will be installed
-
-        
-  #LD_PRELOAD="" 
+  
   make
 }
 
 check() {
-  cd "${srcdir}/icedtea7"
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
   make -k check
 }
 
@@ -146,7 +143,7 @@ package_jre7-openjdk() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment"
   depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst'
            'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng')
-  optdepends=('icedtea-web: web browser plugin + Java Web Start'
+  optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
              'alsa-lib: for sound'
              'giflib: for gif format support')
   provides=('java-runtime=7')
@@ -157,7 +154,7 @@ package_jre7-openjdk() {
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
-  cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image/jre"
+  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
 
   install -d -m755 ${pkgdir}/${_jvmdir}/jre/
   cp -a bin lib ${pkgdir}/${_jvmdir}/jre
@@ -216,7 +213,7 @@ package_jdk7-openjdk() {
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
-  cd "${srcdir}/icedtea7/openjdk.build/j2sdk-image"
+  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
 
   # Main files
   install -m755 -d ${pkgdir}/${_jvmdir}/
@@ -262,6 +259,6 @@ package_jdk7-openjdk() {
 package_openjdk7-src() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
 
-  install -D ${srcdir}/icedtea7/openjdk.build/j2sdk-image/src.zip \
+  install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
              ${pkgdir}/${_jvmdir}/src.zip
 }