From fb69e0cd7dd8c7b251700844fec19ff02289a588609653201c21c05f15142bca Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 19 Nov 2009 10:22:02 +0000 Subject: [PATCH 1/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=9 --- emacs.changes | 6 ++++++ emacs.spec | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/emacs.changes b/emacs.changes index ee6ee34..fc0ca3f 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 19 11:18:54 CET 2009 - werner@suse.de + +- Remove binaries from main package as theyx are provided by the + x11 sub package (bnc#555682) + ------------------------------------------------------------------- Fri Aug 14 13:19:59 CEST 2009 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index 2fa20a0..238842a 100644 --- a/emacs.spec +++ b/emacs.spec @@ -556,10 +556,6 @@ done /etc/skel/.gnu-emacs %{_bindir}/b2m %{_bindir}/ebrowse -%{_bindir}/emacs -%{_bindir}/emacs-gtk -%{_bindir}/emacs-nox -%{_bindir}/emacs-x11 %{_bindir}/emacsclient %{_bindir}/grep-changelog %{_bindir}/rcs-checkin From dc6f678c6e05dbc6a60406c267283cbdce87f9dbd10254430bc8d001f19c8b8c Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 23 Nov 2009 11:04:03 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=10 --- emacs.changes | 6 ------ emacs.spec | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/emacs.changes b/emacs.changes index fc0ca3f..ee6ee34 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Thu Nov 19 11:18:54 CET 2009 - werner@suse.de - -- Remove binaries from main package as theyx are provided by the - x11 sub package (bnc#555682) - ------------------------------------------------------------------- Fri Aug 14 13:19:59 CEST 2009 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index 238842a..2fa20a0 100644 --- a/emacs.spec +++ b/emacs.spec @@ -556,6 +556,10 @@ done /etc/skel/.gnu-emacs %{_bindir}/b2m %{_bindir}/ebrowse +%{_bindir}/emacs +%{_bindir}/emacs-gtk +%{_bindir}/emacs-nox +%{_bindir}/emacs-x11 %{_bindir}/emacsclient %{_bindir}/grep-changelog %{_bindir}/rcs-checkin From 4ed14d38e84cc07993894f49fde9eda1f6ab17b41de8105c8ae9d72f1e943a46 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 26 Nov 2009 13:55:05 +0000 Subject: [PATCH 3/5] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=11 --- emacs-23.1-bnc556175.patch | 71 ++++++++++++++++++++++++++++++++++++++ emacs.changes | 11 ++++++ emacs.spec | 8 ++--- 3 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 emacs-23.1-bnc556175.patch diff --git a/emacs-23.1-bnc556175.patch b/emacs-23.1-bnc556175.patch new file mode 100644 index 0000000..6cae673 --- /dev/null +++ b/emacs-23.1-bnc556175.patch @@ -0,0 +1,71 @@ +--- src/term.c ++++ src/term.c 2009-11-26 14:09:38.631431310 +0100 +@@ -37,6 +37,7 @@ along with GNU Emacs. If not, see + #include ++#include + + #include "lisp.h" + #include "termchar.h" +@@ -1650,7 +1651,7 @@ produce_glyphs (it) + if (unibyte_display_via_language_environment + && (it->c >= 0240)) + { +- it->char_to_display = unibyte_char_to_multibyte (it->c); ++ it->char_to_display = BYTE8_TO_CHAR (it->c); + it->pixel_width = CHAR_WIDTH (it->char_to_display); + it->nglyphs = it->pixel_width; + if (it->glyph_row) +@@ -3467,9 +3465,7 @@ init_tty (char *name, char *terminal_typ + + tty->type = xstrdup (terminal_type); + +-#ifdef subprocesses + add_keyboard_wait_descriptor (fileno (tty->input)); +-#endif + + #endif /* !DOS_NT */ + +@@ -3959,8 +3957,6 @@ static void + delete_tty (struct terminal *terminal) + { + struct tty_display_info *tty; +- Lisp_Object tail, frame; +- int last_terminal; + + /* Protect against recursive calls. delete_frame in + delete_terminal calls us back when it deletes our last frame. */ +@@ -3972,19 +3968,6 @@ delete_tty (struct terminal *terminal) + + tty = terminal->display_info.tty; + +- last_terminal = 1; +- FOR_EACH_FRAME (tail, frame) +- { +- struct frame *f = XFRAME (frame); +- if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty)) +- { +- last_terminal = 0; +- break; +- } +- } +- if (last_terminal) +- error ("Attempt to delete the sole terminal device with live frames"); +- + if (tty == tty_list) + tty_list = tty->next; + else +@@ -4025,10 +4008,8 @@ delete_tty (struct terminal *terminal) + + xfree (tty->old_tty); + xfree (tty->Wcm); +- if (tty->termcap_strings_buffer) +- xfree (tty->termcap_strings_buffer); +- if (tty->termcap_term_buffer) +- xfree (tty->termcap_term_buffer); ++ xfree (tty->termcap_strings_buffer); ++ xfree (tty->termcap_term_buffer); + + bzero (tty, sizeof (struct tty_display_info)); + xfree (tty); diff --git a/emacs.changes b/emacs.changes index ee6ee34..375d4cf 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Nov 26 14:54:17 CET 2009 - werner@suse.de + +- Add patch from upstream to fix bug bnc#556175 + +------------------------------------------------------------------- +Thu Nov 19 11:18:54 CET 2009 - werner@suse.de + +- Remove binaries from main package as theyx are provided by the + x11 sub package (bnc#555682) + ------------------------------------------------------------------- Fri Aug 14 13:19:59 CEST 2009 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index 2fa20a0..0331618 100644 --- a/emacs.spec +++ b/emacs.spec @@ -24,7 +24,7 @@ Url: http://www.gnu.org/software/emacs/ License: GPL v2 or later Group: Productivity/Editors/Emacs Version: 23.1 -Release: 2 +Release: 3 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} @@ -52,6 +52,7 @@ Patch10: emacs-22.0.99-sentinel.patch Patch11: emacs-22.0.99-xim.patch Patch12: emacs-22.0.99-x11r7.patch Patch13: emacs-23.1-s390x.dif +Patch14: emacs-23.1-bnc556175.patch Patch15: emacs-22.2-iconic.patch Patch16: emacs-23.1-flyspell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -230,6 +231,7 @@ Authors: %patch11 -p0 -b .xim %patch12 -p0 -b .x11r7 %patch13 -p0 -b .s390x +%patch14 -p0 -b .loop %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell %patch @@ -556,10 +558,6 @@ done /etc/skel/.gnu-emacs %{_bindir}/b2m %{_bindir}/ebrowse -%{_bindir}/emacs -%{_bindir}/emacs-gtk -%{_bindir}/emacs-nox -%{_bindir}/emacs-x11 %{_bindir}/emacsclient %{_bindir}/grep-changelog %{_bindir}/rcs-checkin From 76cc4f9d09b817bdd4afa55f1545fc3024f85958d8d5ff0f295e28667f6b811d Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 27 Nov 2009 13:35:16 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=12 --- emacs-23.1-bnc556175.patch | 71 -------------------------------------- emacs.changes | 5 --- emacs.spec | 2 -- 3 files changed, 78 deletions(-) delete mode 100644 emacs-23.1-bnc556175.patch diff --git a/emacs-23.1-bnc556175.patch b/emacs-23.1-bnc556175.patch deleted file mode 100644 index 6cae673..0000000 --- a/emacs-23.1-bnc556175.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- src/term.c -+++ src/term.c 2009-11-26 14:09:38.631431310 +0100 -@@ -37,6 +37,7 @@ along with GNU Emacs. If not, see - #include -+#include - - #include "lisp.h" - #include "termchar.h" -@@ -1650,7 +1651,7 @@ produce_glyphs (it) - if (unibyte_display_via_language_environment - && (it->c >= 0240)) - { -- it->char_to_display = unibyte_char_to_multibyte (it->c); -+ it->char_to_display = BYTE8_TO_CHAR (it->c); - it->pixel_width = CHAR_WIDTH (it->char_to_display); - it->nglyphs = it->pixel_width; - if (it->glyph_row) -@@ -3467,9 +3465,7 @@ init_tty (char *name, char *terminal_typ - - tty->type = xstrdup (terminal_type); - --#ifdef subprocesses - add_keyboard_wait_descriptor (fileno (tty->input)); --#endif - - #endif /* !DOS_NT */ - -@@ -3959,8 +3957,6 @@ static void - delete_tty (struct terminal *terminal) - { - struct tty_display_info *tty; -- Lisp_Object tail, frame; -- int last_terminal; - - /* Protect against recursive calls. delete_frame in - delete_terminal calls us back when it deletes our last frame. */ -@@ -3972,19 +3968,6 @@ delete_tty (struct terminal *terminal) - - tty = terminal->display_info.tty; - -- last_terminal = 1; -- FOR_EACH_FRAME (tail, frame) -- { -- struct frame *f = XFRAME (frame); -- if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty)) -- { -- last_terminal = 0; -- break; -- } -- } -- if (last_terminal) -- error ("Attempt to delete the sole terminal device with live frames"); -- - if (tty == tty_list) - tty_list = tty->next; - else -@@ -4025,10 +4008,8 @@ delete_tty (struct terminal *terminal) - - xfree (tty->old_tty); - xfree (tty->Wcm); -- if (tty->termcap_strings_buffer) -- xfree (tty->termcap_strings_buffer); -- if (tty->termcap_term_buffer) -- xfree (tty->termcap_term_buffer); -+ xfree (tty->termcap_strings_buffer); -+ xfree (tty->termcap_term_buffer); - - bzero (tty, sizeof (struct tty_display_info)); - xfree (tty); diff --git a/emacs.changes b/emacs.changes index 375d4cf..fc0ca3f 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Nov 26 14:54:17 CET 2009 - werner@suse.de - -- Add patch from upstream to fix bug bnc#556175 - ------------------------------------------------------------------- Thu Nov 19 11:18:54 CET 2009 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index 0331618..e6bbc14 100644 --- a/emacs.spec +++ b/emacs.spec @@ -52,7 +52,6 @@ Patch10: emacs-22.0.99-sentinel.patch Patch11: emacs-22.0.99-xim.patch Patch12: emacs-22.0.99-x11r7.patch Patch13: emacs-23.1-s390x.dif -Patch14: emacs-23.1-bnc556175.patch Patch15: emacs-22.2-iconic.patch Patch16: emacs-23.1-flyspell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -231,7 +230,6 @@ Authors: %patch11 -p0 -b .xim %patch12 -p0 -b .x11r7 %patch13 -p0 -b .s390x -%patch14 -p0 -b .loop %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell %patch From b169acd5eb89e203ae8f64774dbdf861e865defe91ba3923fec6982de321c125 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 27 Nov 2009 13:35:17 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/emacs revision 39.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=f18c0fa1a7a27a2fa30f3767683ae6e2 --- emacs-23.1-bnc556175.patch | 71 ++++++++++++++++++++++++++++++++++++++ emacs.changes | 5 +++ emacs.spec | 14 ++++---- 3 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 emacs-23.1-bnc556175.patch diff --git a/emacs-23.1-bnc556175.patch b/emacs-23.1-bnc556175.patch new file mode 100644 index 0000000..6cae673 --- /dev/null +++ b/emacs-23.1-bnc556175.patch @@ -0,0 +1,71 @@ +--- src/term.c ++++ src/term.c 2009-11-26 14:09:38.631431310 +0100 +@@ -37,6 +37,7 @@ along with GNU Emacs. If not, see + #include ++#include + + #include "lisp.h" + #include "termchar.h" +@@ -1650,7 +1651,7 @@ produce_glyphs (it) + if (unibyte_display_via_language_environment + && (it->c >= 0240)) + { +- it->char_to_display = unibyte_char_to_multibyte (it->c); ++ it->char_to_display = BYTE8_TO_CHAR (it->c); + it->pixel_width = CHAR_WIDTH (it->char_to_display); + it->nglyphs = it->pixel_width; + if (it->glyph_row) +@@ -3467,9 +3465,7 @@ init_tty (char *name, char *terminal_typ + + tty->type = xstrdup (terminal_type); + +-#ifdef subprocesses + add_keyboard_wait_descriptor (fileno (tty->input)); +-#endif + + #endif /* !DOS_NT */ + +@@ -3959,8 +3957,6 @@ static void + delete_tty (struct terminal *terminal) + { + struct tty_display_info *tty; +- Lisp_Object tail, frame; +- int last_terminal; + + /* Protect against recursive calls. delete_frame in + delete_terminal calls us back when it deletes our last frame. */ +@@ -3972,19 +3968,6 @@ delete_tty (struct terminal *terminal) + + tty = terminal->display_info.tty; + +- last_terminal = 1; +- FOR_EACH_FRAME (tail, frame) +- { +- struct frame *f = XFRAME (frame); +- if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty)) +- { +- last_terminal = 0; +- break; +- } +- } +- if (last_terminal) +- error ("Attempt to delete the sole terminal device with live frames"); +- + if (tty == tty_list) + tty_list = tty->next; + else +@@ -4025,10 +4008,8 @@ delete_tty (struct terminal *terminal) + + xfree (tty->old_tty); + xfree (tty->Wcm); +- if (tty->termcap_strings_buffer) +- xfree (tty->termcap_strings_buffer); +- if (tty->termcap_term_buffer) +- xfree (tty->termcap_term_buffer); ++ xfree (tty->termcap_strings_buffer); ++ xfree (tty->termcap_term_buffer); + + bzero (tty, sizeof (struct tty_display_info)); + xfree (tty); diff --git a/emacs.changes b/emacs.changes index fc0ca3f..375d4cf 100644 --- a/emacs.changes +++ b/emacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 26 14:54:17 CET 2009 - werner@suse.de + +- Add patch from upstream to fix bug bnc#556175 + ------------------------------------------------------------------- Thu Nov 19 11:18:54 CET 2009 - werner@suse.de diff --git a/emacs.spec b/emacs.spec index e6bbc14..fb4bb18 100644 --- a/emacs.spec +++ b/emacs.spec @@ -21,10 +21,10 @@ Name: emacs BuildRequires: alsa-devel bind-devel dbus-1-devel elfutils fdupes fonts-config freetype2-devel giflib-devel gpm gtk2-devel krb5-devel libjpeg-devel libotf-devel libpng-devel librsvg-devel libtiff-devel m17n-lib-devel ncurses-devel nmh sendmail texinfo update-desktop-files xaw3d-devel xorg-x11-devel Url: http://www.gnu.org/software/emacs/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.1 -Release: 3 +Release: 4 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} @@ -52,6 +52,7 @@ Patch10: emacs-22.0.99-sentinel.patch Patch11: emacs-22.0.99-xim.patch Patch12: emacs-22.0.99-x11r7.patch Patch13: emacs-23.1-s390x.dif +Patch14: emacs-23.1-bnc556175.patch Patch15: emacs-22.2-iconic.patch Patch16: emacs-23.1-flyspell.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -93,7 +94,7 @@ Authors: Ken Stevens %package -n emacs-nox -License: GPL v2 or later +License: GPLv2+ PreReq: fileutils Requires: emacs = %{version}-%{release} Provides: emacs_program = %{version}-%{release} @@ -125,7 +126,7 @@ Authors: Ken Stevens %package -n emacs-x11 -License: GPL v2 or later +License: GPLv2+ PreReq: fileutils Requires: emacs = %{version}-%{release} Enhances: xorg-x11-libs @@ -160,7 +161,7 @@ Authors: Ken Stevens %package -n emacs-el -License: GPL v2 or later +License: GPLv2+ Obsoletes: ge_lisp Requires: emacs = %{version}-%{release} Summary: Several Lisp Files for GNU Emacs @@ -187,7 +188,7 @@ Authors: Eric S. Raymond %package -n emacs-info -License: GPL v2 or later +License: GPLv2+ Obsoletes: ge_info elispman elisp-manual elispint emacs-lisp-intro Provides: elispman elisp-manual elispint emacs-lisp-intro Summary: Info files for GNU Emacs @@ -230,6 +231,7 @@ Authors: %patch11 -p0 -b .xim %patch12 -p0 -b .x11r7 %patch13 -p0 -b .s390x +%patch14 -p0 -b .loop %patch15 -p0 -b .iconic %patch16 -p0 -b .flyspell %patch