rpms/emacs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed etags on x86_64. Resolves rhbz#545398.

Browse Source
This commit is contained in:
Karel Klíč 2009-12-08 17:02:32 +00:00
parent 6c1c662e75
commit 1de5c1cc99
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
emacs-23.1-memmove.patch Normal file
View File

@ -0,0 +1,19 @@
diff -up emacs-23.1/lib-src/etags.c.memmove emacs-23.1/lib-src/etags.c
--- emacs-23.1/lib-src/etags.c.memmove 2009-06-21 06:37:34.000000000 +0200
+++ emacs-23.1/lib-src/etags.c 2009-12-08 17:55:41.442792036 +0100
@@ -6695,13 +6695,13 @@ absolute_filename (file, dir)
else if (cp[0] != '/')
cp = slashp;
#endif
- strcpy (cp, slashp + 3);
+ memmove (cp, slashp + 3, strlen(slashp + 2));
slashp = cp;
continue;
}
else if (slashp[2] == '/' || slashp[2] == '\0')
{
- strcpy (slashp, slashp + 2);
+ memmove (slashp, slashp + 2, strlen(slashp + 1));
continue;
}
}

9
emacs.spec
View File

@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 23.1 Version: 23.1
Release: 16%{?dist} Release: 17%{?dist}
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/emacs/ URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors Group: Applications/Editors
@ -28,9 +28,12 @@ Patch2: po-mode-auto-replace-date-71264.patch
Patch3: rpm-spec-mode-utc.patch Patch3: rpm-spec-mode-utc.patch
Patch4: emacs-gtk.patch Patch4: emacs-gtk.patch
Patch5: emacs-23.1-xdg.patch Patch5: emacs-23.1-xdg.patch
# Fixed in upstream CVS.
Patch6: emacs-23.1-cpp.patch Patch6: emacs-23.1-cpp.patch
Patch7: emacs-23.1-scroll.patch Patch7: emacs-23.1-scroll.patch
Patch8: emacs-23.1-indian.patch Patch8: emacs-23.1-indian.patch
# Fixed in upstream CVS
Patch9: emacs-23.1-memmove.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root Buildroot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
@ -129,6 +132,7 @@ Emacs packages or see some elisp examples.
%patch6 -p1 %patch6 -p1
%patch7 -p1 -b .scroll %patch7 -p1 -b .scroll
%patch8 -p1 %patch8 -p1
%patch9 -p1 -b .memmove
# install rest of site-lisp files # install rest of site-lisp files
( cd site-lisp ( cd site-lisp
@ -400,6 +404,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
%dir %{_datadir}/emacs/%{version} %dir %{_datadir}/emacs/%{version}
%changelog %changelog
* Tue Dec 8 2009 Karel Klic <kklic@redhat.com> 1:23.1-17
- Fixed rhbz#545398 - ETags messes up filenames
* Thu Dec 03 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-16 * Thu Dec 03 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-16
- fix #542657 - emacs does not display indic text - fix #542657 - emacs does not display indic text