[arch-commits] Commit in openjdk6/trunk (6 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Fri Jan 29 14:16:55 EST 2010


    Date: Friday, January 29, 2010 @ 14:16:54
  Author: andyrtr
Revision: 65473

upgpkg: openjdk6 6.b17_1.7-1
    update to final 1.7 release; some cleanup

Modified:
  openjdk6/trunk/PKGBUILD
Deleted:
  openjdk6/trunk/X11.diff
  openjdk6/trunk/gcjwebplugin_xulrunner.diff
  openjdk6/trunk/icedtea6-1.7-buildfix.patch
  openjdk6/trunk/libjpeg7.diff
  openjdk6/trunk/libpng14.diff

-----------------------------+
 PKGBUILD                    |   39 ++----
 X11.diff                    |   34 -----
 gcjwebplugin_xulrunner.diff |   11 -
 icedtea6-1.7-buildfix.patch |   61 ----------
 libjpeg7.diff               |  252 ------------------------------------------
 libpng14.diff               |   11 -
 6 files changed, 14 insertions(+), 394 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-29 16:49:23 UTC (rev 65472)
+++ PKGBUILD	2010-01-29 19:16:54 UTC (rev 65473)
@@ -4,12 +4,13 @@
 
 pkgname=('openjdk6' 'openjdk6-src')
 pkgbase="openjdk6"
-_date=20100125
+_date=20100129
 _javaver=6
 _icedteaver=1.7
 _openjdk_version=b17
 _openjdk_date=14_oct_2009
-pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
+#pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date}
+pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
 pkgrel=1
 url='http://icedtea.classpath.org'
 arch=('i686' 'x86_64')
@@ -18,10 +19,10 @@
 _hotspotver=62926c7f67a3 
 makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
 	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.2' 
-	     'apache-ant>=1.7.0-2' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
+	     'apache-ant>=1.7.1-3' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip')
 options=('!emptydirs' 'force')
-source=(#http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
-	ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
+source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
+	#ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
 	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
 	http://hg.openjdk.java.net/hsx/hsx16/master/archive/${_hotspotver}.tar.gz
 	fix_jdk_cmds_path.diff
@@ -29,11 +30,9 @@
 	aatext_by_default.diff
 	fontconfig-paths.diff
 	nonreparenting-wm.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'
+md5sums=('56dce477d8363db4e20199990167ff06'
          '078fe0ab744c98694decc77f2456c560'
          'd683eb501e7ce710198f20f0c127ebbb'
          '5da3e39fa60985576c4f37d1491efbe2'
@@ -41,11 +40,9 @@
          'ef60d567c0d9bad111212851220deafd'
          'ee1afda124d5927345014ab382ef581e'
          '409812b5675f9678b1c9e1a12a945a9a'
-         '6ec02621643aa6a8395af574efea3388'
-         '8be4409457de3ccb2fb50b238bd55501'
          '10d13b19762218ee157273cee874394e')
 
-                       
+                
 # source PKGBUILD && mksource
 mksource() {
 	mkdir /tmp/icedtea6-${_date}
@@ -68,19 +65,15 @@
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   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/
 
-  patch -Np1 -i ${srcdir}/icedtea6-1.7-buildfix.patch || return 1
-
-  sed -i "s/libxul-unstable/libxul/" configure.ac
   autoreconf -i
 
-  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 patches/libpng14.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"
 
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
@@ -99,9 +92,8 @@
 	--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
-	
-#	--enable-npplugin \
+	--with-hotspot-src-zip=${_hotspotver}.tar.gz
+
 # 	--enable-visualvm \ --with-additional-vms=cacao,zero,shark \
 
   LD_PRELOAD="" make || return 1
@@ -129,11 +121,10 @@
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   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
+
    # Install main files.
   cp -a bin include lib ${pkgdir}/${_jvmdir}/ || return 1
   cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
@@ -168,7 +159,7 @@
   install -m644 javaws.png ${pkgdir}/usr/share/pixmaps || return 1
   install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications || return 1
 
-  # link the mozilla-plugin
+  # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
   install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
   ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaNPPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
 
@@ -204,11 +195,9 @@
   _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
 
   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
    # Install src.zip file
   cp -a src.zip ${pkgdir}/${_jvmdir}/ || return 1
 }

Deleted: X11.diff
===================================================================
--- X11.diff	2010-01-29 16:49:23 UTC (rev 65472)
+++ X11.diff	2010-01-29 19:16:54 UTC (rev 65473)
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User Mark Wielaard <mark at klomp.org>
-# Date 1257249030 -3600
-# Node ID c75348f9db6a48f22f2568c8f2d346e5d0ac73be
-# Parent 547923046557e6b3d0f675274e783571a385bb85
-Support newer X11 headers for awt_GraphicsEnv.h.
-
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/patches/icedtea-xshm.patch	Tue Nov 03 12:50:30 2009 +0100
-@@ -0,0 +1,13 @@
-+--- old/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-17 10:36:09.000000000 -0400
-++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h	2009-07-30 13:25:52.000000000 -0400
-+@@ -42,6 +42,10 @@
-+ #include <sys/ipc.h>
-+ #include <sys/shm.h>
-+ #include <X11/extensions/XShm.h>
-++#ifndef X_ShmAttach
-++#include <X11/Xmd.h>
-++#include <X11/extensions/shmproto.h>
-++#endif
-+ 
-+ extern int XShmQueryExtension();
-+ 
-
---- icedtea6-1.6.1/Makefile.am	2009-09-14 16:42:42.367592000 +0000
-+++ icedtea6-1.6.1/Makefile.am.new	2009-11-03 16:42:12.387191646 +0000
-@@ -708,6 +708,7 @@
- 	patches/icedtea-explicit-target-arch.patch \
- 	patches/openjdk/6648816.patch \
- 	patches/openjdk/oj100103-debugger-socket-overflow.patch \
-+	patches/icedtea-xshm.patch \
- 	$(DISTRIBUTION_PATCHES)
- 
- stamps/extract.stamp: stamps/download.stamp

Deleted: gcjwebplugin_xulrunner.diff
===================================================================
--- gcjwebplugin_xulrunner.diff	2010-01-29 16:49:23 UTC (rev 65472)
+++ gcjwebplugin_xulrunner.diff	2010-01-29 19:16:54 UTC (rev 65473)
@@ -1,11 +0,0 @@
---- Makefile.am	2008-07-21 15:12:07.000000000 +0000
-+++ Makefile.am.new	2008-07-22 08:37:49.000000000 +0000
-@@ -1176,7 +1176,7 @@
- # gcjwebplugin.so.
- gcjwebplugin.so: gcjwebplugin.cc
- 	$(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
--	  $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
-+	  $(MOZILLA_LIBS) -Wl,-R/usr/lib/xulrunner-1.9 $(GLIB_CFLAGS) $(GLIB_LIBS) \
- 	  $(GTK_CFLAGS) $(GTK_LIBS) \
- 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
- 	  -fpic -shared -o $@ $<

Deleted: icedtea6-1.7-buildfix.patch
===================================================================
--- icedtea6-1.7-buildfix.patch	2010-01-29 16:49:23 UTC (rev 65472)
+++ icedtea6-1.7-buildfix.patch	2010-01-29 19:16:54 UTC (rev 65473)
@@ -1,61 +0,0 @@
-diff -r e303235cefa8 Makefile.am
---- a/Makefile.am	Thu Jan 21 16:11:56 2010 +0000
-+++ b/Makefile.am	Fri Jan 22 16:21:38 2010 -0500
-@@ -1528,13 +1528,13 @@
- 	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
- 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
- 	  $(GTK_CFLAGS) \
--	  $(XULRUNNER_CFLAGS) \
-+	  $(MOZILLA_CFLAGS) \
- 	  -fPIC -c -o $@ $<
- IcedTeaPlugin.so: IcedTeaPlugin.o
- 	$(CXX) $(CXXFLAGS) \
- 	  $< \
- 	  $(GTK_LIBS) \
--	  $(XULRUNNER_LIBS) \
-+	  $(MOZILLA_LIBS) \
- 	  -shared -o $@
- 
- clean-IcedTeaPlugin:
-diff -r e303235cefa8 configure.ac
---- a/configure.ac	Thu Jan 21 16:11:56 2010 +0000
-+++ b/configure.ac	Fri Jan 22 16:21:38 2010 -0500
-@@ -429,7 +429,7 @@
- dnl FIXME: use unstable
- if test "x${enable_plugin}" = "xyes"
-   then
--    PKG_CHECK_MODULES(XULRUNNER, \
-+    PKG_CHECK_MODULES(MOZILLA, \
-       nspr mozilla-js mozilla-plugin libxul-unstable >= 1.9)
-     PKG_CHECK_MODULES(GTK, gtk+-2.0)
-     PKG_CHECK_MODULES(GLIB, glib-2.0)
-@@ -445,7 +445,7 @@
- if test "x${enable_npplugin}" = "xyes"
-   then
-     PKG_CHECK_MODULES(MOZILLA, \
--      mozilla-plugin libxul)
-+      mozilla-plugin libxul libxul-unstable)
-     PKG_CHECK_MODULES(GTK, gtk+-2.0)
-     PKG_CHECK_MODULES(GLIB, glib-2.0)
- 
-@@ -461,7 +461,7 @@
- then
-   AC_LANG_PUSH([C++])
-   OLDCPPFLAGS="$CPPFLAGS"
--  CPPFLAGS="$CPPFLAGS $XULRUNNER_CFLAGS"
-+  CPPFLAGS="$CPPFLAGS $MOZILLA_CFLAGS"
- 
-   AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],
-       [AC_RUN_IFELSE(
-diff -r e303235cefa8 plugin/icedteanp/IcedTeaNPPlugin.cc
---- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Jan 21 16:11:56 2010 +0000
-+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Fri Jan 22 16:21:38 2010 -0500
-@@ -1336,7 +1336,7 @@
- 
-   // if proxy info is available, extract it
-   nsCString phost;
--  PRint32_t pport;
-+  PRInt32 pport;
-   nsCString ptype;
- 
-   info->GetHost(phost);

Deleted: libjpeg7.diff
===================================================================
--- libjpeg7.diff	2010-01-29 16:49:23 UTC (rev 65472)
+++ libjpeg7.diff	2010-01-29 19:16:54 UTC (rev 65473)
@@ -1,252 +0,0 @@
-# HG changeset patch
-# User Jon VanAlten <jon.vanalten at redhat.com>
-# Date 1256594970 14400
-# Node ID b862917f2b93f49eab266966d6ffe96156e7d026
-# Parent ad96ca42aab39a291416b5e326d29e49b87dc640
-2009-10-26 Jon VanAlten <jon.vanalten at redhat.com>
-
-	Fixes Bug #367
-        * patches/icedtea-libraries.patch: Check for libjpeg.so.7.
-        * INSTALL: Indicate newer versions of libjpeg are supported.
-
-
---- a/INSTALL	Thu Oct 22 08:00:17 2009 +0200
-+++ b/INSTALL	Mon Oct 26 18:09:30 2009 -0400
-@@ -27,7 +27,7 @@ libXinerama-devel
- libXinerama-devel
- giflib-devel
- libpng-devel
--libjpeg-devel = 6b
-+libjpeg-devel >= 6b
- zlib-devel
- rhino (can be disabled using --without-rhino)
- 
---- a/patches/icedtea-libraries.patch	Thu Oct 22 08:00:17 2009 +0200
-+++ b/patches/icedtea-libraries.patch	Mon Oct 26 18:09:30 2009 -0400
-@@ -25045,14 +25045,17 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  }
-  
-  
--@@ -2317,6 +2377,142 @@
-+@@ -2317,6 +2377,145 @@
-  
-  /********************** end of destination manager ************/
-  
- +METHODDEF(void)
- +initIDs()
- +{
--+    void *handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-++    void *handle = dlopen("libjpeg.so.7", RTLD_LAZY | RTLD_GLOBAL);
-++    if (handle == NULL) {
-++       handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-++    }
- +    
- +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
- +    if (jpegstderror == NULL) {
-@@ -25188,7 +25191,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  /********************** Writer JNI calls **********************/
-  
-  
--@@ -2328,6 +2524,8 @@
-+@@ -2328,6 +2527,8 @@
-       jclass qTableClass,
-       jclass huffClass) {
-  
-@@ -25197,7 +25200,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-      ImageOutputStream_writeID = (*env)->GetMethodID(env,
-                                                      IOSClass,
-                                                      "write",
--@@ -2401,7 +2599,7 @@
-+@@ -2401,7 +2602,7 @@
-      }
-  
-      /* We set up the normal JPEG error routines, then override error_exit. */
-@@ -25206,7 +25209,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-      jerr->pub.error_exit = sun_jpeg_error_exit;
-      /* We need to setup our own print routines */
-      jerr->pub.output_message = sun_jpeg_output_message;
--@@ -2418,7 +2616,7 @@
-+@@ -2418,7 +2619,7 @@
-      }
-  
-      /* Perform library initialization */
-@@ -25215,7 +25218,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-      /* Now set up the destination  */
-      dest = malloc(sizeof(struct jpeg_destination_mgr));
--@@ -2527,7 +2725,7 @@
-+@@ -2527,7 +2728,7 @@
-          return;
-      }
-  
-@@ -25224,7 +25227,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-      data->streamBuf.suspendable = FALSE;
-      if (qtables != NULL) {
--@@ -2542,7 +2740,7 @@
-+@@ -2542,7 +2743,7 @@
-                     DCHuffmanTables, ACHuffmanTables, TRUE);
-      }
-  
-@@ -25233,7 +25236,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-      RELEASE_ARRAYS(env, data, NULL);
-  }
-  
--@@ -2698,9 +2896,9 @@
-+@@ -2698,9 +2899,9 @@
-      cinfo->input_components = numBands;
-      cinfo->in_color_space = inCs;
-  
-@@ -25245,7 +25248,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-      cinfo->optimize_coding = optimize;
-  
--@@ -2737,7 +2935,7 @@
-+@@ -2737,7 +2938,7 @@
-      (*env)->ReleaseIntArrayElements(env, QtableSelectors,
-                                      qsels, JNI_ABORT);
-  
-@@ -25254,7 +25257,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-      qlen = setQTables(env, (j_common_ptr) cinfo, qtables, writeDQT);
-  
--@@ -2762,7 +2960,7 @@
-+@@ -2762,7 +2963,7 @@
-  
-      if (progressive) {
-          if (numScans == 0) { // then use default scans
-@@ -25263,7 +25266,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-          } else {
-              cinfo->num_scans = numScans;
-              // Copy the scanInfo to a local array
--@@ -2804,7 +3002,7 @@
-+@@ -2804,7 +3005,7 @@
-  #endif
-  
-      // start the compressor; tables must already be set
-@@ -25272,7 +25275,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-      if (haveMetadata) {
-          // Flush the buffer
--@@ -2868,7 +3066,7 @@
-+@@ -2868,7 +3069,7 @@
-              }
-          }
-          // write it out
-@@ -25281,7 +25284,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-          targetLine += stepY;
-      }
-  
--@@ -2877,9 +3075,9 @@
-+@@ -2877,9 +3078,9 @@
-       * so use jpeg_abort instead of jpeg_finish_compress.
-       */
-      if (cinfo->next_scanline == cinfo->image_height) {
-@@ -25339,11 +25342,14 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  /* Initialize the Java VM instance variable when the library is
-     first loaded */
-  JavaVM *jvm;
--@@ -462,6 +490,68 @@
-+@@ -462,6 +493,71 @@
-  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);
-++    if (handle == NULL) {
-++       handle = dlopen("libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
-++    }
- + 
- +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
- +    if (jpegstderror == NULL) {
-@@ -25408,7 +25414,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-      sendHeaderInfoID = (*env)->GetMethodID(env, cls, "sendHeaderInfo",
-                                             "(IIZZZ)Z");
-      sendPixelsByteID = (*env)->GetMethodID(env, cls, "sendPixels", "([BI)Z");
--@@ -519,7 +609,7 @@
-+@@ -519,7 +612,7 @@
-    /* Step 1: allocate and initialize JPEG decompression object */
-  
-    /* We set up the normal JPEG error routines, then override error_exit. */
-@@ -25417,7 +25423,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-    jerr.pub.error_exit = sun_jpeg_error_exit;
-  
-    /* We need to setup our own print routines */
--@@ -530,7 +620,7 @@
-+@@ -530,7 +623,7 @@
-      /* If we get here, the JPEG code has signaled an error.
-       * We need to clean up the JPEG object, close the input file, and return.
-       */
-@@ -25426,7 +25432,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-      RELEASE_ARRAYS(env, &jsrc);
-      if (!(*env)->ExceptionOccurred(env)) {
-          char buffer[JMSG_LENGTH_MAX];
--@@ -541,7 +631,7 @@
-+@@ -541,7 +634,7 @@
-      return;
-    }
-    /* Now we can initialize the JPEG decompression object. */
-@@ -25435,7 +25441,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-    /* Step 2: specify data source (eg, a file) */
-  
--@@ -555,17 +645,17 @@
-+@@ -555,17 +648,17 @@
-    jsrc.pub.init_source = sun_jpeg_init_source;
-    jsrc.pub.fill_input_buffer = sun_jpeg_fill_input_buffer;
-    jsrc.pub.skip_input_data = sun_jpeg_skip_input_data;
-@@ -25457,7 +25463,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-    grayscale = (cinfo.out_color_space == JCS_GRAYSCALE);
-  #ifdef YCCALPHA
-    hasalpha = (cinfo.out_color_space == JCS_RGBA);
--@@ -584,7 +674,7 @@
-+@@ -584,7 +677,7 @@
-                                    grayscale, hasalpha, buffered_mode);
-    if ((*env)->ExceptionOccurred(env) || !ret) {
-      /* No more interest in this image... */
-@@ -25466,7 +25472,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-      return;
-    }
-    /* Make a one-row-high sample array with enough room to expand to ints */
--@@ -595,7 +685,7 @@
-+@@ -595,7 +688,7 @@
-    }
-  
-    if (jsrc.hOutputBuffer == 0 || !GET_ARRAYS(env, &jsrc)) {
-@@ -25475,7 +25481,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-      return;
-    }
-  
--@@ -613,7 +703,7 @@
-+@@ -613,7 +706,7 @@
-  
-    /* Step 5: Start decompressor */
-  
-@@ -25484,7 +25490,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-    /* We may need to do some setup of our own at this point before reading
-     * the data.  After jpeg_start_decompress() we have the correct scaled
--@@ -638,28 +728,28 @@
-+@@ -638,28 +731,28 @@
-            do {
-                sun_jpeg_fill_suspended_buffer(&cinfo);
-                jsrc.suspendable = TRUE;
-@@ -25517,7 +25523,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-  
-            if (grayscale) {
-                RELEASE_ARRAYS(env, &jsrc);
--@@ -695,18 +785,18 @@
-+@@ -695,18 +788,18 @@
-            if ((*env)->ExceptionOccurred(env) || !ret ||
-                !GET_ARRAYS(env, &jsrc)) {
-                /* No more interest in this image... */
-@@ -25539,7 +25545,7 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
-    /* We can ignore the return value since suspension is not possible
-     * with the stdio data source.
-     * (nor with the Java data source)
--@@ -715,7 +805,7 @@
-+@@ -715,7 +808,7 @@
-    /* Step 8: Release JPEG decompression object */
-  
-    /* This is an important step since it will release a good deal of memory. */
-

Deleted: libpng14.diff
===================================================================
--- libpng14.diff	2010-01-29 16:49:23 UTC (rev 65472)
+++ libpng14.diff	2010-01-29 19:16:54 UTC (rev 65473)
@@ -1,11 +0,0 @@
---- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c	2010-01-22 16:40:55.984689900 +0000
-+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c.new	2010-01-22 16:59:25.450412461 +0000
-@@ -182,7 +182,7 @@
-     int success = 0;
- 
-     stream->read(stream, sig, SIG_BYTES);
--    if (!png_check_sig(sig, SIG_BYTES)) {
-+    if (png_sig_cmp(sig, 0, SIG_BYTES)) {
-         goto done;
-     }
-     success = SplashDecodePng(splash, my_png_read_stream, stream);



More information about the arch-commits mailing list