diff options
| author | dinoex <dinoex@FreeBSD.org> | 2010-03-30 11:59:01 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2010-03-30 11:59:01 +0800 |
| commit | 393eb9408b6ef48aa0a09477a07284aa84a33990 (patch) | |
| tree | 0405760661370af0107f01fe0661071ae9ef2f5a /editors | |
| parent | f6fa4996bab83e7676e825207221de3e856a101a (diff) | |
| download | freebsd-ports-gnome-393eb9408b6ef48aa0a09477a07284aa84a33990.tar.gz freebsd-ports-gnome-393eb9408b6ef48aa0a09477a07284aa84a33990.tar.zst freebsd-ports-gnome-393eb9408b6ef48aa0a09477a07284aa84a33990.zip | |
- fix build for png-1.4.1
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/files/patch-src-image.c | 47 | ||||
| -rw-r--r-- | editors/emacs23/files/patch-src-image.c | 47 |
2 files changed, 94 insertions, 0 deletions
diff --git a/editors/emacs/files/patch-src-image.c b/editors/emacs/files/patch-src-image.c new file mode 100644 index 000000000000..c031bb012f30 --- /dev/null +++ b/editors/emacs/files/patch-src-image.c @@ -0,0 +1,47 @@ +--- src/image.c.orig 2010-03-29 08:46:39.902587060 +0200 ++++ src/image.c 2010-03-29 08:51:40.907908128 +0200 +@@ -5793,7 +5793,7 @@ + /* PNG library details. */ + + DEF_IMGLIB_FN (png_get_io_ptr); +-DEF_IMGLIB_FN (png_check_sig); ++DEF_IMGLIB_FN (png_sig_cmp); + DEF_IMGLIB_FN (png_create_read_struct); + DEF_IMGLIB_FN (png_create_info_struct); + DEF_IMGLIB_FN (png_destroy_read_struct); +@@ -5824,7 +5824,7 @@ + return 0; + + LOAD_IMGLIB_FN (library, png_get_io_ptr); +- LOAD_IMGLIB_FN (library, png_check_sig); ++ LOAD_IMGLIB_FN (library, png_sig_cmp); + LOAD_IMGLIB_FN (library, png_create_read_struct); + LOAD_IMGLIB_FN (library, png_create_info_struct); + LOAD_IMGLIB_FN (library, png_destroy_read_struct); +@@ -5849,7 +5849,7 @@ + #else + + #define fn_png_get_io_ptr png_get_io_ptr +-#define fn_png_check_sig png_check_sig ++#define fn_png_sig_cmp png_sig_cmp + #define fn_png_create_read_struct png_create_read_struct + #define fn_png_create_info_struct png_create_info_struct + #define fn_png_destroy_read_struct png_destroy_read_struct +@@ -5996,7 +5996,7 @@ + + /* Check PNG signature. */ + if (fread (sig, 1, sizeof sig, fp) != sizeof sig +- || !fn_png_check_sig (sig, sizeof sig)) ++ || !fn_png_sig_cmp (sig, 0, sizeof sig)) + { + image_error ("Not a PNG file: `%s'", file, Qnil); + UNGCPRO; +@@ -6013,7 +6013,7 @@ + + /* Check PNG signature. */ + if (tbr.len < sizeof sig +- || !fn_png_check_sig (tbr.bytes, sizeof sig)) ++ || !fn_png_sig_cmp (tbr.bytes, 0, sizeof sig)) + { + image_error ("Not a PNG image: `%s'", img->spec, Qnil); + UNGCPRO; diff --git a/editors/emacs23/files/patch-src-image.c b/editors/emacs23/files/patch-src-image.c new file mode 100644 index 000000000000..c031bb012f30 --- /dev/null +++ b/editors/emacs23/files/patch-src-image.c @@ -0,0 +1,47 @@ +--- src/image.c.orig 2010-03-29 08:46:39.902587060 +0200 ++++ src/image.c 2010-03-29 08:51:40.907908128 +0200 +@@ -5793,7 +5793,7 @@ + /* PNG library details. */ + + DEF_IMGLIB_FN (png_get_io_ptr); +-DEF_IMGLIB_FN (png_check_sig); ++DEF_IMGLIB_FN (png_sig_cmp); + DEF_IMGLIB_FN (png_create_read_struct); + DEF_IMGLIB_FN (png_create_info_struct); + DEF_IMGLIB_FN (png_destroy_read_struct); +@@ -5824,7 +5824,7 @@ + return 0; + + LOAD_IMGLIB_FN (library, png_get_io_ptr); +- LOAD_IMGLIB_FN (library, png_check_sig); ++ LOAD_IMGLIB_FN (library, png_sig_cmp); + LOAD_IMGLIB_FN (library, png_create_read_struct); + LOAD_IMGLIB_FN (library, png_create_info_struct); + LOAD_IMGLIB_FN (library, png_destroy_read_struct); +@@ -5849,7 +5849,7 @@ + #else + + #define fn_png_get_io_ptr png_get_io_ptr +-#define fn_png_check_sig png_check_sig ++#define fn_png_sig_cmp png_sig_cmp + #define fn_png_create_read_struct png_create_read_struct + #define fn_png_create_info_struct png_create_info_struct + #define fn_png_destroy_read_struct png_destroy_read_struct +@@ -5996,7 +5996,7 @@ + + /* Check PNG signature. */ + if (fread (sig, 1, sizeof sig, fp) != sizeof sig +- || !fn_png_check_sig (sig, sizeof sig)) ++ || !fn_png_sig_cmp (sig, 0, sizeof sig)) + { + image_error ("Not a PNG file: `%s'", file, Qnil); + UNGCPRO; +@@ -6013,7 +6013,7 @@ + + /* Check PNG signature. */ + if (tbr.len < sizeof sig +- || !fn_png_check_sig (tbr.bytes, sizeof sig)) ++ || !fn_png_sig_cmp (tbr.bytes, 0, sizeof sig)) + { + image_error ("Not a PNG image: `%s'", img->spec, Qnil); + UNGCPRO; |