Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at Sun Apr 4 20:05:40 CEST 2010. -------- --- emacs/emacs.changes 2010-03-26 18:37:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/emacs/emacs.changes 2010-04-04 15:39:30.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 4 15:39:02 CEST 2010 - ro@suse.de + +- replace png_check_sig with !png_sig_cmp for libpng14 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- emacs-23.1-png_sig_cmp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.E77iVE/_old 2010-04-04 20:05:27.000000000 +0200 +++ /var/tmp/diff_new_pack.E77iVE/_new 2010-04-04 20:05:27.000000000 +0200 @@ -25,7 +25,7 @@ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 10 +Release: 11 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -60,6 +60,7 @@ Patch18: emacs-sparc.diff Patch19: emacs-23.1-fix_cpp.patch Patch20: emacs-23.1-gcc45.dif +Patch21: emacs-23.1-png_sig_cmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -253,6 +254,7 @@ install-mh -auto < /dev/null fi %patch20 -p0 -b .gcc45 +%patch21 %build CC=gcc-4.3 ++++++ emacs-23.1-png_sig_cmp.patch ++++++ --- src/image.c +++ src/image.c @@ -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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org