Mercurial > hg > release > icedtea-1.10
changeset 803:e1f5ee2e2c0e cacao
2008-02-11 Lillian Angel <langel@redhat.com>
* patches/icedtea-libraries.patch: Changed to dlopen libjpeg.so.62
instead of libjpeg.so.
* INSTALL: Added libjpeg version 6b to build requirements.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Mon, 11 Feb 2008 14:25:34 -0500 |
parents | 93c7943f1787 |
children | 43edef9724f0 |
files | ChangeLog INSTALL patches/icedtea-libraries.patch |
diffstat | 3 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@redhat.com> * Makefile.am: Changed cp -a arg to -dpPR.
--- 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 giflib-devel libpng-devel -libjpeg-devel +libjpeg-devel = 6b zlib-devel mercurial 0.9.5 + forest extension
--- 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 @@ 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 @@ +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);