diff options
author | Hans de Graaff <graaff@gentoo.org> | 2007-06-24 11:19:11 +0000 |
---|---|---|
committer | Hans de Graaff <graaff@gentoo.org> | 2007-06-24 11:19:11 +0000 |
commit | 9770cc83074ef6a22e1e4d0250fe9f3a96554df9 (patch) | |
tree | a56bdfaee9ea550644b653474c3efba0579dfea5 /app-editors/xemacs/files | |
parent | Test numerical condition and return instead of exit in elisp-comp(). (diff) | |
download | emacs-9770cc83074ef6a22e1e4d0250fe9f3a96554df9.tar.gz emacs-9770cc83074ef6a22e1e4d0250fe9f3a96554df9.tar.bz2 emacs-9770cc83074ef6a22e1e4d0250fe9f3a96554df9.zip |
Initial version of xemacs 21.5 beta build
svn path=/emacs-overlay/; revision=466
Diffstat (limited to 'app-editors/xemacs/files')
-rw-r--r-- | app-editors/xemacs/files/digest-xemacs-21.5.28 | 6 | ||||
-rw-r--r-- | app-editors/xemacs/files/font-lock-warning-face.patch | 19 | ||||
-rw-r--r-- | app-editors/xemacs/files/gdbm-and-db.patch | 37 | ||||
-rw-r--r-- | app-editors/xemacs/files/xemacs-21.4.19-db.patch | 84 | ||||
-rw-r--r-- | app-editors/xemacs/files/xemacs.desktop | 34 |
5 files changed, 180 insertions, 0 deletions
diff --git a/app-editors/xemacs/files/digest-xemacs-21.5.28 b/app-editors/xemacs/files/digest-xemacs-21.5.28 new file mode 100644 index 0000000..8981fb1 --- /dev/null +++ b/app-editors/xemacs/files/digest-xemacs-21.5.28 @@ -0,0 +1,6 @@ +MD5 95c531ec2639990a09e92c59a855784e NeXT_XEmacs.tar.gz 39571 +RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 NeXT_XEmacs.tar.gz 39571 +SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7 NeXT_XEmacs.tar.gz 39571 +MD5 12e35715c5239c63651a8189973527ab xemacs-21.5.28.tar.gz 15310202 +RMD160 a225a2da39c22dccbc5d14399d40dadecead5e11 xemacs-21.5.28.tar.gz 15310202 +SHA256 588a3970ee44426975cd86026a932ed0e2cf47f597ebcf76d376bbd18638eae2 xemacs-21.5.28.tar.gz 15310202 diff --git a/app-editors/xemacs/files/font-lock-warning-face.patch b/app-editors/xemacs/files/font-lock-warning-face.patch new file mode 100644 index 0000000..176bb39 --- /dev/null +++ b/app-editors/xemacs/files/font-lock-warning-face.patch @@ -0,0 +1,19 @@ +Index: font-lock.el +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font-lock.el,v +retrieving revision 1.31 +diff -u -B -r1.31 font-lock.el +--- lisp/font-lock.el 2006/11/01 23:14:33 1.31 ++++ lisp/font-lock.el 2007/06/23 07:14:17 +@@ -721,6 +721,11 @@ + It is present only for horrid FSF compatibility reasons. + The corresponding face should be set using `edit-faces' or the + `set-face-*' functions.") ++(defvar font-lock-warning-face 'font-lock-warning-face ++ "This variable should not be set. ++It is present only for horrid FSF compatibility reasons. ++The corresponding face should be set using `edit-faces' or the ++`set-face-*' functions.") + + (defconst font-lock-face-list + '(font-lock-comment-face diff --git a/app-editors/xemacs/files/gdbm-and-db.patch b/app-editors/xemacs/files/gdbm-and-db.patch new file mode 100644 index 0000000..d3c5d5f --- /dev/null +++ b/app-editors/xemacs/files/gdbm-and-db.patch @@ -0,0 +1,37 @@ +XEmacs uses the legacy dbm mode from gdbm but does not take into +account that this function may be in gdbm_compat instead of gdbm. + +The Berkely DB checks aren't correct for version 4 due to a minor +thinko. + +Index: configure.ac +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v +retrieving revision 1.59 +diff -u -B -r1.59 configure.ac +--- configure.ac 2007/05/21 03:50:13 1.59 ++++ configure.ac 2007/06/24 08:44:04 +@@ -5391,10 +5391,13 @@ + if test "$enable_database_gdbm" != "no"; then + AC_CHECK_LIB(gdbm, dbm_open, [ + enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm], [ ++ AC_CHECK_LIB(gdbm_compat, dbm_open, [ ++ enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [ + if test "$enable_database_gdbm" = "yes"; then + XE_DIE("Required GNU DBM support cannot be provided.") + fi +- enable_database_gdbm=no]) ++ enable_database_gdbm=no], -lgdbm) ++ ]) + fi + + dnl Check for DBM support in libc and libdbm. +@@ -5475,7 +5478,7 @@ + fi + + dnl Berk db 4.1 decorates public functions with version information +- if test "$enable_database_berkdb" != "yes" -a "$dbver" = "4"; then ++ if test "$enable_database_berkdb" = "yes" -a "$dbver" = "4"; then + rm -f $tempcname + echo "#include <$db_h_file>" > $tempcname + echo "configure___ dbfunc=db_create" >> $tempcname diff --git a/app-editors/xemacs/files/xemacs-21.4.19-db.patch b/app-editors/xemacs/files/xemacs-21.4.19-db.patch new file mode 100644 index 0000000..cf87d60 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.4.19-db.patch @@ -0,0 +1,84 @@ +This patch fixes several database-related problems. + +dbm_open has been moved into gdbm_compat, so we check for that and include it. + +ndbm.h is located in /usr/include/gdbm on Gentoo, so we only check +there, given that we don't support normal dbm installations, and we +patch database.c as well. Not portable beyond Gentoo, but will work +for us. + +The checks for Berkeley DB only took into account up to version +3. Added checks to deal with several versions 4 as well. + +--- xemacs-21.4.19/configure.in 2005-12-24 01:48:14.000000000 +0100 ++++ xemacs-21.4.19-db/configure.in 2006-06-11 22:43:52.000000000 +0200 +@@ -4502,7 +4502,7 @@ + + dnl Check for ndbm.h, required for either kind of DBM support. + if test "$with_database_gdbm $with_database_dbm" != "no no"; then +- AC_CHECK_HEADER(ndbm.h, [:], [ ++ AC_CHECK_HEADER(gdbm/ndbm.h, [:], [ + test "$with_database_gdbm" = "yes" -o \ + "$with_database_dbm" = "yes" && \ + XE_DIE("Required DBM support cannot be provided.") +@@ -4513,10 +4513,13 @@ + if test "$with_database_gdbm" != "no"; then + AC_CHECK_LIB(gdbm, dbm_open, [ + with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [ ++ AC_CHECK_LIB(gdbm_compat, dbm_open, [ ++ with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [ + if test "$with_database_gdbm" = "yes"; then + XE_DIE("Required GNU DBM support cannot be provided.") + fi +- with_database_gdbm=no]) ++ with_database_gdbm=no], -lgdbm) ++ ]) + fi + + dnl Check for DBM support in libc and libdbm. +@@ -4614,11 +4617,30 @@ + #if DB_VERSION_MAJOR > 2 + yes + #endif +-], [AC_MSG_RESULT(3); dbfunc=db_create],[ +- AC_MSG_RESULT(2); dbfunc=db_open])],[ +- AC_MSG_RESULT(1); dbfunc=dbopen]) ++], [AC_EGREP_CPP(yes, ++[#include <$db_h_file> ++#if DB_VERSION_MAJOR > 3 ++yes ++#endif ++], [AC_MSG_RESULT(4); dbfunc=db_create; dbver=4],[ ++ AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[ ++ AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[ ++ AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1]) + AC_CHECK_FUNC($dbfunc, with_database_berkdb=yes need_libdb=no, [ +- AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)]) ++ AC_CHECK_LIB(db, db_create_4002, with_database_berkdb=yes need_libdb=yes)]) ++ fi ++ ++ dnl Berk db 4.1 decorates public functions with version information ++ if test "$have_database_berkdb" != "yes" -a "$dbver" = "4"; then ++ rm -f $tempcname ++ echo "#include <$db_h_file>" > $tempcname ++ echo "configure___ dbfunc=db_create" >> $tempcname ++ define(TAB, [ ])dnl ++ eval `$CPP -Isrc $tempcname \ ++ | sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"` ++ rm -f $tempcname ++ AC_MSG_WARN("db_create is really $dbfunc") ++ AC_CHECK_LIB(db, $dbfunc, have_database_berkdb=yes need_libdb=yes) + fi + + if test "$with_database_berkdb" = "yes"; then +--- xemacs-21.4.19/src/database.c 2005-12-24 01:52:35.000000000 +0100 ++++ xemacs-21.4.19-db/src/database.c 2006-06-13 21:00:01.000000000 +0200 +@@ -82,7 +82,7 @@ + #endif /* HAVE_BERKELEY_DB */ + + #ifdef HAVE_DBM +-#include <ndbm.h> ++#include <gdbm/ndbm.h> + Lisp_Object Qdbm; + #endif /* HAVE_DBM */ + diff --git a/app-editors/xemacs/files/xemacs.desktop b/app-editors/xemacs/files/xemacs.desktop new file mode 100644 index 0000000..54f23a2 --- /dev/null +++ b/app-editors/xemacs/files/xemacs.desktop @@ -0,0 +1,34 @@ +[Desktop Entry] +Name=XEmacs Text Editor +Name[bg]=редактор XEmacs +Name[ca]=Editor XEmacs +Name[cs]=Editor XEmacs +Name[da]=XEmacs tekstredigerer +Name[de]=XEmacs Texteditor +Name[eo]=La redaktilo XEmakso +Name[es]=Emacs para X +Name[et]=Emacs X'i kasutajaliidesega +Name[fi]=XEmacs editori +Name[fr]=Éditeur XEmacs +Name[hu]=XEmacs szövegszerkesztő +Name[is]=XEmacs-ritill +Name[it]=Emacs per X +Name[ja]=XEmacs テキスト・エディター +Name[mk]=Софистицираниот XEmacs уредувач +Name[no]=XEmacs-tekstredigerer +Name[pt]=Editor XEmacs +Name[ro]=Editorul XEmacs +Name[ru]=Редактор XEmacs +Name[sk]=Editor XEmacs +Name[sl]=Urejevalnik XEmacs +Name[uk]=Редактор XEmacs +GenericName=Text Editor +Comment=Edit text +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=xemacs %f +Icon=xemacs +Type=Application +Terminal=false +Categories=Development;TextEditor; +Encoding=UTF-8 +StartupWMClass=Emacs |