[arch-commits] Commit in emacs/trunk (2 files)

[Juergen Hoetzel]

    Date: Saturday, May 8, 2010 @ 05:05:49
  Author: juergen
Revision: 79816

remove orphan patches

Deleted:
  emacs/trunk/0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch
  emacs/trunk/libpng14.patch

-----------------------------------------------------------------+
 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch |   35 -------
 libpng14.patch                                                  |   48 ----------
 2 files changed, 83 deletions(-)

Deleted: 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch
===================================================================
--- 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch	2010-05-08 09:00:32 UTC (rev 79815)
+++ 0001-configure.in-Invoke-CPP-with-P-when-creating-Makefil.patch	2010-05-08 09:05:49 UTC (rev 79816)
@@ -1,35 +0,0 @@
-diff -ub src/emacs-23.1/configure src/emacs-23.1.fixed/configure
---- src/emacs-23.1/configure	2009-07-29 17:12:00.000000000 +0200
-+++ src/emacs-23.1.fixed/configure	2010-04-29 23:13:41.493641756 +0200
-@@ -25742,7 +25742,7 @@
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	
]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-@@ -25758,7 +25758,7 @@
-   sed -e '1,/start of cpp stuff/d'\
-       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
-       < Makefile.c > junk.c
--  $CPP $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-+  $CPP -P $cpp_undefs -I. -I$srcdir/src $CPPFLAGS junk.c | \
-       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	
]*$/d' > junk2.c
-   cat junk1.c junk2.c > Makefile.new
-   rm -f junk.c junk1.c junk2.c
-Common subdirectories: src/emacs-23.1/doc and src/emacs-23.1.fixed/doc
-Common subdirectories: src/emacs-23.1/etc and src/emacs-23.1.fixed/etc
-Common subdirectories: src/emacs-23.1/info and src/emacs-23.1.fixed/info
-Common subdirectories: src/emacs-23.1/leim and src/emacs-23.1.fixed/leim
-Common subdirectories: src/emacs-23.1/lib-src and src/emacs-23.1.fixed/lib-src
-Common subdirectories: src/emacs-23.1/lisp and src/emacs-23.1.fixed/lisp
-Common subdirectories: src/emacs-23.1/lwlib and src/emacs-23.1.fixed/lwlib
-Common subdirectories: src/emacs-23.1/m4 and src/emacs-23.1.fixed/m4
-Common subdirectories: src/emacs-23.1/msdos and src/emacs-23.1.fixed/msdos
-Common subdirectories: src/emacs-23.1/nextstep and src/emacs-23.1.fixed/nextstep
-Common subdirectories: src/emacs-23.1/nt and src/emacs-23.1.fixed/nt
-Common subdirectories: src/emacs-23.1/oldXMenu and src/emacs-23.1.fixed/oldXMenu
-Common subdirectories: src/emacs-23.1/site-lisp and src/emacs-23.1.fixed/site-lisp
-Common subdirectories: src/emacs-23.1/src and src/emacs-23.1.fixed/src

Deleted: libpng14.patch
===================================================================
--- libpng14.patch	2010-05-08 09:00:32 UTC (rev 79815)
+++ libpng14.patch	2010-05-08 09:05:49 UTC (rev 79816)
@@ -1,48 +0,0 @@
-diff -Naur emacs-23.1-orig/src/image.c emacs-23.1/src/image.c
---- emacs-23.1-orig/src/image.c	2010-01-17 23:12:10.000000000 -0500
-+++ emacs-23.1/src/image.c	2010-01-17 23:18:16.000000000 -0500
-@@ -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;