diff options
| author | wiz <wiz> | 2011-01-29 11:09:44 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-29 11:09:44 +0000 |
| commit | c0a44989aec521d2ecbe329067a06d6c2dfa5181 (patch) | |
| tree | 0b663e7e39b557f017cff1208568360fc7929838 /devel/libmatchbox | |
| parent | 7d1b83fe6d94468c20cdecd62ffa9ac88c4c2c47 (diff) | |
| download | pkgsrc-c0a44989aec521d2ecbe329067a06d6c2dfa5181.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'devel/libmatchbox')
| -rw-r--r-- | devel/libmatchbox/distinfo | 3 | ||||
| -rw-r--r-- | devel/libmatchbox/patches/patch-aa | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/devel/libmatchbox/distinfo b/devel/libmatchbox/distinfo index 933dae90c7e..bb10202b4f7 100644 --- a/devel/libmatchbox/distinfo +++ b/devel/libmatchbox/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2006/10/16 10:48:35 obache Exp $ +$NetBSD: distinfo,v 1.6 2011/01/29 11:09:44 wiz Exp $ SHA1 (libmatchbox-1.9.tar.gz) = 9a14f77c7bf0c7ea7177929bbf306bdad7f4a6fe RMD160 (libmatchbox-1.9.tar.gz) = 4620db3da81a6acd69694cd6cec8393ec8d91a05 Size (libmatchbox-1.9.tar.gz) = 418576 bytes +SHA1 (patch-aa) = eed22f59959b067475fde30c605d446a9f7d1b7d diff --git a/devel/libmatchbox/patches/patch-aa b/devel/libmatchbox/patches/patch-aa new file mode 100644 index 00000000000..c4e8cb42dc5 --- /dev/null +++ b/devel/libmatchbox/patches/patch-aa @@ -0,0 +1,26 @@ +$NetBSD: patch-aa,v 1.3 2011/01/29 11:09:44 wiz Exp $ + +Fix build with png-1.5. + +--- libmb/mbpixbuf.c.orig 2006-07-26 19:12:25.000000000 +0000 ++++ libmb/mbpixbuf.c +@@ -247,7 +247,7 @@ _load_png_file( const char *file, + return NULL; + } + +- if ( setjmp( png_ptr->jmpbuf ) ) { ++ if ( setjmp( png_jmpbuf( png_ptr ) ) ) { + png_destroy_read_struct( &png_ptr, &info_ptr, NULL); + fclose(fd); + return NULL; +@@ -269,8 +269,8 @@ _load_png_file( const char *file, + ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) + png_set_gray_to_rgb(png_ptr); + +- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA +- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA ++ if ( png_get_color_type( png_ptr, info_ptr ) == PNG_COLOR_TYPE_RGB_ALPHA ++ || png_get_color_type ( png_ptr, info_ptr ) == PNG_COLOR_TYPE_GRAY_ALPHA + ) + *has_alpha = 1; + else |