From a89e2005498efef0621e5a6994d04f4c5b2b5557d6ab30f29463f5e236272b3b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 19 Oct 2010 11:05:28 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/emacs revision 57.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=87745159d2dcd18e977aa228feab2728 --- emacs-23.1-fix_cpp.patch | 27 --------------------- emacs-23.1-png_sig_cmp.patch | 47 ------------------------------------ emacs-23.1.tar.bz2 | 3 --- 3 files changed, 77 deletions(-) delete mode 100644 emacs-23.1-fix_cpp.patch delete mode 100644 emacs-23.1-png_sig_cmp.patch delete mode 100644 emacs-23.1.tar.bz2 diff --git a/emacs-23.1-fix_cpp.patch b/emacs-23.1-fix_cpp.patch deleted file mode 100644 index 1c500d6..0000000 --- a/emacs-23.1-fix_cpp.patch +++ /dev/null @@ -1,27 +0,0 @@ -2009-10-23 Jim Meyering - - * configure.in: Invoke $CPP with -P when creating Makefile and - src/Makefile. Without this, gcc 4.4.2 converts each - backslash-newline pair in the input to a bare newline, yielding - invalid Makefiles. - ---- emacs-23.1.orig/configure.in 2010-02-24 18:49:14.000000000 +0100 -+++ emacs-23.1/configure.in 2010-02-24 18:51:16.000000000 +0100 -@@ -2984,7 +2984,7 @@ echo creating lib-src/Makefile - 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 -@@ -3000,7 +3000,7 @@ echo creating src/Makefile - 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 diff --git a/emacs-23.1-png_sig_cmp.patch b/emacs-23.1-png_sig_cmp.patch deleted file mode 100644 index 31d3544..0000000 --- a/emacs-23.1-png_sig_cmp.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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; diff --git a/emacs-23.1.tar.bz2 b/emacs-23.1.tar.bz2 deleted file mode 100644 index 87f6528..0000000 --- a/emacs-23.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:435db5a28ff0b48b6e3c81dad7104ed21c563b76565666d98bbc8fe0afd14332 -size 1048576 From ea3fdea07f7758aeda102f3b458c79206416723f04542f59d9194a051e042a6a Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 18 Nov 2010 10:12:27 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=45 --- emacs.changes | 8 ++++++++ site-lisp.tar.bz2 | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/emacs.changes b/emacs.changes index 9e9ba0c..c7ecfa3 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 18 11:10:16 CET 2010 - werner@suse.de + +- Support foreign emacs extensions to scanning + /usr/share/emacs/site-lisp/site-start.d/ + /etc/emacs/site-lisp/site-start.d/ + for emacs lisp files suggested by Holger Arnold (bnc#653798) + ------------------------------------------------------------------- Tue Oct 19 09:36:29 CEST 2010 - werner@suse.de diff --git a/site-lisp.tar.bz2 b/site-lisp.tar.bz2 index dd37e8c..b8fba44 100644 --- a/site-lisp.tar.bz2 +++ b/site-lisp.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63ca6e4c270440b575df40007b3a7707bf126f23abc753f8d3c433eb9fcf918d -size 51564 +oid sha256:8710deb2a54e2da1065fa3bc62b18c70dc00bcbb081b553f0b0e7cfc593c2d5b +size 51829