[arch-commits] Commit in openjdk6/trunk (PKGBUILD jpeg8.diff)

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Jan 25 19:27:25 UTC 2010


    Date: Monday, January 25, 2010 @ 14:27:24
  Author: andyrtr
Revision: 65242

upgpkg: openjdk6 6.b17_0.hg_20100125-1
    update snapshot from 1.7 branch, jpeg fix is now upstream

Modified:
  openjdk6/trunk/PKGBUILD
Deleted:
  openjdk6/trunk/jpeg8.diff

------------+
 PKGBUILD   |   52 +++++++++++++++++++++++++++++++---------------------
 jpeg8.diff |   22 ----------------------
 2 files changed, 31 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-25 19:27:23 UTC (rev 65241)
+++ PKGBUILD	2010-01-25 19:27:24 UTC (rev 65242)
@@ -4,7 +4,7 @@
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
-_date=20100122
+_date=20100125
 _javaver=6
 _icedteaver=1.7
 _openjdk_version=b17
@@ -29,19 +29,30 @@
 	aatext_by_default.diff
 	fontconfig-paths.diff
 	nonreparenting-wm.diff
-	jpeg8.diff
 	libpng14.diff
 	icedtea6-1.7-buildfix.patch
 	openjdk6.profile)
 noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-                         
+md5sums=('687982de5bd54661496d88bc9ca57296'
+         '078fe0ab744c98694decc77f2456c560'
+         'd683eb501e7ce710198f20f0c127ebbb'
+         '5da3e39fa60985576c4f37d1491efbe2'
+         'f7e7a212e50abb56a6ef1a2b1bd27405'
+         'ef60d567c0d9bad111212851220deafd'
+         'ee1afda124d5927345014ab382ef581e'
+         '409812b5675f9678b1c9e1a12a945a9a'
+         '6ec02621643aa6a8395af574efea3388'
+         '8be4409457de3ccb2fb50b238bd55501'
+         '10d13b19762218ee157273cee874394e')
+
+                       
 # source PKGBUILD && mksource
 mksource() {
 	mkdir /tmp/icedtea6-${_date}
 	pushd /tmp/icedtea6-${_date}
-	hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
+	#hg -v clone http://icedtea.classpath.org/hg/icedtea6 || return 1
 	# use specific release branch
-	# hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.7/ || return 1
+	hg -v clone http://icedtea.classpath.org/hg/release/icedtea6-1.7/ || return 1
 	rm -rf icedtea6/.hg*
 	tar -cvjf /tmp/icedtea6-${_date}/icedtea6-${_date}.tar.bz2 *
 	popd
@@ -56,15 +67,14 @@
   
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
-#  cd ${srcdir}/icedtea6-${_icedteaver}
-  cd ${srcdir}/icedtea6
+  cd ${srcdir}/icedtea6-${_icedteaver}
+#  cd ${srcdir}/icedtea6
   ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
   ln -s ${srcdir}/${_hotspotver}.tar.gz .
 
-#  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
+  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
+#  cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
 
-  patch -Np0 -i ${srcdir}/jpeg8.diff || return 1
   patch -Np1 -i ${srcdir}/icedtea6-1.7-buildfix.patch || return 1
 
   sed -i "s/libxul-unstable/libxul/" configure.ac
@@ -89,7 +99,7 @@
 	--with-xalan2-jar=/usr/share/java/xalan.jar \
 	--with-ant-home=/usr/share/java/apache-ant \
 	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH  $JCONF \
-	--with-hotspot-src-zip=${_hotspotver}.tar.gz --enable-npplugin=yes
+	--with-hotspot-src-zip=${_hotspotver}.tar.gz --enable-npplugin
 	
 #	--enable-npplugin \
 # 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
@@ -114,16 +124,16 @@
   else
     _arch=i586
   fi
-#  _javaver=1.6.0
+
   _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
-#  cd ${srcdir}/icedtea6-${_icedteaver}
-  cd ${srcdir}/icedtea6
+  cd ${srcdir}/icedtea6-${_icedteaver}
+#  cd ${srcdir}/icedtea6
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
 
-#  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
-  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+#  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
    # Install main files.
   cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
   cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
@@ -189,16 +199,16 @@
   else
     _arch=i586
   fi
- # _javaver=1.6.0
+
   _javaver=6
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
-#  cd ${srcdir}/icedtea6-${_icedteaver}
-  cd ${srcdir}/icedtea6
+  cd ${srcdir}/icedtea6-${_icedteaver}
+#  cd ${srcdir}/icedtea6
   install -m755 -d ${pkgdir}/${_jvmdir}/jre
   
-#  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
-  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
+  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/build/linux-${_arch}/j2sdk-image
+#  pushd ${srcdir}/icedtea6/openjdk/build/linux-${_arch}/j2sdk-image
    # Install src.zip file
   cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
 }

Deleted: jpeg8.diff
===================================================================
--- jpeg8.diff	2010-01-25 19:27:23 UTC (rev 65241)
+++ jpeg8.diff	2010-01-25 19:27:24 UTC (rev 65242)
@@ -1,22 +0,0 @@
---- patches/icedtea-libraries.patch	2010-01-22 19:57:38.000000000 +0000
-+++ patches/icedtea-libraries.patch.new	2010-01-23 11:51:50.166950941 +0000
-@@ -25052,8 +25052,8 @@
- +METHODDEF(void)
- +initIDs()
- +{
--+#if JPEG_LIB_VERSION >= 70
--+    void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
-++#if JPEG_LIB_VERSION >= 80
-++    void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
- +#else
- +    void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
- +#endif
-@@ -25347,7 +25347,7 @@
-  Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
-                                              jclass InputStreamClass)
-  {
--+    void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
-++    void *handle = dlopen("libjpeg.so.8", RTLD_LAZY | RTLD_GLOBAL);
- +    if (handle == NULL) {
- +       handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
- +    }




More information about the arch-commits mailing list