changeset in /hg/icedtea: 2008-02-11 Lillian Angel <langel at red...

[Lillian Angel]

changeset e1f5ee2e2c0e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e1f5ee2e2c0e
description:
	2008-02-11  Lillian Angel  <langel at redhat.com>

	        * patches/icedtea-libraries.patch: Changed to dlopen libjpeg.so.62
	        instead of libjpeg.so.
	        * INSTALL: Added libjpeg version 6b to build requirements.

diffstat:

3 files changed, 11 insertions(+), 5 deletions(-)
ChangeLog                       |    6 ++++++
INSTALL                         |    2 +-
patches/icedtea-libraries.patch |    8 ++++----

diffs (52 lines):

diff -r 93c7943f1787 -r e1f5ee2e2c0e ChangeLog
--- a/ChangeLog	Mon Feb 11 10:36:41 2008 -0500
+++ b/ChangeLog	Mon Feb 11 14:25:34 2008 -0500
@@ -1,3 +1,9 @@ 2008-02-11  Lillian Angel  <langel at redha
+2008-02-11  Lillian Angel  <langel at redhat.com>
+
+	* patches/icedtea-libraries.patch: Changed to dlopen libjpeg.so.62
+	instead of libjpeg.so.
+	* INSTALL: Added libjpeg version 6b to build requirements.
+
 2008-02-11  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am: Changed cp -a arg to -dpPR.
diff -r 93c7943f1787 -r e1f5ee2e2c0e INSTALL
--- a/INSTALL	Mon Feb 11 10:36:41 2008 -0500
+++ b/INSTALL	Mon Feb 11 14:25:34 2008 -0500
@@ -28,7 +28,7 @@ libXinerama-devel
 libXinerama-devel
 giflib-devel
 libpng-devel
-libjpeg-devel
+libjpeg-devel = 6b
 zlib-devel
 mercurial 0.9.5 + forest extension
 
diff -r 93c7943f1787 -r e1f5ee2e2c0e patches/icedtea-libraries.patch
--- a/patches/icedtea-libraries.patch	Mon Feb 11 10:36:41 2008 -0500
+++ b/patches/icedtea-libraries.patch	Mon Feb 11 14:25:34 2008 -0500
@@ -24791,9 +24791,9 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
  Java_sun_awt_image_JPEGImageDecoder_initIDs(JNIEnv *env, jclass cls,
                                              jclass InputStreamClass)
  {
-+    void *handle = dlopen("/usr/lib/libjpeg.so", RTLD_LAZY | RTLD_GLOBAL);
++    void *handle = dlopen("/usr/lib/libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
 +    if (handle == NULL)
-+      handle = dlopen("/usr/lib64/libjpeg.so", RTLD_LAZY | RTLD_GLOBAL);
++      handle = dlopen("/usr/lib64/libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
 + 
 +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
 +    if (jpegstderror == NULL) {
@@ -25301,9 +25301,9 @@ diff -ruN ..openjdk.old/openjdk/jdk/src/
 +METHODDEF(void)
 +initIDs()
 +{
-+    void *handle = dlopen("/usr/lib/libjpeg.so", RTLD_LAZY | RTLD_GLOBAL);
++    void *handle = dlopen("/usr/lib/libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
 +    if (handle == NULL)
-+      handle = dlopen("/usr/lib64/libjpeg.so", RTLD_LAZY | RTLD_GLOBAL);
++      handle = dlopen("/usr/lib64/libjpeg.so.62", RTLD_LAZY | RTLD_GLOBAL);
 +    jpegstderror = (fn_jpegstderror)dlsym(handle, "jpeg_std_error");
 +    if (jpegstderror == NULL) {
 +       dlclose(handle);