diff options
| author | obache <obache> | 2011-01-14 08:35:23 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-01-14 08:35:23 +0000 |
| commit | 5fd7801c50209cc2dda4a2f9f4c806feca3854d2 (patch) | |
| tree | 10889d822bfe20f33e76481b5d894532b547addc | |
| parent | 19c638c71ab2c052780ca03682f1894452b8fbf8 (diff) | |
| download | pkgsrc-5fd7801c50209cc2dda4a2f9f4c806feca3854d2.tar.gz | |
Fixes build with png>=1.5.
| -rw-r--r-- | meta-pkgs/ruby-gnome2/distinfo | 3 | ||||
| -rw-r--r-- | meta-pkgs/ruby-gnome2/patches/patch-au | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo index d444e649290..9700ecb96ed 100644 --- a/meta-pkgs/ruby-gnome2/distinfo +++ b/meta-pkgs/ruby-gnome2/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.18 2010/11/27 06:14:45 obache Exp $ +$NetBSD: distinfo,v 1.19 2011/01/14 08:35:23 obache Exp $ SHA1 (ruby-gnome2-all-0.90.5.tar.gz) = 320fc4c9b65b6494abac894e84013683584acf54 RMD160 (ruby-gnome2-all-0.90.5.tar.gz) = 7c96480e366bac2408a3790c355ad517cc0b0023 Size (ruby-gnome2-all-0.90.5.tar.gz) = 1754503 bytes +SHA1 (patch-au) = bb7b7bcb362e978e4393625ecd490f20c78db70e diff --git a/meta-pkgs/ruby-gnome2/patches/patch-au b/meta-pkgs/ruby-gnome2/patches/patch-au new file mode 100644 index 00000000000..d8c11e9af45 --- /dev/null +++ b/meta-pkgs/ruby-gnome2/patches/patch-au @@ -0,0 +1,25 @@ +$NetBSD: patch-au,v 1.1 2011/01/14 08:35:24 obache Exp $ + +* for png>=1.5 + * zlib.h is not included from png.h. + * use API instead of direct acess to the main linpng control structures. + +--- libart/src/rbart_canvas.c.orig 2010-10-28 08:12:38.000000000 +0000 ++++ libart/src/rbart_canvas.c +@@ -14,6 +14,7 @@ + #include "rbart.h" + + #include <jpeglib.h> ++#include <zlib.h> + #include <png.h> + + #define ART_CANVAS_PNG_INTERLACE_ADAM7 1 +@@ -352,7 +353,7 @@ canvas_to_png(argc, argv, r_self) + return Qnil; + } + +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, &info_ptr); + return Qnil; |