rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity

Accepting request 36882 from home:oertel:branches:openSUSE:Factory

Browse Source 
Copy from home:oertel:branches:openSUSE:Factory/emacs via accept of submit request 36882 revision 2.
Request was accepted with message:
forward

OBS-URL: https://build.opensuse.org/request/show/36882
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=27
This commit is contained in:
Ruediger Oertel 2010-04-04 17:47:03 +00:00 committed by Git OBS Bridge
parent bfebd91f63
commit d6ff336481
3 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
emacs-23.1-png_sig_cmp.patch Normal file
View File

@ -0,0 +1,47 @@
--- 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;

5
emacs.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Apr 4 15:39:02 CEST 2010 - ro@suse.de
- replace png_check_sig with !png_sig_cmp for libpng14
-------------------------------------------------------------------
Fri Mar 26 18:32:03 CET 2010 - werner@suse.de

2
emacs.spec
View File

@ -60,6 +60,7 @@ Patch17: emacs-23.1-bnc558884.patch
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 @@ if test ! -e $HOME/.mh_profile && type -p install-mh > /dev/null 2>&1; then
install-mh -auto < /dev/null
fi
%patch20 -p0 -b .gcc45
%patch21
%build
CC=gcc-4.3