From 6173cdcae4031f2dbb633c3e9c150811daaf449f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 1 Mar 2005 22:11:36 +0000 Subject: [PATCH 001/160] auto-import xemacs-21.4.17-2 on branch devel from xemacs-21.4.17-2.src.rpm Latest from Core devel CVS adapted to Extras + some improvements. --- .cvsignore | 1 + default.el | 16 + delprevline.py | 20 + dotxemacs-init.el | 7 + menubar-games.patch | 13 + movemail-mktemp.patch | 11 + sources | 1 + xemacs-21-cursor.patch | 11 + xemacs-21.4.10-find-paths-pkgdir.patch | 23 + xemacs-21.4.12-find-paths-libexec-lib64.patch | 11 + xemacs-21.4.12-mk-nochk-features.patch | 11 + xemacs-21.4.13-dump-paths-lispdir.patch | 21 + xemacs-21.4.13-utf8-fontsets.patch | 18 + xemacs-21.4.15-wnnfix-128362.patch | 61 ++ xemacs-debian-docdir-dump.patch | 67 ++ xemacs-no-expdyn-ia64-106744.patch | 21 + xemacs-sitestart.el | 74 ++ xemacs.desktop | 34 + xemacs.png | Bin 0 -> 1363 bytes xemacs.spec | 796 ++++++++++++++++++ 20 files changed, 1217 insertions(+) create mode 100644 default.el create mode 100644 delprevline.py create mode 100644 dotxemacs-init.el create mode 100644 menubar-games.patch create mode 100644 movemail-mktemp.patch create mode 100644 xemacs-21-cursor.patch create mode 100644 xemacs-21.4.10-find-paths-pkgdir.patch create mode 100644 xemacs-21.4.12-find-paths-libexec-lib64.patch create mode 100644 xemacs-21.4.12-mk-nochk-features.patch create mode 100644 xemacs-21.4.13-dump-paths-lispdir.patch create mode 100644 xemacs-21.4.13-utf8-fontsets.patch create mode 100644 xemacs-21.4.15-wnnfix-128362.patch create mode 100644 xemacs-debian-docdir-dump.patch create mode 100644 xemacs-no-expdyn-ia64-106744.patch create mode 100644 xemacs-sitestart.el create mode 100644 xemacs.desktop create mode 100644 xemacs.png create mode 100644 xemacs.spec diff --git a/.cvsignore b/.cvsignore index e69de29..81e99a6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xemacs-21.4.17.tar.bz2 diff --git a/default.el b/default.el new file mode 100644 index 0000000..f497674 --- /dev/null +++ b/default.el @@ -0,0 +1,16 @@ +;;; default.el - loaded at startup after "~/.xemacs/init.el" by default +;;; +;;; Setting `inhibit-default-init' non-nil in "~/.xemacs/init.el" +;;; prevents loading of this file. The "-q" option to xemacs +;;; prevents "~/.xemacs/init.el" *and* this file from being loaded +;;; at startup. + +;; enable wheelmouse support by default +(when window-system + (mwheel-install)) + +;; make gnus save articles be mbox format not rmail format +(defvar gnus-default-article-saver 'gnus-summary-save-in-file) + +;; use terminfo by default +(defvar system-uses-terminfo t) diff --git a/delprevline.py b/delprevline.py new file mode 100644 index 0000000..578d70d --- /dev/null +++ b/delprevline.py @@ -0,0 +1,20 @@ +#!/usr/bin/python + +import string +import sys + +match="(japanese)" +file=open(sys.argv[1]) +lines=file.readlines() +file.close +lines2=[] +for line in lines: + if string.find(line,match)>0: + lines2.pop() + else: + lines2.append(line) +file=open(sys.argv[1],"w") +file.writelines(lines2) + + + diff --git a/dotxemacs-init.el b/dotxemacs-init.el new file mode 100644 index 0000000..df8f072 --- /dev/null +++ b/dotxemacs-init.el @@ -0,0 +1,7 @@ +;;; .xemacs/init.el + +;;; uncomment this line to disable loading of "default.el" at startup +;; (setq inhibit-default-init t) + +;; default to unified diffs +(setq diff-switches "-u") diff --git a/menubar-games.patch b/menubar-games.patch new file mode 100644 index 0000000..5018ff0 --- /dev/null +++ b/menubar-games.patch @@ -0,0 +1,13 @@ +--- xemacs-21.4.12/lisp/menubar-items.el~ 2003-01-17 04:46:27.000000000 +0900 ++++ xemacs-21.4.12/lisp/menubar-items.el 2003-01-17 04:46:27.000000000 +0900 +@@ -627,8 +627,8 @@ + ("Ga%_mes" + ["%_Mine Game" xmine + :active (fboundp 'xmine)] +- ["%_Tetris" tetris +- :active (fboundp 'tetris)] ++;; ["%_Tetris" tetris ++;; :active (fboundp 'tetris)] + ["%_Sokoban" sokoban + :active (fboundp 'sokoban)] + ["Quote from %_Zippy" yow diff --git a/movemail-mktemp.patch b/movemail-mktemp.patch new file mode 100644 index 0000000..a0314ae --- /dev/null +++ b/movemail-mktemp.patch @@ -0,0 +1,11 @@ +--- xemacs-21.4.10/lib-src/movemail.c.mktemp 2002-08-20 20:34:22.000000000 +0900 ++++ xemacs-21.4.10/lib-src/movemail.c 2002-12-18 22:09:11.000000000 +0900 +@@ -588,7 +588,7 @@ + p--; + *p = 0; + strcpy (p, "EXXXXXX"); +- mktemp (tempname); ++ mkstemp (tempname); + unlink (tempname); + + for (;;) diff --git a/sources b/sources index e69de29..2fcf6a4 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +a207e106138c085711160855d78b72a2 xemacs-21.4.17.tar.bz2 diff --git a/xemacs-21-cursor.patch b/xemacs-21-cursor.patch new file mode 100644 index 0000000..3bcb9b4 --- /dev/null +++ b/xemacs-21-cursor.patch @@ -0,0 +1,11 @@ +--- gtk-xemacs/src/redisplay-tty.c.cursor Tue Nov 28 18:24:15 2000 ++++ gtk-xemacs/src/redisplay-tty.c Tue Nov 28 18:25:09 2000 +@@ -1236,7 +1236,7 @@ + } + + TTY_SD (c).cursor_visible = tgetstr ("ve", &bufptr); +- TTY_SD (c).cursor_normal = tgetstr ("vs", &bufptr); ++ TTY_SD (c).cursor_normal = tgetstr ("ve", &bufptr); + TTY_SD (c).init_motion = tgetstr ("ti", &bufptr); + TTY_SD (c).end_motion = tgetstr ("te", &bufptr); + TTY_SD (c).keypad_on = tgetstr ("ks", &bufptr); diff --git a/xemacs-21.4.10-find-paths-pkgdir.patch b/xemacs-21.4.10-find-paths-pkgdir.patch new file mode 100644 index 0000000..2f5dd99 --- /dev/null +++ b/xemacs-21.4.10-find-paths-pkgdir.patch @@ -0,0 +1,23 @@ +diff -u xemacs-21.4.10/lisp/find-paths.el~ xemacs-21.4.10/lisp/find-paths.el +--- xemacs-21.4.10/lisp/find-paths.el~ 2002-12-21 08:56:42.000000000 +0900 ++++ xemacs-21.4.10/lisp/find-paths.el 2002-12-21 08:56:42.000000000 +0900 +@@ -103,8 +103,8 @@ + (or + ;; installed + (paths-file-readable-directory-p (paths-construct-path (list directory +- "lib" +- emacs-program-name))) ++ "share" ++ (construct-emacs-version-name)))) + ;; in-place or windows-nt + (and + (paths-file-readable-directory-p (paths-construct-path (list directory "lisp"))) +@@ -211,7 +211,7 @@ + (paths-find-emacs-directory roots + (file-name-as-directory + (paths-construct-path (list +- "lib" ++ "share" + emacs-program-name))) + base + envvar default diff --git a/xemacs-21.4.12-find-paths-libexec-lib64.patch b/xemacs-21.4.12-find-paths-libexec-lib64.patch new file mode 100644 index 0000000..c0283b4 --- /dev/null +++ b/xemacs-21.4.12-find-paths-libexec-lib64.patch @@ -0,0 +1,11 @@ +--- xemacs-21.4.12/lisp/find-paths.el.pkgdir 2003-01-21 18:37:30.000000000 +0900 ++++ xemacs-21.4.12/lisp/find-paths.el 2003-01-21 18:37:30.000000000 +0900 +@@ -225,7 +225,7 @@ + (paths-find-emacs-directory roots + (file-name-as-directory + (paths-construct-path +- (list "lib" ++ (list "lib64" + (construct-emacs-version-name)))) + base + envvar default diff --git a/xemacs-21.4.12-mk-nochk-features.patch b/xemacs-21.4.12-mk-nochk-features.patch new file mode 100644 index 0000000..2dbfd0d --- /dev/null +++ b/xemacs-21.4.12-mk-nochk-features.patch @@ -0,0 +1,11 @@ +--- xemacs-21.4.12/Makefile.in.in~ 2003-02-08 00:28:44.000000000 +0900 ++++ xemacs-21.4.12/Makefile.in.in 2003-02-08 00:28:44.000000000 +0900 +@@ -407,7 +407,7 @@ + + install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep + +-install: all check-features install-arch-dep install-arch-indep ++install: all install-arch-dep install-arch-indep + + install-arch-dep: mkdir + for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \ diff --git a/xemacs-21.4.13-dump-paths-lispdir.patch b/xemacs-21.4.13-dump-paths-lispdir.patch new file mode 100644 index 0000000..e0e16e9 --- /dev/null +++ b/xemacs-21.4.13-dump-paths-lispdir.patch @@ -0,0 +1,21 @@ +diff -u xemacs-21.4.13/lisp/dump-paths.el.dump-path xemacs-21.4.13/lisp/dump-paths.el +--- xemacs-21.4.13/lisp/dump-paths.el.dump-path 2003-06-26 23:33:42.000000000 +0900 ++++ xemacs-21.4.13/lisp/dump-paths.el 2003-06-26 23:33:42.000000000 +0900 +@@ -58,15 +58,14 @@ + late-packages late-package-load-path) + 'external-debugging-output))) + +- (setq lisp-directory (paths-find-lisp-directory roots)) ++ (setq lisp-directory "@srcdir@/lisp") + (if debug-paths + (princ (format "lisp-directory:\n%S\n" lisp-directory) + 'external-debugging-output)) + (if (featurep 'mule) + (progn + (setq mule-lisp-directory +- (paths-find-mule-lisp-directory roots +- lisp-directory)) ++ "@srcdir@/lisp/mule") + (if debug-paths + (princ (format "mule-lisp-directory:\n%S\n" + mule-lisp-directory) diff --git a/xemacs-21.4.13-utf8-fontsets.patch b/xemacs-21.4.13-utf8-fontsets.patch new file mode 100644 index 0000000..f4b7d2b --- /dev/null +++ b/xemacs-21.4.13-utf8-fontsets.patch @@ -0,0 +1,18 @@ +--- xemacs-21.4.13/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 ++++ xemacs-21.4.13/etc/Emacs.ad 2003-07-13 19:47:48.000000000 +0300 +@@ -203,11 +203,13 @@ + *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ + -*-*-*-*-*-*-*-120-*-iso10646-1, \ + -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ +- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 ++ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ ++ -*-*-*-*-*-*-*-120-*-*-* + *popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ + -*-*-*-*-*-*-*-120-*-iso10646-1, \ + -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ +- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 ++ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ ++ -*-*-*-*-*-*-*-120-*-*-* + + ! Gui elements share this font + ! diff --git a/xemacs-21.4.15-wnnfix-128362.patch b/xemacs-21.4.15-wnnfix-128362.patch new file mode 100644 index 0000000..9ccecb1 --- /dev/null +++ b/xemacs-21.4.15-wnnfix-128362.patch @@ -0,0 +1,61 @@ +--- xemacs-21.4.15/src/mule-wnnfns.c.orig 2004-07-22 15:34:28.473317319 +0900 ++++ xemacs-21.4.15/src/mule-wnnfns.c 2004-07-22 15:34:38.932537998 +0900 +@@ -318,7 +318,7 @@ + Lisp_Object Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji; + Lisp_Object Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko; + Lisp_Object Vwnn_server_type; +-Lisp_Object Vcwnn_zhuyin; ++//Lisp_Object Vcwnn_zhuyin; + Lisp_Object Vwnnenv_sticky; + Lisp_Object Vwnn_uniq_level; + Fixnum lb_sisheng; +@@ -1899,9 +1899,11 @@ + DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /* + *jserver, cserver .. + */ ); +- DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /* ++#if 0 ++ DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /* + *pinyin or zhuyin + */ ); ++#endif + DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /* + *If non-nil, make environment sticky + */ ); +@@ -1910,7 +1912,7 @@ + */ ); + + Vwnn_server_type = Qjserver; +- Vcwnn_zhuyin = Qnil; ++ //Vcwnn_zhuyin = Qnil; + Vwnnenv_sticky = Qnil; + + Vwnn_uniq_level = Qwnn_uniq; +@@ -1932,10 +1934,14 @@ + case 0x80: + if (EQ(Vwnn_server_type, Qcserver)) + { ++#if 0 + len = cwnn_yincod_pzy (pzy, wc, + NILP (Vcwnn_zhuyin) + ? CWNN_PINYIN + : CWNN_ZHUYIN); ++#else ++ len = 0; ++#endif + for (i = 0; i < len; i++) + { + if (pzy[i] & 0x80) +@@ -2038,8 +2044,12 @@ + else *pin = *w; + w++; pin++; + } ++#if 0 + len = cwnn_pzy_yincod (ybuf, pbuf, + NILP (Vcwnn_zhuyin) ? CWNN_PINYIN : CWNN_ZHUYIN); ++#else ++ return; ++#endif + if (len <= 0) + return; + diff --git a/xemacs-debian-docdir-dump.patch b/xemacs-debian-docdir-dump.patch new file mode 100644 index 0000000..d1a34dd --- /dev/null +++ b/xemacs-debian-docdir-dump.patch @@ -0,0 +1,67 @@ +--- xemacs21-21.4.15.orig/src/config.h.in ++++ xemacs21-21.4.15/src/config.h.in +@@ -905,6 +905,7 @@ + #undef MODULEDIR_USER_DEFINED + #undef SITEMODULEDIR_USER_DEFINED + #undef DOCDIR_USER_DEFINED ++#undef DOCDIR + #undef LISPDIR_USER_DEFINED + #undef PACKAGE_PATH_USER_DEFINED + #undef SITELISPDIR_USER_DEFINED +--- xemacs-21.4.15/configure.in~ 2004-04-06 21:05:13.000000000 +0900 ++++ xemacs-21.4.15/configure.in 2004-04-06 21:05:13.000000000 +0900 +@@ -4856,6 +4856,7 @@ + esac + done + AC_SUBST(DOCDIR) ++AC_DEFINE_UNQUOTED(DOCDIR, "$docdir") + + AC_SUBST(archlibdir) + AC_SUBST(ARCHLIBDIR_USER_DEFINED) +--- xemacs21-21.4.15.orig/src/dumper.c ++++ xemacs21-21.4.15/src/dumper.c +@@ -1322,9 +1322,24 @@ + } + #endif /* !WIN32_NATIVE */ + ++static int ++pdump_file_doc_dir_try (char *exe_path) ++{ ++ char *w = exe_path + strlen (exe_path); ++ ++ sprintf (w, "%s", "DUMP"); ++ ++ if (pdump_file_get (exe_path)) ++ { ++ if (pdump_load_check ()) ++ return 1; ++ pdump_free (); ++ } ++ return 0; ++} + + static int +-pdump_file_try (char *exe_path) ++pdump_file_exe_path_try (char *exe_path) + { + char *w = exe_path + strlen (exe_path); + +@@ -1439,9 +1454,16 @@ + + /* Save exe_path because pdump_file_try() modifies it */ + strcpy(real_exe_path, exe_path); +- if (pdump_file_try (exe_path) ++ if (pdump_file_exe_path_try (exe_path) + || (xrealpath(real_exe_path, real_exe_path) +- && pdump_file_try (real_exe_path))) ++ && pdump_file_exe_path_try (real_exe_path))) ++ { ++ pdump_load_finish (); ++ return 1; ++ } ++ ++ sprintf(exe_path, "%s", DOCDIR); ++ if (pdump_file_doc_dir_try (exe_path)) + { + pdump_load_finish (); + return 1; diff --git a/xemacs-no-expdyn-ia64-106744.patch b/xemacs-no-expdyn-ia64-106744.patch new file mode 100644 index 0000000..267e2c7 --- /dev/null +++ b/xemacs-no-expdyn-ia64-106744.patch @@ -0,0 +1,21 @@ +diff -u xemacs-21.4.15/aclocal.m4~ xemacs-21.4.15/aclocal.m4 +--- xemacs-21.4.15/aclocal.m4~ 2004-05-07 07:55:22.000000000 -0400 ++++ xemacs-21.4.15/aclocal.m4 2004-05-07 07:55:22.000000000 -0400 +@@ -530,11 +530,12 @@ + dnl usually need to be prefix with ${wl} or some other such thing. + dnl + +-if test "$xe_gnu_ld" = yes; then +- if test "$ld_shlibs" = yes; then +- ld_dynamic_link_flags="${wl}-export-dynamic" +- fi +-fi ++dnl dnl avoid -export-dynamic on ia64 ++dnl if test "$xe_gnu_ld" = yes; then ++dnl if test "$ld_shlibs" = yes; then ++dnl ld_dynamic_link_flags="${wl}-export-dynamic" ++dnl fi ++dnl fi + + if test -z "$ld_dynamic_link_flags"; then + case "$xehost_os" in diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el new file mode 100644 index 0000000..d313294 --- /dev/null +++ b/xemacs-sitestart.el @@ -0,0 +1,74 @@ +;;; site-start.el - loaded at startup before "~/.xemacs/init.el" +;;; +;;; The "-no-site-file" option to xemacs prevents this file from being loaded. + +;; fix default info path +(setq Info-directory-list '("/usr/share/info/" + "/usr/share/xemacs/xemacs-packages/info/" + "/usr/share/xemacs/mule-packages/info/")) + +;;; psgml catalog list +(setq sgml-catalog-files + (if (getenv "SGML_CATALOG_FILES") + (split-path (getenv "SGML_CATALOG_FILES")) + (list "CATALOG" "catalog" + "/etc/sgml/catalog" + "/etc/xml/catalog" + (locate-data-file "CATALOG")))) + +;; default to non-kerberos ftp +(setq efs-ftp-program-name "/usr/bin/ftp") + +;; load .el files in "site-start.d/" +(let ((files (directory-files "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$"))) + (mapc 'load-file files)) + +;; fix default courier italics +;; for courier, oblique usually produces better results than italic +(setq try-oblique-before-italic-fonts t) +(when window-system + (make-face-italic 'italic) + (make-face-italic 'bold-italic)) + +;; setup coding-systems +(when (featurep 'mule) + (let* ((locale (or (getenv "LC_ALL") + (getenv "LC_CTYPE") + (getenv "LANG"))) + (lang-region (and locale + (substring locale 0 (min 5 (length locale))))) + (lang (and lang-region + (substring lang-region 0 (min 2 (length lang-region)))))) + (cond ((equal lang "ja") + (set-language-environment "Japanese")) + ((equal lang "ko") + (set-language-environment "Korean")) + ((equal lang-region "zh_CN") + (set-language-environment "Chinese-GB")) + ((equal lang-region "zh_TW") + (set-language-environment "Chinese-BIG5"))) + (cond ((and locale (string-match "UTF-8" locale)) + (require 'un-define) + (set-default-coding-systems 'utf-8) + (set-coding-priority-list '(utf-8)) + (set-coding-category-system 'utf-8 'utf-8)) + ((equal lang "ja") + (set-default-coding-systems 'euc-jp)) + ((equal lang "ko") + (set-default-coding-systems 'euc-kr)) + ((equal lang-region "zh_CN") + (set-default-coding-systems 'cn-gb-2312)) + ((equal lang-region "zh_TW") + (set-default-coding-systems 'big5))) + ;; register available Input Methods + (load "leim-list") + (when (member lang '("ja" "ko" "zh")) + ;; ispell doesn't support CJK + (setq-default ispell-local-dictionary "english")))) + +;; try to preserve user/group when saving files +(setq-default backup-by-copying-when-mismatch t) + +;; when saving a buffer always end it with a newline +(setq-default require-final-newline t) + diff --git a/xemacs.desktop b/xemacs.desktop new file mode 100644 index 0000000..c5dcc39 --- /dev/null +++ b/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=Application;Development;TextEditor;X-Red-Hat-Extra; +Encoding=UTF-8 +StartupWMClass=Emacs diff --git a/xemacs.png b/xemacs.png new file mode 100644 index 0000000000000000000000000000000000000000..21be91beefb211546897aea4de77cae4d09c91f1 GIT binary patch literal 1363 zcmchWv1`;|7{;I2JIYl%eAb56LF#u!7Y9p(Qo3mFJ8VF&P1+#cgd;DG>J{Q7wnL#? zk7mi{;&>t`bdcNp3)I2IP5cYoDn#Bdxg>Y>q=NXsm*w}p&-=bll7o%b-RY^zQvjx& zHRS=g$)_>_;MI+9?*LrcxVP2Bb~Q9&A=Wb%j9`)J!7RBq9pp#?rvb z)F2QkC@R3Wi2|7dc{OitXy7sMeP1p*YAKz{U~lrSn?w)7r(qa|PqJ~@BajSSA$||| zLVY=}U@uQs5Cvl^P6KYmQ$@2NS-LrxKT?iWyxJ7ZJ<9J7 z_DI1#?G~hLMbuV}71hwR48~TB?V&ZJjwHL4t%me>AW~NL!KHf)=?qpQe{($e2LYXU ap#uB^eR}b7@5AA(w`}D!Tk5s_aPJpqKhi7! literal 0 HcmV?d00001 diff --git a/xemacs.spec b/xemacs.spec new file mode 100644 index 0000000..b38d969 --- /dev/null +++ b/xemacs.spec @@ -0,0 +1,796 @@ +Summary: A different version of Emacs. +Name: xemacs +Version: 21.4.17 +Release: 2 +License: GPL +Group: Applications/Editors +Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2 +Source1: %{name}.png +Source6: xemacs.desktop +Source9: xemacs-sitestart.el +#Used for cleaning finder-inf.el when it needs compilation +Source22: delprevline.py +Source23: dotxemacs-init.el +Source24: default.el +Patch5: xemacs-21-cursor.patch +Patch10: xemacs-21.4.10-find-paths-pkgdir.patch +Patch11: movemail-mktemp.patch +Patch14: menubar-games.patch +Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch +Patch16: xemacs-21.4.12-mk-nochk-features.patch +Patch18: xemacs-21.4.13-dump-paths-lispdir.patch +Patch19: xemacs-21.4.13-utf8-fontsets.patch +Patch21: xemacs-debian-docdir-dump.patch +Patch23: xemacs-no-expdyn-ia64-106744.patch +Patch24: xemacs-21.4.15-wnnfix-128362.patch +URL: http://www.xemacs.org/ +Buildroot: %{_tmppath}/%{name}-%{version}-root +BuildRequires: perl python autoconf213 +BuildRequires: XFree86-devel ncurses-devel gpm-devel +BuildRequires: pam-devel zlib-devel libjpeg-devel glibc-devel compface +BuildRequires: libpng-devel libtiff-devel Canna-devel +#BuildRequires: postgresql-devel db4-devel openldap-devel krb5-devel +%{?_with_gtk:BuildRequires: gtk+-devel libglade-devel} +%{!?_with_gtk:BuildRequires: Xaw3d-devel} +Requires: xemacs-sumo >= 20050118-2, xemacs-common = %{version}-%{release} +Obsoletes: xemacs-extras xemacs-noX xemacs-X11 xemacs-mule xemacs-static + +%description +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the +GNU General Public License and related to other versions of Emacs, +in particular GNU Emacs. Its emphasis is on modern graphical +user interface support and an open software development +model, similar to Linux. + +This package contains xemacs built for X Windows with MULE support. + +%package common +Summary: The byte-compiled lisp files and other common files for XEmacs. +Group: Applications/Editors +PreReq: %{_sbindir}/alternatives + +%description common +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the +GNU General Public License and related to other versions of Emacs, +in particular GNU Emacs. Its emphasis is on modern graphical +user interface support and an open software development +model, similar to Linux. + +This package contains byte-compiled lisp and other common files for XEmacs. + +%package nox +Summary: A different version of Emacs built without X Windows Support. +Group: Applications/Editors +# Note: no xemacs-sumo dependency here, we need -nox to build the sumo package. +Requires: xemacs-common = %{version}-%{release} + +%description nox +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the +GNU General Public License and related to other versions of Emacs, +in particular GNU Emacs. Its emphasis is on modern graphical +user interface support and an open software development +model, similar to Linux. + +This package contains XEmacs built without X Windows support. + +%package el +Summary: The .el source files for XEmacs. +Group: Applications/Editors + +%description el +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the +GNU General Public License and related to other versions of Emacs, +in particular GNU Emacs. Its emphasis is on modern graphical +user interface support and an open software development +model, similar to Linux. + +This package contains the lisp source files for XEmacs. + +%package info +Summary: Information files for XEmacs. +Group: Applications/Editors +PreReq: /sbin/install-info + +%description info +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the +GNU General Public License and related to other versions of Emacs, +in particular GNU Emacs. Its emphasis is on modern graphical +user interface support and an open software development +model, similar to Linux. + +This package contains the XEmacs manuals in info format. + + +%define pkgdir %{_datadir}/xemacs +%define exectop %{_libdir}/xemacs-%{version} + + +%prep +%setup -q + +## Lisp patches ## +# make find-paths.el look in datadir +rm lisp/find-paths.elc +%patch10 -p1 +# fix "libexec" on multilib +%ifarch x86_64 s390x +%patch15 -p1 -b .lib64 +%endif +# remove game we shouldn't ship +%patch14 -p1 +# make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir) +%patch18 -p1 +rm lisp/dump-paths.elc +sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el + +## non-Lisp patches ## +%patch5 -p1 -b .cursor +# movemail +%patch11 -p1 -b .mkstemp +# skip redundant check-features +%patch16 -p1 -b .feature-chk +# fix missing charsets warning with Xaw/UTF-8 +%patch19 -p1 +# look for dump file docdir/DUMP as well as bindir/xemacs.dmp +%patch21 -p1 -b .docdmp +%ifarch ia64 +# don't link with -dynamic-export on ia64 +%patch23 -p1 -b .dyn-exp +%endif +# remove cwnn symbols +%patch24 -p1 -b .cwnn + +# patch21 touch configure.in, and patch23 touches aclocal.m4 +autoconf-2.13 + + +%build +export CFLAGS="${CFLAGS:-%optflags}" + +# XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, +# --includedir, --libexecdir, --localstatedir, --sharedstatedir +# NB datadir has to be defined because it defaults to /usr/lib +common_options=" + %{_target_platform} + --prefix=%{_prefix} + --datadir=%{_datadir} + --infodir=%{_infodir} + --libdir=%{_libdir} + --mandir=%{_mandir}/man1 + --with-gpm=yes + --with-pop + --mail-locking=lockf + --with-clash-detection + --with-database=no + --with-postgresql=no + --with-ldap=no + --with-hesiod=no + --with-msw=no + --pdump + --debug=%{?_without_debug:no}%{!?_without_debug:yes} + %{!?_without_mule:--with-mule=yes} +%ifarch alpha ia64 ppc64 + --with-system-malloc +%endif +%ifarch ia64 + --without-modules +%endif +" + +## build without X +# +# NB docdir requires trailing slash +./configure $common_options \ + --docdir=%{exectop}/doc-nox/ \ + --with-sound=no \ + --with-x11=no \ + --with-canna=no \ + --with-wnn=no \ + --with-xim=no +# toplevel smp build fails +make %{?_smp_mflags} -C lib-src +#make src/Emacs.ad.h +make %{?_smp_mflags} -C src +EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes +mv lib-src/DOC{,-nox} +mv src/xemacs{,-nox-%{version}} +mv src/{xemacs.dmp,DUMP-nox} +mv lib-src/config.values{,-nox} + +#make clean + +## build with X +# +# NB docdir requires trailing slash +./configure $common_options \ + --docdir=%{exectop}/doc/ \ + --with-sound=native \ + %{!?_without_mule:--with-canna=yes --with-xim=xlib} \ + %{?_with_gtk: --with-gtk --with-gnome} \ + %{!?_with_gtk: --with-athena=3d --with-widgets=athena --with-menubars=lucid --with-scrollbars=lucid --with-dialogs=athena } \ + --with-xfs=no +# toplevel smp build fails +make %{?_smp_mflags} -C lib-src +make src/Emacs.ad.h +make %{?_smp_mflags} -C src +EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes + + +%install +rm -rf %buildroot +# adjust mandir +export EMACSLOADPATH=$PWD/lisp +# make docdir +mkdir -p %buildroot%{exectop}/doc +%makeinstall mandir=%buildroot%{_mandir}/man1 docdir=%buildroot%{exectop}/doc/ + +# install nox files +mkdir -p %buildroot%{exectop}/doc-nox +cp -p src/xemacs-nox-%{version} %buildroot%{_bindir} +ln -s xemacs-nox-%{version} %buildroot%{_bindir}/xemacs-nox +cp -p src/DUMP-nox %buildroot%{exectop}/doc-nox/DUMP +cp -p lib-src/DOC-nox %buildroot%{exectop}/doc-nox/DOC +cp -p lib-src/config.values-nox %buildroot%{exectop}/doc-nox/config.values + +mv %buildroot%{_bindir}/xemacs-%{version}-*.dmp %buildroot%{exectop}/doc/DUMP + +# these clash with GNU Emacs +mv %buildroot%{_bindir}/{etags,etags.xemacs} +rm -f %buildroot%{_bindir}/{ctags,rcs-checkin,b2m} +rm %buildroot%{_mandir}/man1/{etags.1,ctags.1} + +rm -f %buildroot%{_infodir}/dir + +#These clash with other packages +rm -f %buildroot%{_infodir}/info* +rm -f %buildroot%{_infodir}/standards* +rm -f %buildroot%{_infodir}/termcap* + +install -m 755 -d %buildroot%{_datadir}/applications +install -m 644 %SOURCE6 %buildroot%{_datadir}/applications/net-xemacs.desktop + +# Lockdir +mkdir -p %buildroot%{_localstatedir}/lock/xemacs + +# site-start.el +mkdir -p %buildroot%{pkgdir}/site-packages/lisp/site-start.d/ +install -m 644 %SOURCE9 %buildroot%{pkgdir}/site-packages/lisp/site-start.el + +# default.el +install -m 644 %SOURCE24 %buildroot%{pkgdir}/site-packages/lisp + +# default user init file +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs +install -m 0644 %SOURCE23 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el + +# icon +install -Dpm 644 %{SOURCE1} %buildroot%{_datadir}/pixmaps/xemacs.png + +# Make sure nothing is 0400 +chmod -R a+rX %buildroot%{_prefix} + +# filter out buildroot from finder-inf.el +sed -i -e "s|%buildroot||" %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el +[ -x %{_bindir}/xemacs ] && python %SOURCE22 %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el + +# separate files +rm -f *.files base-files el-files info-files +echo "%defattr(-,root,root)" > base-files +echo "%defattr(-,root,root)" > el-files +echo "%defattr(-,root,root)" > info-files + +find %buildroot%{_datadir}/xemacs-%{version} %buildroot%{pkgdir} \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \) + +# remove buildroot prefix from files +sed -i -e "s|%buildroot||" *.files +# make site-packages lisp files config files +perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' base-el-not-bytecomped.files +# combine the file lists +cat base-*.files dir.files >> base-files +cat el-*.files dir.files >> el-files +cat info.files >> info-files + + +%clean +rm -rf %buildroot + + +%post common +alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 + +%preun common +if [ "$1" = 0 ]; then + alternatives --remove etags %{_bindir}/etags.xemacs +fi + +%post info +for file in xemacs cl internals lispref new-users-guide; do + /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir +done + +%preun info +if [ "$1" = "0" ]; then + for file in xemacs cl internals lispref new-users-guide; do + /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir + done +fi + + +%files +%defattr(-, root, root) +%{_bindir}/xemacs +%{_bindir}/xemacs-%{version} +%{_bindir}/gnuclient +%{exectop}/*/gnuserv +%{exectop}/doc +%{_datadir}/applications/* + +%files nox +%defattr(-, root, root) +%{_bindir}/xemacs-nox +%{_bindir}/xemacs-nox-%{version} +%{exectop}/doc-nox + +%files common -f base-files +%defattr(-, root, root) +%doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release +%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages +%doc etc/TUTORIAL +%exclude %{_bindir}/xemacs* +# needs X libs +%exclude %{_bindir}/gnuclient +%{_bindir} +%exclude %{exectop}/doc* +# needs X libs +%exclude %{exectop}/*/gnuserv +%{exectop} +%{_datadir}/pixmaps/xemacs.png +%config %{_sysconfdir}/skel/.xemacs +%{_mandir}/*/* +%attr(1777, root, root) %{_localstatedir}/lock/xemacs + +%files el -f el-files +%defattr(-, root, root) + +%files info -f info-files +%defattr(-, root, root) +%{_infodir}/* + + +%changelog +* Tue Mar 1 2005 Ville Skyttä - 21.4.17-2 +- Drop xemacs-sumo build dependency and -nox install time dependency on it + to solve chicken-egg bootstrap problem. +- Include X-Face support. +- Include Glade support when built with GTK. +- Include prettier icon, based on upstream xemacs.xpm. +- Drop FreeWnn-devel build dependency. +- Drop main package dependency from -info. +- Require updated -sumo. +- Avoid shipping patch backups. +- Improve package summaries and descriptions. +- Trim pre-XEmacs-21.4 %%changelog entries. +- Some specfile maintainablity improvements and cleanups. + +* Fri Feb 25 2005 Jens Petersen +- use PreReq not Requires(post,preun) for install and uninstall script + requirements (Axel Thimm, 147791) +- use sed instead of perl to fixup filelists + +* Mon Feb 7 2005 Jens Petersen - 21.4.17-1 +- update to 21.4.17 + - fixes movemail format string vulnerability (CAN-2005-0100, 146705) + - xemacs-21.4.16-xutil-keysym-144601.patch no longer needed + +* Tue Jan 25 2005 Jens Petersen - 21.4.16-2 +- workaround xorg-x11 issue with iso-level3-shift (Ville Skyttä, 144601) + - add xemacs-21.4.16-xutil-keysym-144601.patch + +* Mon Dec 13 2004 Jens Petersen - 21.4.16-1 +- update to new stable release + - no longer need configure-ppc-ldscript.patch and + xemacs-21.4.15-pui-120437.patch +- default to unified diff in .xemacs/init.el + +* Thu Nov 18 2004 Jens Petersen - 21.4.15-10 +- show xemacs again in the desktop menu (132567) + +* Mon Oct 18 2004 Jens Petersen - 21.4.15-9 +- fix etag alternatives removal when uninstalling (Karsten Hopp, 136137) + +* Wed Oct 6 2004 Jens Petersen +- xemacs-el no longer requires xemacs for -nox users + (Lars Hupfeldt Nielsen, 134479) + +* Thu Sep 30 2004 Jens Petersen - 21.4.15-8 +- cleanup and update .desktop file +- make xemacs not appear in the desktop menu (Seth Nickell,132567) +- move the desktop file from -common to main package +- etags is now handled by alternatives (92256) +- no longer require ctags +- turn back on wnn support and add xemacs-21.4.15-wnnfix-128362.patch + (Yukihiro Nakai, 128362) + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Mon Jun 7 2004 Jens Petersen - 21.4.15-6 +- don't link with -export-dynamic on ia64 to stop dumped function pointers from + breaking (Roland McGrath & Jakub Jelinek, #106744) +- disable dynamic module support on ia64 +- change the xemacs-info uninstall script from %%postun to %%preun and move + the post/preun install-info requires to xemacs-info +- simplify coding-system setup somewhat in site-start.el +- fix up the desktop file (Ville Skyttä, 123135) +- xemacs-nox now requires xemacs-sumo +- build without xfs since it seems to cause some problem with fonts missing + +* Wed May 5 2004 Jens Petersen +- move install-info requirement to xemacs-info +- drop unnecessary Canna-libs requirement + +* Fri Apr 9 2004 Jens Petersen - 21.4.15-5 +- add xemacs-21.4.15-pui-120437.patch to fix pui problems in 21.4.15 + (Ville Skyttä) +- buildrequire gpm-devel and build xemacs-nox with gpm (Ville Skyttä,120437) +- separate patches into lisp and non-lisp patches +- move gnuclient and gnuserv from xemacs-common to xemacs since they + require X libs (Ville Skyttä,110649) + +* Wed Apr 7 2004 Jens Petersen - 21.4.15-4 +- add xemacs-nox subpackage (Jamie Zawinski, #110649) and xemacs-common + - add xemacs-debian-docdir-dump.patch and put dump files in docdir + - xemacs and xemacs-nox require xemacs-common + - define exectop and use it + - one configure and build for xemacs-nox and one for xemacs +- update package descriptions +- don't create backup of patched Emacs.ad since it gets installed, and + drop Canna-devel version requirement (Ville Skyttä, #115270) +- default ispell dictionary to english for CJK locale, since aspell doesn't + support widechars (#103145) +- rebuild against latest Canna built with xorg-x11 xmkmf (Kaj Niemi, #119562) +- simplify coding-system setup +- enable gpm for xemacs package + +* Tue Mar 16 2004 Mike A. Harris 21.4.15-3 +- Removed bogus Requires: XFree86-libs, and other similar library runtime + dependancies, because rpm find-requires automatically puts dependancy info + in the binary rpms which are on the .so files rather than a specific + package. The XFree86-libs removal is necessary in order to replace XFree86 + with xorg-x11 in an X11 implementation agnostic fashion. (#118483) +- Changed "Requires(post,preun): info" dependancy to + "Requires(post,postun): /sbin/install-info" + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Feb 5 2004 Jens Petersen - 21.4.15-1 +- update to 21.4.15 +- improve language and coding-system startup in site-start.el like + lang-coding-systems-init.el in emacs package +- build without wnn support +- drop xemacs-21.4.13-regexp-stack-overflow-107402.patch + +* Sat Dec 27 2003 Jens Petersen - 21.4.14-6 +- set EMACSLOADPATH during final make and install so that it is buildable + even when xemacs isn't installed +- disable ldap, postgresql and dbm support for now (#110649) [jwz] + +* Sat Dec 13 2003 Jeff Johnson +- rebuild against db-4.2.52. + +* Fri Nov 7 2003 Jens Petersen - 21.4.14-5 +- add a "--without mule" rpmbuild option for the 8bit dead-hards (#102718) + which disables mule and Input Method support +- only load un-define in site-start.el when there is mule support + +* Thu Nov 6 2003 Jens Petersen - 21.4.14-4 +- increase regexp re_max_failures to 40000 in + xemacs-21.4.13-regexp-stack-overflow-107402.patch (#107402) [Rik Faith] + +* Mon Oct 27 2003 Jens Petersen - 21.4.14-3 +- no longer obsolete xemacs-sumo-el for xemacs-el [thanks to Axel Thimm] +- fix "Stack overflow in regexp matcher" (#107402) [reported by Rik Faith, + patch by Stephen J. Turnbull] + +* Fri Oct 17 2003 Jens Petersen - 21.4.14-2 +- require Canna-libs not Canna +- move CJK X resource files to xemacs-sumo +- no longer need to define ispell program to be aspell + +* Thu Sep 25 2003 Jeff Johnson - 21.4.14-1.1 +- rebuild against db-4.2.42. + +* Mon Sep 8 2003 Jens Petersen - 21.4.14-1 +- update to 21.4.14 +- default require-final-newline to t in site-start.el (#102022) + +* Tue Sep 2 2003 Jens Petersen - 21.4.13-5 +- default require-final-newline to ask in site-start.el + and remove redundant setting of next-line-add-newlines to nil in default.el + (#102022) [reported by Ville Skyttä] + +* Mon Jul 14 2003 Jens Petersen - 21.4.13-4 +- build with --debug=yes by default (suggested by Ville Skyttä) + +* Sun Jul 13 2003 Ville Skyttä +- add xemacs-21.4.13-utf8-fontsets.patch to eliminate warning about missing + charsets in utf-8 locale with Xaw +- motif-specific xemacs-21.4.13-EmacsFrame-fontlock.patch no longer needed + +* Fri Jun 27 2003 Jens Petersen - 21.4.13-3 +- add xemacs-21.4.13-dump-paths-lispdir.patch, so that the source lisp files + get re-bytecompiled and dumped, not the installed ones +- use Athena/Xaw3d instead of motif for dialogs and widgets +- buildrequirements fixes +- use _localstatedir + +* Sat May 31 2003 Jens Petersen - 21.4.13-2 +- add xemacs-21.4.13-EmacsFrame-fontlock.patch to stop font-lock being + very slow (Ville Skyttä) + +* Fri May 30 2003 Ville Skyttä +- Use upstream icon in desktop entry, add missing semicolon to Categories. +- Have backup-by-copying-when-mismatch default to true in site-start.el. +- Mark init files as %%config. + +* Thu May 29 2003 Jens Petersen - 21.4.13-1 +- update to 21.4.13 + - rcs2log-update.patch no longer needed +- buildrequire recent xemacs-sumo +- set system-uses-terminfo in default.el (#76102) +- use defvar in default.el not to override user's settings +- default gnus-default-article-saver to mbox format (#90604) +- add aspell as ispell program in site-start.el (#88262) +- add rpmbuild option "--with gtk" allowing building with gtk +- exclude s390x temporarily + +* Mon May 12 2003 Jens Petersen - 21.4.12-12 +- sumo packages moved to separate xemacs-sumo package + +* Sat May 10 2003 Jens Petersen - 21.4.12-11 +- build with system malloc on ppc64 + +* Tue Apr 22 2003 Jens Petersen - 21.4.12-10 +- obsoletes ruby-mode-xemacs (#84673) +- move obsoletes xemacs-sumo-el to -el subpackage +- fix links in jde html documentation (#89499) + +* Tue Apr 15 2003 Jens Petersen - 21.4.12-8 +- comment out ja and ko menubar translations in X resource files for now, + to avoid startup hanging in utf-8 locale (#88860) +- use default menubar font in ja and ko locale +- in a UTF-8 locale set default coding systems to utf-8 (partly #77130 + and #74227) +- set Info-directory-list in site-start.el again +- move psgml setup into site-start.el +- move previous contents of "dotxemacs-init.el" to new "default.el" + +* Mon Mar 31 2003 Akira TAGOH 21.4.12-7 +- Rebuild against the latest Canna. + +* Thu Feb 20 2003 Jens Petersen - 21.4.12-6 +- default browse-url to use htmlview and update psgml-html browser + defaults (#84262) + +* Tue Feb 11 2003 Jens Petersen - 21.4.12-5 +- build with system-malloc on alpha and ia64 +- skip redundant check-features target + +* Thu Feb 6 2003 Jens Petersen - 21.4.12-4 +- fix "libexec dir" to be under lib64 on multilib archs +- set default ftp to be non-kerberos in site-start.el +- update sumos to 2003-02-05 +- mspec patch and rpm-spec-mode update no longer needed +- buildrequire autoconf213 +- add ".xemacs/init.el" to /etc/skel +- skip redundant check-features target on s390 and s390x + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 21 2003 Jens Petersen - 21.4.12-2 +- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib +- don't generate backup files when updating autoloads +- try startup notification in desktop file +- cleanup desktop file to use name XEmacs and add encoding key + +* Fri Jan 17 2003 Jens Petersen 21.4.12-1 +- update to 21.4.12 bugfix release (21.4 series now declared stable branch) +- renumbered sumo package patches to be greater than 100 +- install sumo packages by copying rather than moving +- patch sh-script.el to append m?spec entry to auto-mode-alist +- avoid ppc.ldscript and build on ppc +- remove games that we shouldn't ship +- update to latest rcs2log +- update to latest rpm-spec-mode.el +- use _smp_mflags for lib-src and src +- run batch-update-directory and batch-byte-recompile-directory on sumo lisp + dirs +- improve datadir/xemacs-version/ ownership + +* Sat Jan 4 2003 Jens Petersen 21.4.11-1 +- update to 21.4.11 +- don't configure with union-type, since it causes runtime problems apparently +- only do postun info dir deletions when uninstalling + +* Wed Jan 1 2003 Jens Petersen 21.4.10-6 +- move apel to separate package and require it +- renamed psgml-init.el-xemacs to xemacs-psgml-init.el +- use datadir in site-start.el +- really include the movemail mkstemp patch +- use mapc to load site-start.d files + +* Tue Dec 31 2002 Ville Skyttä +- New Sumos (2002-12-30). +- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el), + fixing "Couldn't find obvious default for XEmacs hierarchy" warnings + (as in XEmacs 21.5). +- Move site-start stuff to site-packages. +- Don't set Info-directory-list in site-start.el. +- Don't use --pkgdir, it's ignored. Don't pass pkgdir to makeinstall. +- Fix source tarball URLs. +- Don't override the defcustom in psgml-init.el, set its default value instead. +- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs. + +* Sun Dec 29 2002 Jens Petersen +- updates package sumos to 2002-12-26 release + +* Mon Dec 23 2002 Jens Petersen 21.4.10-5 +- patch find-paths.el to search in datadir +- setup lisp packages under datadir not libdir +- use buildroot macro instead of RPM_BUILD_ROOT +- drop local configure macro +- fix buildrequires and requires +- list configure options one-per-line +- improve psgml-init.el catalog setup +- remove and add lisp packages with package-admin +- rebyte-compile lisp packages +- keep etags as etags.xemacs (#78106) +- don't bother removing non-existent udp2tcp nor .cvsignore files +- simply filelist generation to a single find search pass +- put core .el files in -el package +- put package info files into -info package +- don't create backup files when patching in lisp packages tree +- don't explicitly gzip lisp package info files +- don't mark the applications files noreplace +- exclude ppc, since __init_array_start undefined + +* Wed Dec 18 2002 Jens Petersen +- patch egg-wnn to default to unix domain socket (#79826) + [patch from ynakai@redhat.com] +- add ia64 patch from SuSE +- use mkstemp in movemail + +* Tue Nov 19 2002 Jens Petersen +- apply jlatex autodetect patch correctly and drop append to tex-site.el +- default to pTeX and pLaTeX for Japanese TeX and LaTeX + +* Mon Nov 18 2002 Jens Petersen 21.4.10-3 +- backout uncommenting of deactivate-mark (#77696) +- update psgml dtd catalog path in psgml-init.el (#78022) + [reported by ville.skytta@iki.fi] +- build with --use-union-type (#78024) + [suggested by ville.skytta@iki.fi] + +* Fri Nov 15 2002 Jens Petersen +- fix autodetection of jlatex (#69129) + +* Tue Nov 12 2002 Elliot Lee 21.4.10-2 +- build on x86_64 + +* Mon Nov 11 2002 Jens Petersen 21.4.10-1 +- update to 21.4.10 +- update sumos to 2002-09-19 +- no longer backout mule-ucs package +- encode this file in utf-8 +- xemacs-21.1.14-xfs.patch no longer needed +- use _libdir, _datadir, _bindir, _prefix +- exclude x86_64 (requires Canna) +- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/ (#73982) + [reported by enrico.scholz@informatik.tu-chemnitz.de] +- fix default italic font size (#75275) + [reported with fix by ville.skytta@iki.fi] +- update ja menubar translations in ja locale X resource file (#76068) + [from ynakai@redhat.com] +- update ko locale X resource file (#76072) [from ynakai@redhat.com] +- add pkgdir rpm macro for packages dir +- uncomment deactivate-mark in simple.el (#77696) + +* Mon Aug 26 2002 Trond Eivind Glomsrød 21.4.8-16 +- some cleanups - and remove the info tarball, it's now part + of the base tarball. Wow, the package gets smaller. (#72480) + +* Mon Aug 19 2002 Trond Eivind Glomsrød 21.4.8-15 +- Bug in specfile from -14 gave bug on startup (#71743) + +* Thu Aug 15 2002 Trond Eivind Glomsrød 21.4.8-14 +- Use utf-8 by default for input/output (#71584 ) +- Make it not segfault when handling utf-8 (#71589) + +* Wed Aug 7 2002 Trond Eivind Glomsrød 21.4.8-13 +- Add openmotif-devel to buildrequires, as it will use it for widgets + if it finds it + +* Fri Aug 2 2002 Trond Eivind Glomsrød 21.4.8-12 +- Don't package po-mode separately, it's now in sumo +- Compile with drag'n'drop support +- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs + +* Wed Jul 31 2002 Trond Eivind Glomsrød 21.4.8-11 +- Don't use a separate ispell.el file anymore - the included one is newer +- Fix html-mode (#64826) + +* Tue Jul 23 2002 Trond Eivind Glomsrød 21.4.8-10 +- Update lisp tarballs +- desktop file fixes (#69542) +- Add bdb support (#65640) + +* Mon Jul 8 2002 Trond Eivind Glomsrød 21.4.8-9 +- Make it provide ruby-mode-xemacs (request from tagoh) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Mon Jun 17 2002 Trond Eivind Glomsrød 21.4.8-7 +- #66835 + +* Wed May 29 2002 Trond Eivind Glomsrød 21.4.8-6 +- Make it build... Evil. +- Exclude IA64 +- Upgrade sumo tarballs to 2002-05-22 + +* Fri May 24 2002 Jens Petersen 21.4.8-5 +- Build using portable dumper, so that build with glibc-2.3 malloc is ok + +* Mon May 13 2002 Trond Eivind Glomsrød 21.4.8-2 +- Remove the s390 patches so it builds on s390 :) + +* Fri May 10 2002 Trond Eivind Glomsrød 21.4.8-1 +- 21.4.8 + +* Tue May 7 2002 Trond Eivind Glomsrød 21.4.6-9 +- Rebuild... chmod -x pstogif to work around an rpm bug until + it's fixed (#64320) + +* Tue Apr 23 2002 Trond Eivind Glomsrød 21.4.6-8 +- New sumo packages + +* Thu Feb 21 2002 Trond Eivind Glomsrød 21.4.6-7 +- Rebuild + +* Tue Jan 29 2002 Jens Petersen 21.4.6-6 +- Remove skk package, since it conflicts with ddskk-xemacs (newer) + +* Thu Jan 24 2002 Trond Eivind Glomsrød 21.4.6-5 +- New sumos + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Dec 19 2001 Jens Petersen 21.4.6-3 +- Fix fontlist pattern in Emacs.ad.Japanese. +- CHANGES-beta is now CHANGES-release. +- Obsolete xemacs-sumo xemacs-sumo-el + +* Wed Dec 19 2001 Jens Petersen 21.4.6-2 +- Don't obsolete flim. + +* Mon Dec 17 2001 Trond Eivind Glomsrød 21.4.6-1 +- 21.4.6 +- New sumo packages +- disable alpha + +* Wed Nov 14 2001 Jens Petersen 21.4.5-2 +- Add -znocombreloc configure option to override new ld default. + +* Tue Nov 6 2001 Trond Eivind Glomsrød 21.4.5-1 +- 21.4.5. It builds on IA64 and fixes #55578 From 5dbc6e26f24ee306a9fcc5ad9e0838e8a8112b22 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Sat, 5 Mar 2005 21:10:25 +0000 Subject: [PATCH 002/160] Further mass cleanup. One or more apply : - Remove (hopefully) all zero epoch remains. - Remove trailing spaces and tabs. - Keep consistency between tabs and spaces. - Clean up summary. --- xemacs.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index b38d969..fb5ecd0 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,4 +1,4 @@ -Summary: A different version of Emacs. +Summary: Different version of Emacs Name: xemacs Version: 21.4.17 Release: 2 @@ -35,7 +35,7 @@ BuildRequires: libpng-devel libtiff-devel Canna-devel Requires: xemacs-sumo >= 20050118-2, xemacs-common = %{version}-%{release} Obsoletes: xemacs-extras xemacs-noX xemacs-X11 xemacs-mule xemacs-static -%description +%description XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General Public License and related to other versions of Emacs, @@ -113,7 +113,7 @@ This package contains the XEmacs manuals in info format. %prep %setup -q -## Lisp patches ## +## Lisp patches ## # make find-paths.el look in datadir rm lisp/find-paths.elc %patch10 -p1 @@ -312,7 +312,7 @@ fi for file in xemacs cl internals lispref new-users-guide; do /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir done - + %preun info if [ "$1" = "0" ]; then for file in xemacs cl internals lispref new-users-guide; do @@ -378,7 +378,7 @@ fi - Some specfile maintainablity improvements and cleanups. * Fri Feb 25 2005 Jens Petersen -- use PreReq not Requires(post,preun) for install and uninstall script +- use PreReq not Requires(post,preun) for install and uninstall script requirements (Axel Thimm, 147791) - use sed instead of perl to fixup filelists @@ -607,7 +607,7 @@ fi - update to 21.4.12 bugfix release (21.4 series now declared stable branch) - renumbered sumo package patches to be greater than 100 - install sumo packages by copying rather than moving -- patch sh-script.el to append m?spec entry to auto-mode-alist +- patch sh-script.el to append m?spec entry to auto-mode-alist - avoid ppc.ldscript and build on ppc - remove games that we shouldn't ship - update to latest rcs2log @@ -706,7 +706,7 @@ fi - uncomment deactivate-mark in simple.el (#77696) * Mon Aug 26 2002 Trond Eivind Glomsrød 21.4.8-16 -- some cleanups - and remove the info tarball, it's now part +- some cleanups - and remove the info tarball, it's now part of the base tarball. Wow, the package gets smaller. (#72480) * Mon Aug 19 2002 Trond Eivind Glomsrød 21.4.8-15 @@ -717,7 +717,7 @@ fi - Make it not segfault when handling utf-8 (#71589) * Wed Aug 7 2002 Trond Eivind Glomsrød 21.4.8-13 -- Add openmotif-devel to buildrequires, as it will use it for widgets +- Add openmotif-devel to buildrequires, as it will use it for widgets if it finds it * Fri Aug 2 2002 Trond Eivind Glomsrød 21.4.8-12 @@ -758,7 +758,7 @@ fi - 21.4.8 * Tue May 7 2002 Trond Eivind Glomsrød 21.4.6-9 -- Rebuild... chmod -x pstogif to work around an rpm bug until +- Rebuild... chmod -x pstogif to work around an rpm bug until it's fixed (#64320) * Tue Apr 23 2002 Trond Eivind Glomsrød 21.4.6-8 From 0993bcc24e2cb48372c9d22a80b41c0dcf5e1b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 5 May 2005 19:24:59 +0000 Subject: [PATCH 003/160] Stack corruption fix from Enrico Scholz, #154112. --- xemacs-21.4.17-innerbuf.patch | 28 ++++++++++++++++++++++++++++ xemacs.spec | 8 +++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.4.17-innerbuf.patch diff --git a/xemacs-21.4.17-innerbuf.patch b/xemacs-21.4.17-innerbuf.patch new file mode 100644 index 0000000..b4a7a20 --- /dev/null +++ b/xemacs-21.4.17-innerbuf.patch @@ -0,0 +1,28 @@ +2005-04-07 15:08 Enrico Scholz + * src/process-unix.c (unix_open_network_stream): moved + 'portbuf' buffer out of an inner block as it is used in the + entire function. With gcc4, the stack may get corrupted + after leaving this block. This patches adjusts the size of + the used buffer also; static '128' bytes are far too much + currently and might not suffice for future architectures + (e.g. for 512 bit ones ;)). Instead of, use only the really + required space (max octets * ln(256)/ln(10) chars + space + for '\0' and the sign) + +--- xemacs-21.4.17/src/process-unix.c.innerbuf 2005-01-31 03:55:26.000000000 +0100 ++++ xemacs-21.4.17/src/process-unix.c 2005-04-07 16:09:36.000000000 +0200 +@@ -1670,13 +1670,13 @@ + volatile int xerrno = 0; + volatile int failed_connect = 0; + char *ext_host; ++ char portbuf[sizeof(long)*3 + 2]; + /* + * Caution: service can either be a string or int. + * Convert to a C string for later use by getaddrinfo. + */ + if (INTP (service)) + { +- char portbuf[128]; + snprintf (portbuf, sizeof (portbuf), "%ld", (long) XINT (service)); + portstring = portbuf; + port = htons ((unsigned short) XINT (service)); diff --git a/xemacs.spec b/xemacs.spec index fb5ecd0..479c02d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,7 +1,7 @@ Summary: Different version of Emacs Name: xemacs Version: 21.4.17 -Release: 2 +Release: 3 License: GPL Group: Applications/Editors Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2 @@ -12,6 +12,7 @@ Source9: xemacs-sitestart.el Source22: delprevline.py Source23: dotxemacs-init.el Source24: default.el +Patch0: xemacs-21.4.17-innerbuf.patch Patch5: xemacs-21-cursor.patch Patch10: xemacs-21.4.10-find-paths-pkgdir.patch Patch11: movemail-mktemp.patch @@ -129,6 +130,7 @@ rm lisp/dump-paths.elc sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el ## non-Lisp patches ## +%patch0 -p1 -b .innerbuf %patch5 -p1 -b .cursor # movemail %patch11 -p1 -b .mkstemp @@ -363,6 +365,10 @@ fi %changelog +* Thu May 5 2005 Ville Skyttä - 21.4.17-3 +- Avoid stack corruption in open-network-stream when built with gcc4 + (Enrico Scholz, #154112). + * Tue Mar 1 2005 Ville Skyttä - 21.4.17-2 - Drop xemacs-sumo build dependency and -nox install time dependency on it to solve chicken-egg bootstrap problem. From 0918460753c43f969c635a07778c7ccbde6dd97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:16:03 +0000 Subject: [PATCH 004/160] Improve package summaries and descriptions, reformat/clean up specfile. --- xemacs.spec | 424 ++++++++++++++++++++++++++++------------------------ 1 file changed, 231 insertions(+), 193 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 479c02d..127d1cd 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,120 +1,136 @@ -Summary: Different version of Emacs -Name: xemacs -Version: 21.4.17 -Release: 3 -License: GPL -Group: Applications/Editors -Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2 -Source1: %{name}.png -Source6: xemacs.desktop -Source9: xemacs-sitestart.el -#Used for cleaning finder-inf.el when it needs compilation -Source22: delprevline.py -Source23: dotxemacs-init.el -Source24: default.el -Patch0: xemacs-21.4.17-innerbuf.patch -Patch5: xemacs-21-cursor.patch -Patch10: xemacs-21.4.10-find-paths-pkgdir.patch -Patch11: movemail-mktemp.patch -Patch14: menubar-games.patch -Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch -Patch16: xemacs-21.4.12-mk-nochk-features.patch -Patch18: xemacs-21.4.13-dump-paths-lispdir.patch -Patch19: xemacs-21.4.13-utf8-fontsets.patch -Patch21: xemacs-debian-docdir-dump.patch -Patch23: xemacs-no-expdyn-ia64-106744.patch -Patch24: xemacs-21.4.15-wnnfix-128362.patch -URL: http://www.xemacs.org/ -Buildroot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: perl python autoconf213 -BuildRequires: XFree86-devel ncurses-devel gpm-devel -BuildRequires: pam-devel zlib-devel libjpeg-devel glibc-devel compface -BuildRequires: libpng-devel libtiff-devel Canna-devel -#BuildRequires: postgresql-devel db4-devel openldap-devel krb5-devel -%{?_with_gtk:BuildRequires: gtk+-devel libglade-devel} -%{!?_with_gtk:BuildRequires: Xaw3d-devel} -Requires: xemacs-sumo >= 20050118-2, xemacs-common = %{version}-%{release} -Obsoletes: xemacs-extras xemacs-noX xemacs-X11 xemacs-mule xemacs-static +%define pkgdir %{_datadir}/xemacs +%define exectop %{_libdir}/xemacs-%{version} + +Name: xemacs +Version: 21.4.17 +Release: 4 +Summary: Different version of Emacs + +Group: Applications/Editors +License: GPL +URL: http://www.xemacs.org/ +Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2 +Source1: %{name}.png +Source6: xemacs.desktop +Source9: xemacs-sitestart.el +# Used for cleaning finder-inf.el when it needs compilation +Source22: delprevline.py +Source23: dotxemacs-init.el +Source24: default.el +Patch0: xemacs-21.4.17-innerbuf.patch +Patch5: xemacs-21-cursor.patch +Patch10: xemacs-21.4.10-find-paths-pkgdir.patch +Patch11: movemail-mktemp.patch +Patch14: menubar-games.patch +Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch +Patch16: xemacs-21.4.12-mk-nochk-features.patch +Patch18: xemacs-21.4.13-dump-paths-lispdir.patch +Patch19: xemacs-21.4.13-utf8-fontsets.patch +Patch21: xemacs-debian-docdir-dump.patch +Patch23: xemacs-no-expdyn-ia64-106744.patch +Patch24: xemacs-21.4.15-wnnfix-128362.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: autoconf213 +BuildRequires: perl +BuildRequires: python +BuildRequires: XFree86-devel +BuildRequires: ncurses-devel +BuildRequires: gpm-devel +BuildRequires: pam-devel +BuildRequires: zlib-devel +BuildRequires: libjpeg-devel +BuildRequires: glibc-devel +BuildRequires: compface +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: Canna-devel +%if 0%{?_with_gtk:1} +BuildRequires: gtk+-devel +BuildRequires: libglade-devel +%else +BuildRequires: Xaw3d-devel +%endif +Requires: xemacs-sumo >= 20050118-2 +Requires: xemacs-common = %{version}-%{release} +Obsoletes: xemacs-extras +Obsoletes: xemacs-noX +Obsoletes: xemacs-X11 +Obsoletes: xemacs-mule +Obsoletes: xemacs-static %description XEmacs is a highly customizable open source text editor and -application development system. It is protected under the -GNU General Public License and related to other versions of Emacs, -in particular GNU Emacs. Its emphasis is on modern graphical -user interface support and an open software development -model, similar to Linux. +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. -This package contains xemacs built for X Windows with MULE support. +This package contains XEmacs built for X Windows with MULE support. -%package common -Summary: The byte-compiled lisp files and other common files for XEmacs. -Group: Applications/Editors -PreReq: %{_sbindir}/alternatives +%package common +Summary: Byte-compiled lisp files and other common files for XEmacs +Group: Applications/Editors +PreReq: %{_sbindir}/alternatives -%description common +%description common XEmacs is a highly customizable open source text editor and -application development system. It is protected under the -GNU General Public License and related to other versions of Emacs, -in particular GNU Emacs. Its emphasis is on modern graphical -user interface support and an open software development -model, similar to Linux. +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. This package contains byte-compiled lisp and other common files for XEmacs. -%package nox -Summary: A different version of Emacs built without X Windows Support. -Group: Applications/Editors +%package nox +Summary: Different version of Emacs built without X Windows support +Group: Applications/Editors # Note: no xemacs-sumo dependency here, we need -nox to build the sumo package. -Requires: xemacs-common = %{version}-%{release} +Requires: xemacs-common = %{version}-%{release} -%description nox +%description nox XEmacs is a highly customizable open source text editor and -application development system. It is protected under the -GNU General Public License and related to other versions of Emacs, -in particular GNU Emacs. Its emphasis is on modern graphical -user interface support and an open software development -model, similar to Linux. +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. This package contains XEmacs built without X Windows support. -%package el -Summary: The .el source files for XEmacs. -Group: Applications/Editors +%package el +Summary: Emacs lisp source files for XEmacs +Group: Development/Libraries -%description el +%description el XEmacs is a highly customizable open source text editor and -application development system. It is protected under the -GNU General Public License and related to other versions of Emacs, -in particular GNU Emacs. Its emphasis is on modern graphical -user interface support and an open software development -model, similar to Linux. +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. -This package contains the lisp source files for XEmacs. +This package contains the lisp source files for XEmacs, mainly of +interest when developing or debugging XEmacs itself. -%package info -Summary: Information files for XEmacs. -Group: Applications/Editors -PreReq: /sbin/install-info +%package info +Summary: XEmacs documemtation in GNU texinfo format +Group: Documentation +PreReq: /sbin/install-info -%description info +%description info XEmacs is a highly customizable open source text editor and -application development system. It is protected under the -GNU General Public License and related to other versions of Emacs, -in particular GNU Emacs. Its emphasis is on modern graphical -user interface support and an open software development -model, similar to Linux. +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. -This package contains the XEmacs manuals in info format. - - -%define pkgdir %{_datadir}/xemacs -%define exectop %{_libdir}/xemacs-%{version} +This package contains XEmacs documentation in GNU texinfo format. %prep %setup -q -## Lisp patches ## +## lisp patches ## + # make find-paths.el look in datadir rm lisp/find-paths.elc %patch10 -p1 @@ -129,7 +145,8 @@ rm lisp/find-paths.elc rm lisp/dump-paths.elc sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el -## non-Lisp patches ## +## non-lisp patches ## + %patch0 -p1 -b .innerbuf %patch5 -p1 -b .cursor # movemail @@ -147,7 +164,7 @@ sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el # remove cwnn symbols %patch24 -p1 -b .cwnn -# patch21 touch configure.in, and patch23 touches aclocal.m4 +# patch21 touches configure.in, and patch23 touches aclocal.m4 autoconf-2.13 @@ -156,44 +173,43 @@ export CFLAGS="${CFLAGS:-%optflags}" # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, # --includedir, --libexecdir, --localstatedir, --sharedstatedir -# NB datadir has to be defined because it defaults to /usr/lib +# note: datadir has to be defined because it defaults to /usr/lib common_options=" - %{_target_platform} - --prefix=%{_prefix} - --datadir=%{_datadir} - --infodir=%{_infodir} - --libdir=%{_libdir} - --mandir=%{_mandir}/man1 - --with-gpm=yes - --with-pop - --mail-locking=lockf - --with-clash-detection - --with-database=no - --with-postgresql=no - --with-ldap=no - --with-hesiod=no - --with-msw=no - --pdump - --debug=%{?_without_debug:no}%{!?_without_debug:yes} - %{!?_without_mule:--with-mule=yes} + %{_target_platform} + --prefix=%{_prefix} + --datadir=%{_datadir} + --infodir=%{_infodir} + --libdir=%{_libdir} + --mandir=%{_mandir}/man1 + --with-gpm=yes + --with-pop + --mail-locking=lockf + --with-clash-detection + --with-database=no + --with-postgresql=no + --with-ldap=no + --with-hesiod=no + --with-msw=no + --pdump + --debug=%{?_without_debug:no}%{!?_without_debug:yes} + %{!?_without_mule:--with-mule=yes} %ifarch alpha ia64 ppc64 - --with-system-malloc + --with-system-malloc %endif %ifarch ia64 - --without-modules + --without-modules %endif " -## build without X -# -# NB docdir requires trailing slash +# build without X +# note: docdir requires trailing slash ./configure $common_options \ - --docdir=%{exectop}/doc-nox/ \ - --with-sound=no \ - --with-x11=no \ - --with-canna=no \ - --with-wnn=no \ - --with-xim=no + --docdir=%{exectop}/doc-nox/ \ + --with-sound=no \ + --with-x11=no \ + --with-canna=no \ + --with-wnn=no \ + --with-xim=no # toplevel smp build fails make %{?_smp_mflags} -C lib-src #make src/Emacs.ad.h @@ -204,18 +220,23 @@ mv src/xemacs{,-nox-%{version}} mv src/{xemacs.dmp,DUMP-nox} mv lib-src/config.values{,-nox} -#make clean - -## build with X -# -# NB docdir requires trailing slash +# build with X +# note: docdir requires trailing slash ./configure $common_options \ - --docdir=%{exectop}/doc/ \ - --with-sound=native \ - %{!?_without_mule:--with-canna=yes --with-xim=xlib} \ - %{?_with_gtk: --with-gtk --with-gnome} \ - %{!?_with_gtk: --with-athena=3d --with-widgets=athena --with-menubars=lucid --with-scrollbars=lucid --with-dialogs=athena } \ - --with-xfs=no + --docdir=%{exectop}/doc/ \ + --with-sound=native \ + %{!?_without_mule:--with-canna=yes --with-xim=xlib} \ +%if 0%{?_with_gtk:1} + --with-gtk \ + --with-gnome \ +%else + --with-athena=3d \ + --with-widgets=athena \ + --with-menubars=lucid \ + --with-scrollbars=lucid \ + --with-dialogs=athena \ +%endif + --with-xfs=no # toplevel smp build fails make %{?_smp_mflags} -C lib-src make src/Emacs.ad.h @@ -224,74 +245,89 @@ EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes %install -rm -rf %buildroot +rm -rf $RPM_BUILD_ROOT + # adjust mandir export EMACSLOADPATH=$PWD/lisp -# make docdir -mkdir -p %buildroot%{exectop}/doc -%makeinstall mandir=%buildroot%{_mandir}/man1 docdir=%buildroot%{exectop}/doc/ + +install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc +# note: no DESTDIR support, docdir requires trailing slash +%makeinstall \ + mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ + docdir=$RPM_BUILD_ROOT%{exectop}/doc/ # install nox files -mkdir -p %buildroot%{exectop}/doc-nox -cp -p src/xemacs-nox-%{version} %buildroot%{_bindir} -ln -s xemacs-nox-%{version} %buildroot%{_bindir}/xemacs-nox -cp -p src/DUMP-nox %buildroot%{exectop}/doc-nox/DUMP -cp -p lib-src/DOC-nox %buildroot%{exectop}/doc-nox/DOC -cp -p lib-src/config.values-nox %buildroot%{exectop}/doc-nox/config.values +install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir} +ln -s xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox +install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc-nox +install -pm 644 src/DUMP-nox $RPM_BUILD_ROOT%{exectop}/doc-nox/DUMP +install -pm 644 lib-src/DOC-nox $RPM_BUILD_ROOT%{exectop}/doc-nox/DOC +install -pm 644 lib-src/config.values-nox \ + $RPM_BUILD_ROOT%{exectop}/doc-nox/config.values -mv %buildroot%{_bindir}/xemacs-%{version}-*.dmp %buildroot%{exectop}/doc/DUMP +mv $RPM_BUILD_ROOT%{_bindir}/xemacs-%{version}-*.dmp \ + $RPM_BUILD_ROOT%{exectop}/doc/DUMP # these clash with GNU Emacs -mv %buildroot%{_bindir}/{etags,etags.xemacs} -rm -f %buildroot%{_bindir}/{ctags,rcs-checkin,b2m} -rm %buildroot%{_mandir}/man1/{etags.1,ctags.1} +mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} +rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/[ce]tags.1 -rm -f %buildroot%{_infodir}/dir +# these clash with other packages +rm -f $RPM_BUILD_ROOT%{_infodir}/info* +rm -f $RPM_BUILD_ROOT%{_infodir}/standards* +rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* +rm -f $RPM_BUILD_ROOT%{_infodir}/dir -#These clash with other packages -rm -f %buildroot%{_infodir}/info* -rm -f %buildroot%{_infodir}/standards* -rm -f %buildroot%{_infodir}/termcap* +install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/applications +install -m 644 %{SOURCE6} \ + $RPM_BUILD_ROOT%{_datadir}/applications/net-xemacs.desktop -install -m 755 -d %buildroot%{_datadir}/applications -install -m 644 %SOURCE6 %buildroot%{_datadir}/applications/net-xemacs.desktop - -# Lockdir -mkdir -p %buildroot%{_localstatedir}/lock/xemacs +# lockdir +install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/lock/xemacs # site-start.el -mkdir -p %buildroot%{pkgdir}/site-packages/lisp/site-start.d/ -install -m 644 %SOURCE9 %buildroot%{pkgdir}/site-packages/lisp/site-start.el +install -dm 755 $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp/site-start.d +install -pm 644 %{SOURCE9} \ + $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp/site-start.el # default.el -install -m 644 %SOURCE24 %buildroot%{pkgdir}/site-packages/lisp +install -pm 644 %{SOURCE24} $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp # default user init file -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs -install -m 0644 %SOURCE23 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el +install -Dpm 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el # icon -install -Dpm 644 %{SOURCE1} %buildroot%{_datadir}/pixmaps/xemacs.png +install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/xemacs.png -# Make sure nothing is 0400 -chmod -R a+rX %buildroot%{_prefix} +# make sure nothing is 0400 +chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} # filter out buildroot from finder-inf.el -sed -i -e "s|%buildroot||" %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el -[ -x %{_bindir}/xemacs ] && python %SOURCE22 %buildroot%{_datadir}/xemacs-%{version}/lisp/finder-inf.el +sed -i -e "s|$RPM_BUILD_ROOT||" \ + $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el +[ -x %{_bindir}/xemacs ] && \ + python %{SOURCE22} \ + $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el # separate files rm -f *.files base-files el-files info-files -echo "%defattr(-,root,root)" > base-files -echo "%defattr(-,root,root)" > el-files -echo "%defattr(-,root,root)" > info-files +echo "%%defattr(-,root,root,-)" > base-files +echo "%%defattr(-,root,root,-)" > el-files +echo "%%defattr(-,root,root,-)" > info-files -find %buildroot%{_datadir}/xemacs-%{version} %buildroot%{pkgdir} \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \( -type d -name info -fprint info.files -prune \) -o \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o -fprint base-el-not-bytecomped.files \) \) +find $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version} $RPM_BUILD_ROOT%{pkgdir} \ + \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ + \( -type d -name info -fprint info.files -prune \) -o \ + \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \ + \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ + -fprint base-el-not-bytecomped.files \) \) +sed -i -e "s|$RPM_BUILD_ROOT||" *.files -# remove buildroot prefix from files -sed -i -e "s|%buildroot||" *.files # make site-packages lisp files config files -perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' base-el-not-bytecomped.files +perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' \ + base-el-not-bytecomped.files + # combine the file lists cat base-*.files dir.files >> base-files cat el-*.files dir.files >> el-files @@ -299,72 +335,74 @@ cat info.files >> info-files %clean -rm -rf %buildroot +rm -rf $RPM_BUILD_ROOT %post common alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 %preun common -if [ "$1" = 0 ]; then +if [ $1 -eq 0 ] ; then alternatives --remove etags %{_bindir}/etags.xemacs fi %post info -for file in xemacs cl internals lispref new-users-guide; do +for file in xemacs cl internals lispref new-users-guide ; do /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir done %preun info -if [ "$1" = "0" ]; then - for file in xemacs cl internals lispref new-users-guide; do +if [ $1 -eq 0 ] ; then + for file in xemacs cl internals lispref new-users-guide ; do /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir done fi %files -%defattr(-, root, root) +%defattr(-,root,root,-) %{_bindir}/xemacs %{_bindir}/xemacs-%{version} %{_bindir}/gnuclient %{exectop}/*/gnuserv -%{exectop}/doc -%{_datadir}/applications/* +%{exectop}/doc/ +%{_datadir}/applications/*-%{name}.desktop %files nox -%defattr(-, root, root) +%defattr(-,root,root,-) %{_bindir}/xemacs-nox %{_bindir}/xemacs-nox-%{version} -%{exectop}/doc-nox +%{exectop}/doc-nox/ %files common -f base-files -%defattr(-, root, root) +%defattr(-,root,root,-) %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release -%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages -%doc etc/TUTORIAL +%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL %exclude %{_bindir}/xemacs* # needs X libs %exclude %{_bindir}/gnuclient %{_bindir} +%{exectop}/ %exclude %{exectop}/doc* # needs X libs %exclude %{exectop}/*/gnuserv -%{exectop} %{_datadir}/pixmaps/xemacs.png -%config %{_sysconfdir}/skel/.xemacs -%{_mandir}/*/* -%attr(1777, root, root) %{_localstatedir}/lock/xemacs +%config %{_sysconfdir}/skel/.xemacs/ +%{_mandir}/man1/*.1* +%dir %{_localstatedir}/lock/xemacs/ %files el -f el-files -%defattr(-, root, root) +%defattr(-,root,root,-) %files info -f info-files -%defattr(-, root, root) -%{_infodir}/* +%defattr(-,root,root,-) +%{_infodir}/*.info* %changelog +* Thu Jun 30 2005 Ville Skyttä - 21.4.17-4 +- Improve package summaries and descriptions, reformat/clean up specfile. + * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 (Enrico Scholz, #154112). From b30e41d2dc10bb0803c43c8582c056ce3390061f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:20:17 +0000 Subject: [PATCH 005/160] Bring back Wnn support. --- xemacs.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xemacs.spec b/xemacs.spec index 127d1cd..635ee4d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -45,6 +45,7 @@ BuildRequires: compface BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: Canna-devel +BuildRequires: FreeWnn-devel %if 0%{?_with_gtk:1} BuildRequires: gtk+-devel BuildRequires: libglade-devel @@ -402,6 +403,7 @@ fi %changelog * Thu Jun 30 2005 Ville Skyttä - 21.4.17-4 - Improve package summaries and descriptions, reformat/clean up specfile. +- Bring back Wnn support. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From d1e938e48f8ee28aa3eb3580ab24538ff5a3fbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:27:37 +0000 Subject: [PATCH 006/160] Fine tune dependencies and options of "--without mule" builds. --- xemacs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 635ee4d..6cd0fb9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -44,8 +44,10 @@ BuildRequires: glibc-devel BuildRequires: compface BuildRequires: libpng-devel BuildRequires: libtiff-devel +%if 0%{!?_without_mule:1} BuildRequires: Canna-devel BuildRequires: FreeWnn-devel +%endif # mule %if 0%{?_with_gtk:1} BuildRequires: gtk+-devel BuildRequires: libglade-devel @@ -67,7 +69,7 @@ Public License and related to other versions of Emacs, in particular GNU Emacs. Its emphasis is on modern graphical user interface support and an open software development model, similar to Linux. -This package contains XEmacs built for X Windows with MULE support. +This package contains XEmacs built for X Windows%{!?_without_mule: with MULE support}. %package common Summary: Byte-compiled lisp files and other common files for XEmacs @@ -226,7 +228,7 @@ mv lib-src/config.values{,-nox} ./configure $common_options \ --docdir=%{exectop}/doc/ \ --with-sound=native \ - %{!?_without_mule:--with-canna=yes --with-xim=xlib} \ + --with-xim=xlib \ %if 0%{?_with_gtk:1} --with-gtk \ --with-gnome \ @@ -404,6 +406,7 @@ fi * Thu Jun 30 2005 Ville Skyttä - 21.4.17-4 - Improve package summaries and descriptions, reformat/clean up specfile. - Bring back Wnn support. +- Fine tune dependencies and options of "--without mule" builds. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From 9112171a57ac147a807a0bbae49541b586d08a75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:35:00 +0000 Subject: [PATCH 007/160] Use d-f-i to install .desktop, fix X-* categories, update desktop database. --- xemacs.desktop | 2 +- xemacs.spec | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/xemacs.desktop b/xemacs.desktop index c5dcc39..11482b4 100644 --- a/xemacs.desktop +++ b/xemacs.desktop @@ -29,6 +29,6 @@ Exec=xemacs %f Icon=xemacs Type=Application Terminal=false -Categories=Application;Development;TextEditor;X-Red-Hat-Extra; +Categories=Application;Development;TextEditor; Encoding=UTF-8 StartupWMClass=Emacs diff --git a/xemacs.spec b/xemacs.spec index 6cd0fb9..127b265 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -44,6 +44,7 @@ BuildRequires: glibc-devel BuildRequires: compface BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: desktop-file-utils %if 0%{!?_without_mule:1} BuildRequires: Canna-devel BuildRequires: FreeWnn-devel @@ -282,9 +283,12 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/standards* rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* rm -f $RPM_BUILD_ROOT%{_infodir}/dir -install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/applications -install -m 644 %{SOURCE6} \ - $RPM_BUILD_ROOT%{_datadir}/applications/net-xemacs.desktop +desktop-file-install \ + --vendor=fedora \ + --mode=644 \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + %{SOURCE6} # lockdir install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/lock/xemacs @@ -341,6 +345,12 @@ cat info.files >> info-files rm -rf $RPM_BUILD_ROOT +%post +update-desktop-database -q %{_datadir}/applications 2>/dev/null || : + +%postun +update-desktop-database -q %{_datadir}/applications 2>/dev/null || : + %post common alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 @@ -407,6 +417,8 @@ fi - Improve package summaries and descriptions, reformat/clean up specfile. - Bring back Wnn support. - Fine tune dependencies and options of "--without mule" builds. +- Use desktop-file-install for installing the desktop entry, fix up X-* + categories, update desktop database at post (un)install time. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From 6cf0fa47f2606e3f88c5d150a6a1447b67674742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:40:33 +0000 Subject: [PATCH 008/160] Really mark default init files as %config, use sed instead of perl everywhere. --- xemacs.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 127b265..f64bedf 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -32,8 +32,8 @@ Patch24: xemacs-21.4.15-wnnfix-128362.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf213 -BuildRequires: perl BuildRequires: python +BuildRequires: sed >= 3.95 BuildRequires: XFree86-devel BuildRequires: ncurses-devel BuildRequires: gpm-devel @@ -332,7 +332,7 @@ find $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version} $RPM_BUILD_ROOT%{pkgdir} \ sed -i -e "s|$RPM_BUILD_ROOT||" *.files # make site-packages lisp files config files -perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' \ +sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config \1|' \ base-el-not-bytecomped.files # combine the file lists @@ -419,6 +419,8 @@ fi - Fine tune dependencies and options of "--without mule" builds. - Use desktop-file-install for installing the desktop entry, fix up X-* categories, update desktop database at post (un)install time. +- Really mark default init files as %%config. +- Use sed instead of perl for in-place edits throughout the build. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From 0c142a4e03dd09434bf55ce9f698495f29a312d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:42:00 +0000 Subject: [PATCH 009/160] Drop redundant build dependencies. --- xemacs.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index f64bedf..1f84690 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -34,13 +34,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf213 BuildRequires: python BuildRequires: sed >= 3.95 -BuildRequires: XFree86-devel BuildRequires: ncurses-devel BuildRequires: gpm-devel BuildRequires: pam-devel BuildRequires: zlib-devel BuildRequires: libjpeg-devel -BuildRequires: glibc-devel BuildRequires: compface BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -421,6 +419,7 @@ fi categories, update desktop database at post (un)install time. - Really mark default init files as %%config. - Use sed instead of perl for in-place edits throughout the build. +- Drop redundant build dependencies. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From 7452c81f05534aa9806b60aa90e51c158f47f515 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:50:34 +0000 Subject: [PATCH 010/160] Make sure scriptlet errors won't break upgrades, add context marked deps. --- xemacs.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 1f84690..4aa4d4c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -73,7 +73,8 @@ This package contains XEmacs built for X Windows%{!?_without_mule: with MULE sup %package common Summary: Byte-compiled lisp files and other common files for XEmacs Group: Applications/Editors -PreReq: %{_sbindir}/alternatives +Requires(post): %{_sbindir}/alternatives +Requires(preun): %{_sbindir}/alternatives %description common XEmacs is a highly customizable open source text editor and @@ -116,7 +117,8 @@ interest when developing or debugging XEmacs itself. %package info Summary: XEmacs documemtation in GNU texinfo format Group: Documentation -PreReq: /sbin/install-info +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description info XEmacs is a highly customizable open source text editor and @@ -350,22 +352,23 @@ update-desktop-database -q %{_datadir}/applications 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : %post common -alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 +%{_sbindir}/alternatives --install %{_bindir}/etags etags \ + %{_bindir}/etags.xemacs 40 || : %preun common -if [ $1 -eq 0 ] ; then - alternatives --remove etags %{_bindir}/etags.xemacs +if [ $1 -eq 0 ] ; then + %{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : fi %post info for file in xemacs cl internals lispref new-users-guide ; do - /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir + /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || : done %preun info if [ $1 -eq 0 ] ; then for file in xemacs cl internals lispref new-users-guide ; do - /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || : done fi @@ -420,6 +423,8 @@ fi - Really mark default init files as %%config. - Use sed instead of perl for in-place edits throughout the build. - Drop redundant build dependencies. +- Make sure scriptlet errors won't break upgrades. +- Add context marked dependencies for scriptlets. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From 28ed2fd1346c00562ed4e59ec3bc515e94f24dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 21:57:35 +0000 Subject: [PATCH 011/160] Build with -fno-strict-aliasing per upstream recommendations. --- xemacs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 4aa4d4c..f0e0774 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -173,7 +173,7 @@ autoconf-2.13 %build -export CFLAGS="${CFLAGS:-%optflags}" +export CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, # --includedir, --libexecdir, --localstatedir, --sharedstatedir @@ -425,6 +425,7 @@ fi - Drop redundant build dependencies. - Make sure scriptlet errors won't break upgrades. - Add context marked dependencies for scriptlets. +- Build with -fno-strict-aliasing per upstream recommendations. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From b4dbf659d8b26ddae5710e4872b50c02e1bdfafc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 22:02:32 +0000 Subject: [PATCH 012/160] Use neXtaw by default, rebuild "--with xaw3d" to get Xaw3d. --- xemacs.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index f0e0774..6db8ff5 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -51,8 +51,12 @@ BuildRequires: FreeWnn-devel BuildRequires: gtk+-devel BuildRequires: libglade-devel %else +%if 0%{?_with_xaw3d:1} BuildRequires: Xaw3d-devel -%endif +%else +BuildRequires: neXtaw-devel +%endif # xaw3d +%endif # gtk Requires: xemacs-sumo >= 20050118-2 Requires: xemacs-common = %{version}-%{release} Obsoletes: xemacs-extras @@ -234,7 +238,7 @@ mv lib-src/config.values{,-nox} --with-gtk \ --with-gnome \ %else - --with-athena=3d \ + --with-athena=%{?_with_xaw3d:3d}%{!?_with_xaw3d:next} \ --with-widgets=athena \ --with-menubars=lucid \ --with-scrollbars=lucid \ @@ -426,6 +430,7 @@ fi - Make sure scriptlet errors won't break upgrades. - Add context marked dependencies for scriptlets. - Build with -fno-strict-aliasing per upstream recommendations. +- Use neXtaw by default, rebuild with "--with xaw3d" to get Xaw3d. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From 10aac53e7405586ae85b15993f223b0a24cedf30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 29 Jun 2005 22:18:48 +0000 Subject: [PATCH 013/160] Don't own %{_bindir} in -common. --- xemacs.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 6db8ff5..1cb4a3c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -396,10 +396,10 @@ fi %defattr(-,root,root,-) %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL +%{_bindir}/* %exclude %{_bindir}/xemacs* # needs X libs %exclude %{_bindir}/gnuclient -%{_bindir} %{exectop}/ %exclude %{exectop}/doc* # needs X libs @@ -431,6 +431,7 @@ fi - Add context marked dependencies for scriptlets. - Build with -fno-strict-aliasing per upstream recommendations. - Use neXtaw by default, rebuild with "--with xaw3d" to get Xaw3d. +- Don't own %%{_bindir} in -common. * Thu May 5 2005 Ville Skyttä - 21.4.17-3 - Avoid stack corruption in open-network-stream when built with gcc4 From 48fc31b499f643688db74ef322d41049d1693456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 25 Nov 2005 15:49:34 +0000 Subject: [PATCH 014/160] - Adapt to modular X.Org. - Move icon to icons/hicolor and to the main package. - Move man pages to subpackages where the things they document are, install a few more of them. - Mark config files as noreplace. - Drop no longer needed obsoletions. - Start cleaning up unneeded files. - Don't use %exclude. - Use %bcond_with*. --- xemacs-21.4.17-x-paths.patch | 46 +++++++++++++++++ xemacs.spec | 96 +++++++++++++++++++++++++----------- 2 files changed, 113 insertions(+), 29 deletions(-) create mode 100644 xemacs-21.4.17-x-paths.patch diff --git a/xemacs-21.4.17-x-paths.patch b/xemacs-21.4.17-x-paths.patch new file mode 100644 index 0000000..5e22292 --- /dev/null +++ b/xemacs-21.4.17-x-paths.patch @@ -0,0 +1,46 @@ +--- xemacs-21.4.17/etc/xemacs.1~ 2001-04-12 21:20:52.000000000 +0300 ++++ xemacs-21.4.17/etc/xemacs.1 2005-11-25 12:34:43.000000000 +0200 +@@ -293,7 +293,7 @@ + Sets the color of the text. + + See the file +-.I /usr/lib/X11/rgb.txt ++.I /usr/share/X11/rgb.txt + for a list of valid + color names. + .TP +--- xemacs-21.4.17/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 ++++ xemacs-21.4.17/etc/Emacs.ad 2005-11-25 12:35:46.000000000 +0200 +@@ -9,7 +9,7 @@ + ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no + ! effect. + ! +-! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs ++! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs + ! (or whatever the standard app-defaults directory is at your site) to cause + ! it to be consulted at run-time. (Do this only for site-wide customizations: + ! personal customizations should be put into ~/.Xdefaults instead.) +--- xemacs-21.4.17/lisp/minibuf.el~ 2002-04-30 19:05:46.000000000 +0300 ++++ xemacs-21.4.17/lisp/minibuf.el 2005-11-25 12:35:17.000000000 +0200 +@@ -2187,7 +2187,8 @@ + ;; Ben wanted all of the possibilities from the `configure' script used + ;; here, but I think this is way too many. I already trimmed the R4 variants + ;; and a few obvious losers from the list. --Stig +-(defvar x-library-search-path '("/usr/X11R6/lib/X11/" ++(defvar x-library-search-path '("/usr/share/X11/" ++ "/usr/X11R6/lib/X11/" + "/usr/X11R5/lib/X11/" + "/usr/lib/X11R6/X11/" + "/usr/lib/X11R5/X11/" +--- xemacs-21.4.17/lisp/font.el~ 2002-08-20 14:34:44.000000000 +0300 ++++ xemacs-21.4.17/lisp/font.el 2005-11-25 12:35:35.000000000 +0200 +@@ -1080,7 +1080,8 @@ + x-library-search-path + ;; This default is from XEmacs 19.13 - hope it covers + ;; everyone. +- (list "/usr/X11R6/lib/X11/" ++ (list "/usr/share/X11/" ++ "/usr/X11R6/lib/X11/" + "/usr/X11R5/lib/X11/" + "/usr/lib/X11R6/X11/" + "/usr/lib/X11R5/X11/" diff --git a/xemacs.spec b/xemacs.spec index 1cb4a3c..25401b6 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,9 +1,14 @@ +%bcond_with gtk +%bcond_with xaw3d +%bcond_without debug +%bcond_without mule + %define pkgdir %{_datadir}/xemacs %define exectop %{_libdir}/xemacs-%{version} Name: xemacs Version: 21.4.17 -Release: 4 +Release: 5%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -18,6 +23,7 @@ Source22: delprevline.py Source23: dotxemacs-init.el Source24: default.el Patch0: xemacs-21.4.17-innerbuf.patch +Patch1: xemacs-21.4.17-x-paths.patch Patch5: xemacs-21-cursor.patch Patch10: xemacs-21.4.10-find-paths-pkgdir.patch Patch11: movemail-mktemp.patch @@ -43,27 +49,26 @@ BuildRequires: compface BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: desktop-file-utils -%if 0%{!?_without_mule:1} +%if !%{with mule} BuildRequires: Canna-devel BuildRequires: FreeWnn-devel %endif # mule -%if 0%{?_with_gtk:1} +%if %{with gtk} BuildRequires: gtk+-devel BuildRequires: libglade-devel %else -%if 0%{?_with_xaw3d:1} +%if %{with xaw3d} BuildRequires: Xaw3d-devel %else BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk +# TODO: verify these build deps wrt gtk/xaw3d builds +BuildRequires: xorg-x11-xbitmaps +BuildRequires: libXaw-devel +BuildRequires: libXpm-devel Requires: xemacs-sumo >= 20050118-2 Requires: xemacs-common = %{version}-%{release} -Obsoletes: xemacs-extras -Obsoletes: xemacs-noX -Obsoletes: xemacs-X11 -Obsoletes: xemacs-mule -Obsoletes: xemacs-static %description XEmacs is a highly customizable open source text editor and @@ -72,7 +77,7 @@ Public License and related to other versions of Emacs, in particular GNU Emacs. Its emphasis is on modern graphical user interface support and an open software development model, similar to Linux. -This package contains XEmacs built for X Windows%{!?_without_mule: with MULE support}. +This package contains XEmacs built for X Windows%{?with_mule: with MULE support}. %package common Summary: Byte-compiled lisp files and other common files for XEmacs @@ -137,8 +142,11 @@ This package contains XEmacs documentation in GNU texinfo format. %prep %setup -q +f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f + ## lisp patches ## +%patch1 -p1 -b .x-paths # make find-paths.el look in datadir rm lisp/find-paths.elc %patch10 -p1 @@ -199,8 +207,8 @@ common_options=" --with-hesiod=no --with-msw=no --pdump - --debug=%{?_without_debug:no}%{!?_without_debug:yes} - %{!?_without_mule:--with-mule=yes} + --debug=%{?with_debug:yes}%{!?with_debug:no} + %{?with_mule:--with-mule=yes} %ifarch alpha ia64 ppc64 --with-system-malloc %endif @@ -234,11 +242,11 @@ mv lib-src/config.values{,-nox} --docdir=%{exectop}/doc/ \ --with-sound=native \ --with-xim=xlib \ -%if 0%{?_with_gtk:1} +%if %{with gtk} --with-gtk \ --with-gnome \ %else - --with-athena=%{?_with_xaw3d:3d}%{!?_with_xaw3d:next} \ + --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ --with-widgets=athena \ --with-menubars=lucid \ --with-scrollbars=lucid \ @@ -263,6 +271,7 @@ install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc %makeinstall \ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ docdir=$RPM_BUILD_ROOT%{exectop}/doc/ +install -Dpm 644 etc/xemacs-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1 # install nox files install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir} @@ -279,7 +288,8 @@ mv $RPM_BUILD_ROOT%{_bindir}/xemacs-%{version}-*.dmp \ # these clash with GNU Emacs mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/[ce]tags.1 +mv $RPM_BUILD_ROOT%{_mandir}/man1/etags{,.xemacs}.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ctags.1 # these clash with other packages rm -f $RPM_BUILD_ROOT%{_infodir}/info* @@ -309,7 +319,8 @@ install -pm 644 %{SOURCE24} $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp install -Dpm 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el # icon -install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/xemacs.png +install -Dpm 644 %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png # make sure nothing is 0400 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} @@ -321,6 +332,12 @@ sed -i -e "s|$RPM_BUILD_ROOT||" \ python %{SOURCE22} \ $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el +# clean up "junk" (TODO: there's much more!) +cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/etc +rm -r aliases.ksh BETA check_cygwin_setup.sh CODING-STANDARDS InstallGuide \ + sparcworks tests xemacs-fe.sh XKeysymDB *.sco *.1 +cd - + # separate files rm -f *.files base-files el-files info-files echo "%%defattr(-,root,root,-)" > base-files @@ -336,7 +353,7 @@ find $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version} $RPM_BUILD_ROOT%{pkgdir} \ sed -i -e "s|$RPM_BUILD_ROOT||" *.files # make site-packages lisp files config files -sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config \1|' \ +sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config(noreplace) \1|' \ base-el-not-bytecomped.files # combine the file lists @@ -350,9 +367,11 @@ rm -rf $RPM_BUILD_ROOT %post +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : %postun +gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : %post common @@ -381,10 +400,14 @@ fi %defattr(-,root,root,-) %{_bindir}/xemacs %{_bindir}/xemacs-%{version} +# gnuclient, gnuserv need X libs, so not in -common %{_bindir}/gnuclient -%{exectop}/*/gnuserv +%{exectop}/*linux/gnuserv %{exectop}/doc/ %{_datadir}/applications/*-%{name}.desktop +%{_datadir}/icons/hicolor/48x48/apps/xemacs.png +%{_mandir}/man1/gnuclient.1* +%{_mandir}/man1/gnuserv.1* %files nox %defattr(-,root,root,-) @@ -396,17 +419,21 @@ fi %defattr(-,root,root,-) %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL -%{_bindir}/* -%exclude %{_bindir}/xemacs* -# needs X libs -%exclude %{_bindir}/gnuclient -%{exectop}/ -%exclude %{exectop}/doc* -# needs X libs -%exclude %{exectop}/*/gnuserv -%{_datadir}/pixmaps/xemacs.png -%config %{_sysconfdir}/skel/.xemacs/ -%{_mandir}/man1/*.1* +%{_bindir}/ellcc +%{_bindir}/etags.xemacs +%{_bindir}/gnuattach +%{_bindir}/gnudoit +%{_bindir}/ootags +%dir %{exectop}/ +%dir %{exectop}/*linux/ +%{exectop}/*linux/[acdfhimprsvwy]* +%{exectop}/*linux/gzip-el.sh +%config(noreplace) %{_sysconfdir}/skel/.xemacs/ +%{_mandir}/man1/etags.xemacs.1* +%{_mandir}/man1/gnuattach.1* +%{_mandir}/man1/gnudoit.1* +%{_mandir}/man1/xemacs.1* +%lang(ja) %{_mandir}/ja/man1/xemacs.1* %dir %{_localstatedir}/lock/xemacs/ %files el -f el-files @@ -418,6 +445,17 @@ fi %changelog +* Fri Nov 25 2005 Ville Skyttä - 21.4.17-5 +- Adapt to modular X.Org. +- Move icon to icons/hicolor and to the main package. +- Move man pages to subpackages where the things they document are, + install a few more of them. +- Mark config files as noreplace. +- Drop no longer needed obsoletions. +- Start cleaning up unneeded files. +- Don't use %%exclude. +- Use %%bcond_with*. + * Thu Jun 30 2005 Ville Skyttä - 21.4.17-4 - Improve package summaries and descriptions, reformat/clean up specfile. - Bring back Wnn support. From 32061386e95d810cde8afc16f6f0c54993f099e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Nov 2005 22:34:13 +0000 Subject: [PATCH 015/160] - More modular X.Org fixes (Xauth for gnuclient, menubar font tweak). - Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5). - Don't ship patch backup files. --- ...ntsets.patch => xemacs-21.4.17-utf8-fonts.patch | 13 ++++++++++--- xemacs.spec | 14 ++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) rename xemacs-21.4.13-utf8-fontsets.patch => xemacs-21.4.17-utf8-fonts.patch (52%) diff --git a/xemacs-21.4.13-utf8-fontsets.patch b/xemacs-21.4.17-utf8-fonts.patch similarity index 52% rename from xemacs-21.4.13-utf8-fontsets.patch rename to xemacs-21.4.17-utf8-fonts.patch index f4b7d2b..8c0baf8 100644 --- a/xemacs-21.4.13-utf8-fontsets.patch +++ b/xemacs-21.4.17-utf8-fonts.patch @@ -1,6 +1,13 @@ ---- xemacs-21.4.13/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 -+++ xemacs-21.4.13/etc/Emacs.ad 2003-07-13 19:47:48.000000000 +0300 -@@ -203,11 +203,13 @@ +--- xemacs-21.4.17/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 ++++ xemacs-21.4.17/etc/Emacs.ad 2005-11-27 22:46:58.000000000 +0200 +@@ -198,16 +198,18 @@ + ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ + ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 + ! +-*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +-*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* ++*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* ++*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ diff --git a/xemacs.spec b/xemacs.spec index 25401b6..4809c07 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -8,7 +8,7 @@ Name: xemacs Version: 21.4.17 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -31,7 +31,7 @@ Patch14: menubar-games.patch Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch Patch16: xemacs-21.4.12-mk-nochk-features.patch Patch18: xemacs-21.4.13-dump-paths-lispdir.patch -Patch19: xemacs-21.4.13-utf8-fontsets.patch +Patch19: xemacs-21.4.17-utf8-fonts.patch Patch21: xemacs-debian-docdir-dump.patch Patch23: xemacs-no-expdyn-ia64-106744.patch Patch24: xemacs-21.4.15-wnnfix-128362.patch @@ -49,7 +49,7 @@ BuildRequires: compface BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: desktop-file-utils -%if !%{with mule} +%if %{with mule} BuildRequires: Canna-devel BuildRequires: FreeWnn-devel %endif # mule @@ -63,6 +63,7 @@ BuildRequires: Xaw3d-devel BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk +BuildRequires: libXau-devel # TODO: verify these build deps wrt gtk/xaw3d builds BuildRequires: xorg-x11-xbitmaps BuildRequires: libXaw-devel @@ -146,7 +147,7 @@ f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f ## lisp patches ## -%patch1 -p1 -b .x-paths +%patch1 -p1 # make find-paths.el look in datadir rm lisp/find-paths.elc %patch10 -p1 @@ -445,6 +446,11 @@ fi %changelog +* Mon Nov 28 2005 Ville Skyttä - 21.4.17-6 +- More modular X.Org fixes (Xauth for gnuclient, menubar font tweak). +- Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5). +- Don't ship patch backup files. + * Fri Nov 25 2005 Ville Skyttä - 21.4.17-5 - Adapt to modular X.Org. - Move icon to icons/hicolor and to the main package. From 5047c688d6cff24e0f75e5bcf1f011bb7e6d1635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 1 Dec 2005 10:05:26 +0000 Subject: [PATCH 016/160] - Require ISO-8859-1 fonts (Alexandre Oliva, #174617). - Make popup dialog font the intended one even without ISO-8859 fonts. - BuildRequire xmkmf to get X defines during build. - Move editclient.sh to docs. --- xemacs-21.4.17-utf8-fonts.patch | 9 +++++++++ xemacs.spec | 16 +++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/xemacs-21.4.17-utf8-fonts.patch b/xemacs-21.4.17-utf8-fonts.patch index 8c0baf8..53d256d 100644 --- a/xemacs-21.4.17-utf8-fonts.patch +++ b/xemacs-21.4.17-utf8-fonts.patch @@ -23,3 +23,12 @@ ! Gui elements share this font ! +@@ -229,7 +229,7 @@ + ! Some people use 12-point anyway because you get more text, but + ! there's no purpose at all in doing this for dialog boxes. + +-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* ++*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-* + + ! Dialog box translations. + ! ======================= diff --git a/xemacs.spec b/xemacs.spec index 4809c07..64b956f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -8,7 +8,7 @@ Name: xemacs Version: 21.4.17 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -63,6 +63,7 @@ BuildRequires: Xaw3d-devel BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk +BuildRequires: xmkmf BuildRequires: libXau-devel # TODO: verify these build deps wrt gtk/xaw3d builds BuildRequires: xorg-x11-xbitmaps @@ -70,6 +71,8 @@ BuildRequires: libXaw-devel BuildRequires: libXpm-devel Requires: xemacs-sumo >= 20050118-2 Requires: xemacs-common = %{version}-%{release} +Requires: xorg-x11-fonts-ISO8859-1-75dpi +Requires: xorg-x11-fonts-ISO8859-1-100dpi %description XEmacs is a highly customizable open source text editor and @@ -335,8 +338,8 @@ sed -i -e "s|$RPM_BUILD_ROOT||" \ # clean up "junk" (TODO: there's much more!) cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/etc -rm -r aliases.ksh BETA check_cygwin_setup.sh CODING-STANDARDS InstallGuide \ - sparcworks tests xemacs-fe.sh XKeysymDB *.sco *.1 +rm -r aliases.ksh BETA *.sh CODING-STANDARDS InstallGuide \ + sparcworks tests XKeysymDB *.sco *.1 cd - # separate files @@ -420,6 +423,7 @@ fi %defattr(-,root,root,-) %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL +%doc etc/editclient.sh %{_bindir}/ellcc %{_bindir}/etags.xemacs %{_bindir}/gnuattach @@ -446,6 +450,12 @@ fi %changelog +* Wed Nov 30 2005 Ville Skyttä - 21.4.17-7 +- Require ISO-8859-1 fonts (Alexandre Oliva, #174617). +- Make popup dialog font the intended one even without ISO-8859 fonts. +- BuildRequire xmkmf to get X defines during build. +- Move editclient.sh to docs. + * Mon Nov 28 2005 Ville Skyttä - 21.4.17-6 - More modular X.Org fixes (Xauth for gnuclient, menubar font tweak). - Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5). From aa5e6cdd968c30c246e191e25c62f419dbb40f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 5 Dec 2005 11:28:45 +0000 Subject: [PATCH 017/160] - 21.4.18, innerbuf and cursor patches applied upstream. --- .cvsignore | 2 +- sources | 2 +- xemacs-21-cursor.patch | 11 -------- xemacs-21.4.17-innerbuf.patch | 28 ------------------- ...s.patch => xemacs-21.4.18-utf8-fonts.patch | 13 ++++++--- xemacs.spec | 16 +++++------ 6 files changed, 18 insertions(+), 54 deletions(-) delete mode 100644 xemacs-21-cursor.patch delete mode 100644 xemacs-21.4.17-innerbuf.patch rename xemacs-21.4.17-utf8-fonts.patch => xemacs-21.4.18-utf8-fonts.patch (73%) diff --git a/.cvsignore b/.cvsignore index 81e99a6..b31cf6b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xemacs-21.4.17.tar.bz2 +xemacs-21.4.18.tar.bz2 diff --git a/sources b/sources index 2fcf6a4..12488e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a207e106138c085711160855d78b72a2 xemacs-21.4.17.tar.bz2 +08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2 diff --git a/xemacs-21-cursor.patch b/xemacs-21-cursor.patch deleted file mode 100644 index 3bcb9b4..0000000 --- a/xemacs-21-cursor.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk-xemacs/src/redisplay-tty.c.cursor Tue Nov 28 18:24:15 2000 -+++ gtk-xemacs/src/redisplay-tty.c Tue Nov 28 18:25:09 2000 -@@ -1236,7 +1236,7 @@ - } - - TTY_SD (c).cursor_visible = tgetstr ("ve", &bufptr); -- TTY_SD (c).cursor_normal = tgetstr ("vs", &bufptr); -+ TTY_SD (c).cursor_normal = tgetstr ("ve", &bufptr); - TTY_SD (c).init_motion = tgetstr ("ti", &bufptr); - TTY_SD (c).end_motion = tgetstr ("te", &bufptr); - TTY_SD (c).keypad_on = tgetstr ("ks", &bufptr); diff --git a/xemacs-21.4.17-innerbuf.patch b/xemacs-21.4.17-innerbuf.patch deleted file mode 100644 index b4a7a20..0000000 --- a/xemacs-21.4.17-innerbuf.patch +++ /dev/null @@ -1,28 +0,0 @@ -2005-04-07 15:08 Enrico Scholz - * src/process-unix.c (unix_open_network_stream): moved - 'portbuf' buffer out of an inner block as it is used in the - entire function. With gcc4, the stack may get corrupted - after leaving this block. This patches adjusts the size of - the used buffer also; static '128' bytes are far too much - currently and might not suffice for future architectures - (e.g. for 512 bit ones ;)). Instead of, use only the really - required space (max octets * ln(256)/ln(10) chars + space - for '\0' and the sign) - ---- xemacs-21.4.17/src/process-unix.c.innerbuf 2005-01-31 03:55:26.000000000 +0100 -+++ xemacs-21.4.17/src/process-unix.c 2005-04-07 16:09:36.000000000 +0200 -@@ -1670,13 +1670,13 @@ - volatile int xerrno = 0; - volatile int failed_connect = 0; - char *ext_host; -+ char portbuf[sizeof(long)*3 + 2]; - /* - * Caution: service can either be a string or int. - * Convert to a C string for later use by getaddrinfo. - */ - if (INTP (service)) - { -- char portbuf[128]; - snprintf (portbuf, sizeof (portbuf), "%ld", (long) XINT (service)); - portstring = portbuf; - port = htons ((unsigned short) XINT (service)); diff --git a/xemacs-21.4.17-utf8-fonts.patch b/xemacs-21.4.18-utf8-fonts.patch similarity index 73% rename from xemacs-21.4.17-utf8-fonts.patch rename to xemacs-21.4.18-utf8-fonts.patch index 53d256d..8b1ccd8 100644 --- a/xemacs-21.4.17-utf8-fonts.patch +++ b/xemacs-21.4.18-utf8-fonts.patch @@ -1,6 +1,6 @@ ---- xemacs-21.4.17/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 -+++ xemacs-21.4.17/etc/Emacs.ad 2005-11-27 22:46:58.000000000 +0200 -@@ -198,16 +198,18 @@ +--- xemacs-21.4.18/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 ++++ xemacs-21.4.18/etc/Emacs.ad 2005-12-04 18:07:07.000000000 +0200 +@@ -198,20 +198,22 @@ ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 ! @@ -23,7 +23,12 @@ ! Gui elements share this font ! -@@ -229,7 +229,7 @@ +-Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* ++Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* + + ! Font in the Motif dialog boxes. + ! (Motif uses `fontList' while most other things use `font' - if you don't +@@ -227,7 +229,7 @@ ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. diff --git a/xemacs.spec b/xemacs.spec index 64b956f..0b23916 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -7,8 +7,8 @@ %define exectop %{_libdir}/xemacs-%{version} Name: xemacs -Version: 21.4.17 -Release: 7%{?dist} +Version: 21.4.18 +Release: 2%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -22,16 +22,14 @@ Source9: xemacs-sitestart.el Source22: delprevline.py Source23: dotxemacs-init.el Source24: default.el -Patch0: xemacs-21.4.17-innerbuf.patch Patch1: xemacs-21.4.17-x-paths.patch -Patch5: xemacs-21-cursor.patch Patch10: xemacs-21.4.10-find-paths-pkgdir.patch Patch11: movemail-mktemp.patch Patch14: menubar-games.patch Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch Patch16: xemacs-21.4.12-mk-nochk-features.patch Patch18: xemacs-21.4.13-dump-paths-lispdir.patch -Patch19: xemacs-21.4.17-utf8-fonts.patch +Patch19: xemacs-21.4.18-utf8-fonts.patch Patch21: xemacs-debian-docdir-dump.patch Patch23: xemacs-no-expdyn-ia64-106744.patch Patch24: xemacs-21.4.15-wnnfix-128362.patch @@ -40,6 +38,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf213 BuildRequires: python BuildRequires: sed >= 3.95 +BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel BuildRequires: pam-devel @@ -152,7 +151,6 @@ f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f %patch1 -p1 # make find-paths.el look in datadir -rm lisp/find-paths.elc %patch10 -p1 # fix "libexec" on multilib %ifarch x86_64 s390x @@ -162,13 +160,10 @@ rm lisp/find-paths.elc %patch14 -p1 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir) %patch18 -p1 -rm lisp/dump-paths.elc sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el ## non-lisp patches ## -%patch0 -p1 -b .innerbuf -%patch5 -p1 -b .cursor # movemail %patch11 -p1 -b .mkstemp # skip redundant check-features @@ -450,6 +445,9 @@ fi %changelog +* Sun Dec 4 2005 Ville Skyttä - 21.4.18-2 +- 21.4.18, innerbuf and cursor patches applied upstream. + * Wed Nov 30 2005 Ville Skyttä - 21.4.17-7 - Require ISO-8859-1 fonts (Alexandre Oliva, #174617). - Make popup dialog font the intended one even without ISO-8859 fonts. From a2e9977834a4b3423e67dfbf6b6e6dae14653610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 5 Dec 2005 17:27:05 +0000 Subject: [PATCH 018/160] - Fix typo in -info summary. - Point to main man page for xemacs-nox. --- xemacs.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 0b23916..94908cc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -127,7 +127,7 @@ This package contains the lisp source files for XEmacs, mainly of interest when developing or debugging XEmacs itself. %package info -Summary: XEmacs documemtation in GNU texinfo format +Summary: XEmacs documentation in GNU texinfo format Group: Documentation Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -271,6 +271,8 @@ install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ docdir=$RPM_BUILD_ROOT%{exectop}/doc/ install -Dpm 644 etc/xemacs-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1 +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs-nox.1 # install nox files install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir} @@ -432,8 +434,8 @@ fi %{_mandir}/man1/etags.xemacs.1* %{_mandir}/man1/gnuattach.1* %{_mandir}/man1/gnudoit.1* -%{_mandir}/man1/xemacs.1* -%lang(ja) %{_mandir}/ja/man1/xemacs.1* +%{_mandir}/man1/xemacs*.1* +%lang(ja) %{_mandir}/ja/man1/xemacs*.1* %dir %{_localstatedir}/lock/xemacs/ %files el -f el-files @@ -445,6 +447,10 @@ fi %changelog +* Mon Dec 5 2005 Ville Skyttä +- Fix typo in -info summary. +- Point to main man page for xemacs-nox. + * Sun Dec 4 2005 Ville Skyttä - 21.4.18-2 - 21.4.18, innerbuf and cursor patches applied upstream. From ee5298aff0ea7022e4981dba6668ab67730f7c6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 13 Dec 2005 16:06:27 +0000 Subject: [PATCH 019/160] - Don't set Info-directory-list in site-start.el to fix honoring INFOPATH from the environment (Geert Kloosterman). --- xemacs-sitestart.el | 5 ----- xemacs.spec | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el index d313294..a37fffa 100644 --- a/xemacs-sitestart.el +++ b/xemacs-sitestart.el @@ -2,11 +2,6 @@ ;;; ;;; The "-no-site-file" option to xemacs prevents this file from being loaded. -;; fix default info path -(setq Info-directory-list '("/usr/share/info/" - "/usr/share/xemacs/xemacs-packages/info/" - "/usr/share/xemacs/mule-packages/info/")) - ;;; psgml catalog list (setq sgml-catalog-files (if (getenv "SGML_CATALOG_FILES") diff --git a/xemacs.spec b/xemacs.spec index 94908cc..f4bb079 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -447,6 +447,10 @@ fi %changelog +* Tue Dec 13 2005 Ville Skyttä +- Don't set Info-directory-list in site-start.el to fix honoring INFOPATH + from the environment (Geert Kloosterman). + * Mon Dec 5 2005 Ville Skyttä - Fix typo in -info summary. - Point to main man page for xemacs-nox. From 9685d6a99cde49156dfa4be68e5a69211440ff74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 11 Feb 2006 13:11:48 +0000 Subject: [PATCH 020/160] - 21.4.19, X paths patch mostly applied upstream. --- .cvsignore | 2 +- sources | 2 +- xemacs-21.4.17-x-paths.patch | 46 ------------------------------------ xemacs-21.4.19-x-paths.patch | 22 +++++++++++++++++ xemacs.spec | 9 +++++-- 5 files changed, 31 insertions(+), 50 deletions(-) delete mode 100644 xemacs-21.4.17-x-paths.patch create mode 100644 xemacs-21.4.19-x-paths.patch diff --git a/.cvsignore b/.cvsignore index b31cf6b..0d2ddce 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xemacs-21.4.18.tar.bz2 +xemacs-21.4.19.tar.bz2 diff --git a/sources b/sources index 12488e7..748ac0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2 +0d2d255e2b362064959f329d522b137b xemacs-21.4.19.tar.bz2 diff --git a/xemacs-21.4.17-x-paths.patch b/xemacs-21.4.17-x-paths.patch deleted file mode 100644 index 5e22292..0000000 --- a/xemacs-21.4.17-x-paths.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- xemacs-21.4.17/etc/xemacs.1~ 2001-04-12 21:20:52.000000000 +0300 -+++ xemacs-21.4.17/etc/xemacs.1 2005-11-25 12:34:43.000000000 +0200 -@@ -293,7 +293,7 @@ - Sets the color of the text. - - See the file --.I /usr/lib/X11/rgb.txt -+.I /usr/share/X11/rgb.txt - for a list of valid - color names. - .TP ---- xemacs-21.4.17/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 -+++ xemacs-21.4.17/etc/Emacs.ad 2005-11-25 12:35:46.000000000 +0200 -@@ -9,7 +9,7 @@ - ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no - ! effect. - ! --! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs -+! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs - ! (or whatever the standard app-defaults directory is at your site) to cause - ! it to be consulted at run-time. (Do this only for site-wide customizations: - ! personal customizations should be put into ~/.Xdefaults instead.) ---- xemacs-21.4.17/lisp/minibuf.el~ 2002-04-30 19:05:46.000000000 +0300 -+++ xemacs-21.4.17/lisp/minibuf.el 2005-11-25 12:35:17.000000000 +0200 -@@ -2187,7 +2187,8 @@ - ;; Ben wanted all of the possibilities from the `configure' script used - ;; here, but I think this is way too many. I already trimmed the R4 variants - ;; and a few obvious losers from the list. --Stig --(defvar x-library-search-path '("/usr/X11R6/lib/X11/" -+(defvar x-library-search-path '("/usr/share/X11/" -+ "/usr/X11R6/lib/X11/" - "/usr/X11R5/lib/X11/" - "/usr/lib/X11R6/X11/" - "/usr/lib/X11R5/X11/" ---- xemacs-21.4.17/lisp/font.el~ 2002-08-20 14:34:44.000000000 +0300 -+++ xemacs-21.4.17/lisp/font.el 2005-11-25 12:35:35.000000000 +0200 -@@ -1080,7 +1080,8 @@ - x-library-search-path - ;; This default is from XEmacs 19.13 - hope it covers - ;; everyone. -- (list "/usr/X11R6/lib/X11/" -+ (list "/usr/share/X11/" -+ "/usr/X11R6/lib/X11/" - "/usr/X11R5/lib/X11/" - "/usr/lib/X11R6/X11/" - "/usr/lib/X11R5/X11/" diff --git a/xemacs-21.4.19-x-paths.patch b/xemacs-21.4.19-x-paths.patch new file mode 100644 index 0000000..034c940 --- /dev/null +++ b/xemacs-21.4.19-x-paths.patch @@ -0,0 +1,22 @@ +--- xemacs-21.4.19/etc/xemacs.1~ 2001-04-12 21:20:52.000000000 +0300 ++++ xemacs-21.4.19/etc/xemacs.1 2006-02-02 01:55:34.000000000 +0200 +@@ -293,7 +293,7 @@ + Sets the color of the text. + + See the file +-.I /usr/lib/X11/rgb.txt ++.I /usr/share/X11/rgb.txt + for a list of valid + color names. + .TP +--- xemacs-21.4.19/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 ++++ xemacs-21.4.19/etc/Emacs.ad 2006-02-02 01:55:43.000000000 +0200 +@@ -9,7 +9,7 @@ + ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no + ! effect. + ! +-! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs ++! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs + ! (or whatever the standard app-defaults directory is at your site) to cause + ! it to be consulted at run-time. (Do this only for site-wide customizations: + ! personal customizations should be put into ~/.Xdefaults instead.) diff --git a/xemacs.spec b/xemacs.spec index f4bb079..e536421 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -7,7 +7,7 @@ %define exectop %{_libdir}/xemacs-%{version} Name: xemacs -Version: 21.4.18 +Version: 21.4.19 Release: 2%{?dist} Summary: Different version of Emacs @@ -22,7 +22,7 @@ Source9: xemacs-sitestart.el Source22: delprevline.py Source23: dotxemacs-init.el Source24: default.el -Patch1: xemacs-21.4.17-x-paths.patch +Patch1: xemacs-21.4.19-x-paths.patch Patch10: xemacs-21.4.10-find-paths-pkgdir.patch Patch11: movemail-mktemp.patch Patch14: menubar-games.patch @@ -147,6 +147,8 @@ This package contains XEmacs documentation in GNU texinfo format. f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f + ## lisp patches ## %patch1 -p1 @@ -447,6 +449,9 @@ fi %changelog +* Thu Feb 2 2006 Ville Skyttä - 21.4.19-2 +- 21.4.19, X paths patch mostly applied upstream. + * Tue Dec 13 2005 Ville Skyttä - Don't set Info-directory-list in site-start.el to fix honoring INFOPATH from the environment (Geert Kloosterman). From 388aeb8f1d3970267340b6efb821f17a33ca8219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 19 Mar 2006 09:47:31 +0000 Subject: [PATCH 021/160] - Build without -fstack-protector by default for now (#183643). --- xemacs.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index e536421..49bcebd 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -2,13 +2,14 @@ %bcond_with xaw3d %bcond_without debug %bcond_without mule +%bcond_with stackprot %define pkgdir %{_datadir}/xemacs %define exectop %{_libdir}/xemacs-%{version} Name: xemacs Version: 21.4.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -186,7 +187,12 @@ autoconf-2.13 %build -export CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +%if ! %{with stackprot} +CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" +CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" +%endif +export CFLAGS # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, # --includedir, --libexecdir, --localstatedir, --sharedstatedir @@ -449,6 +455,9 @@ fi %changelog +* Sat Mar 18 2006 Ville Skyttä - 21.4.19-3 +- Build without -fstack-protector by default for now (#183643). + * Thu Feb 2 2006 Ville Skyttä - 21.4.19-2 - 21.4.19, X paths patch mostly applied upstream. From 7e0999b03d742d9ca2dd462167d271a5b500a13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 6 Apr 2006 16:27:53 +0000 Subject: [PATCH 022/160] =?UTF-8?q?-=20Borrow=20Mike=20Fabian's=20site-sta?= =?UTF-8?q?rt.el=20work=20from=20the=20SuSE=20package.=20Tue=20Apr=204=202?= =?UTF-8?q?006=20Ville=20Skytt=C3=A4=20=20-=20?= =?UTF-8?q?21.5.26-1=20-=2021.5.26=20(WIP).=20-=20Make=20%{=5Fbindir}/xema?= =?UTF-8?q?cs=20an=20alternative=20(main/nox).=20-=20Convert=20some=20info?= =?UTF-8?q?=20docs=20to=20UTF-8.=20Fri=20Mar=2031=202006=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=2021.5.25-1=20-=2021.?= =?UTF-8?q?5.25=20(WIP).=20-=20Trim=20pre-21.5=20%changelog=20entries.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- delprevline.py | 20 - menubar-games.patch | 13 - movemail-mktemp.patch | 11 - sources | 2 +- xemacs-21.4.10-find-paths-pkgdir.patch | 23 - xemacs-21.4.12-find-paths-libexec-lib64.patch | 11 - xemacs-21.4.13-dump-paths-lispdir.patch | 21 - xemacs-21.5.25-find-paths-pkgdir.patch | 11 + ... => xemacs-21.5.25-mk-nochk-features.patch | 6 +- ...s.patch => xemacs-21.5.25-utf8-fonts.patch | 28 +- ...atch => xemacs-21.5.25-wnnfix-128362.patch | 12 +- ...aths.patch => xemacs-21.5.25-x-paths.patch | 26 +- ...xemacs-21.5.26-no-expdyn-ia64-106744.patch | 7 +- xemacs-debian-docdir-dump.patch | 67 -- xemacs-sitestart.el | 145 ++- xemacs.spec | 822 ++++-------------- 17 files changed, 325 insertions(+), 902 deletions(-) delete mode 100644 delprevline.py delete mode 100644 menubar-games.patch delete mode 100644 movemail-mktemp.patch delete mode 100644 xemacs-21.4.10-find-paths-pkgdir.patch delete mode 100644 xemacs-21.4.12-find-paths-libexec-lib64.patch delete mode 100644 xemacs-21.4.13-dump-paths-lispdir.patch create mode 100644 xemacs-21.5.25-find-paths-pkgdir.patch rename xemacs-21.4.12-mk-nochk-features.patch => xemacs-21.5.25-mk-nochk-features.patch (62%) rename xemacs-21.4.18-utf8-fonts.patch => xemacs-21.5.25-utf8-fonts.patch (58%) rename xemacs-21.4.15-wnnfix-128362.patch => xemacs-21.5.25-wnnfix-128362.patch (84%) rename xemacs-21.4.19-x-paths.patch => xemacs-21.5.25-x-paths.patch (62%) rename xemacs-no-expdyn-ia64-106744.patch => xemacs-21.5.26-no-expdyn-ia64-106744.patch (68%) delete mode 100644 xemacs-debian-docdir-dump.patch diff --git a/.cvsignore b/.cvsignore index 0d2ddce..ea77615 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xemacs-21.4.19.tar.bz2 +xemacs-21.5.26.tar.gz diff --git a/delprevline.py b/delprevline.py deleted file mode 100644 index 578d70d..0000000 --- a/delprevline.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/python - -import string -import sys - -match="(japanese)" -file=open(sys.argv[1]) -lines=file.readlines() -file.close -lines2=[] -for line in lines: - if string.find(line,match)>0: - lines2.pop() - else: - lines2.append(line) -file=open(sys.argv[1],"w") -file.writelines(lines2) - - - diff --git a/menubar-games.patch b/menubar-games.patch deleted file mode 100644 index 5018ff0..0000000 --- a/menubar-games.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- xemacs-21.4.12/lisp/menubar-items.el~ 2003-01-17 04:46:27.000000000 +0900 -+++ xemacs-21.4.12/lisp/menubar-items.el 2003-01-17 04:46:27.000000000 +0900 -@@ -627,8 +627,8 @@ - ("Ga%_mes" - ["%_Mine Game" xmine - :active (fboundp 'xmine)] -- ["%_Tetris" tetris -- :active (fboundp 'tetris)] -+;; ["%_Tetris" tetris -+;; :active (fboundp 'tetris)] - ["%_Sokoban" sokoban - :active (fboundp 'sokoban)] - ["Quote from %_Zippy" yow diff --git a/movemail-mktemp.patch b/movemail-mktemp.patch deleted file mode 100644 index a0314ae..0000000 --- a/movemail-mktemp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xemacs-21.4.10/lib-src/movemail.c.mktemp 2002-08-20 20:34:22.000000000 +0900 -+++ xemacs-21.4.10/lib-src/movemail.c 2002-12-18 22:09:11.000000000 +0900 -@@ -588,7 +588,7 @@ - p--; - *p = 0; - strcpy (p, "EXXXXXX"); -- mktemp (tempname); -+ mkstemp (tempname); - unlink (tempname); - - for (;;) diff --git a/sources b/sources index 748ac0d..05fa34a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0d2d255e2b362064959f329d522b137b xemacs-21.4.19.tar.bz2 +e0cd4521e8857a16f6cd675bb4c1039b xemacs-21.5.26.tar.gz diff --git a/xemacs-21.4.10-find-paths-pkgdir.patch b/xemacs-21.4.10-find-paths-pkgdir.patch deleted file mode 100644 index 2f5dd99..0000000 --- a/xemacs-21.4.10-find-paths-pkgdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u xemacs-21.4.10/lisp/find-paths.el~ xemacs-21.4.10/lisp/find-paths.el ---- xemacs-21.4.10/lisp/find-paths.el~ 2002-12-21 08:56:42.000000000 +0900 -+++ xemacs-21.4.10/lisp/find-paths.el 2002-12-21 08:56:42.000000000 +0900 -@@ -103,8 +103,8 @@ - (or - ;; installed - (paths-file-readable-directory-p (paths-construct-path (list directory -- "lib" -- emacs-program-name))) -+ "share" -+ (construct-emacs-version-name)))) - ;; in-place or windows-nt - (and - (paths-file-readable-directory-p (paths-construct-path (list directory "lisp"))) -@@ -211,7 +211,7 @@ - (paths-find-emacs-directory roots - (file-name-as-directory - (paths-construct-path (list -- "lib" -+ "share" - emacs-program-name))) - base - envvar default diff --git a/xemacs-21.4.12-find-paths-libexec-lib64.patch b/xemacs-21.4.12-find-paths-libexec-lib64.patch deleted file mode 100644 index c0283b4..0000000 --- a/xemacs-21.4.12-find-paths-libexec-lib64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xemacs-21.4.12/lisp/find-paths.el.pkgdir 2003-01-21 18:37:30.000000000 +0900 -+++ xemacs-21.4.12/lisp/find-paths.el 2003-01-21 18:37:30.000000000 +0900 -@@ -225,7 +225,7 @@ - (paths-find-emacs-directory roots - (file-name-as-directory - (paths-construct-path -- (list "lib" -+ (list "lib64" - (construct-emacs-version-name)))) - base - envvar default diff --git a/xemacs-21.4.13-dump-paths-lispdir.patch b/xemacs-21.4.13-dump-paths-lispdir.patch deleted file mode 100644 index e0e16e9..0000000 --- a/xemacs-21.4.13-dump-paths-lispdir.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u xemacs-21.4.13/lisp/dump-paths.el.dump-path xemacs-21.4.13/lisp/dump-paths.el ---- xemacs-21.4.13/lisp/dump-paths.el.dump-path 2003-06-26 23:33:42.000000000 +0900 -+++ xemacs-21.4.13/lisp/dump-paths.el 2003-06-26 23:33:42.000000000 +0900 -@@ -58,15 +58,14 @@ - late-packages late-package-load-path) - 'external-debugging-output))) - -- (setq lisp-directory (paths-find-lisp-directory roots)) -+ (setq lisp-directory "@srcdir@/lisp") - (if debug-paths - (princ (format "lisp-directory:\n%S\n" lisp-directory) - 'external-debugging-output)) - (if (featurep 'mule) - (progn - (setq mule-lisp-directory -- (paths-find-mule-lisp-directory roots -- lisp-directory)) -+ "@srcdir@/lisp/mule") - (if debug-paths - (princ (format "mule-lisp-directory:\n%S\n" - mule-lisp-directory) diff --git a/xemacs-21.5.25-find-paths-pkgdir.patch b/xemacs-21.5.25-find-paths-pkgdir.patch new file mode 100644 index 0000000..9e8b945 --- /dev/null +++ b/xemacs-21.5.25-find-paths-pkgdir.patch @@ -0,0 +1,11 @@ +--- xemacs-21.5.25/lisp/find-paths.el~ 2005-01-15 17:17:36.000000000 +0200 ++++ xemacs-21.5.25/lisp/find-paths.el 2006-03-30 23:49:20.000000000 +0300 +@@ -220,7 +220,7 @@ + roots + (file-name-as-directory + (paths-construct-path (list +- "lib" ++ "share" + emacs-program-name))) + base + envvar default)) diff --git a/xemacs-21.4.12-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch similarity index 62% rename from xemacs-21.4.12-mk-nochk-features.patch rename to xemacs-21.5.25-mk-nochk-features.patch index 2dbfd0d..6b0e810 100644 --- a/xemacs-21.4.12-mk-nochk-features.patch +++ b/xemacs-21.5.25-mk-nochk-features.patch @@ -1,6 +1,6 @@ ---- xemacs-21.4.12/Makefile.in.in~ 2003-02-08 00:28:44.000000000 +0900 -+++ xemacs-21.4.12/Makefile.in.in 2003-02-08 00:28:44.000000000 +0900 -@@ -407,7 +407,7 @@ +--- xemacs-21.5.25/Makefile.in.in.orig 2005-12-31 14:41:23.000000000 +0200 ++++ xemacs-21.5.25/Makefile.in.in 2006-03-30 23:53:48.000000000 +0300 +@@ -375,7 +375,7 @@ install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep diff --git a/xemacs-21.4.18-utf8-fonts.patch b/xemacs-21.5.25-utf8-fonts.patch similarity index 58% rename from xemacs-21.4.18-utf8-fonts.patch rename to xemacs-21.5.25-utf8-fonts.patch index 8b1ccd8..454cd33 100644 --- a/xemacs-21.4.18-utf8-fonts.patch +++ b/xemacs-21.5.25-utf8-fonts.patch @@ -1,5 +1,5 @@ ---- xemacs-21.4.18/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 -+++ xemacs-21.4.18/etc/Emacs.ad 2005-12-04 18:07:07.000000000 +0200 +--- xemacs-21.5.25/etc/Emacs.ad~ 2003-03-27 14:57:44.000000000 +0200 ++++ xemacs-21.5.25/etc/Emacs.ad 2006-03-31 00:27:07.000000000 +0300 @@ -198,20 +198,22 @@ ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 @@ -8,18 +8,18 @@ -*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* +*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* - *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 -+ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ -+ -*-*-*-*-*-*-*-120-*-*-* - *popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 -+ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ -+ -*-*-*-*-*-*-*-120-*-*-* + *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ + -*-*-*-*-*-*-*-120-*-iso10646-1, \ + -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ +- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 ++ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ ++ -*-*-*-*-*-*-*-120-*-*-* + *popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ + -*-*-*-*-*-*-*-120-*-iso10646-1, \ + -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ +- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 ++ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ ++ -*-*-*-*-*-*-*-120-*-*-* ! Gui elements share this font ! diff --git a/xemacs-21.4.15-wnnfix-128362.patch b/xemacs-21.5.25-wnnfix-128362.patch similarity index 84% rename from xemacs-21.4.15-wnnfix-128362.patch rename to xemacs-21.5.25-wnnfix-128362.patch index 9ccecb1..6153740 100644 --- a/xemacs-21.4.15-wnnfix-128362.patch +++ b/xemacs-21.5.25-wnnfix-128362.patch @@ -1,5 +1,5 @@ ---- xemacs-21.4.15/src/mule-wnnfns.c.orig 2004-07-22 15:34:28.473317319 +0900 -+++ xemacs-21.4.15/src/mule-wnnfns.c 2004-07-22 15:34:38.932537998 +0900 +--- xemacs-21.5.25/src/mule-wnnfns.c.orig 2004-11-05 01:06:43.000000000 +0200 ++++ xemacs-21.5.25/src/mule-wnnfns.c 2006-03-31 00:20:37.000000000 +0300 @@ -318,7 +318,7 @@ Lisp_Object Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji; Lisp_Object Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko; @@ -9,7 +9,7 @@ Lisp_Object Vwnnenv_sticky; Lisp_Object Vwnn_uniq_level; Fixnum lb_sisheng; -@@ -1899,9 +1899,11 @@ +@@ -1897,9 +1897,11 @@ DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /* *jserver, cserver .. */ ); @@ -22,7 +22,7 @@ DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /* *If non-nil, make environment sticky */ ); -@@ -1910,7 +1912,7 @@ +@@ -1908,7 +1910,7 @@ */ ); Vwnn_server_type = Qjserver; @@ -31,7 +31,7 @@ Vwnnenv_sticky = Qnil; Vwnn_uniq_level = Qwnn_uniq; -@@ -1932,10 +1934,14 @@ +@@ -1930,10 +1932,14 @@ case 0x80: if (EQ(Vwnn_server_type, Qcserver)) { @@ -46,7 +46,7 @@ for (i = 0; i < len; i++) { if (pzy[i] & 0x80) -@@ -2038,8 +2044,12 @@ +@@ -2036,8 +2042,12 @@ else *pin = *w; w++; pin++; } diff --git a/xemacs-21.4.19-x-paths.patch b/xemacs-21.5.25-x-paths.patch similarity index 62% rename from xemacs-21.4.19-x-paths.patch rename to xemacs-21.5.25-x-paths.patch index 034c940..7421744 100644 --- a/xemacs-21.4.19-x-paths.patch +++ b/xemacs-21.5.25-x-paths.patch @@ -1,5 +1,16 @@ ---- xemacs-21.4.19/etc/xemacs.1~ 2001-04-12 21:20:52.000000000 +0300 -+++ xemacs-21.4.19/etc/xemacs.1 2006-02-02 01:55:34.000000000 +0200 +--- xemacs-21.5.25/etc/Emacs.ad.orig 2003-03-27 14:57:44.000000000 +0200 ++++ xemacs-21.5.25/etc/Emacs.ad 2006-03-30 23:36:47.000000000 +0300 +@@ -9,7 +9,7 @@ + ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no + ! effect. + ! +-! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs ++! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs + ! (or whatever the standard app-defaults directory is at your site) to cause + ! it to be consulted at run-time. (Do this only for site-wide customizations: + ! personal customizations should be put into ~/.Xresources instead.) +--- xemacs-21.5.25/etc/xemacs.1.orig 2001-04-12 21:20:52.000000000 +0300 ++++ xemacs-21.5.25/etc/xemacs.1 2006-03-30 23:36:47.000000000 +0300 @@ -293,7 +293,7 @@ Sets the color of the text. @@ -9,14 +20,3 @@ for a list of valid color names. .TP ---- xemacs-21.4.19/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200 -+++ xemacs-21.4.19/etc/Emacs.ad 2006-02-02 01:55:43.000000000 +0200 -@@ -9,7 +9,7 @@ - ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no - ! effect. - ! --! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs -+! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs - ! (or whatever the standard app-defaults directory is at your site) to cause - ! it to be consulted at run-time. (Do this only for site-wide customizations: - ! personal customizations should be put into ~/.Xdefaults instead.) diff --git a/xemacs-no-expdyn-ia64-106744.patch b/xemacs-21.5.26-no-expdyn-ia64-106744.patch similarity index 68% rename from xemacs-no-expdyn-ia64-106744.patch rename to xemacs-21.5.26-no-expdyn-ia64-106744.patch index 267e2c7..83d0e48 100644 --- a/xemacs-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.26-no-expdyn-ia64-106744.patch @@ -1,7 +1,6 @@ -diff -u xemacs-21.4.15/aclocal.m4~ xemacs-21.4.15/aclocal.m4 ---- xemacs-21.4.15/aclocal.m4~ 2004-05-07 07:55:22.000000000 -0400 -+++ xemacs-21.4.15/aclocal.m4 2004-05-07 07:55:22.000000000 -0400 -@@ -530,11 +530,12 @@ +--- xemacs-21.5.26/aclocal.m4.orig 2006-03-28 18:55:49.000000000 +0300 ++++ xemacs-21.5.26/aclocal.m4 2006-04-04 21:11:33.000000000 +0300 +@@ -549,11 +549,12 @@ dnl usually need to be prefix with ${wl} or some other such thing. dnl diff --git a/xemacs-debian-docdir-dump.patch b/xemacs-debian-docdir-dump.patch deleted file mode 100644 index d1a34dd..0000000 --- a/xemacs-debian-docdir-dump.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- xemacs21-21.4.15.orig/src/config.h.in -+++ xemacs21-21.4.15/src/config.h.in -@@ -905,6 +905,7 @@ - #undef MODULEDIR_USER_DEFINED - #undef SITEMODULEDIR_USER_DEFINED - #undef DOCDIR_USER_DEFINED -+#undef DOCDIR - #undef LISPDIR_USER_DEFINED - #undef PACKAGE_PATH_USER_DEFINED - #undef SITELISPDIR_USER_DEFINED ---- xemacs-21.4.15/configure.in~ 2004-04-06 21:05:13.000000000 +0900 -+++ xemacs-21.4.15/configure.in 2004-04-06 21:05:13.000000000 +0900 -@@ -4856,6 +4856,7 @@ - esac - done - AC_SUBST(DOCDIR) -+AC_DEFINE_UNQUOTED(DOCDIR, "$docdir") - - AC_SUBST(archlibdir) - AC_SUBST(ARCHLIBDIR_USER_DEFINED) ---- xemacs21-21.4.15.orig/src/dumper.c -+++ xemacs21-21.4.15/src/dumper.c -@@ -1322,9 +1322,24 @@ - } - #endif /* !WIN32_NATIVE */ - -+static int -+pdump_file_doc_dir_try (char *exe_path) -+{ -+ char *w = exe_path + strlen (exe_path); -+ -+ sprintf (w, "%s", "DUMP"); -+ -+ if (pdump_file_get (exe_path)) -+ { -+ if (pdump_load_check ()) -+ return 1; -+ pdump_free (); -+ } -+ return 0; -+} - - static int --pdump_file_try (char *exe_path) -+pdump_file_exe_path_try (char *exe_path) - { - char *w = exe_path + strlen (exe_path); - -@@ -1439,9 +1454,16 @@ - - /* Save exe_path because pdump_file_try() modifies it */ - strcpy(real_exe_path, exe_path); -- if (pdump_file_try (exe_path) -+ if (pdump_file_exe_path_try (exe_path) - || (xrealpath(real_exe_path, real_exe_path) -- && pdump_file_try (real_exe_path))) -+ && pdump_file_exe_path_try (real_exe_path))) -+ { -+ pdump_load_finish (); -+ return 1; -+ } -+ -+ sprintf(exe_path, "%s", DOCDIR); -+ if (pdump_file_doc_dir_try (exe_path)) - { - pdump_load_finish (); - return 1; diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el index a37fffa..d705389 100644 --- a/xemacs-sitestart.el +++ b/xemacs-sitestart.el @@ -25,41 +25,118 @@ (make-face-italic 'italic) (make-face-italic 'bold-italic)) -;; setup coding-systems +;; Set up language environment.setup coding-systems (when (featurep 'mule) - (let* ((locale (or (getenv "LC_ALL") - (getenv "LC_CTYPE") - (getenv "LANG"))) - (lang-region (and locale - (substring locale 0 (min 5 (length locale))))) - (lang (and lang-region - (substring lang-region 0 (min 2 (length lang-region)))))) - (cond ((equal lang "ja") - (set-language-environment "Japanese")) - ((equal lang "ko") - (set-language-environment "Korean")) - ((equal lang-region "zh_CN") - (set-language-environment "Chinese-GB")) - ((equal lang-region "zh_TW") - (set-language-environment "Chinese-BIG5"))) - (cond ((and locale (string-match "UTF-8" locale)) - (require 'un-define) - (set-default-coding-systems 'utf-8) - (set-coding-priority-list '(utf-8)) - (set-coding-category-system 'utf-8 'utf-8)) - ((equal lang "ja") - (set-default-coding-systems 'euc-jp)) - ((equal lang "ko") - (set-default-coding-systems 'euc-kr)) - ((equal lang-region "zh_CN") - (set-default-coding-systems 'cn-gb-2312)) - ((equal lang-region "zh_TW") - (set-default-coding-systems 'big5))) - ;; register available Input Methods - (load "leim-list") - (when (member lang '("ja" "ko" "zh")) - ;; ispell doesn't support CJK - (setq-default ispell-local-dictionary "english")))) + (let* ((locale (getenv "LANG")) + (lang-region (and locale + (substring locale 0 (min 5 (length locale))))) + (lang (and lang-region + (substring lang-region 0 (min 2 (length lang-region)))))) + (cond ((equal lang "af") + (set-language-environment "Afrikaans")) + ((equal lang "sq") + (set-language-environment "Albanian")) + ((equal lang "ca") + (set-language-environment "Catalan")) + ((or (equal lang-region "zh_TW") (equal lang-region "zh_HK")) + (set-language-environment "Chinese-BIG5")) + ((or (equal lang-region "zh_CN") (equal lang-region "zh_SG")) + (set-language-environment "Chinese-GB")) + ((equal lang "hr") + (set-language-environment "Croatian")) + ((equal lang "ru") + (set-language-environment "Cyrillic-KOI8")) + ((equal lang "cs") + (set-language-environment "Czech")) + ((equal lang "da") + (set-language-environment "Danish")) + ((equal lang "nl") + (set-language-environment "Dutch")) + ((equal lang "et") + (set-language-environment "Estonian")) + ((equal lang "fi") + (set-language-environment "Finnish")) + ((equal lang "fr") + (set-language-environment "French")) + ((equal lang "gl") + (set-language-environment "Galician")) + ((equal lang "de") + (set-language-environment "German")) + ((equal lang "el") + (set-language-environment "Greek")) + ((equal lang "kl") + (set-language-environment "Greenlandic")) + ((or (equal lang "he") (equal lang "iw")) + (set-language-environment "Hebrew")) + ((equal lang "hu") + (set-language-environment "Hungarian")) + ((equal lang "ga") + (set-language-environment "Irish")) + ((equal lang "it") + (set-language-environment "Italian")) + ((equal lang "ja") + (set-language-environment "Japanese")) + ((equal lang "ko") + (set-language-environment "Korean")) + ((equal lang "lt") + (set-language-environment "Lithuanian")) + ((equal lang "mt") + (set-language-environment "Maltese")) + ((or (equal lang "nb") (equal lang "nn") (equal lang "no")) + (set-language-environment "Norwegian")) + ((equal lang "pl") + (set-language-environment "Polish")) + ((equal lang "pt") + (set-language-environment "Portuguese")) + ((equal lang "ro") + (set-language-environment "Romanian")) + ((equal lang "sk") + (set-language-environment "Slovak")) + ((equal lang "sl") + (set-language-environment "Slovenian")) + ((equal lang "es") + (set-language-environment "Spanish")) + ((equal lang "sv") + (set-language-environment "Swedish")) + ((equal lang "th") + (set-language-environment "Thai-XTIS")) + ((equal lang "tr") + (set-language-environment "Turkish")) + ((equal lang "vi") + (set-language-environment "Vietnamese")) + (t + (set-language-environment "English"))) + + ;; set-language-environment changes the locale; restore it. + (setenv "LANG" locale) + (set-current-locale locale) + + (let* ((tmp (shell-command-to-string "locale charmap")) + (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp))) + (tmp (intern (downcase tmp)))) + (when (find-coding-system tmp) + (set-coding-priority-list (list tmp)) + (set-coding-category-system tmp tmp) + (set-default-output-coding-systems tmp) + (set-keyboard-coding-system tmp) + (set-terminal-coding-system tmp) + (setq file-name-coding-system tmp) + (setq process-coding-system-alist (cons (cons ".*" tmp) '())) + (define-coding-system-alias 'native tmp))) + + ;; Register available Input Methods. + (load "leim-list") + (when (member lang '("ja" "ko" "zh")) + ;; ispell doesn't support CJK + (setq-default ispell-local-dictionary "english")))) + +;; Set input mode +;(let ((value (current-input-mode))) +; (set-input-mode (nth 0 value) +; (nth 1 value) +; (terminal-coding-system) +; ;; This quit value is optional +; (nth 3 value))) ;; try to preserve user/group when saving files (setq-default backup-by-copying-when-mismatch t) diff --git a/xemacs.spec b/xemacs.spec index 49bcebd..88c7f2b 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,43 +1,47 @@ +# TODO: xft build option +# TODO: site-modules vs site-lisp -> to same dir (are modules noarch?) +# TODO: review desktop entry associations +# TODO: split off -devel? +# TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el +# TODO: non-ASCII in buffer tabs +# TODO: re-enable XFontSet support for menubars? --> see suse fontset patch +# TODO: build issues if previous 21.5.x installed, restore finder-inf stuff? +# TODO: gtk+ build doesn't find glade, need pkg-config libglade --cflags +# TODO: gtk+ build fails, invalid lvalues + %bcond_with gtk %bcond_with xaw3d -%bcond_without debug %bcond_without mule -%bcond_with stackprot +%bcond_without stackprot -%define pkgdir %{_datadir}/xemacs -%define exectop %{_libdir}/xemacs-%{version} +%define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') Name: xemacs -Version: 21.4.19 -Release: 3%{?dist} +Version: 21.5.26 +Release: 2%{?dist} Summary: Different version of Emacs Group: Applications/Editors License: GPL URL: http://www.xemacs.org/ -Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2 +Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz Source1: %{name}.png -Source6: xemacs.desktop -Source9: xemacs-sitestart.el -# Used for cleaning finder-inf.el when it needs compilation -Source22: delprevline.py -Source23: dotxemacs-init.el -Source24: default.el -Patch1: xemacs-21.4.19-x-paths.patch -Patch10: xemacs-21.4.10-find-paths-pkgdir.patch -Patch11: movemail-mktemp.patch -Patch14: menubar-games.patch -Patch15: xemacs-21.4.12-find-paths-libexec-lib64.patch -Patch16: xemacs-21.4.12-mk-nochk-features.patch -Patch18: xemacs-21.4.13-dump-paths-lispdir.patch -Patch19: xemacs-21.4.18-utf8-fonts.patch -Patch21: xemacs-debian-docdir-dump.patch -Patch23: xemacs-no-expdyn-ia64-106744.patch -Patch24: xemacs-21.4.15-wnnfix-128362.patch +Source2: xemacs.desktop +Source3: dotxemacs-init.el +Source4: default.el +Source5: xemacs-sitestart.el + +Patch0: %{name}-21.5.25-utf8-fonts.patch +Patch1: %{name}-21.5.25-x-paths.patch +# TODO: patch2 still needed with --with-system-packages??? +Patch2: %{name}-21.5.25-find-paths-pkgdir.patch +Patch3: %{name}-21.5.25-mk-nochk-features.patch +Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch +Patch5: %{name}-21.5.25-wnnfix-128362.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf213 -BuildRequires: python +BuildRequires: autoconf >= 2.59 BuildRequires: sed >= 3.95 BuildRequires: texinfo BuildRequires: ncurses-devel @@ -53,22 +57,25 @@ BuildRequires: desktop-file-utils BuildRequires: Canna-devel BuildRequires: FreeWnn-devel %endif # mule + +BuildRequires: xmkmf +BuildRequires: libXau-devel +BuildRequires: libXpm-devel +BuildRequires: alsa-lib-devel +# TODO: verify this wrt gtk/xaw3d build +BuildRequires: xorg-x11-xbitmaps %if %{with gtk} BuildRequires: gtk+-devel BuildRequires: libglade-devel %else +# TODO: verify this wrt xaw3d +BuildRequires: libXaw-devel %if %{with xaw3d} BuildRequires: Xaw3d-devel %else BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk -BuildRequires: xmkmf -BuildRequires: libXau-devel -# TODO: verify these build deps wrt gtk/xaw3d builds -BuildRequires: xorg-x11-xbitmaps -BuildRequires: libXaw-devel -BuildRequires: libXpm-devel Requires: xemacs-sumo >= 20050118-2 Requires: xemacs-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi @@ -145,45 +152,25 @@ This package contains XEmacs documentation in GNU texinfo format. %prep %setup -q - -f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f - find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f - -## lisp patches ## - +rm -f configure.in +sed -i -e /tetris/d lisp/menubar-items.el +%patch0 -p1 %patch1 -p1 -# make find-paths.el look in datadir -%patch10 -p1 -# fix "libexec" on multilib -%ifarch x86_64 s390x -%patch15 -p1 -b .lib64 -%endif -# remove game we shouldn't ship -%patch14 -p1 -# make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir) -%patch18 -p1 -sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el - -## non-lisp patches ## - -# movemail -%patch11 -p1 -b .mkstemp -# skip redundant check-features -%patch16 -p1 -b .feature-chk -# fix missing charsets warning with Xaw/UTF-8 -%patch19 -p1 -# look for dump file docdir/DUMP as well as bindir/xemacs.dmp -%patch21 -p1 -b .docdmp +%patch2 -p1 +sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el +%patch3 -p1 %ifarch ia64 -# don't link with -dynamic-export on ia64 -%patch23 -p1 -b .dyn-exp +%patch4 -p1 %endif -# remove cwnn symbols -%patch24 -p1 -b .cwnn +%patch5 -p1 -# patch21 touches configure.in, and patch23 touches aclocal.m4 -autoconf-2.13 +for f in man/lispref/mule.texi man/xemacs-faq.texi ; do + iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f +done + +# for patch0, patch4 +autoconf %build @@ -193,73 +180,63 @@ CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" %endif export CFLAGS +export EMACSLOADPATH=$PWD/lisp -# XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, -# --includedir, --libexecdir, --localstatedir, --sharedstatedir -# note: datadir has to be defined because it defaults to /usr/lib common_options=" - %{_target_platform} - --prefix=%{_prefix} - --datadir=%{_datadir} - --infodir=%{_infodir} - --libdir=%{_libdir} - --mandir=%{_mandir}/man1 - --with-gpm=yes - --with-pop - --mail-locking=lockf - --with-clash-detection - --with-database=no - --with-postgresql=no - --with-ldap=no - --with-hesiod=no - --with-msw=no - --pdump - --debug=%{?with_debug:yes}%{!?with_debug:no} - %{?with_mule:--with-mule=yes} + --with-system-packages=%{_datadir}/xemacs + --with-gpm + --with-pop + --with-mail-locking=lockf + --with-clash-detection + --with-database=no + --without-postgresql + --without-ldap + --without-hesiod + --without-msw + --with-pdump + --with-debug + %{?with_mule:--with-mule} %ifarch alpha ia64 ppc64 - --with-system-malloc + --with-system-malloc %endif %ifarch ia64 - --without-modules + --without-modules %endif " # build without X -# note: docdir requires trailing slash -./configure $common_options \ - --docdir=%{exectop}/doc-nox/ \ - --with-sound=no \ - --with-x11=no \ - --with-canna=no \ - --with-wnn=no \ - --with-xim=no +# note: docdir requires trailing slash # TODO: still in 21.5? +%configure $common_options \ + --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox/ \ + --with-sound=none \ + --without-x \ + --without-canna \ + --without-wnn \ + --with-xim=no # toplevel smp build fails make %{?_smp_mflags} -C lib-src -#make src/Emacs.ad.h make %{?_smp_mflags} -C src EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes mv lib-src/DOC{,-nox} -mv src/xemacs{,-nox-%{version}} -mv src/{xemacs.dmp,DUMP-nox} +mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} # build with X -# note: docdir requires trailing slash -./configure $common_options \ - --docdir=%{exectop}/doc/ \ - --with-sound=native \ - --with-xim=xlib \ +# note: docdir requires trailing slash # TODO: still in 21.5? +%configure $common_options \ + --with-docdir=%{_libdir}/xemacs-%{xver}/doc/ \ %if %{with gtk} - --with-gtk \ - --with-gnome \ + --with-gtk \ + --with-gnome \ %else - --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ - --with-widgets=athena \ - --with-menubars=lucid \ - --with-scrollbars=lucid \ - --with-dialogs=athena \ + --with-xim=xlib \ + --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ + --with-widgets=athena \ + --with-menubars=lucid \ + --with-scrollbars=lucid \ + --with-dialogs=athena \ %endif - --with-xfs=no + --without-xfs # toplevel smp build fails make %{?_smp_mflags} -C lib-src make src/Emacs.ad.h @@ -270,29 +247,23 @@ EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes %install rm -rf $RPM_BUILD_ROOT -# adjust mandir export EMACSLOADPATH=$PWD/lisp -install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc -# note: no DESTDIR support, docdir requires trailing slash +# note: no DESTDIR support +# note: docdir requires trailing slash # TODO: still in 21.5? %makeinstall \ - mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ - docdir=$RPM_BUILD_ROOT%{exectop}/doc/ -install -Dpm 644 etc/xemacs-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1 + mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ + docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc/ echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 -echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs-nox.1 # install nox files -install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir} -ln -s xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox -install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc-nox -install -pm 644 src/DUMP-nox $RPM_BUILD_ROOT%{exectop}/doc-nox/DUMP -install -pm 644 lib-src/DOC-nox $RPM_BUILD_ROOT%{exectop}/doc-nox/DOC +install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir} +ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox +install -pm 644 lib-src/DOC-nox \ + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC install -pm 644 lib-src/config.values-nox \ - $RPM_BUILD_ROOT%{exectop}/doc-nox/config.values - -mv $RPM_BUILD_ROOT%{_bindir}/xemacs-%{version}-*.dmp \ - $RPM_BUILD_ROOT%{exectop}/doc/DUMP + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values # these clash with GNU Emacs mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} @@ -307,44 +278,39 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* rm -f $RPM_BUILD_ROOT%{_infodir}/dir desktop-file-install \ - --vendor=fedora \ - --mode=644 \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category=X-Fedora \ - %{SOURCE6} + --vendor=fedora \ + --mode=644 \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category=X-Fedora \ + %{SOURCE2} # lockdir install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/lock/xemacs # site-start.el -install -dm 755 $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp/site-start.d -install -pm 644 %{SOURCE9} \ - $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp/site-start.el +install -dm 755 \ + $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d +install -pm 644 %{SOURCE5} \ + $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.el # default.el -install -pm 644 %{SOURCE24} $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp +install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp # default user init file -install -Dpm 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el +install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el # icon install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png # make sure nothing is 0400 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} -# filter out buildroot from finder-inf.el -sed -i -e "s|$RPM_BUILD_ROOT||" \ - $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el -[ -x %{_bindir}/xemacs ] && \ - python %{SOURCE22} \ - $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el - -# clean up "junk" (TODO: there's much more!) -cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/etc -rm -r aliases.ksh BETA *.sh CODING-STANDARDS InstallGuide \ - sparcworks tests XKeysymDB *.sco *.1 +# clean up unneeded stuff (TODO: there's probably much more) +find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm +rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh +cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc +rm -r InstallGuide sparcworks tests XKeysymDB *.sco *.1 cd - # separate files @@ -353,7 +319,7 @@ echo "%%defattr(-,root,root,-)" > base-files echo "%%defattr(-,root,root,-)" > el-files echo "%%defattr(-,root,root,-)" > info-files -find $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version} $RPM_BUILD_ROOT%{pkgdir} \ +find $RPM_BUILD_ROOT{%{_datadir}/xemacs-%{xver},%{_datadir}/xemacs} \ \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ \( -type d -name info -fprint info.files -prune \) -o \ \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \ @@ -376,43 +342,58 @@ rm -rf $RPM_BUILD_ROOT %post +# rm because alternatives won't overwrite pre-alternatives symlink, bug? +rm -f %{_bindir}/xemacs && \ +%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ + %{_bindir}/xemacs-%{xver} 80 || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : %postun +[ $1 -ne 0 ] || \ +%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : +%post nox +# rm because alternatives won't overwrite pre-alternatives symlink, bug? +rm -f %{_bindir}/xemacs && \ +%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ + %{_bindir}/xemacs-nox-%{xver} 40 || : + +%postun nox +[ $1 -ne 0 ] || \ +%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : + %post common %{_sbindir}/alternatives --install %{_bindir}/etags etags \ - %{_bindir}/etags.xemacs 40 || : + %{_bindir}/etags.xemacs 40 || : %preun common -if [ $1 -eq 0 ] ; then - %{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : -fi +[ $1 -ne 0 ] || \ +%{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : %post info for file in xemacs cl internals lispref new-users-guide ; do - /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || : + /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || : done %preun info if [ $1 -eq 0 ] ; then - for file in xemacs cl internals lispref new-users-guide ; do - /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || : - done + for file in xemacs cl internals lispref new-users-guide ; do + /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || : + done fi %files %defattr(-,root,root,-) -%{_bindir}/xemacs -%{_bindir}/xemacs-%{version} +%ghost %{_bindir}/xemacs +%{_bindir}/xemacs-%{xver} # gnuclient, gnuserv need X libs, so not in -common %{_bindir}/gnuclient -%{exectop}/*linux/gnuserv -%{exectop}/doc/ +%{_libdir}/xemacs-%{xver}/*linux/gnuserv +%{_libdir}/xemacs-%{xver}/doc/ %{_datadir}/applications/*-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* @@ -420,30 +401,29 @@ fi %files nox %defattr(-,root,root,-) +%ghost %{_bindir}/xemacs %{_bindir}/xemacs-nox -%{_bindir}/xemacs-nox-%{version} -%{exectop}/doc-nox/ +%{_bindir}/xemacs-nox-%{xver} +%{_libdir}/xemacs-%{xver}/doc-nox/ %files common -f base-files %defattr(-,root,root,-) -%doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release -%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL +%doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL %doc etc/editclient.sh %{_bindir}/ellcc %{_bindir}/etags.xemacs %{_bindir}/gnuattach %{_bindir}/gnudoit %{_bindir}/ootags -%dir %{exectop}/ -%dir %{exectop}/*linux/ -%{exectop}/*linux/[acdfhimprsvwy]* -%{exectop}/*linux/gzip-el.sh +%{_libdir}/xemacs/ +%dir %{_libdir}/xemacs-%{xver} +%dir %{_libdir}/xemacs-%{xver}/*linux/ +%{_libdir}/xemacs-%{xver}/*linux/[acdfhimprsvwy]* %config(noreplace) %{_sysconfdir}/skel/.xemacs/ %{_mandir}/man1/etags.xemacs.1* %{_mandir}/man1/gnuattach.1* %{_mandir}/man1/gnudoit.1* %{_mandir}/man1/xemacs*.1* -%lang(ja) %{_mandir}/ja/man1/xemacs*.1* %dir %{_localstatedir}/lock/xemacs/ %files el -f el-files @@ -455,492 +435,14 @@ fi %changelog -* Sat Mar 18 2006 Ville Skyttä - 21.4.19-3 -- Build without -fstack-protector by default for now (#183643). +* Thu Apr 6 2006 Ville Skyttä - 21.5.26-2 +- Borrow Mike Fabian's site-start.el work from the SuSE package. -* Thu Feb 2 2006 Ville Skyttä - 21.4.19-2 -- 21.4.19, X paths patch mostly applied upstream. +* Tue Apr 4 2006 Ville Skyttä - 21.5.26-1 +- 21.5.26 (WIP). +- Make %%{_bindir}/xemacs an alternative (main/nox). +- Convert some info docs to UTF-8. -* Tue Dec 13 2005 Ville Skyttä -- Don't set Info-directory-list in site-start.el to fix honoring INFOPATH - from the environment (Geert Kloosterman). - -* Mon Dec 5 2005 Ville Skyttä -- Fix typo in -info summary. -- Point to main man page for xemacs-nox. - -* Sun Dec 4 2005 Ville Skyttä - 21.4.18-2 -- 21.4.18, innerbuf and cursor patches applied upstream. - -* Wed Nov 30 2005 Ville Skyttä - 21.4.17-7 -- Require ISO-8859-1 fonts (Alexandre Oliva, #174617). -- Make popup dialog font the intended one even without ISO-8859 fonts. -- BuildRequire xmkmf to get X defines during build. -- Move editclient.sh to docs. - -* Mon Nov 28 2005 Ville Skyttä - 21.4.17-6 -- More modular X.Org fixes (Xauth for gnuclient, menubar font tweak). -- Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5). -- Don't ship patch backup files. - -* Fri Nov 25 2005 Ville Skyttä - 21.4.17-5 -- Adapt to modular X.Org. -- Move icon to icons/hicolor and to the main package. -- Move man pages to subpackages where the things they document are, - install a few more of them. -- Mark config files as noreplace. -- Drop no longer needed obsoletions. -- Start cleaning up unneeded files. -- Don't use %%exclude. -- Use %%bcond_with*. - -* Thu Jun 30 2005 Ville Skyttä - 21.4.17-4 -- Improve package summaries and descriptions, reformat/clean up specfile. -- Bring back Wnn support. -- Fine tune dependencies and options of "--without mule" builds. -- Use desktop-file-install for installing the desktop entry, fix up X-* - categories, update desktop database at post (un)install time. -- Really mark default init files as %%config. -- Use sed instead of perl for in-place edits throughout the build. -- Drop redundant build dependencies. -- Make sure scriptlet errors won't break upgrades. -- Add context marked dependencies for scriptlets. -- Build with -fno-strict-aliasing per upstream recommendations. -- Use neXtaw by default, rebuild with "--with xaw3d" to get Xaw3d. -- Don't own %%{_bindir} in -common. - -* Thu May 5 2005 Ville Skyttä - 21.4.17-3 -- Avoid stack corruption in open-network-stream when built with gcc4 - (Enrico Scholz, #154112). - -* Tue Mar 1 2005 Ville Skyttä - 21.4.17-2 -- Drop xemacs-sumo build dependency and -nox install time dependency on it - to solve chicken-egg bootstrap problem. -- Include X-Face support. -- Include Glade support when built with GTK. -- Include prettier icon, based on upstream xemacs.xpm. -- Drop FreeWnn-devel build dependency. -- Drop main package dependency from -info. -- Require updated -sumo. -- Avoid shipping patch backups. -- Improve package summaries and descriptions. -- Trim pre-XEmacs-21.4 %%changelog entries. -- Some specfile maintainablity improvements and cleanups. - -* Fri Feb 25 2005 Jens Petersen -- use PreReq not Requires(post,preun) for install and uninstall script - requirements (Axel Thimm, 147791) -- use sed instead of perl to fixup filelists - -* Mon Feb 7 2005 Jens Petersen - 21.4.17-1 -- update to 21.4.17 - - fixes movemail format string vulnerability (CAN-2005-0100, 146705) - - xemacs-21.4.16-xutil-keysym-144601.patch no longer needed - -* Tue Jan 25 2005 Jens Petersen - 21.4.16-2 -- workaround xorg-x11 issue with iso-level3-shift (Ville Skyttä, 144601) - - add xemacs-21.4.16-xutil-keysym-144601.patch - -* Mon Dec 13 2004 Jens Petersen - 21.4.16-1 -- update to new stable release - - no longer need configure-ppc-ldscript.patch and - xemacs-21.4.15-pui-120437.patch -- default to unified diff in .xemacs/init.el - -* Thu Nov 18 2004 Jens Petersen - 21.4.15-10 -- show xemacs again in the desktop menu (132567) - -* Mon Oct 18 2004 Jens Petersen - 21.4.15-9 -- fix etag alternatives removal when uninstalling (Karsten Hopp, 136137) - -* Wed Oct 6 2004 Jens Petersen -- xemacs-el no longer requires xemacs for -nox users - (Lars Hupfeldt Nielsen, 134479) - -* Thu Sep 30 2004 Jens Petersen - 21.4.15-8 -- cleanup and update .desktop file -- make xemacs not appear in the desktop menu (Seth Nickell,132567) -- move the desktop file from -common to main package -- etags is now handled by alternatives (92256) -- no longer require ctags -- turn back on wnn support and add xemacs-21.4.15-wnnfix-128362.patch - (Yukihiro Nakai, 128362) - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Mon Jun 7 2004 Jens Petersen - 21.4.15-6 -- don't link with -export-dynamic on ia64 to stop dumped function pointers from - breaking (Roland McGrath & Jakub Jelinek, #106744) -- disable dynamic module support on ia64 -- change the xemacs-info uninstall script from %%postun to %%preun and move - the post/preun install-info requires to xemacs-info -- simplify coding-system setup somewhat in site-start.el -- fix up the desktop file (Ville Skyttä, 123135) -- xemacs-nox now requires xemacs-sumo -- build without xfs since it seems to cause some problem with fonts missing - -* Wed May 5 2004 Jens Petersen -- move install-info requirement to xemacs-info -- drop unnecessary Canna-libs requirement - -* Fri Apr 9 2004 Jens Petersen - 21.4.15-5 -- add xemacs-21.4.15-pui-120437.patch to fix pui problems in 21.4.15 - (Ville Skyttä) -- buildrequire gpm-devel and build xemacs-nox with gpm (Ville Skyttä,120437) -- separate patches into lisp and non-lisp patches -- move gnuclient and gnuserv from xemacs-common to xemacs since they - require X libs (Ville Skyttä,110649) - -* Wed Apr 7 2004 Jens Petersen - 21.4.15-4 -- add xemacs-nox subpackage (Jamie Zawinski, #110649) and xemacs-common - - add xemacs-debian-docdir-dump.patch and put dump files in docdir - - xemacs and xemacs-nox require xemacs-common - - define exectop and use it - - one configure and build for xemacs-nox and one for xemacs -- update package descriptions -- don't create backup of patched Emacs.ad since it gets installed, and - drop Canna-devel version requirement (Ville Skyttä, #115270) -- default ispell dictionary to english for CJK locale, since aspell doesn't - support widechars (#103145) -- rebuild against latest Canna built with xorg-x11 xmkmf (Kaj Niemi, #119562) -- simplify coding-system setup -- enable gpm for xemacs package - -* Tue Mar 16 2004 Mike A. Harris 21.4.15-3 -- Removed bogus Requires: XFree86-libs, and other similar library runtime - dependancies, because rpm find-requires automatically puts dependancy info - in the binary rpms which are on the .so files rather than a specific - package. The XFree86-libs removal is necessary in order to replace XFree86 - with xorg-x11 in an X11 implementation agnostic fashion. (#118483) -- Changed "Requires(post,preun): info" dependancy to - "Requires(post,postun): /sbin/install-info" - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Thu Feb 5 2004 Jens Petersen - 21.4.15-1 -- update to 21.4.15 -- improve language and coding-system startup in site-start.el like - lang-coding-systems-init.el in emacs package -- build without wnn support -- drop xemacs-21.4.13-regexp-stack-overflow-107402.patch - -* Sat Dec 27 2003 Jens Petersen - 21.4.14-6 -- set EMACSLOADPATH during final make and install so that it is buildable - even when xemacs isn't installed -- disable ldap, postgresql and dbm support for now (#110649) [jwz] - -* Sat Dec 13 2003 Jeff Johnson -- rebuild against db-4.2.52. - -* Fri Nov 7 2003 Jens Petersen - 21.4.14-5 -- add a "--without mule" rpmbuild option for the 8bit dead-hards (#102718) - which disables mule and Input Method support -- only load un-define in site-start.el when there is mule support - -* Thu Nov 6 2003 Jens Petersen - 21.4.14-4 -- increase regexp re_max_failures to 40000 in - xemacs-21.4.13-regexp-stack-overflow-107402.patch (#107402) [Rik Faith] - -* Mon Oct 27 2003 Jens Petersen - 21.4.14-3 -- no longer obsolete xemacs-sumo-el for xemacs-el [thanks to Axel Thimm] -- fix "Stack overflow in regexp matcher" (#107402) [reported by Rik Faith, - patch by Stephen J. Turnbull] - -* Fri Oct 17 2003 Jens Petersen - 21.4.14-2 -- require Canna-libs not Canna -- move CJK X resource files to xemacs-sumo -- no longer need to define ispell program to be aspell - -* Thu Sep 25 2003 Jeff Johnson - 21.4.14-1.1 -- rebuild against db-4.2.42. - -* Mon Sep 8 2003 Jens Petersen - 21.4.14-1 -- update to 21.4.14 -- default require-final-newline to t in site-start.el (#102022) - -* Tue Sep 2 2003 Jens Petersen - 21.4.13-5 -- default require-final-newline to ask in site-start.el - and remove redundant setting of next-line-add-newlines to nil in default.el - (#102022) [reported by Ville Skyttä] - -* Mon Jul 14 2003 Jens Petersen - 21.4.13-4 -- build with --debug=yes by default (suggested by Ville Skyttä) - -* Sun Jul 13 2003 Ville Skyttä -- add xemacs-21.4.13-utf8-fontsets.patch to eliminate warning about missing - charsets in utf-8 locale with Xaw -- motif-specific xemacs-21.4.13-EmacsFrame-fontlock.patch no longer needed - -* Fri Jun 27 2003 Jens Petersen - 21.4.13-3 -- add xemacs-21.4.13-dump-paths-lispdir.patch, so that the source lisp files - get re-bytecompiled and dumped, not the installed ones -- use Athena/Xaw3d instead of motif for dialogs and widgets -- buildrequirements fixes -- use _localstatedir - -* Sat May 31 2003 Jens Petersen - 21.4.13-2 -- add xemacs-21.4.13-EmacsFrame-fontlock.patch to stop font-lock being - very slow (Ville Skyttä) - -* Fri May 30 2003 Ville Skyttä -- Use upstream icon in desktop entry, add missing semicolon to Categories. -- Have backup-by-copying-when-mismatch default to true in site-start.el. -- Mark init files as %%config. - -* Thu May 29 2003 Jens Petersen - 21.4.13-1 -- update to 21.4.13 - - rcs2log-update.patch no longer needed -- buildrequire recent xemacs-sumo -- set system-uses-terminfo in default.el (#76102) -- use defvar in default.el not to override user's settings -- default gnus-default-article-saver to mbox format (#90604) -- add aspell as ispell program in site-start.el (#88262) -- add rpmbuild option "--with gtk" allowing building with gtk -- exclude s390x temporarily - -* Mon May 12 2003 Jens Petersen - 21.4.12-12 -- sumo packages moved to separate xemacs-sumo package - -* Sat May 10 2003 Jens Petersen - 21.4.12-11 -- build with system malloc on ppc64 - -* Tue Apr 22 2003 Jens Petersen - 21.4.12-10 -- obsoletes ruby-mode-xemacs (#84673) -- move obsoletes xemacs-sumo-el to -el subpackage -- fix links in jde html documentation (#89499) - -* Tue Apr 15 2003 Jens Petersen - 21.4.12-8 -- comment out ja and ko menubar translations in X resource files for now, - to avoid startup hanging in utf-8 locale (#88860) -- use default menubar font in ja and ko locale -- in a UTF-8 locale set default coding systems to utf-8 (partly #77130 - and #74227) -- set Info-directory-list in site-start.el again -- move psgml setup into site-start.el -- move previous contents of "dotxemacs-init.el" to new "default.el" - -* Mon Mar 31 2003 Akira TAGOH 21.4.12-7 -- Rebuild against the latest Canna. - -* Thu Feb 20 2003 Jens Petersen - 21.4.12-6 -- default browse-url to use htmlview and update psgml-html browser - defaults (#84262) - -* Tue Feb 11 2003 Jens Petersen - 21.4.12-5 -- build with system-malloc on alpha and ia64 -- skip redundant check-features target - -* Thu Feb 6 2003 Jens Petersen - 21.4.12-4 -- fix "libexec dir" to be under lib64 on multilib archs -- set default ftp to be non-kerberos in site-start.el -- update sumos to 2003-02-05 -- mspec patch and rpm-spec-mode update no longer needed -- buildrequire autoconf213 -- add ".xemacs/init.el" to /etc/skel -- skip redundant check-features target on s390 and s390x - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 21 2003 Jens Petersen - 21.4.12-2 -- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib -- don't generate backup files when updating autoloads -- try startup notification in desktop file -- cleanup desktop file to use name XEmacs and add encoding key - -* Fri Jan 17 2003 Jens Petersen 21.4.12-1 -- update to 21.4.12 bugfix release (21.4 series now declared stable branch) -- renumbered sumo package patches to be greater than 100 -- install sumo packages by copying rather than moving -- patch sh-script.el to append m?spec entry to auto-mode-alist -- avoid ppc.ldscript and build on ppc -- remove games that we shouldn't ship -- update to latest rcs2log -- update to latest rpm-spec-mode.el -- use _smp_mflags for lib-src and src -- run batch-update-directory and batch-byte-recompile-directory on sumo lisp - dirs -- improve datadir/xemacs-version/ ownership - -* Sat Jan 4 2003 Jens Petersen 21.4.11-1 -- update to 21.4.11 -- don't configure with union-type, since it causes runtime problems apparently -- only do postun info dir deletions when uninstalling - -* Wed Jan 1 2003 Jens Petersen 21.4.10-6 -- move apel to separate package and require it -- renamed psgml-init.el-xemacs to xemacs-psgml-init.el -- use datadir in site-start.el -- really include the movemail mkstemp patch -- use mapc to load site-start.d files - -* Tue Dec 31 2002 Ville Skyttä -- New Sumos (2002-12-30). -- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el), - fixing "Couldn't find obvious default for XEmacs hierarchy" warnings - (as in XEmacs 21.5). -- Move site-start stuff to site-packages. -- Don't set Info-directory-list in site-start.el. -- Don't use --pkgdir, it's ignored. Don't pass pkgdir to makeinstall. -- Fix source tarball URLs. -- Don't override the defcustom in psgml-init.el, set its default value instead. -- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs. - -* Sun Dec 29 2002 Jens Petersen -- updates package sumos to 2002-12-26 release - -* Mon Dec 23 2002 Jens Petersen 21.4.10-5 -- patch find-paths.el to search in datadir -- setup lisp packages under datadir not libdir -- use buildroot macro instead of RPM_BUILD_ROOT -- drop local configure macro -- fix buildrequires and requires -- list configure options one-per-line -- improve psgml-init.el catalog setup -- remove and add lisp packages with package-admin -- rebyte-compile lisp packages -- keep etags as etags.xemacs (#78106) -- don't bother removing non-existent udp2tcp nor .cvsignore files -- simply filelist generation to a single find search pass -- put core .el files in -el package -- put package info files into -info package -- don't create backup files when patching in lisp packages tree -- don't explicitly gzip lisp package info files -- don't mark the applications files noreplace -- exclude ppc, since __init_array_start undefined - -* Wed Dec 18 2002 Jens Petersen -- patch egg-wnn to default to unix domain socket (#79826) - [patch from ynakai@redhat.com] -- add ia64 patch from SuSE -- use mkstemp in movemail - -* Tue Nov 19 2002 Jens Petersen -- apply jlatex autodetect patch correctly and drop append to tex-site.el -- default to pTeX and pLaTeX for Japanese TeX and LaTeX - -* Mon Nov 18 2002 Jens Petersen 21.4.10-3 -- backout uncommenting of deactivate-mark (#77696) -- update psgml dtd catalog path in psgml-init.el (#78022) - [reported by ville.skytta@iki.fi] -- build with --use-union-type (#78024) - [suggested by ville.skytta@iki.fi] - -* Fri Nov 15 2002 Jens Petersen -- fix autodetection of jlatex (#69129) - -* Tue Nov 12 2002 Elliot Lee 21.4.10-2 -- build on x86_64 - -* Mon Nov 11 2002 Jens Petersen 21.4.10-1 -- update to 21.4.10 -- update sumos to 2002-09-19 -- no longer backout mule-ucs package -- encode this file in utf-8 -- xemacs-21.1.14-xfs.patch no longer needed -- use _libdir, _datadir, _bindir, _prefix -- exclude x86_64 (requires Canna) -- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/ (#73982) - [reported by enrico.scholz@informatik.tu-chemnitz.de] -- fix default italic font size (#75275) - [reported with fix by ville.skytta@iki.fi] -- update ja menubar translations in ja locale X resource file (#76068) - [from ynakai@redhat.com] -- update ko locale X resource file (#76072) [from ynakai@redhat.com] -- add pkgdir rpm macro for packages dir -- uncomment deactivate-mark in simple.el (#77696) - -* Mon Aug 26 2002 Trond Eivind Glomsrød 21.4.8-16 -- some cleanups - and remove the info tarball, it's now part - of the base tarball. Wow, the package gets smaller. (#72480) - -* Mon Aug 19 2002 Trond Eivind Glomsrød 21.4.8-15 -- Bug in specfile from -14 gave bug on startup (#71743) - -* Thu Aug 15 2002 Trond Eivind Glomsrød 21.4.8-14 -- Use utf-8 by default for input/output (#71584 ) -- Make it not segfault when handling utf-8 (#71589) - -* Wed Aug 7 2002 Trond Eivind Glomsrød 21.4.8-13 -- Add openmotif-devel to buildrequires, as it will use it for widgets - if it finds it - -* Fri Aug 2 2002 Trond Eivind Glomsrød 21.4.8-12 -- Don't package po-mode separately, it's now in sumo -- Compile with drag'n'drop support -- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs - -* Wed Jul 31 2002 Trond Eivind Glomsrød 21.4.8-11 -- Don't use a separate ispell.el file anymore - the included one is newer -- Fix html-mode (#64826) - -* Tue Jul 23 2002 Trond Eivind Glomsrød 21.4.8-10 -- Update lisp tarballs -- desktop file fixes (#69542) -- Add bdb support (#65640) - -* Mon Jul 8 2002 Trond Eivind Glomsrød 21.4.8-9 -- Make it provide ruby-mode-xemacs (request from tagoh) - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Mon Jun 17 2002 Trond Eivind Glomsrød 21.4.8-7 -- #66835 - -* Wed May 29 2002 Trond Eivind Glomsrød 21.4.8-6 -- Make it build... Evil. -- Exclude IA64 -- Upgrade sumo tarballs to 2002-05-22 - -* Fri May 24 2002 Jens Petersen 21.4.8-5 -- Build using portable dumper, so that build with glibc-2.3 malloc is ok - -* Mon May 13 2002 Trond Eivind Glomsrød 21.4.8-2 -- Remove the s390 patches so it builds on s390 :) - -* Fri May 10 2002 Trond Eivind Glomsrød 21.4.8-1 -- 21.4.8 - -* Tue May 7 2002 Trond Eivind Glomsrød 21.4.6-9 -- Rebuild... chmod -x pstogif to work around an rpm bug until - it's fixed (#64320) - -* Tue Apr 23 2002 Trond Eivind Glomsrød 21.4.6-8 -- New sumo packages - -* Thu Feb 21 2002 Trond Eivind Glomsrød 21.4.6-7 -- Rebuild - -* Tue Jan 29 2002 Jens Petersen 21.4.6-6 -- Remove skk package, since it conflicts with ddskk-xemacs (newer) - -* Thu Jan 24 2002 Trond Eivind Glomsrød 21.4.6-5 -- New sumos - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Wed Dec 19 2001 Jens Petersen 21.4.6-3 -- Fix fontlist pattern in Emacs.ad.Japanese. -- CHANGES-beta is now CHANGES-release. -- Obsolete xemacs-sumo xemacs-sumo-el - -* Wed Dec 19 2001 Jens Petersen 21.4.6-2 -- Don't obsolete flim. - -* Mon Dec 17 2001 Trond Eivind Glomsrød 21.4.6-1 -- 21.4.6 -- New sumo packages -- disable alpha - -* Wed Nov 14 2001 Jens Petersen 21.4.5-2 -- Add -znocombreloc configure option to override new ld default. - -* Tue Nov 6 2001 Trond Eivind Glomsrød 21.4.5-1 -- 21.4.5. It builds on IA64 and fixes #55578 +* Fri Mar 31 2006 Ville Skyttä - 21.5.25-1 +- 21.5.25 (WIP). +- Trim pre-21.5 %%changelog entries. From 9f259eb05bf9f0b069cf4b70fe5b685af35e0f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 15 Apr 2006 16:58:44 +0000 Subject: [PATCH 023/160] - Don't expect to find ellcc if building without modules (#188929). - New --with/--without rpmbuild flags: - xft: enable/disable Xft support, default disabled. - nox: enable/disable building the non-X version, default enabled - modules: enable/disable module support, default arch-dependent. - Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE). - Move gnuserv to -common, gnudoit to base package, drop gnuattach. - Split ellcc and headers to -devel subpackage. - Drop unneeded libXaw-devel build dependency. - Move -nox "man page" to -nox subpackage. - Fix GTK build and glade detection for it. - Avoid -common dependency on ALSA. --- xemacs-21.5.26-gtk-gcc4.patch | 29 ++++ ...s.patch => xemacs-21.5.26-utf8-fonts.patch | 22 ++- xemacs.spec | 140 +++++++++++++----- 3 files changed, 142 insertions(+), 49 deletions(-) create mode 100644 xemacs-21.5.26-gtk-gcc4.patch rename xemacs-21.5.25-utf8-fonts.patch => xemacs-21.5.26-utf8-fonts.patch (64%) diff --git a/xemacs-21.5.26-gtk-gcc4.patch b/xemacs-21.5.26-gtk-gcc4.patch new file mode 100644 index 0000000..9591542 --- /dev/null +++ b/xemacs-21.5.26-gtk-gcc4.patch @@ -0,0 +1,29 @@ +--- xemacs-21.5.26/src/glyphs-gtk.c~ 2005-11-22 13:24:44.000000000 +0200 ++++ xemacs-21.5.26/src/glyphs-gtk.c 2006-04-14 23:57:23.000000000 +0300 +@@ -796,7 +796,7 @@ + find_keyword_in_vector (instantiator, Q_file); + + IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap; +- IMAGE_INSTANCE_GTK_MASK (ii) = 0; ++ IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0; + IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width; + IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height; + IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth; +@@ -837,7 +837,7 @@ + + IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = Qnil; + IMAGE_INSTANCE_GTK_PIXMAP (ii) = gdk_pixmap; +- IMAGE_INSTANCE_GTK_MASK (ii) = 0; ++ IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0; + IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = width; + IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = height; + IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth; +@@ -2972,7 +2972,7 @@ + IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP; + /* Make sure there aren't two pointers to the same mask, causing + it to get freed twice. */ +- IMAGE_INSTANCE_GTK_MASK (p) = 0; ++ IMAGE_INSTANCE_PIXMAP_MASK (p) = 0; + break; + + default: diff --git a/xemacs-21.5.25-utf8-fonts.patch b/xemacs-21.5.26-utf8-fonts.patch similarity index 64% rename from xemacs-21.5.25-utf8-fonts.patch rename to xemacs-21.5.26-utf8-fonts.patch index 454cd33..02b842b 100644 --- a/xemacs-21.5.25-utf8-fonts.patch +++ b/xemacs-21.5.26-utf8-fonts.patch @@ -1,6 +1,6 @@ ---- xemacs-21.5.25/etc/Emacs.ad~ 2003-03-27 14:57:44.000000000 +0200 -+++ xemacs-21.5.25/etc/Emacs.ad 2006-03-31 00:27:07.000000000 +0300 -@@ -198,20 +198,22 @@ +--- xemacs-21.5.26/etc/Emacs.ad.orig 2003-03-27 14:57:44.000000000 +0200 ++++ xemacs-21.5.26/etc/Emacs.ad 2006-04-14 20:37:56.000000000 +0300 +@@ -198,8 +198,12 @@ ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 ! @@ -8,18 +8,14 @@ -*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* +*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* ++ ++XEmacs*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ++ * *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 -+ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ -+ -*-*-*-*-*-*-*-120-*-*-* - *popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -- -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 -+ -*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \ -+ -*-*-*-*-*-*-*-120-*-*-* +@@ -211,7 +215,7 @@ ! Gui elements share this font ! @@ -28,7 +24,7 @@ ! Font in the Motif dialog boxes. ! (Motif uses `fontList' while most other things use `font' - if you don't -@@ -227,7 +229,7 @@ +@@ -227,7 +231,7 @@ ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. diff --git a/xemacs.spec b/xemacs.spec index 88c7f2b..a75ca77 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,24 +1,26 @@ -# TODO: xft build option -# TODO: site-modules vs site-lisp -> to same dir (are modules noarch?) # TODO: review desktop entry associations -# TODO: split off -devel? # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el # TODO: non-ASCII in buffer tabs -# TODO: re-enable XFontSet support for menubars? --> see suse fontset patch # TODO: build issues if previous 21.5.x installed, restore finder-inf stuff? -# TODO: gtk+ build doesn't find glade, need pkg-config libglade --cflags -# TODO: gtk+ build fails, invalid lvalues +# TODO: fix --without modules build (../modules/canna_api.o not found?) %bcond_with gtk %bcond_with xaw3d +%bcond_with xft %bcond_without mule +%bcond_without nox %bcond_without stackprot +%ifarch ia64 +%bcond_with modules +%else +%bcond_without modules +%endif %define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') Name: xemacs Version: 21.5.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -31,13 +33,15 @@ Source3: dotxemacs-init.el Source4: default.el Source5: xemacs-sitestart.el -Patch0: %{name}-21.5.25-utf8-fonts.patch +Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch # TODO: patch2 still needed with --with-system-packages??? Patch2: %{name}-21.5.25-find-paths-pkgdir.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch +# http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html +Patch6: %{name}-21.5.26-gtk-gcc4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,25 +61,24 @@ BuildRequires: desktop-file-utils BuildRequires: Canna-devel BuildRequires: FreeWnn-devel %endif # mule - BuildRequires: xmkmf BuildRequires: libXau-devel BuildRequires: libXpm-devel BuildRequires: alsa-lib-devel -# TODO: verify this wrt gtk/xaw3d build -BuildRequires: xorg-x11-xbitmaps %if %{with gtk} BuildRequires: gtk+-devel BuildRequires: libglade-devel -%else -# TODO: verify this wrt xaw3d -BuildRequires: libXaw-devel +%else # gtk +BuildRequires: xorg-x11-xbitmaps %if %{with xaw3d} BuildRequires: Xaw3d-devel -%else +%else # xaw3d BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk +%if %{with xft} +BuildRequires: libXft-devel +%endif # xft Requires: xemacs-sumo >= 20050118-2 Requires: xemacs-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi @@ -149,6 +152,20 @@ and an open software development model, similar to Linux. This package contains XEmacs documentation in GNU texinfo format. +%package devel +Summary: Development files for XEmacs +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. + +This package contains XEmacs development support files. + %prep %setup -q @@ -164,6 +181,7 @@ sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el %patch4 -p1 %endif %patch5 -p1 +%patch6 -p1 for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -179,6 +197,9 @@ CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" %endif +%if %{with gtk} +CFLAGS="$CFLAGS $(pkg-config libglade --cflags)" +%endif export CFLAGS export EMACSLOADPATH=$PWD/lisp @@ -199,15 +220,15 @@ common_options=" %ifarch alpha ia64 ppc64 --with-system-malloc %endif -%ifarch ia64 +%if ! %{with modules} --without-modules %endif " +%if %{with nox} # build without X -# note: docdir requires trailing slash # TODO: still in 21.5? %configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox/ \ + --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \ --with-sound=none \ --without-x \ --without-canna \ @@ -220,11 +241,14 @@ EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes mv lib-src/DOC{,-nox} mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} +# grab these from -nox, the X ones may have deps on ALSA, X, etc +for file in {e,oo}tags gnuserv {fake,move}mail yow ; do + mv lib-src/$file{,-mindep} +done +%endif # nox # build with X -# note: docdir requires trailing slash # TODO: still in 21.5? %configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc/ \ %if %{with gtk} --with-gtk \ --with-gnome \ @@ -236,7 +260,12 @@ mv lib-src/config.values{,-nox} --with-scrollbars=lucid \ --with-dialogs=athena \ %endif - --without-xfs +%if %{with xft} + --with-xft=all \ +%else + --with-xfs \ +%endif + --with-docdir=%{_libdir}/xemacs-%{xver}/doc # toplevel smp build fails make %{?_smp_mflags} -C lib-src make src/Emacs.ad.h @@ -249,14 +278,19 @@ rm -rf $RPM_BUILD_ROOT export EMACSLOADPATH=$PWD/lisp +%if %{with nox} +# restore binaries with less dependencies; note: no -p nor move +for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done +%endif + # note: no DESTDIR support -# note: docdir requires trailing slash # TODO: still in 21.5? %makeinstall \ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ - docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc/ -echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 + docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc +%if %{with nox} # install nox files +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir} ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox @@ -264,6 +298,7 @@ install -pm 644 lib-src/DOC-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC install -pm 644 lib-src/config.values-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values +%endif # nox # these clash with GNU Emacs mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} @@ -309,8 +344,9 @@ chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} # clean up unneeded stuff (TODO: there's probably much more) find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh +rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc -rm -r InstallGuide sparcworks tests XKeysymDB *.sco *.1 +rm -r editclient.sh InstallGuide sparcworks tests XKeysymDB *.sco *.1 cd - # separate files @@ -388,53 +424,85 @@ fi %files %defattr(-,root,root,-) +# gnuclient needs X libs, so not in -common +%{_bindir}/gnuclient +%{_bindir}/gnudoit %ghost %{_bindir}/xemacs %{_bindir}/xemacs-%{xver} -# gnuclient, gnuserv need X libs, so not in -common -%{_bindir}/gnuclient -%{_libdir}/xemacs-%{xver}/*linux/gnuserv %{_libdir}/xemacs-%{xver}/doc/ +%if %{with modules} +%{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell +%endif %{_datadir}/applications/*-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* -%{_mandir}/man1/gnuserv.1* +%{_mandir}/man1/gnudoit.1* +%if %{with nox} %files nox %defattr(-,root,root,-) %ghost %{_bindir}/xemacs %{_bindir}/xemacs-nox %{_bindir}/xemacs-nox-%{xver} %{_libdir}/xemacs-%{xver}/doc-nox/ +%{_mandir}/man1/xemacs-nox.1* +%endif %files common -f base-files %defattr(-,root,root,-) %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL %doc etc/editclient.sh -%{_bindir}/ellcc %{_bindir}/etags.xemacs -%{_bindir}/gnuattach -%{_bindir}/gnudoit %{_bindir}/ootags %{_libdir}/xemacs/ %dir %{_libdir}/xemacs-%{xver} %dir %{_libdir}/xemacs-%{xver}/*linux/ -%{_libdir}/xemacs-%{xver}/*linux/[acdfhimprsvwy]* +%{_libdir}/xemacs-%{xver}/*linux/[acdfghprsvwy]* +%{_libdir}/xemacs-%{xver}/*linux/m[am]* +%{_libdir}/xemacs-%{xver}/*linux/movemail +%if %{with modules} +%dir %{_libdir}/xemacs-%{xver}/*linux/modules/ +%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.elc +%endif %config(noreplace) %{_sysconfdir}/skel/.xemacs/ %{_mandir}/man1/etags.xemacs.1* -%{_mandir}/man1/gnuattach.1* -%{_mandir}/man1/gnudoit.1* -%{_mandir}/man1/xemacs*.1* +%{_mandir}/man1/gnuserv.1* +%{_mandir}/man1/xemacs.1* %dir %{_localstatedir}/lock/xemacs/ %files el -f el-files %defattr(-,root,root,-) +%if %{with modules} +%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.el +%endif %files info -f info-files %defattr(-,root,root,-) %{_infodir}/*.info* +%files devel +%defattr(-,root,root,-) +%if %{with modules} +%{_bindir}/ellcc +%endif +%{_libdir}/xemacs-%{xver}/*linux/include/ + %changelog +* Sat Apr 15 2006 Ville Skyttä - 21.5.26-3 +- Don't expect to find ellcc if building without modules (#188929). +- New --with/--without rpmbuild flags: + - xft: enable/disable Xft support, default disabled. + - nox: enable/disable building the non-X version, default enabled + - modules: enable/disable module support, default arch-dependent. +- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE). +- Move gnuserv to -common, gnudoit to base package, drop gnuattach. +- Split ellcc and headers to -devel subpackage. +- Drop unneeded libXaw-devel build dependency. +- Move -nox "man page" to -nox subpackage. +- Fix GTK build and glade detection for it. +- Avoid -common dependency on ALSA. + * Thu Apr 6 2006 Ville Skyttä - 21.5.26-2 - Borrow Mike Fabian's site-start.el work from the SuSE package. From 47b7f57a9fd1bcdeee89a5cf7e65a1483e2f1f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 23 Apr 2006 18:05:29 +0000 Subject: [PATCH 024/160] - Bring StartupWMClass in desktop entry up to date. - Fix non-MULE build. --- xemacs.desktop | 2 +- xemacs.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xemacs.desktop b/xemacs.desktop index 11482b4..103eb42 100644 --- a/xemacs.desktop +++ b/xemacs.desktop @@ -31,4 +31,4 @@ Type=Application Terminal=false Categories=Application;Development;TextEditor; Encoding=UTF-8 -StartupWMClass=Emacs +StartupWMClass=XEmacs diff --git a/xemacs.spec b/xemacs.spec index a75ca77..1e4efb1 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -431,8 +431,10 @@ fi %{_bindir}/xemacs-%{xver} %{_libdir}/xemacs-%{xver}/doc/ %if %{with modules} +%if %{with mule} %{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell %endif +%endif %{_datadir}/applications/*-%{name}.desktop %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* @@ -489,6 +491,10 @@ fi %changelog +* Sun Apr 23 2006 Ville Skyttä - 21.5.26-4 +- Bring StartupWMClass in desktop entry up to date. +- Fix non-MULE build. + * Sat Apr 15 2006 Ville Skyttä - 21.5.26-3 - Don't expect to find ellcc if building without modules (#188929). - New --with/--without rpmbuild flags: From 04bda358166e86ff4df6132559454ad1f76ca310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 7 May 2006 20:36:57 +0000 Subject: [PATCH 025/160] - Apply upstream fix for window maximization problems (#111225). --- xemacs-21.5.26-maximize.patch | 329 ++++++++++++++++++++++++++++++++++ xemacs.spec | 7 +- 2 files changed, 335 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.26-maximize.patch diff --git a/xemacs-21.5.26-maximize.patch b/xemacs-21.5.26-maximize.patch new file mode 100644 index 0000000..88e9c5c --- /dev/null +++ b/xemacs-21.5.26-maximize.patch @@ -0,0 +1,329 @@ +Index: src/ChangeLog +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v +retrieving revision 1.954 +diff -u -r1.954 ChangeLog +--- src/ChangeLog 6 May 2006 08:46:38 -0000 1.954 ++++ src/ChangeLog 6 May 2006 17:26:00 -0000 +@@ -0,0 +1,26 @@ ++2006-04-30 Stephen J. Turnbull ++ ++ Move geometry management from EmacsFrameResize to x_set_frame_size. ++ Should fix "metacity maximization" bug. ++ Provide (deprecated, temporary) backward compatibility option. ++ ++ * EmacsFrame.c (EmacsFrameResize): ++ * frame-x.c (x_set_frame_size): ++ Move call of ChangeEmacsManagerSize. ++ Don't bogusly notify WM about size changes the WM asked for. ++ ++ * console-x.c (wedge-metacity): New builtin Boolean Lisp variable. ++ * console-x-impl.h (wedge_metacity): Declare C variable. ++ * console-x.c (vars_of_console_x): New function to initialize it. ++ * symsinit.h (vars_of_console_x): declare it. ++ * emacs.c (main_1): Call vars_of_console_x. ++ ++ * EmacsFrameP.h (struct EmacsFrame): ++ * EmacsManager.c (ChangeEmacsManagerSize): ++ * EmacsShell-sub.c (SuperClassRootGeometryManager): ++ * console-x-impl.h (wedge_metacity): ++ Various comments, some improved documentation, mostly sad comments ++ on the state of the art of Xt programming. ++ ++ * frame-x.c (defi): #undef it. (Random code cleanliness.) ++ + +Index: src/EmacsFrame.c +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrame.c,v +retrieving revision 1.28 +diff -u -r1.28 EmacsFrame.c +--- src/EmacsFrame.c 25 Oct 2005 11:16:20 -0000 1.28 ++++ src/EmacsFrame.c 6 May 2006 17:26:00 -0000 +@@ -360,19 +360,32 @@ + pixel_to_char_size (f, ew->core.width, ew->core.height, &columns, &rows); + change_frame_size (f, rows, columns, 0); + +- /* Now we tell the EmacsShell that we've changed the size of the non-fixed +- portion of the frame. Note that, if we the resize occurred as a result +- of EmacsFrameSetCharSize(), this information will be stored twice. +- This is not a big deal, as storing this information doesn't actually +- do anything until the next resize. */ +- if (FRAME_X_TOP_LEVEL_FRAME_P (f)) +- x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); ++ /* The code below is just plain wrong. If the EmacsShell or EmacsManager ++ needs to know, they should just ask. If needed information is being ++ updated here, then we should set a dirty flag and have it updated on an ++ as-needed basis. ++ For now, conditionalize so people can get work done if this breaks ++ something. */ ++ if (wedge_metacity) /* cf. x_set_frame_size */ ++ { ++ /* Now we tell the EmacsShell that we've changed the size of the ++ non-fixed portion of the frame. Note that, if the resize occurred ++ as a result of EmacsFrameSetCharSize(), this information will be ++ stored twice. This is not a big deal, as storing this information ++ doesn't actually do anything until the next resize. */ ++ if (FRAME_X_TOP_LEVEL_FRAME_P (f)) ++ x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); + +- /* Kick the manager so that it knows we've changed size. */ +- req.request_mode = 0; +- XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); +- EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), repl.width, +- repl.height); ++ /* Kick the manager so that it knows we've changed size. ++ #### No, no, no! If this does anything at all, it will involve ++ changing the manager's size. That's not something that a child ++ widget should initialize as part of a purely informational ++ method!! */ ++ req.request_mode = 0; ++ XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); ++ EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), ++ repl.width, repl.height); ++ } + } + + static Boolean +Index: src/EmacsFrameP.h +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrameP.h,v +retrieving revision 1.7 +diff -u -r1.7 EmacsFrameP.h +--- src/EmacsFrameP.h 4 May 2003 02:34:35 -0000 1.7 ++++ src/EmacsFrameP.h 6 May 2006 17:26:00 -0000 +@@ -65,13 +65,16 @@ + Boolean iconic; /* whether this frame is iconic */ + + /* The rest of this is crap and should be deleted. ++ #### Comments that start with + are fields that actually get referred ++ to somewhere aside from the init function. ++ I guess the "crap" has mostly moved to specifiers? + */ + Boolean minibuffer; /* 0: normal frames with minibuffers. + * 1: frames without minibuffers + * 2: minibuffer only. */ + Boolean unsplittable; /* frame can only have one window */ + +- int internal_border_width; /* internal borders */ ++ int internal_border_width; /* + internal borders */ + int scrollbar_width; /* width of frame vertical sb's */ + int scrollbar_height; /* height of frame horizontal sb's */ + int top_toolbar_height; /* height of top toolbar */ +@@ -82,9 +85,9 @@ + int bottom_toolbar_border_width; /* ... of bottom toolbar */ + int left_toolbar_border_width; /* ... of left toolbar */ + int right_toolbar_border_width; /* ... of right toolbar */ +- Dimension toolbar_shadow_thickness; ++ Dimension toolbar_shadow_thickness; /* + of shadows */ + unsigned char scrollbar_placement; +- int interline; /* skips between lines */ ++ int interline; /* + skips between lines */ + + XFontStruct* font; /* font */ + Pixel foreground_pixel; /* foreground */ +@@ -97,7 +100,7 @@ + int bell_volume; /* how loud is beep */ + + Boolean menubar_p; /* initially show a menubar? */ +- Boolean initially_unmapped; /* inhibit initial window mapping */ ++ Boolean initially_unmapped; /* + inhibit initial window mapping */ + Boolean use_backing_store; /* backing store for menubar & ew? */ + + Dimension preferred_width; /* if non-zero, preferred size for */ +Index: src/EmacsManager.c +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsManager.c,v +retrieving revision 1.7 +diff -u -r1.7 EmacsManager.c +--- src/EmacsManager.c 22 Dec 2004 10:59:09 -0000 1.7 ++++ src/EmacsManager.c 6 May 2006 17:26:00 -0000 +@@ -241,6 +241,12 @@ + if (height == 0) + height = w->core.height; + ++ /* #### AFAICT this gets called in two places. One is in ChangeManaged(), ++ above. The other is in EmacsFrameResize(). Perhaps ChangeManaged() ++ should initiate resize requests, but EmacsFrameResize() should not. ++ Unfortunately, I've tried making this conditional on whether we're ++ called from EmacsFrameResize() or not, but that results in an infloop ++ via the callback to x_layout_widgets() in Resize(). Whee! */ + /* do nothing if we're already that size */ + if (w->core.width != width || w->core.height != height) + { +Index: src/EmacsShell-sub.c +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsShell-sub.c,v +retrieving revision 1.7 +diff -u -r1.7 EmacsShell-sub.c +--- src/EmacsShell-sub.c 24 Jan 2005 23:33:46 -0000 1.7 ++++ src/EmacsShell-sub.c 6 May 2006 17:26:00 -0000 +@@ -278,7 +278,8 @@ + GenericClassExtRec *gcer; + + /* find the shell extension record that specifies the +- root geometry manager method */ ++ root geometry manager method ++ #### We could use XtGetClassExtension here. */ + for (gcer = (GenericClassExtRec *) swc->shell_class.extension; + gcer; + gcer = (GenericClassExtRec *) gcer->next_extension) +@@ -287,6 +288,9 @@ + break; + } + ++ /* #### The R11.6.4 Xt specification says if we don't find NULLQUARK here, ++ we should assume root_geometry_manager = XtInheritRootGeometryManager. ++ Is that actually callable? */ + if (!gcer) + ABORT (); + +Index: src/console-x-impl.h +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x-impl.h,v +retrieving revision 1.5 +diff -u -r1.5 console-x-impl.h +--- src/console-x-impl.h 26 Nov 2005 11:46:07 -0000 1.5 ++++ src/console-x-impl.h 6 May 2006 17:26:00 -0000 +@@ -40,6 +40,8 @@ + + DECLARE_CONSOLE_TYPE (x); + ++extern int wedge_metacity; ++ + struct x_device + { + #ifdef NEW_GC +@@ -234,7 +236,8 @@ + + /* The maximum number of widgets that can be displayed above the text + area at one time. Currently no more than 3 will ever actually be +- displayed (menubar, psheet, debugger panel). */ ++ displayed (menubar, psheet, debugger panel). ++ #### Are "psheet" and "debugger panel" relevant any more? */ + #define MAX_CONCURRENT_TOP_WIDGETS 8 + + struct x_frame +@@ -243,12 +246,17 @@ + struct lrecord_header header; + #endif /* NEW_GC */ + +- /* The widget of this frame. This is an EmacsShell or an +- ExternalShell. */ ++ /* The widget of this frame. ++ This is an EmacsShell or an ExternalShell. ++ It negotiates with the window manager or containing app on behalf of ++ the container widget. Should be (but isn't) invisible to Emacs. */ + Widget widget; + + /* The parent of the EmacsFrame, the menubar, and the scrollbars. +- This is an EmacsManager. */ ++ This is an EmacsManager. ++ It is responsible for managing the geometry of the frame. This is what ++ Emacs mostly talks to. Anything that affects its geometry will be ++ reflected in the Shell widget, and thus cause WM interaction. */ + Widget container; + + /* The widget of the menubar, of whatever widget class it happens to be. */ +Index: src/console-x.c +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x.c,v +retrieving revision 1.16 +diff -u -r1.16 console-x.c +--- src/console-x.c 17 Dec 2005 19:47:02 -0000 1.16 ++++ src/console-x.c 6 May 2006 17:26:00 -0000 +@@ -41,6 +41,8 @@ + + DEFINE_CONSOLE_TYPE (x); + ++int wedge_metacity; /* nonzero means update WM_HINTS always */ ++ + extern void x_has_keysym (KeySym, Lisp_Object, int); + + static int +@@ -399,6 +401,22 @@ + CONSOLE_HAS_METHOD (x, perhaps_init_unseen_key_defaults); + } + ++ ++void ++vars_of_console_x (void) ++{ ++ DEFVAR_BOOL ("wedge-metacity", &wedge_metacity /* ++When non-nil, frame geometry management is backward-compatible. ++This is known to create inflooping window jitter in metacity, et al. ++It also does not conform to Xt conventions for geometry management. ++Specifically, all frame resizes, XEmacs-initiated or not, update WM_HINTS. ++Furthermore, geometry changes occur in the widget resize method. ++ ++The default is nil. This probably gives correct behavior regardless of the ++window manager used. ++This variable is deprecated and will be removed. ++*/ ); ++} + + void + reinit_console_type_create_x (void) +Index: src/emacs.c +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v +retrieving revision 1.166 +diff -u -r1.166 emacs.c +--- src/emacs.c 25 Apr 2006 14:02:08 -0000 1.166 ++++ src/emacs.c 6 May 2006 17:26:01 -0000 +@@ -2186,6 +2186,7 @@ + #ifdef HAVE_BALLOON_HELP + vars_of_balloon_x (); + #endif ++ vars_of_console_x (); + vars_of_device_x (); + #ifdef HAVE_X_DIALOGS + vars_of_dialog_x (); +Index: src/frame-x.c +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v +retrieving revision 1.72 +diff -u -r1.72 frame-x.c +--- src/frame-x.c 26 Nov 2005 11:46:08 -0000 1.72 ++++ src/frame-x.c 6 May 2006 17:26:01 -0000 +@@ -507,6 +507,7 @@ + defi(Qtop, XtNy); + + #undef def ++#undef defi + } + + static Lisp_Object +@@ -2307,6 +2308,17 @@ + x_set_frame_size (struct frame *f, int cols, int rows) + { + EmacsFrameSetCharSize (FRAME_X_TEXT_WIDGET (f), cols, rows); ++ ++ if (!wedge_metacity) /* cf. EmacsFrameResize */ ++ { ++ /* Kick the manager so that it knows we've changed size. */ ++ XtWidgetGeometry req, repl; ++ req.request_mode = 0; ++ XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); ++ EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), ++ repl.width, repl.height); ++ } ++ + #if 0 + /* this is not correct. x_set_frame_size() is called from + Fset_frame_size(), which may or may not have been called +Index: src/symsinit.h +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v +retrieving revision 1.57 +diff -u -r1.57 symsinit.h +--- src/symsinit.h 25 Apr 2006 14:02:09 -0000 1.57 ++++ src/symsinit.h 6 May 2006 17:26:01 -0000 +@@ -306,6 +306,7 @@ + void vars_of_console_stream (void); + void vars_of_console_mswindows (void); + void vars_of_console_tty (void); ++void vars_of_console_x (void); + void vars_of_data (void); + void vars_of_database (void); + void vars_of_debug (void); diff --git a/xemacs.spec b/xemacs.spec index 1e4efb1..dd7f514 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -42,6 +42,7 @@ Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch +Patch7: %{name}-21.5.26-maximize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -182,6 +183,7 @@ sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el %endif %patch5 -p1 %patch6 -p1 +%patch7 -p0 for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -491,6 +493,9 @@ fi %changelog +* Sun May 7 2006 Ville Skyttä - 21.5.26-5 +- Apply upstream fix for window maximization problems (#111225). + * Sun Apr 23 2006 Ville Skyttä - 21.5.26-4 - Bring StartupWMClass in desktop entry up to date. - Fix non-MULE build. From 41624d135d693f58825d90b74fc0bbd1c0fc4ef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 16 May 2006 19:16:36 +0000 Subject: [PATCH 026/160] - 21.5.27, maximize patch included upstream. - Drop no longer needed find-paths patch. - Fix alternatives setup. --- .cvsignore | 2 +- sources | 2 +- xemacs-21.5.25-find-paths-pkgdir.patch | 11 - xemacs-21.5.26-maximize.patch | 329 ------------------------- xemacs.spec | 27 +- 5 files changed, 19 insertions(+), 352 deletions(-) delete mode 100644 xemacs-21.5.25-find-paths-pkgdir.patch delete mode 100644 xemacs-21.5.26-maximize.patch diff --git a/.cvsignore b/.cvsignore index ea77615..79504d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xemacs-21.5.26.tar.gz +xemacs-21.5.27.tar.gz diff --git a/sources b/sources index 05fa34a..0d33c11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0cd4521e8857a16f6cd675bb4c1039b xemacs-21.5.26.tar.gz +c415348d58eb18a9f4ed57d97e2acc62 xemacs-21.5.27.tar.gz diff --git a/xemacs-21.5.25-find-paths-pkgdir.patch b/xemacs-21.5.25-find-paths-pkgdir.patch deleted file mode 100644 index 9e8b945..0000000 --- a/xemacs-21.5.25-find-paths-pkgdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xemacs-21.5.25/lisp/find-paths.el~ 2005-01-15 17:17:36.000000000 +0200 -+++ xemacs-21.5.25/lisp/find-paths.el 2006-03-30 23:49:20.000000000 +0300 -@@ -220,7 +220,7 @@ - roots - (file-name-as-directory - (paths-construct-path (list -- "lib" -+ "share" - emacs-program-name))) - base - envvar default)) diff --git a/xemacs-21.5.26-maximize.patch b/xemacs-21.5.26-maximize.patch deleted file mode 100644 index 88e9c5c..0000000 --- a/xemacs-21.5.26-maximize.patch +++ /dev/null @@ -1,329 +0,0 @@ -Index: src/ChangeLog -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v -retrieving revision 1.954 -diff -u -r1.954 ChangeLog ---- src/ChangeLog 6 May 2006 08:46:38 -0000 1.954 -+++ src/ChangeLog 6 May 2006 17:26:00 -0000 -@@ -0,0 +1,26 @@ -+2006-04-30 Stephen J. Turnbull -+ -+ Move geometry management from EmacsFrameResize to x_set_frame_size. -+ Should fix "metacity maximization" bug. -+ Provide (deprecated, temporary) backward compatibility option. -+ -+ * EmacsFrame.c (EmacsFrameResize): -+ * frame-x.c (x_set_frame_size): -+ Move call of ChangeEmacsManagerSize. -+ Don't bogusly notify WM about size changes the WM asked for. -+ -+ * console-x.c (wedge-metacity): New builtin Boolean Lisp variable. -+ * console-x-impl.h (wedge_metacity): Declare C variable. -+ * console-x.c (vars_of_console_x): New function to initialize it. -+ * symsinit.h (vars_of_console_x): declare it. -+ * emacs.c (main_1): Call vars_of_console_x. -+ -+ * EmacsFrameP.h (struct EmacsFrame): -+ * EmacsManager.c (ChangeEmacsManagerSize): -+ * EmacsShell-sub.c (SuperClassRootGeometryManager): -+ * console-x-impl.h (wedge_metacity): -+ Various comments, some improved documentation, mostly sad comments -+ on the state of the art of Xt programming. -+ -+ * frame-x.c (defi): #undef it. (Random code cleanliness.) -+ - -Index: src/EmacsFrame.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrame.c,v -retrieving revision 1.28 -diff -u -r1.28 EmacsFrame.c ---- src/EmacsFrame.c 25 Oct 2005 11:16:20 -0000 1.28 -+++ src/EmacsFrame.c 6 May 2006 17:26:00 -0000 -@@ -360,19 +360,32 @@ - pixel_to_char_size (f, ew->core.width, ew->core.height, &columns, &rows); - change_frame_size (f, rows, columns, 0); - -- /* Now we tell the EmacsShell that we've changed the size of the non-fixed -- portion of the frame. Note that, if we the resize occurred as a result -- of EmacsFrameSetCharSize(), this information will be stored twice. -- This is not a big deal, as storing this information doesn't actually -- do anything until the next resize. */ -- if (FRAME_X_TOP_LEVEL_FRAME_P (f)) -- x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); -+ /* The code below is just plain wrong. If the EmacsShell or EmacsManager -+ needs to know, they should just ask. If needed information is being -+ updated here, then we should set a dirty flag and have it updated on an -+ as-needed basis. -+ For now, conditionalize so people can get work done if this breaks -+ something. */ -+ if (wedge_metacity) /* cf. x_set_frame_size */ -+ { -+ /* Now we tell the EmacsShell that we've changed the size of the -+ non-fixed portion of the frame. Note that, if the resize occurred -+ as a result of EmacsFrameSetCharSize(), this information will be -+ stored twice. This is not a big deal, as storing this information -+ doesn't actually do anything until the next resize. */ -+ if (FRAME_X_TOP_LEVEL_FRAME_P (f)) -+ x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); - -- /* Kick the manager so that it knows we've changed size. */ -- req.request_mode = 0; -- XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); -- EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), repl.width, -- repl.height); -+ /* Kick the manager so that it knows we've changed size. -+ #### No, no, no! If this does anything at all, it will involve -+ changing the manager's size. That's not something that a child -+ widget should initialize as part of a purely informational -+ method!! */ -+ req.request_mode = 0; -+ XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); -+ EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), -+ repl.width, repl.height); -+ } - } - - static Boolean -Index: src/EmacsFrameP.h -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsFrameP.h,v -retrieving revision 1.7 -diff -u -r1.7 EmacsFrameP.h ---- src/EmacsFrameP.h 4 May 2003 02:34:35 -0000 1.7 -+++ src/EmacsFrameP.h 6 May 2006 17:26:00 -0000 -@@ -65,13 +65,16 @@ - Boolean iconic; /* whether this frame is iconic */ - - /* The rest of this is crap and should be deleted. -+ #### Comments that start with + are fields that actually get referred -+ to somewhere aside from the init function. -+ I guess the "crap" has mostly moved to specifiers? - */ - Boolean minibuffer; /* 0: normal frames with minibuffers. - * 1: frames without minibuffers - * 2: minibuffer only. */ - Boolean unsplittable; /* frame can only have one window */ - -- int internal_border_width; /* internal borders */ -+ int internal_border_width; /* + internal borders */ - int scrollbar_width; /* width of frame vertical sb's */ - int scrollbar_height; /* height of frame horizontal sb's */ - int top_toolbar_height; /* height of top toolbar */ -@@ -82,9 +85,9 @@ - int bottom_toolbar_border_width; /* ... of bottom toolbar */ - int left_toolbar_border_width; /* ... of left toolbar */ - int right_toolbar_border_width; /* ... of right toolbar */ -- Dimension toolbar_shadow_thickness; -+ Dimension toolbar_shadow_thickness; /* + of shadows */ - unsigned char scrollbar_placement; -- int interline; /* skips between lines */ -+ int interline; /* + skips between lines */ - - XFontStruct* font; /* font */ - Pixel foreground_pixel; /* foreground */ -@@ -97,7 +100,7 @@ - int bell_volume; /* how loud is beep */ - - Boolean menubar_p; /* initially show a menubar? */ -- Boolean initially_unmapped; /* inhibit initial window mapping */ -+ Boolean initially_unmapped; /* + inhibit initial window mapping */ - Boolean use_backing_store; /* backing store for menubar & ew? */ - - Dimension preferred_width; /* if non-zero, preferred size for */ -Index: src/EmacsManager.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsManager.c,v -retrieving revision 1.7 -diff -u -r1.7 EmacsManager.c ---- src/EmacsManager.c 22 Dec 2004 10:59:09 -0000 1.7 -+++ src/EmacsManager.c 6 May 2006 17:26:00 -0000 -@@ -241,6 +241,12 @@ - if (height == 0) - height = w->core.height; - -+ /* #### AFAICT this gets called in two places. One is in ChangeManaged(), -+ above. The other is in EmacsFrameResize(). Perhaps ChangeManaged() -+ should initiate resize requests, but EmacsFrameResize() should not. -+ Unfortunately, I've tried making this conditional on whether we're -+ called from EmacsFrameResize() or not, but that results in an infloop -+ via the callback to x_layout_widgets() in Resize(). Whee! */ - /* do nothing if we're already that size */ - if (w->core.width != width || w->core.height != height) - { -Index: src/EmacsShell-sub.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/EmacsShell-sub.c,v -retrieving revision 1.7 -diff -u -r1.7 EmacsShell-sub.c ---- src/EmacsShell-sub.c 24 Jan 2005 23:33:46 -0000 1.7 -+++ src/EmacsShell-sub.c 6 May 2006 17:26:00 -0000 -@@ -278,7 +278,8 @@ - GenericClassExtRec *gcer; - - /* find the shell extension record that specifies the -- root geometry manager method */ -+ root geometry manager method -+ #### We could use XtGetClassExtension here. */ - for (gcer = (GenericClassExtRec *) swc->shell_class.extension; - gcer; - gcer = (GenericClassExtRec *) gcer->next_extension) -@@ -287,6 +288,9 @@ - break; - } - -+ /* #### The R11.6.4 Xt specification says if we don't find NULLQUARK here, -+ we should assume root_geometry_manager = XtInheritRootGeometryManager. -+ Is that actually callable? */ - if (!gcer) - ABORT (); - -Index: src/console-x-impl.h -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x-impl.h,v -retrieving revision 1.5 -diff -u -r1.5 console-x-impl.h ---- src/console-x-impl.h 26 Nov 2005 11:46:07 -0000 1.5 -+++ src/console-x-impl.h 6 May 2006 17:26:00 -0000 -@@ -40,6 +40,8 @@ - - DECLARE_CONSOLE_TYPE (x); - -+extern int wedge_metacity; -+ - struct x_device - { - #ifdef NEW_GC -@@ -234,7 +236,8 @@ - - /* The maximum number of widgets that can be displayed above the text - area at one time. Currently no more than 3 will ever actually be -- displayed (menubar, psheet, debugger panel). */ -+ displayed (menubar, psheet, debugger panel). -+ #### Are "psheet" and "debugger panel" relevant any more? */ - #define MAX_CONCURRENT_TOP_WIDGETS 8 - - struct x_frame -@@ -243,12 +246,17 @@ - struct lrecord_header header; - #endif /* NEW_GC */ - -- /* The widget of this frame. This is an EmacsShell or an -- ExternalShell. */ -+ /* The widget of this frame. -+ This is an EmacsShell or an ExternalShell. -+ It negotiates with the window manager or containing app on behalf of -+ the container widget. Should be (but isn't) invisible to Emacs. */ - Widget widget; - - /* The parent of the EmacsFrame, the menubar, and the scrollbars. -- This is an EmacsManager. */ -+ This is an EmacsManager. -+ It is responsible for managing the geometry of the frame. This is what -+ Emacs mostly talks to. Anything that affects its geometry will be -+ reflected in the Shell widget, and thus cause WM interaction. */ - Widget container; - - /* The widget of the menubar, of whatever widget class it happens to be. */ -Index: src/console-x.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-x.c,v -retrieving revision 1.16 -diff -u -r1.16 console-x.c ---- src/console-x.c 17 Dec 2005 19:47:02 -0000 1.16 -+++ src/console-x.c 6 May 2006 17:26:00 -0000 -@@ -41,6 +41,8 @@ - - DEFINE_CONSOLE_TYPE (x); - -+int wedge_metacity; /* nonzero means update WM_HINTS always */ -+ - extern void x_has_keysym (KeySym, Lisp_Object, int); - - static int -@@ -399,6 +401,22 @@ - CONSOLE_HAS_METHOD (x, perhaps_init_unseen_key_defaults); - } - -+ -+void -+vars_of_console_x (void) -+{ -+ DEFVAR_BOOL ("wedge-metacity", &wedge_metacity /* -+When non-nil, frame geometry management is backward-compatible. -+This is known to create inflooping window jitter in metacity, et al. -+It also does not conform to Xt conventions for geometry management. -+Specifically, all frame resizes, XEmacs-initiated or not, update WM_HINTS. -+Furthermore, geometry changes occur in the widget resize method. -+ -+The default is nil. This probably gives correct behavior regardless of the -+window manager used. -+This variable is deprecated and will be removed. -+*/ ); -+} - - void - reinit_console_type_create_x (void) -Index: src/emacs.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v -retrieving revision 1.166 -diff -u -r1.166 emacs.c ---- src/emacs.c 25 Apr 2006 14:02:08 -0000 1.166 -+++ src/emacs.c 6 May 2006 17:26:01 -0000 -@@ -2186,6 +2186,7 @@ - #ifdef HAVE_BALLOON_HELP - vars_of_balloon_x (); - #endif -+ vars_of_console_x (); - vars_of_device_x (); - #ifdef HAVE_X_DIALOGS - vars_of_dialog_x (); -Index: src/frame-x.c -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-x.c,v -retrieving revision 1.72 -diff -u -r1.72 frame-x.c ---- src/frame-x.c 26 Nov 2005 11:46:08 -0000 1.72 -+++ src/frame-x.c 6 May 2006 17:26:01 -0000 -@@ -507,6 +507,7 @@ - defi(Qtop, XtNy); - - #undef def -+#undef defi - } - - static Lisp_Object -@@ -2307,6 +2308,17 @@ - x_set_frame_size (struct frame *f, int cols, int rows) - { - EmacsFrameSetCharSize (FRAME_X_TEXT_WIDGET (f), cols, rows); -+ -+ if (!wedge_metacity) /* cf. EmacsFrameResize */ -+ { -+ /* Kick the manager so that it knows we've changed size. */ -+ XtWidgetGeometry req, repl; -+ req.request_mode = 0; -+ XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); -+ EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), -+ repl.width, repl.height); -+ } -+ - #if 0 - /* this is not correct. x_set_frame_size() is called from - Fset_frame_size(), which may or may not have been called -Index: src/symsinit.h -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v -retrieving revision 1.57 -diff -u -r1.57 symsinit.h ---- src/symsinit.h 25 Apr 2006 14:02:09 -0000 1.57 -+++ src/symsinit.h 6 May 2006 17:26:01 -0000 -@@ -306,6 +306,7 @@ - void vars_of_console_stream (void); - void vars_of_console_mswindows (void); - void vars_of_console_tty (void); -+void vars_of_console_x (void); - void vars_of_data (void); - void vars_of_database (void); - void vars_of_debug (void); diff --git a/xemacs.spec b/xemacs.spec index dd7f514..6695d4b 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,8 +19,8 @@ %define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') Name: xemacs -Version: 21.5.26 -Release: 5%{?dist} +Version: 21.5.27 +Release: 1%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -35,14 +35,11 @@ Source5: xemacs-sitestart.el Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch -# TODO: patch2 still needed with --with-system-packages??? -Patch2: %{name}-21.5.25-find-paths-pkgdir.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch -Patch7: %{name}-21.5.26-maximize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -175,15 +172,14 @@ rm -f configure.in sed -i -e /tetris/d lisp/menubar-items.el %patch0 -p1 %patch1 -p1 -%patch2 -p1 -sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el %patch3 -p1 %ifarch ia64 %patch4 -p1 %endif %patch5 -p1 %patch6 -p1 -%patch7 -p0 + +sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f @@ -386,9 +382,12 @@ rm -f %{_bindir}/xemacs && \ %{_bindir}/xemacs-%{xver} 80 || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : +# bugfix for 21.5.26, to be removed later +%{_sbindir}/alternatives --remove xemacs \ + %{_bindir}/xemacs-21.5-b26 &>/dev/null || : %postun -[ $1 -ne 0 ] || \ +[ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : @@ -398,9 +397,12 @@ update-desktop-database -q %{_datadir}/applications 2>/dev/null || : rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-nox-%{xver} 40 || : +# bugfix for 21.5.26, to be removed later +%{_sbindir}/alternatives --remove xemacs \ + %{_bindir}/xemacs-nox-21.5-b26 &>/dev/null || : %postun nox -[ $1 -ne 0 ] || \ +[ -e %{_bindir}/xemacs-nox-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : %post common @@ -493,6 +495,11 @@ fi %changelog +* Tue May 16 2006 Ville Skyttä - 21.5.27-1 +- 21.5.27, maximize patch included upstream. +- Drop no longer needed find-paths patch. +- Fix alternatives setup. + * Sun May 7 2006 Ville Skyttä - 21.5.26-5 - Apply upstream fix for window maximization problems (#111225). From ebe8b2dae850515ef45a8f40182fc489c6f969e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:15:51 +0000 Subject: [PATCH 027/160] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 499a12aef4350228b766a1134a68a7cc616baf47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 2 Sep 2006 20:31:25 +0000 Subject: [PATCH 028/160] - Fix build when previous revision of the same XEmacs version is installed. - BuildRequire compface-devel instead of compface. - Turn error checking off. - Specfile cleanups. --- xemacs-21.5.27-finder-lisp-dir.patch | 15 ++++++++++++ xemacs.spec | 35 +++++++++++----------------- 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 xemacs-21.5.27-finder-lisp-dir.patch diff --git a/xemacs-21.5.27-finder-lisp-dir.patch b/xemacs-21.5.27-finder-lisp-dir.patch new file mode 100644 index 0000000..607f5fb --- /dev/null +++ b/xemacs-21.5.27-finder-lisp-dir.patch @@ -0,0 +1,15 @@ +Index: src/Makefile.in.in +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v +retrieving revision 1.125 +diff -u -u -r1.125 Makefile.in.in +--- src/Makefile.in.in 23 Apr 2006 16:11:32 -0000 1.125 ++++ src/Makefile.in.in 2 Sep 2006 15:28:21 -0000 +@@ -649,6 +649,7 @@ + @echo "Building finder database ..." + $(RM) $(LISP)/finder-inf.el + $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ ++ -eval "(setq lisp-directory \"$(LISP)\")" \ + -l finder -f finder-compile-keywords + @echo "Building finder database ...(done)" + diff --git a/xemacs.spec b/xemacs.spec index 6695d4b..044fee2 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,7 +1,6 @@ # TODO: review desktop entry associations # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el # TODO: non-ASCII in buffer tabs -# TODO: build issues if previous 21.5.x installed, restore finder-inf stuff? # TODO: fix --without modules build (../modules/canna_api.o not found?) %bcond_with gtk @@ -20,7 +19,7 @@ Name: xemacs Version: 21.5.27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -40,6 +39,7 @@ Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch +Patch7: %{name}-21.5.27-finder-lisp-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +51,7 @@ BuildRequires: gpm-devel BuildRequires: pam-devel BuildRequires: zlib-devel BuildRequires: libjpeg-devel -BuildRequires: compface +BuildRequires: compface-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: desktop-file-utils @@ -178,6 +178,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %endif %patch5 -p1 %patch6 -p1 +%patch7 -p0 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -199,7 +200,7 @@ CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" CFLAGS="$CFLAGS $(pkg-config libglade --cflags)" %endif export CFLAGS -export EMACSLOADPATH=$PWD/lisp +export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule common_options=" --with-system-packages=%{_datadir}/xemacs @@ -214,6 +215,7 @@ common_options=" --without-msw --with-pdump --with-debug + --with-error-checking=none %{?with_mule:--with-mule} %ifarch alpha ia64 ppc64 --with-system-malloc @@ -232,10 +234,7 @@ common_options=" --without-canna \ --without-wnn \ --with-xim=no -# toplevel smp build fails -make %{?_smp_mflags} -C lib-src -make %{?_smp_mflags} -C src -EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes +make EMACSDEBUGPATHS=yes # toplevel parallel make fails mv lib-src/DOC{,-nox} mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} @@ -264,18 +263,12 @@ done --with-xfs \ %endif --with-docdir=%{_libdir}/xemacs-%{xver}/doc -# toplevel smp build fails -make %{?_smp_mflags} -C lib-src -make src/Emacs.ad.h -make %{?_smp_mflags} -C src -EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes +make EMACSDEBUGPATHS=yes # toplevel parallel make fails %install rm -rf $RPM_BUILD_ROOT -export EMACSLOADPATH=$PWD/lisp - %if %{with nox} # restore binaries with less dependencies; note: no -p nor move for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done @@ -382,9 +375,6 @@ rm -f %{_bindir}/xemacs && \ %{_bindir}/xemacs-%{xver} 80 || : gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : update-desktop-database -q %{_datadir}/applications 2>/dev/null || : -# bugfix for 21.5.26, to be removed later -%{_sbindir}/alternatives --remove xemacs \ - %{_bindir}/xemacs-21.5-b26 &>/dev/null || : %postun [ -e %{_bindir}/xemacs-%{xver} ] || \ @@ -397,9 +387,6 @@ update-desktop-database -q %{_datadir}/applications 2>/dev/null || : rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-nox-%{xver} 40 || : -# bugfix for 21.5.26, to be removed later -%{_sbindir}/alternatives --remove xemacs \ - %{_bindir}/xemacs-nox-21.5-b26 &>/dev/null || : %postun nox [ -e %{_bindir}/xemacs-nox-%{xver} ] || \ @@ -495,6 +482,12 @@ fi %changelog +* Sat Sep 2 2006 Ville Skyttä - 21.5.27-2 +- Fix build when previous revision of the same XEmacs version is installed. +- BuildRequire compface-devel instead of compface. +- Turn error checking off. +- Specfile cleanups. + * Tue May 16 2006 Ville Skyttä - 21.5.27-1 - 21.5.27, maximize patch included upstream. - Drop no longer needed find-paths patch. From 2fb7620dd16861ed21ec6c101ffa158aa5690639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 3 Sep 2006 20:33:42 +0000 Subject: [PATCH 029/160] Rebuilt and pushed. --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From b5f59683b990b7636f17cc3383cd1892d244d929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 10 Sep 2006 09:45:06 +0000 Subject: [PATCH 030/160] - Adjust to split xemacs-packages-{base,extra}. - Provide xemacs(bin) in main package and -nox. --- xemacs-sitestart.el | 2 +- xemacs.spec | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el index d705389..3dfd410 100644 --- a/xemacs-sitestart.el +++ b/xemacs-sitestart.el @@ -125,7 +125,7 @@ (define-coding-system-alias 'native tmp))) ;; Register available Input Methods. - (load "leim-list") + (load "leim-list" t) (when (member lang '("ja" "ko" "zh")) ;; ispell doesn't support CJK (setq-default ispell-local-dictionary "english")))) diff --git a/xemacs.spec b/xemacs.spec index 044fee2..b957f7c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ Name: xemacs Version: 21.5.27 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -77,10 +77,12 @@ BuildRequires: neXtaw-devel %if %{with xft} BuildRequires: libXft-devel %endif # xft -Requires: xemacs-sumo >= 20050118-2 +# Note: no xemacs-packages-extra dependency here, need main pkg to build it. +Requires: xemacs-packages-base >= 20060510 Requires: xemacs-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi +Provides: xemacs(bin) = %{version}-%{release} %description XEmacs is a highly customizable open source text editor and @@ -109,8 +111,10 @@ This package contains byte-compiled lisp and other common files for XEmacs. %package nox Summary: Different version of Emacs built without X Windows support Group: Applications/Editors -# Note: no xemacs-sumo dependency here, we need -nox to build the sumo package. +# Note: no xemacs-packages* dependencies here, we need -nox to build the +# base package set. Requires: xemacs-common = %{version}-%{release} +Provides: xemacs(bin) = %{version}-%{release} %description nox XEmacs is a highly customizable open source text editor and @@ -204,7 +208,6 @@ export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule common_options=" --with-system-packages=%{_datadir}/xemacs - --with-gpm --with-pop --with-mail-locking=lockf --with-clash-detection @@ -482,6 +485,10 @@ fi %changelog +* Sun Sep 10 2006 Ville Skyttä - 21.5.27-3 +- Adjust to split xemacs-packages-{base,extra}. +- Provide xemacs(bin) in main package and -nox. + * Sat Sep 2 2006 Ville Skyttä - 21.5.27-2 - Fix build when previous revision of the same XEmacs version is installed. - BuildRequire compface-devel instead of compface. From 5f0e341748ae5e021549e24d3d9472e5feb8f495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 20 Sep 2006 16:21:20 +0000 Subject: [PATCH 031/160] - Disable graphical progress bar by default (#188973). - Make Wnn support optional at build time, disabled by default. --- xemacs-sitestart.el | 2 ++ xemacs.spec | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el index 3dfd410..ee2d480 100644 --- a/xemacs-sitestart.el +++ b/xemacs-sitestart.el @@ -144,3 +144,5 @@ ;; when saving a buffer always end it with a newline (setq-default require-final-newline t) +;; the graphical progress bar is buggy - disable it by default (#188973) +(setq-default progress-feedback-use-echo-area t) diff --git a/xemacs.spec b/xemacs.spec index b957f7c..e80865c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -4,6 +4,7 @@ # TODO: fix --without modules build (../modules/canna_api.o not found?) %bcond_with gtk +%bcond_with wnn %bcond_with xaw3d %bcond_with xft %bcond_without mule @@ -19,7 +20,7 @@ Name: xemacs Version: 21.5.27 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -57,7 +58,9 @@ BuildRequires: libtiff-devel BuildRequires: desktop-file-utils %if %{with mule} BuildRequires: Canna-devel +%if %{with wnn} BuildRequires: FreeWnn-devel +%endif # wnn %endif # mule BuildRequires: xmkmf BuildRequires: libXau-devel @@ -260,6 +263,9 @@ done --with-scrollbars=lucid \ --with-dialogs=athena \ %endif +%if ! %{with wnn} + --without-wnn \ +%endif %if %{with xft} --with-xft=all \ %else @@ -485,6 +491,10 @@ fi %changelog +* Wed Sep 20 2006 Ville Skyttä - 21.5.27-4 +- Disable graphical progress bar by default (#188973). +- Make Wnn support optional at build time, disabled by default. + * Sun Sep 10 2006 Ville Skyttä - 21.5.27-3 - Adjust to split xemacs-packages-{base,extra}. - Provide xemacs(bin) in main package and -nox. From 9cad7561416cea6bf3b867ccfae8fef4d9f4b890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 2 Oct 2006 18:42:06 +0000 Subject: [PATCH 032/160] - Rebuild. --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index e80865c..f1c1aaa 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.27 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -491,6 +491,9 @@ fi %changelog +* Mon Oct 2 2006 Ville Skyttä - 21.5.27-5 +- Rebuild. + * Wed Sep 20 2006 Ville Skyttä - 21.5.27-4 - Disable graphical progress bar by default (#188973). - Make Wnn support optional at build time, disabled by default. From 4183148cf54247778a8eb54b9341917fc3a0ed1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 3 Jan 2007 22:00:58 +0000 Subject: [PATCH 033/160] - Fix site-start.el coding system setup in non-UTF8 locales (#213582). - Fix "--without modules" build. --- xemacs-sitestart.el | 10 ++++--- xemacs.spec | 68 ++++++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 35 deletions(-) diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el index ee2d480..3e0a224 100644 --- a/xemacs-sitestart.el +++ b/xemacs-sitestart.el @@ -15,7 +15,8 @@ (setq efs-ftp-program-name "/usr/bin/ftp") ;; load .el files in "site-start.d/" -(let ((files (directory-files "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$"))) +(let ((files (directory-files + "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$"))) (mapc 'load-file files)) ;; fix default courier italics @@ -25,7 +26,7 @@ (make-face-italic 'italic) (make-face-italic 'bold-italic)) -;; Set up language environment.setup coding-systems +;; Set up language environment and coding systems (when (featurep 'mule) (let* ((locale (getenv "LANG")) (lang-region (and locale @@ -115,8 +116,9 @@ (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp))) (tmp (intern (downcase tmp)))) (when (find-coding-system tmp) - (set-coding-priority-list (list tmp)) - (set-coding-category-system tmp tmp) + (let ((cat (or (coding-system-category tmp) tmp))) + (set-coding-priority-list (list cat)) + (set-coding-category-system cat tmp)) (set-default-output-coding-systems tmp) (set-keyboard-coding-system tmp) (set-terminal-coding-system tmp) diff --git a/xemacs.spec b/xemacs.spec index f1c1aaa..ccd59f9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,7 +1,6 @@ # TODO: review desktop entry associations # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el # TODO: non-ASCII in buffer tabs -# TODO: fix --without modules build (../modules/canna_api.o not found?) %bcond_with gtk %bcond_with wnn @@ -20,7 +19,7 @@ Name: xemacs Version: 21.5.27 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -211,24 +210,26 @@ export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule common_options=" --with-system-packages=%{_datadir}/xemacs - --with-pop - --with-mail-locking=lockf + --without-msw +%if %{with mule} + --with-mule +%endif --with-clash-detection --with-database=no - --without-postgresql --without-ldap + --without-postgresql + --with-mail-locking=lockf + --with-pop --without-hesiod - --without-msw - --with-pdump - --with-debug - --with-error-checking=none - %{?with_mule:--with-mule} %ifarch alpha ia64 ppc64 --with-system-malloc %endif + --with-pdump %if ! %{with modules} --without-modules %endif + --with-debug + --with-error-checking=none " %if %{with nox} @@ -236,10 +237,10 @@ common_options=" %configure $common_options \ --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \ --with-sound=none \ - --without-x \ + --with-xim=no \ --without-canna \ --without-wnn \ - --with-xim=no + --without-x make EMACSDEBUGPATHS=yes # toplevel parallel make fails mv lib-src/DOC{,-nox} mv src/xemacs{,-nox-%{xver}} @@ -252,26 +253,27 @@ done # build with X %configure $common_options \ -%if %{with gtk} - --with-gtk \ - --with-gnome \ -%else - --with-xim=xlib \ - --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ - --with-widgets=athena \ - --with-menubars=lucid \ - --with-scrollbars=lucid \ - --with-dialogs=athena \ -%endif -%if ! %{with wnn} - --without-wnn \ -%endif + --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ %if %{with xft} --with-xft=all \ %else --with-xfs \ %endif - --with-docdir=%{_libdir}/xemacs-%{xver}/doc +%if %{with gtk} + --with-gtk \ + --with-gnome \ +%else + --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ + --with-menubars=lucid \ + --with-widgets=athena \ + --with-dialogs=athena \ + --with-scrollbars=lucid \ + --with-xim=xlib \ +%endif +%if ! %{with wnn} + --without-wnn +%endif + make EMACSDEBUGPATHS=yes # toplevel parallel make fails @@ -342,7 +344,7 @@ install -Dpm 644 %{SOURCE1} \ chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} # clean up unneeded stuff (TODO: there's probably much more) -find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm +find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc @@ -456,13 +458,13 @@ fi %doc etc/editclient.sh %{_bindir}/etags.xemacs %{_bindir}/ootags -%{_libdir}/xemacs/ %dir %{_libdir}/xemacs-%{xver} %dir %{_libdir}/xemacs-%{xver}/*linux/ %{_libdir}/xemacs-%{xver}/*linux/[acdfghprsvwy]* %{_libdir}/xemacs-%{xver}/*linux/m[am]* %{_libdir}/xemacs-%{xver}/*linux/movemail %if %{with modules} +%{_libdir}/xemacs/ %dir %{_libdir}/xemacs-%{xver}/*linux/modules/ %{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.elc %endif @@ -482,15 +484,19 @@ fi %defattr(-,root,root,-) %{_infodir}/*.info* +%if %{with modules} %files devel %defattr(-,root,root,-) -%if %{with modules} %{_bindir}/ellcc -%endif %{_libdir}/xemacs-%{xver}/*linux/include/ +%endif %changelog +* Wed Jan 3 2007 Ville Skyttä - 21.5.27-6 +- Fix site-start.el coding system setup in non-UTF8 locales (#213582). +- Fix "--without modules" build. + * Mon Oct 2 2006 Ville Skyttä - 21.5.27-5 - Rebuild. From cc42d41fb80a84e1e058d2fab59ab99a1249a4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 3 Jan 2007 22:48:26 +0000 Subject: [PATCH 034/160] - Don't run autoconf during build. --- xemacs-21.5.26-no-expdyn-ia64-106744.patch | 20 ------------- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 34 ++++++++++++++++++++++ xemacs.spec | 13 +++++---- 3 files changed, 41 insertions(+), 26 deletions(-) delete mode 100644 xemacs-21.5.26-no-expdyn-ia64-106744.patch create mode 100644 xemacs-21.5.27-no-expdyn-ia64-106744.patch diff --git a/xemacs-21.5.26-no-expdyn-ia64-106744.patch b/xemacs-21.5.26-no-expdyn-ia64-106744.patch deleted file mode 100644 index 83d0e48..0000000 --- a/xemacs-21.5.26-no-expdyn-ia64-106744.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xemacs-21.5.26/aclocal.m4.orig 2006-03-28 18:55:49.000000000 +0300 -+++ xemacs-21.5.26/aclocal.m4 2006-04-04 21:11:33.000000000 +0300 -@@ -549,11 +549,12 @@ - dnl usually need to be prefix with ${wl} or some other such thing. - dnl - --if test "$xe_gnu_ld" = yes; then -- if test "$ld_shlibs" = yes; then -- ld_dynamic_link_flags="${wl}-export-dynamic" -- fi --fi -+dnl dnl avoid -export-dynamic on ia64 -+dnl if test "$xe_gnu_ld" = yes; then -+dnl if test "$ld_shlibs" = yes; then -+dnl ld_dynamic_link_flags="${wl}-export-dynamic" -+dnl fi -+dnl fi - - if test -z "$ld_dynamic_link_flags"; then - case "$xehost_os" in diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch new file mode 100644 index 0000000..0133bc6 --- /dev/null +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -0,0 +1,34 @@ +--- xemacs-21.5.27/aclocal.m4~ 2006-03-28 18:55:49.000000000 +0300 ++++ xemacs-21.5.27/aclocal.m4 2007-01-04 00:34:57.000000000 +0200 +@@ -549,11 +549,12 @@ + dnl usually need to be prefix with ${wl} or some other such thing. + dnl + +-if test "$xe_gnu_ld" = yes; then +- if test "$ld_shlibs" = yes; then +- ld_dynamic_link_flags="${wl}-export-dynamic" +- fi +-fi ++dnl dnl avoid -export-dynamic on ia64 ++dnl if test "$xe_gnu_ld" = yes; then ++dnl if test "$ld_shlibs" = yes; then ++dnl ld_dynamic_link_flags="${wl}-export-dynamic" ++dnl fi ++dnl fi + + if test -z "$ld_dynamic_link_flags"; then + case "$xehost_os" in +--- xemacs-21.5.27/configure~ 2006-05-16 07:16:04.000000000 +0300 ++++ xemacs-21.5.27/configure 2007-01-04 00:34:35.000000000 +0200 +@@ -21584,11 +21584,6 @@ + fi # End of if cc_produces_so = no + + +-if test "$xe_gnu_ld" = yes; then +- if test "$ld_shlibs" = yes; then +- ld_dynamic_link_flags="${wl}-export-dynamic" +- fi +-fi + + if test -z "$ld_dynamic_link_flags"; then + case "$xehost_os" in diff --git a/xemacs.spec b/xemacs.spec index ccd59f9..04b4c7c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ Name: xemacs Version: 21.5.27 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -35,7 +35,7 @@ Source5: xemacs-sitestart.el Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch -Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch +Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch @@ -43,7 +43,6 @@ Patch7: %{name}-21.5.27-finder-lisp-dir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: autoconf >= 2.59 BuildRequires: sed >= 3.95 BuildRequires: texinfo BuildRequires: ncurses-devel @@ -180,7 +179,9 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch1 -p1 %patch3 -p1 %ifarch ia64 +touch -r aclocal.m4 aclocal.m4-stamp %patch4 -p1 +touch -r aclocal.m4-stamp aclocal.m4 %endif %patch5 -p1 %patch6 -p1 @@ -192,9 +193,6 @@ for f in man/lispref/mule.texi man/xemacs-faq.texi ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f done -# for patch0, patch4 -autoconf - %build CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" @@ -493,6 +491,9 @@ fi %changelog +* Thu Jan 4 2007 Ville Skyttä - 21.5.27-7 +- Don't run autoconf during build. + * Wed Jan 3 2007 Ville Skyttä - 21.5.27-6 - Fix site-start.el coding system setup in non-UTF8 locales (#213582). - Fix "--without modules" build. From c30daef7ae5bbe4f78f3d6056cc349a89c40e880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 24 Jan 2007 16:50:04 +0000 Subject: [PATCH 035/160] - Fix canna_api.ell install/load paths (#222559). - Fix site-start.el locale setup when the LANG env var is unset. --- xemacs-21.5.27-canna-222559.patch | 11 +++++++++++ xemacs-sitestart.el | 2 +- xemacs.spec | 8 +++++++- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 xemacs-21.5.27-canna-222559.patch diff --git a/xemacs-21.5.27-canna-222559.patch b/xemacs-21.5.27-canna-222559.patch new file mode 100644 index 0000000..a2a3234 --- /dev/null +++ b/xemacs-21.5.27-canna-222559.patch @@ -0,0 +1,11 @@ +--- lisp/mule/canna-leim.el 21 Oct 2005 15:48:33 -0000 1.9 ++++ lisp/mule/canna-leim.el 20 Jan 2007 12:08:13 -0000 +@@ -45,7 +45,7 @@ + + (defun canna-activate (&optional name) + ;; XEmacs 21.5.10 and later have 3-argument require. +- (unless (require 'CANNA "canna/canna_api" 'no-error) ++ (unless (require 'CANNA "canna_api" 'no-error) + (error 'file-error + "No Canna API support!? See M-x describe-installation & C-h v module-load-path.")) + (unless (require 'canna nil 'no-error) diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el index 3e0a224..61b6487 100644 --- a/xemacs-sitestart.el +++ b/xemacs-sitestart.el @@ -110,7 +110,7 @@ ;; set-language-environment changes the locale; restore it. (setenv "LANG" locale) - (set-current-locale locale) + (set-current-locale (or locale "C")) (let* ((tmp (shell-command-to-string "locale charmap")) (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp))) diff --git a/xemacs.spec b/xemacs.spec index 04b4c7c..e9d2bf9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ Name: xemacs Version: 21.5.27 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -34,6 +34,7 @@ Source5: xemacs-sitestart.el Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch +Patch2: %{name}-21.5.27-canna-222559.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch @@ -177,6 +178,7 @@ rm -f configure.in sed -i -e /tetris/d lisp/menubar-items.el %patch0 -p1 %patch1 -p1 +%patch2 -p0 %patch3 -p1 %ifarch ia64 touch -r aclocal.m4 aclocal.m4-stamp @@ -491,6 +493,10 @@ fi %changelog +* Wed Jan 24 2007 Ville Skyttä - 21.5.27-8 +- Fix canna_api.ell install/load paths (#222559). +- Fix site-start.el locale setup when the LANG env var is unset. + * Thu Jan 4 2007 Ville Skyttä - 21.5.27-7 - Don't run autoconf during build. From a302836d2c1d56271baa5bc434fcee7fff24cef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 18 May 2007 17:20:37 +0000 Subject: [PATCH 036/160] - Require one of the actual editor variants in -common. - Require -common in -el, drop duplicate dir ownerships. --- xemacs.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index e9d2bf9..701d06e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ Name: xemacs Version: 21.5.27 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -81,7 +81,7 @@ BuildRequires: libXft-devel %endif # xft # Note: no xemacs-packages-extra dependency here, need main pkg to build it. Requires: xemacs-packages-base >= 20060510 -Requires: xemacs-common = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Provides: xemacs(bin) = %{version}-%{release} @@ -98,6 +98,7 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Byte-compiled lisp files and other common files for XEmacs Group: Applications/Editors +Requires: xemacs(bin) = %{version}-%{release} Requires(post): %{_sbindir}/alternatives Requires(preun): %{_sbindir}/alternatives @@ -115,7 +116,7 @@ Summary: Different version of Emacs built without X Windows support Group: Applications/Editors # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. -Requires: xemacs-common = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} Provides: xemacs(bin) = %{version}-%{release} %description nox @@ -130,6 +131,7 @@ This package contains XEmacs built without X Windows support. %package el Summary: Emacs lisp source files for XEmacs Group: Development/Libraries +Requires: %{name}-common = %{version}-%{release} %description el XEmacs is a highly customizable open source text editor and @@ -371,7 +373,7 @@ sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config(noreplace) \1|' \ # combine the file lists cat base-*.files dir.files >> base-files -cat el-*.files dir.files >> el-files +cat el-*.files >> el-files cat info.files >> info-files @@ -493,6 +495,10 @@ fi %changelog +* Fri May 18 2007 Ville Skyttä - 21.5.27-9 +- Require one of the actual editor variants in -common. +- Require -common in -el, drop duplicate dir ownerships. + * Wed Jan 24 2007 Ville Skyttä - 21.5.27-8 - Fix canna_api.ell install/load paths (#222559). - Fix site-start.el locale setup when the LANG env var is unset. From 39897cbd973518eaa03fed6e2d8037a127cbb31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 21 May 2007 15:16:54 +0000 Subject: [PATCH 037/160] - 21.5.28, module path fix applied upstream. - Patch to retain courier as the default font. - Fix some corrupt characters in docs. --- .cvsignore | 2 +- sources | 2 +- xemacs-21.5.27-canna-222559.patch | 11 --- xemacs-21.5.28-courier-default.patch | 16 +++++ xemacs-21.5.28-doc-encodings.patch | 104 +++++++++++++++++++++++++++ xemacs.spec | 22 ++++-- 6 files changed, 139 insertions(+), 18 deletions(-) delete mode 100644 xemacs-21.5.27-canna-222559.patch create mode 100644 xemacs-21.5.28-courier-default.patch create mode 100644 xemacs-21.5.28-doc-encodings.patch diff --git a/.cvsignore b/.cvsignore index 79504d8..d5bf0fb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xemacs-21.5.27.tar.gz +xemacs-21.5.28.tar.gz diff --git a/sources b/sources index 0d33c11..39c18a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c415348d58eb18a9f4ed57d97e2acc62 xemacs-21.5.27.tar.gz +12e35715c5239c63651a8189973527ab xemacs-21.5.28.tar.gz diff --git a/xemacs-21.5.27-canna-222559.patch b/xemacs-21.5.27-canna-222559.patch deleted file mode 100644 index a2a3234..0000000 --- a/xemacs-21.5.27-canna-222559.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lisp/mule/canna-leim.el 21 Oct 2005 15:48:33 -0000 1.9 -+++ lisp/mule/canna-leim.el 20 Jan 2007 12:08:13 -0000 -@@ -45,7 +45,7 @@ - - (defun canna-activate (&optional name) - ;; XEmacs 21.5.10 and later have 3-argument require. -- (unless (require 'CANNA "canna/canna_api" 'no-error) -+ (unless (require 'CANNA "canna_api" 'no-error) - (error 'file-error - "No Canna API support!? See M-x describe-installation & C-h v module-load-path.")) - (unless (require 'canna nil 'no-error) diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch new file mode 100644 index 0000000..19b5904 --- /dev/null +++ b/xemacs-21.5.28-courier-default.patch @@ -0,0 +1,16 @@ +--- src/faces.c 22 Apr 2007 19:58:59 -0000 1.55 ++++ src/faces.c 21 May 2007 14:51:50 -0000 +@@ -2397,11 +2397,12 @@ + THAT WAS A GOOD IDEA?!?!) The other fonts that used to be specified + here gave horrendous results. */ + ++ /* Fedora change: no such issues here, back to courier for backcompat. */ + inst_list = + Fcons + (Fcons + (list1 (device_symbol), +- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), ++ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), + inst_list); + + #endif /* !USE_XFT */ diff --git a/xemacs-21.5.28-doc-encodings.patch b/xemacs-21.5.28-doc-encodings.patch new file mode 100644 index 0000000..71f6794 --- /dev/null +++ b/xemacs-21.5.28-doc-encodings.patch @@ -0,0 +1,104 @@ +Index: man/internals/internals.texi +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v +retrieving revision 1.80 +diff -u -r1.80 internals.texi +--- man/internals/internals.texi 15 May 2007 10:25:16 -0000 1.80 ++++ man/internals/internals.texi 21 May 2007 10:06:28 -0000 +@@ -2178,8 +2178,8 @@ + rather than technical. The XEmacs maintainers would like to have issues + resolved by examining them technically and deciding what makes the most + sense from a technical prospective. RMS however, wants to proceed on a +-tit for tat kind of basis, which is to say, If we support this feature +-of yours, we also get to support this other feature of mine. The ++tit for tat kind of basis, which is to say, ``If we support this feature ++of yours, we also get to support this other feature of mine.'' The + result of such a process is typically a big mess, because there is no + overarching design but instead a great deal of incompatible things + hodgepodged together. +@@ -13441,7 +13441,7 @@ + dependent on the current locale setting, which includes the locale + code page. (For more information, see Locale-Dependent Routines.) By + default, all locale-dependent routines in the Microsoft run-time +-library use the code page that corresponds to the ?locale. At ++library use the code page that corresponds to the locale. At + run-time you can change or query the locale code page in use with a + call to setlocale. + +@@ -13453,7 +13453,7 @@ + + -- The "C" locale is defined by ANSI to correspond to the locale in + which C programs have traditionally executed. The code page for the +-"C" locale (?code page) corresponds to the ASCII character ++"C" locale (code page) corresponds to the ASCII character + set. For example, in the "C" locale, islower returns true for the + values 0x61 ?0x7A only. In another locale, islower may return true + for these as well as other values, as defined by that locale. +@@ -29710,7 +29710,6 @@ + -- + In order to save my hands, I am cutting back on my responses, especially + to XEmacs-related mail. You _will_ get a response, but please be patient. +- + If you need an immediate response and it is not apparent in your message, + please say so. Thanks for your understanding. + +@@ -30033,11 +30032,10 @@ + ben + + -- +-In order to save my hands, I am cutting back on my responses, especially to +-XEmacs-related mail. You +-_will_ get a response, but please be patient. If you need an immediate +-response and its not apparent in +-your message, please say so. Thanks for your understanding. ++In order to save my hands, I am cutting back on my responses, especially ++to XEmacs-related mail. You_will_ get a response, but please be patient. ++If you need an immediate response and it's not apparent in your message, ++please say so. Thanks for your understanding. + + + +@@ -30125,11 +30123,10 @@ + ben + + -- +-In order to save my hands, I am cutting back on my responses, especially to +-XEmacs-related mail. You +-_will_ get a response, but please be patient. If you need an immediate +-response and its not apparent in +-your message, please say so. Thanks for your understanding. ++In order to save my hands, I am cutting back on my responses, especially ++to XEmacs-related mail. You _will_ get a response, but please be patient. ++If you need an immediate response and it's not apparent in your message, ++please say so. Thanks for your understanding. + + + +@@ -31577,10 +31574,8 @@ + + -- + In order to save my hands, I am cutting back on my responses, especially +-to XEmacs-related mail. You _will_ get a response, but please be +-patient. ++to XEmacs-related mail. You _will_ get a response, but please be patient. + If you need an immediate response and it is not apparent in your message, +- + please say so. Thanks for your understanding. + @end example + +Index: man/lispref/ldap.texi +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/ldap.texi,v +retrieving revision 1.3 +diff -u -r1.3 ldap.texi +--- man/lispref/ldap.texi 10 Oct 2003 12:39:34 -0000 1.3 ++++ man/lispref/ldap.texi 21 May 2007 10:06:28 -0000 +@@ -105,7 +105,7 @@ + library XEmacs was compiled with, they may include @code{simple}, + @code{krbv41} and @code{krbv42}. + @item base +-The base for the search. This may look like @samp{c, ome}, see ++The base for the search. This may look like @samp{o=ACME, c=US}, see + RFC 1779 for syntax details. + @item scope + One of the symbols @code{base}, @code{onelevel} or @code{subtree} diff --git a/xemacs.spec b/xemacs.spec index 701d06e..ad2db44 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -18,14 +18,14 @@ %define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') Name: xemacs -Version: 21.5.27 -Release: 9%{?dist} +Version: 21.5.28 +Release: 1%{?dist} Summary: Different version of Emacs Group: Applications/Editors License: GPL URL: http://www.xemacs.org/ -Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz +Source0: http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz Source1: %{name}.png Source2: xemacs.desktop Source3: dotxemacs-init.el @@ -34,13 +34,14 @@ Source5: xemacs-sitestart.el Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch -Patch2: %{name}-21.5.27-canna-222559.patch +Patch2: %{name}-21.5.28-doc-encodings.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch Patch7: %{name}-21.5.27-finder-lisp-dir.patch +Patch8: %{name}-21.5.28-courier-default.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -190,10 +191,11 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch5 -p1 %patch6 -p1 %patch7 -p0 +%patch8 -p0 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el -for f in man/lispref/mule.texi man/xemacs-faq.texi ; do +for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f done @@ -210,7 +212,12 @@ CFLAGS="$CFLAGS $(pkg-config libglade --cflags)" export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule +# For some reason --prefix=/usr (from %%configure) results in etc and lisp +# being installed in %{_datadir}/xemacs-%{xver} but XEmacs trying to find +# them in /usr/{etc,lisp}, and --with-prefix=no doesn't help - upstream bug? +# Let's just override prefix here for now to work around this. common_options=" + --prefix=%{_datadir}/xemacs-%{xver} --with-system-packages=%{_datadir}/xemacs --without-msw %if %{with mule} @@ -495,6 +502,11 @@ fi %changelog +* Mon May 21 2007 Ville Skyttä - 21.5.28-1 +- 21.5.28, module path fix applied upstream. +- Patch to retain courier as the default font. +- Fix some corrupt characters in docs. + * Fri May 18 2007 Ville Skyttä - 21.5.27-9 - Require one of the actual editor variants in -common. - Require -common in -el, drop duplicate dir ownerships. From 69c8b5cbcc2202d0a29caf675c52461fbbb34324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 6 Jun 2007 21:26:20 +0000 Subject: [PATCH 038/160] - Set more dirs explicitly until upstream configure honors them better. - Borrow DESTDIR install patch from openSUSE. - Add pkgconfig file to -devel. --- xemacs-21.5.28-destdir.patch | 362 +++++++++++++++++++++++++++++++++++ xemacs.spec | 77 +++++--- 2 files changed, 417 insertions(+), 22 deletions(-) create mode 100644 xemacs-21.5.28-destdir.patch diff --git a/xemacs-21.5.28-destdir.patch b/xemacs-21.5.28-destdir.patch new file mode 100644 index 0000000..6e08635 --- /dev/null +++ b/xemacs-21.5.28-destdir.patch @@ -0,0 +1,362 @@ +diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in +--- xemacs-21.5.24.orig/Makefile.in.in 2005-12-27 18:11:00.000000000 +0100 ++++ xemacs-21.5.24/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 +@@ -61,6 +61,8 @@ + RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ + #endif + ++DESTDIR= ++ + SHELL = /bin/sh + LANG = C + LC_ALL = C +@@ -382,35 +384,35 @@ + (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \ + exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ + archlibdir=${archlibdir}) ; done +- if test "`(cd ${archlibdir} && $(pwd))`" != \ ++ if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != \ + "`(cd ./lib-src && $(pwd))`"; then \ + if test -f ../Installation; then \ +- ${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \ ++ ${INSTALL_DATA} ../Installation $(DESTDIR)${archlibdir}/Installation; \ + fi; \ +- ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \ +- ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \ ++ ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \ ++ ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \ + for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ + do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ + else true; fi + #if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE)) +- ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp ++ ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp + #endif + #ifdef WIN32_NATIVE +- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} +- -chmod 0755 ${bindir}/${PROGNAME} ++ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME} ++ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME} + #else + # ifdef CYGWIN +- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe +- -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe +- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} ++ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe ++ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe ++ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} + # else +- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} +- -chmod 0755 ${bindir}/${PROGNAME}-${version} +- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} ++ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version} ++ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version} ++ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} + # endif /* CYGWIN */ + #endif /* WIN32_NATIVE */ + if test "${prefix}" != "${exec_prefix}"; then \ +- $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \ ++ $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \ + for dir in \ + lib/${inststaticdir} \ + lib/${instvardir}/etc \ +@@ -421,13 +423,13 @@ + done; \ + fi + #ifdef HAVE_SHLIB +- $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir) ++ $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir) + #endif + + install-arch-indep: mkdir info + -@set ${COPYDESTS} ; \ + for dir in ${COPYDIR} ; do \ +- if test "`(cd $$1 && $(pwd))`" != \ ++ if test "`(cd $(DESTDIR)$$1 && $(pwd))`" != \ + "`(cd $${dir} && $(pwd))`"; then \ + : do nothing - echo "rm -rf $$1" ; \ + fi ; \ +@@ -435,35 +437,35 @@ + done + -set ${COPYDESTS} ; \ + for dir in ${COPYDESTS} ; do \ +- if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \ ++ if test ! -d $${dir} ; then mkdir $(DESTDIR)$${dir} ; fi ; \ + done ; \ + for dir in ${COPYDIR} ; do \ + dest=$$1 ; shift ; \ + test -d $${dir} \ + -a "`(cd $${dir} && $(pwd))`" != \ +- "`(cd $${dest} && $(pwd))`" \ ++ "`(cd $(DESTDIR)$${dest} && $(pwd))`" \ + && (echo "Copying $${dir}..." ; \ + (cd $${dir} && $(TAR) -cf - . ) | \ +- (cd $${dest} && umask 022 && $(TAR) -xf - );\ +- chmod 0755 $${dest}; \ +- for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ ++ (cd $(DESTDIR)$${dest} && umask 022 && $(TAR) -xf - );\ ++ chmod 0755 $(DESTDIR)$${dest}; \ ++ for subdir in `find $(DESTDIR)$${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ + (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \ + done) ; \ + done + if test "`(cd ${srcdir}/info && $(pwd))`" != \ +- "`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ +- if test ! -f ${infodir}/dir -a -f dir ; then \ +- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \ ++ "`(cd $(DESTDIR)${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ ++ if test ! -f $(DESTDIR)${infodir}/dir -a -f dir ; then \ ++ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \ + fi ; \ + for file in *.info* ; do \ +- ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \ +- chmod 0644 ${infodir}/$${file}; \ ++ ${INSTALL_DATA} $${file} $(DESTDIR)${infodir}/$${file} ; \ ++ chmod 0644 $(DESTDIR)${infodir}/$${file}; \ + done ; \ + fi + cd ${srcdir}/etc && \ + for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ +- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ +- chmod 0644 ${mandir}/$${page}${manext} ; \ ++ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \ ++ chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \ + done + @echo "If you would like to save approximately 4M of disk space, do" + @echo "make gzip-el" +@@ -473,19 +475,23 @@ + @echo "${lispdir}" + + gzip-el: +- $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir} ++ $(SHELL) ${srcdir}/lib-src/gzip-el.sh $(DESTDIR)${lispdir} + + ## Build all the directories to install XEmacs in. + ## Since we may be creating several layers of directories, + ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use + ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. + mkdir: FRC.mkdir +- ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ +- ${mandir} ${bindir} ${datadir} ${libdir} \ ++ for dir in \ ++ ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ ++ ${mandir} ${bindir} ${datadir} ${libdir} \ + #ifdef HAVE_SHLIB +- ${moduledir} ${sitemoduledir} \ ++ ${moduledir} ${sitemoduledir} \ + #endif +- ${sitelispdir} ++ ${sitelispdir} ; \ ++ do \ ++ ${MAKEPATH} $(DESTDIR)$${dir} ; \ ++ done ; + + ## Delete all the installed files that the `install' target would + ## create (but not the noninstalled files such as `make all' would +diff -ru xemacs-21.5.24.orig/dynodump/Makefile.in.in xemacs-21.5.24/dynodump/Makefile.in.in +--- xemacs-21.5.24.orig/dynodump/Makefile.in.in 2005-12-27 18:11:04.000000000 +0100 ++++ xemacs-21.5.24/dynodump/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 +@@ -22,6 +22,8 @@ + + ## Synched up with: Not synched with FSF. + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules. + .SUFFIXES: + .SUFFIXES: .c .o .i .h +diff -ru xemacs-21.5.24.orig/etc/tests/external-widget/Makefile xemacs-21.5.24/etc/tests/external-widget/Makefile +--- xemacs-21.5.24.orig/etc/tests/external-widget/Makefile 1996-12-18 23:42:31.000000000 +0100 ++++ xemacs-21.5.24/etc/tests/external-widget/Makefile 2005-12-27 19:00:48.000000000 +0100 +@@ -1,3 +1,5 @@ ++DESTDIR= ++ + CFLAGS += -Xc -g -DTOOLTALK + EMACSHOME = ../../.. + EMACSLIBDIR = $(EMACSHOME)/editor/src +diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makefile.in.in +--- xemacs-21.5.24.orig/lib-src/Makefile.in.in 2005-12-27 18:11:23.000000000 +0100 ++++ xemacs-21.5.24/lib-src/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 +@@ -24,6 +24,8 @@ + ## above a certain point in this file are in shell format instead of + ## in C format. How the hell is this supposed to work? */ + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules + .SUFFIXES: + .SUFFIXES: .c .h .o +@@ -244,26 +246,26 @@ + ## just run them directly from lib-src. + ${archlibdir}: all + @echo; echo "Installing utilities run internally by XEmacs." +- ./make-path ${archlibdir} ++ ./make-path $(DESTDIR)${archlibdir} + if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \ + for f in ${PRIVATE_INSTALLABLE_EXES}; do \ +- (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \ ++ (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \ + done ; \ + fi + if test "`(cd ${archlibdir} && $(pwd))`" \ + != "`(cd ${srcdir} && $(pwd))`"; then \ + for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \ +- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \ ++ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \ + done ; \ + fi + + install: ${archlibdir} + @echo; echo "Installing utilities for users to run." + for file in ${PUBLIC_INSTALLABLE_EXES} ; do \ +- (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ ++ (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \ + done + for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \ +- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \ ++ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \ + done + + uninstall: +diff -ru xemacs-21.5.24.orig/lwlib/Makefile.in.in xemacs-21.5.24/lwlib/Makefile.in.in +--- xemacs-21.5.24.orig/lwlib/Makefile.in.in 2005-12-27 18:11:45.000000000 +0100 ++++ xemacs-21.5.24/lwlib/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 +@@ -22,6 +22,8 @@ + ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + ## Boston, MA 02111-1307, USA. + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules + .SUFFIXES: + .SUFFIXES: .c .h .o .i .s +diff -ru xemacs-21.5.24.orig/man/Makefile xemacs-21.5.24/man/Makefile +--- xemacs-21.5.24.orig/man/Makefile 2005-12-27 18:11:52.000000000 +0100 ++++ xemacs-21.5.24/man/Makefile 2005-12-27 19:00:48.000000000 +0100 +@@ -20,6 +20,8 @@ + # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + # Boston, MA 02111-1307, USA. + ++DESTDIR= ++ + SHELL = /bin/sh + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi +diff -ru xemacs-21.5.24.orig/modules/base64/Makefile xemacs-21.5.24/modules/base64/Makefile +--- xemacs-21.5.24.orig/modules/base64/Makefile 2001-04-12 20:22:33.000000000 +0200 ++++ xemacs-21.5.24/modules/base64/Makefile 2005-12-27 19:00:48.000000000 +0100 +@@ -7,6 +7,8 @@ + # 'installed'. + # + ++DESTDIR= ++ + SHELL=/bin/sh + RM=rm -f + CC=../../lib-src/ellcc +diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modules/common/Makefile.common +--- xemacs-21.5.24.orig/modules/common/Makefile.common 2005-12-27 18:11:58.000000000 +0100 ++++ xemacs-21.5.24/modules/common/Makefile.common 2005-12-27 19:01:49.000000000 +0100 +@@ -31,6 +31,8 @@ + #define NOT_C_CODE + #include "../../src/config.h" + ++DESTDIR= ++ + SHELL=/bin/sh + RM=rm -f + PROGNAME=@PROGNAME@ +@@ -98,7 +100,7 @@ + -$(RM) *~ \#* + + install: $(OBJECT_TO_BUILD) +- $(INSTALL_PROGRAM) $< $(INSTALLPATH) ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(INSTALLPATH) + + ## + ## Local Variables: +diff -ru xemacs-21.5.24.orig/modules/zlib/Makefile xemacs-21.5.24/modules/zlib/Makefile +--- xemacs-21.5.24.orig/modules/zlib/Makefile 2001-04-12 20:22:40.000000000 +0200 ++++ xemacs-21.5.24/modules/zlib/Makefile 2005-12-27 19:00:48.000000000 +0100 +@@ -8,6 +8,8 @@ + # 'installed'. + # + ++DESTDIR= ++ + SHELL=/bin/sh + RM=rm -f + CC=../../lib-src/ellcc +diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall/Makefile.in.in +--- xemacs-21.5.24.orig/netinstall/Makefile.in.in 2005-12-27 18:11:58.000000000 +0100 ++++ xemacs-21.5.24/netinstall/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 +@@ -14,6 +14,8 @@ + ## + ## Makefile for Cygwin installer + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules + .SUFFIXES: + .SUFFIXES: .c .cc .h .o +@@ -172,7 +174,7 @@ + install: + @echo; echo "Installing net setup." + for file in ${INSTALLABLES} ; do \ +- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \ ++ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \ + done + + version.c : $(srcdir)/ChangeLog Makefile +diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.in +--- xemacs-21.5.24.orig/src/Makefile.in.in 2005-12-27 18:12:02.000000000 +0100 ++++ xemacs-21.5.24/src/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 +@@ -39,6 +39,8 @@ + RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ + #endif + ++DESTDIR= ++ + PROGNAME=@PROGNAME@ + prefix=@prefix@ + SRC=@srcdir@ +@@ -1068,7 +1070,7 @@ + #ifdef HAVE_SHLIB + MAKEPATH=../lib-src/make-path + install: $(PROGNAME) +- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s ++ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s + -@echo "Copying include files for ellcc..." + -@hdir=`pwd`; \ + cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ +@@ -1082,12 +1084,12 @@ + test -d s && hdrtars="$$hdrtars s/*"; \ + test -d m && hdrtars="$$hdrtars m/*"; \ + test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ +- (cd $(archlibdir)/include && umask 022 && tar xf -); \ +- chmod 755 $(archlibdir)/include; \ +- test -d $(archlibdir)/include/s && \ +- chmod 755 $(archlibdir)/include/s; \ +- test -d $(archlibdir)/include/m && \ +- chmod 755 $(archlibdir)/include/s;) \ ++ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include; \ ++ test -d $(DESTDIR)$(archlibdir)/include/s && \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \ ++ test -d $(DESTDIR)$(archlibdir)/include/m && \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \ + done) + #endif + +diff -ru xemacs-21.5.24.orig/tests/tooltalk/Makefile xemacs-21.5.24/tests/tooltalk/Makefile +--- xemacs-21.5.24.orig/tests/tooltalk/Makefile 1996-12-18 23:44:15.000000000 +0100 ++++ xemacs-21.5.24/tests/tooltalk/Makefile 2005-12-27 19:00:48.000000000 +0100 +@@ -12,6 +12,8 @@ + + ### Code: + ++DESTDIR= ++ + CC = cc -Xc + CPPFLAGS = -I/usr/openwin/include + CFLAGS = -g -v -DNeedFunctionPrototypes diff --git a/xemacs.spec b/xemacs.spec index ad2db44..77b9aef 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -16,10 +16,11 @@ %endif %define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') +%define xbuild %(echo %{_build} | sed -e 's/^\\([^-]*-[^-]*-[^-]*\\).*/\\1/') Name: xemacs Version: 21.5.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -42,9 +43,11 @@ Patch5: %{name}-21.5.25-wnnfix-128362.patch Patch6: %{name}-21.5.26-gtk-gcc4.patch Patch7: %{name}-21.5.27-finder-lisp-dir.patch Patch8: %{name}-21.5.28-courier-default.patch +Patch9: %{name}-21.5.28-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf BuildRequires: sed >= 3.95 BuildRequires: texinfo BuildRequires: ncurses-devel @@ -163,6 +166,7 @@ This package contains XEmacs documentation in GNU texinfo format. Summary: Development files for XEmacs Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel XEmacs is a highly customizable open source text editor and @@ -192,9 +196,12 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch6 -p1 %patch7 -p0 %patch8 -p0 +%patch9 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el +autoconf --force # for DESTDIR patch + for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f done @@ -212,12 +219,16 @@ CFLAGS="$CFLAGS $(pkg-config libglade --cflags)" export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule -# For some reason --prefix=/usr (from %%configure) results in etc and lisp -# being installed in %{_datadir}/xemacs-%{xver} but XEmacs trying to find -# them in /usr/{etc,lisp}, and --with-prefix=no doesn't help - upstream bug? -# Let's just override prefix here for now to work around this. +# The --with-*dir args can probably go away in the future if/when upstream +# configure learns to honor standard autofoo dirs better. common_options=" - --prefix=%{_datadir}/xemacs-%{xver} + --mandir=%{_mandir}/man1 + --with-archlibdir=%{_libdir}/xemacs-%{xver}/%{xbuild} +%if %{with modules} + --with-moduledir=%{_libdir}/xemacs-%{xver}/%{xbuild}/modules +%endif + --with-lispdir=%{_datadir}/xemacs-%{xver}/lisp + --with-etcdir=%{_datadir}/xemacs-%{xver}/etc --with-system-packages=%{_datadir}/xemacs --without-msw %if %{with mule} @@ -285,6 +296,23 @@ done make EMACSDEBUGPATHS=yes # toplevel parallel make fails +cat << \EOF > xemacs.pc +prefix=%{_prefix} +%if %{with modules} +includedir=%{_libdir}/xemacs-%{xver}/%{xbuild}/include +sitemoduledir=%{_libdir}/xemacs/site-modules +%endif +sitestartdir=%{_datadir}/xemacs/site-packages/lisp/site-start.d +sitepkglispdir=%{_datadir}/xemacs/site-packages/lisp + +Name: xemacs +Description: Different version of Emacs +Version: %{version} +%if %{with modules} +Cflags: -I${includedir} +%endif +EOF + %install rm -rf $RPM_BUILD_ROOT @@ -294,10 +322,7 @@ rm -rf $RPM_BUILD_ROOT for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done %endif -# note: no DESTDIR support -%makeinstall \ - mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \ - docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc +make install DESTDIR=$RPM_BUILD_ROOT %if %{with nox} # install nox files @@ -354,7 +379,7 @@ chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} # clean up unneeded stuff (TODO: there's probably much more) find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm -rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh +rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/%{xbuild}/gzip-el.sh rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc rm -r editclient.sh InstallGuide sparcworks tests XKeysymDB *.sco *.1 @@ -383,6 +408,8 @@ cat base-*.files dir.files >> base-files cat el-*.files >> el-files cat info.files >> info-files +install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc + %clean rm -rf $RPM_BUILD_ROOT @@ -443,7 +470,7 @@ fi %{_libdir}/xemacs-%{xver}/doc/ %if %{with modules} %if %{with mule} -%{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell +%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/canna_api.ell %endif %endif %{_datadir}/applications/*-%{name}.desktop @@ -467,15 +494,15 @@ fi %doc etc/editclient.sh %{_bindir}/etags.xemacs %{_bindir}/ootags -%dir %{_libdir}/xemacs-%{xver} -%dir %{_libdir}/xemacs-%{xver}/*linux/ -%{_libdir}/xemacs-%{xver}/*linux/[acdfghprsvwy]* -%{_libdir}/xemacs-%{xver}/*linux/m[am]* -%{_libdir}/xemacs-%{xver}/*linux/movemail +%dir %{_libdir}/xemacs-%{xver}/ +%dir %{_libdir}/xemacs-%{xver}/%{xbuild}/ +%{_libdir}/xemacs-%{xver}/%{xbuild}/[acdfghprsvwy]* +%{_libdir}/xemacs-%{xver}/%{xbuild}/m[am]* +%{_libdir}/xemacs-%{xver}/%{xbuild}/movemail %if %{with modules} %{_libdir}/xemacs/ -%dir %{_libdir}/xemacs-%{xver}/*linux/modules/ -%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.elc +%dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ +%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc %endif %config(noreplace) %{_sysconfdir}/skel/.xemacs/ %{_mandir}/man1/etags.xemacs.1* @@ -486,22 +513,28 @@ fi %files el -f el-files %defattr(-,root,root,-) %if %{with modules} -%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.el +%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el %endif %files info -f info-files %defattr(-,root,root,-) %{_infodir}/*.info* -%if %{with modules} %files devel %defattr(-,root,root,-) +%if %{with modules} %{_bindir}/ellcc -%{_libdir}/xemacs-%{xver}/*linux/include/ +%{_libdir}/xemacs-%{xver}/%{xbuild}/include/ %endif +%{_libdir}/pkgconfig/xemacs.pc %changelog +* Wed Jun 6 2007 Ville Skyttä - 21.5.28-2 +- Set more dirs explicitly until upstream configure honors them better. +- Borrow DESTDIR install patch from openSUSE. +- Add pkgconfig file to -devel. + * Mon May 21 2007 Ville Skyttä - 21.5.28-1 - 21.5.28, module path fix applied upstream. - Patch to retain courier as the default font. From bc1ad30980e89be9833d229de1e9c67454aaa681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 Jun 2007 09:54:09 +0000 Subject: [PATCH 039/160] - Apply upstream fix for #245017. --- xemacs-21.5.28-revert-modified-245017.patch | 40 +++++++++++++++++++++ xemacs.spec | 7 +++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.28-revert-modified-245017.patch diff --git a/xemacs-21.5.28-revert-modified-245017.patch b/xemacs-21.5.28-revert-modified-245017.patch new file mode 100644 index 0000000..557fba0 --- /dev/null +++ b/xemacs-21.5.28-revert-modified-245017.patch @@ -0,0 +1,40 @@ +2007-06-22 Aidan Kehoe + + * files.el (revert-buffer): + * files.el (recover-file): + Pass NOMODIFY to set-buffer-file-coding-systems after reverting a + buffer and after recovering a file. + + +XEmacs Trunk source patch: +Diff command: cvs -q diff -Nu +Files affected: lisp/files.el +=================================================================== +RCS + +Index: lisp/files.el +=================================================================== +RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v +retrieving revision 1.77 +diff -u -u -r1.77 files.el +--- lisp/files.el 2006/11/30 07:29:36 1.77 ++++ lisp/files.el 2007/06/21 22:49:14 +@@ -3473,7 +3473,7 @@ + (coding-system-base + buffer-file-coding-system-when-loaded) + buffer-file-coding-system-when-loaded) +- (not adjust-eol)))))) ++ (not adjust-eol) t))))) + (goto-char (min opoint (point-max))) + ;; Recompute the truename in case changes in symlinks + ;; have changed the truename. +@@ -3616,7 +3616,8 @@ + (coding-system-for-read 'escape-quoted)) + (erase-buffer) + (insert-file-contents file-name nil) +- (set-buffer-file-coding-system coding-system)) ++ (set-buffer-file-coding-system coding-system ++ nil t)) + (after-find-file nil nil t) + (return nil)) + (diff diff --git a/xemacs.spec b/xemacs.spec index 77b9aef..4765801 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -44,6 +44,7 @@ Patch6: %{name}-21.5.26-gtk-gcc4.patch Patch7: %{name}-21.5.27-finder-lisp-dir.patch Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.28-destdir.patch +Patch10: %{name}-21.5.28-revert-modified-245017.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -197,6 +198,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch7 -p0 %patch8 -p0 %patch9 -p1 +%patch10 -p0 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -530,6 +532,9 @@ fi %changelog +* Sun Jun 24 2007 Ville Skyttä - 21.5.28-3 +- Apply upstream fix for #245017. + * Wed Jun 6 2007 Ville Skyttä - 21.5.28-2 - Set more dirs explicitly until upstream configure honors them better. - Borrow DESTDIR install patch from openSUSE. From a811c1016d26e2fca853852876b82ad4d061b6a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 30 Jun 2007 11:06:10 +0000 Subject: [PATCH 040/160] - Turn on syntax highlighting with lazy-lock by default. - Drop Application and X-Fedora categories and Encoding from desktop entry. - Move diff-switches default from skeleton init.el to site-start.el. --- default.el | 16 ++++++++++++++-- dotxemacs-init.el | 7 ++----- xemacs-sitestart.el | 6 ++++++ xemacs.desktop | 3 +-- xemacs.spec | 12 +++++++----- 5 files changed, 30 insertions(+), 14 deletions(-) diff --git a/default.el b/default.el index f497674..8766c65 100644 --- a/default.el +++ b/default.el @@ -1,11 +1,11 @@ ;;; default.el - loaded at startup after "~/.xemacs/init.el" by default ;;; -;;; Setting `inhibit-default-init' non-nil in "~/.xemacs/init.el" +;;; Setting `inhibit-default-init' to non-nil in "~/.xemacs/init.el" ;;; prevents loading of this file. The "-q" option to xemacs ;;; prevents "~/.xemacs/init.el" *and* this file from being loaded ;;; at startup. -;; enable wheelmouse support by default +;; enable wheel mouse support by default (when window-system (mwheel-install)) @@ -14,3 +14,15 @@ ;; use terminfo by default (defvar system-uses-terminfo t) + +;; turn on syntax highlighting by default +(require 'font-lock) +(when (fboundp 'turn-on-lazy-lock) + ;; use lazy-lock by default if lazy-shot is not enabled + (remove-hook 'font-lock-mode-hook 'turn-on-lazy-lock) + (add-hook 'font-lock-mode-hook + (function + (lambda () + (unless (and (boundp 'lazy-shot-mode) lazy-shot-mode) + (turn-on-lazy-lock)))) + t)) diff --git a/dotxemacs-init.el b/dotxemacs-init.el index df8f072..6697754 100644 --- a/dotxemacs-init.el +++ b/dotxemacs-init.el @@ -1,7 +1,4 @@ -;;; .xemacs/init.el +;;; ~/.xemacs/init.el ;;; uncomment this line to disable loading of "default.el" at startup -;; (setq inhibit-default-init t) - -;; default to unified diffs -(setq diff-switches "-u") +;(setq inhibit-default-init t) diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el index 61b6487..4fa0353 100644 --- a/xemacs-sitestart.el +++ b/xemacs-sitestart.el @@ -14,6 +14,12 @@ ;; default to non-kerberos ftp (setq efs-ftp-program-name "/usr/bin/ftp") +;; default to unified diffs +(setq-default diff-switches "-u") + +;; decrease lazy-lock default threshold +(setq-default lazy-lock-minimum-size (* 2 1024)) + ;; load .el files in "site-start.d/" (let ((files (directory-files "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$"))) diff --git a/xemacs.desktop b/xemacs.desktop index 103eb42..320b8c0 100644 --- a/xemacs.desktop +++ b/xemacs.desktop @@ -29,6 +29,5 @@ Exec=xemacs %f Icon=xemacs Type=Application Terminal=false -Categories=Application;Development;TextEditor; -Encoding=UTF-8 +Categories=Development;TextEditor; StartupWMClass=XEmacs diff --git a/xemacs.spec b/xemacs.spec index 4765801..73b581e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -350,11 +350,8 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/standards* rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* rm -f $RPM_BUILD_ROOT%{_infodir}/dir -desktop-file-install \ - --vendor=fedora \ - --mode=644 \ +desktop-file-install --vendor=fedora --mode=644 \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category=X-Fedora \ %{SOURCE2} # lockdir @@ -532,6 +529,11 @@ fi %changelog +* Sat Jun 30 2007 Ville Skyttä - 21.5.28-4 +- Turn on syntax highlighting with lazy-lock by default. +- Drop Application and X-Fedora categories and Encoding from desktop entry. +- Move diff-switches default from skeleton init.el to site-start.el. + * Sun Jun 24 2007 Ville Skyttä - 21.5.28-3 - Apply upstream fix for #245017. From 0413074f336e57c66ac468367453427ebd969042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 17 Aug 2007 08:31:05 +0000 Subject: [PATCH 041/160] - Turn on syntax highlighting by default only if lazy-lock is available. - Requires(post): coreutils in main package and -nox. - Scriptlet cleanups. - License: GPLv2+ --- default.el | 4 ++-- xemacs.spec | 38 ++++++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/default.el b/default.el index 8766c65..8d4478e 100644 --- a/default.el +++ b/default.el @@ -15,9 +15,9 @@ ;; use terminfo by default (defvar system-uses-terminfo t) -;; turn on syntax highlighting by default -(require 'font-lock) +;; turn on syntax highlighting by default if lazy-lock is available (when (fboundp 'turn-on-lazy-lock) + (require 'font-lock) ;; use lazy-lock by default if lazy-shot is not enabled (remove-hook 'font-lock-mode-hook 'turn-on-lazy-lock) (add-hook 'font-lock-mode-hook diff --git a/xemacs.spec b/xemacs.spec index 73b581e..f6aadb9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,11 +20,11 @@ Name: xemacs Version: 21.5.28 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Different version of Emacs Group: Applications/Editors -License: GPL +License: GPLv2+ URL: http://www.xemacs.org/ Source0: http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz Source1: %{name}.png @@ -89,6 +89,7 @@ Requires: xemacs-packages-base >= 20060510 Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi +Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} %description @@ -122,6 +123,7 @@ Group: Applications/Editors # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} +Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} %description nox @@ -418,15 +420,23 @@ rm -rf $RPM_BUILD_ROOT # rm because alternatives won't overwrite pre-alternatives symlink, bug? rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ - %{_bindir}/xemacs-%{xver} 80 || : -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : -update-desktop-database -q %{_datadir}/applications 2>/dev/null || : + %{_bindir}/xemacs-%{xver} 80 +touch --no-create %{_datadir}/icons/hicolor &>/dev/null +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi +update-desktop-database -q %{_datadir}/applications 2>/dev/null +: %postun [ -e %{_bindir}/xemacs-%{xver} ] || \ -%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || : -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : -update-desktop-database -q %{_datadir}/applications 2>/dev/null || : +%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} +touch --no-create %{_datadir}/icons/hicolor &>/dev/null +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +fi +update-desktop-database -q %{_datadir}/applications 2>/dev/null +: %post nox # rm because alternatives won't overwrite pre-alternatives symlink, bug? @@ -448,15 +458,17 @@ rm -f %{_bindir}/xemacs && \ %post info for file in xemacs cl internals lispref new-users-guide ; do - /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || : + /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir done +: %preun info if [ $1 -eq 0 ] ; then for file in xemacs cl internals lispref new-users-guide ; do - /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir done fi +: %files @@ -529,6 +541,12 @@ fi %changelog +* Fri Aug 17 2007 Ville Skyttä - 21.5.28-5 +- Turn on syntax highlighting by default only if lazy-lock is available. +- Requires(post): coreutils in main package and -nox. +- Scriptlet cleanups. +- License: GPLv2+ + * Sat Jun 30 2007 Ville Skyttä - 21.5.28-4 - Turn on syntax highlighting with lazy-lock by default. - Drop Application and X-Fedora categories and Encoding from desktop entry. From 2b7b37a7cbf3f3cd16e10b58e77b06ef61605e6b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 23:29:32 +0000 Subject: [PATCH 042/160] - Autorebuild for GCC 4.3 --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index f6aadb9..af31caa 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -541,6 +541,9 @@ fi %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 21.5.28-6 +- Autorebuild for GCC 4.3 + * Fri Aug 17 2007 Ville Skyttä - 21.5.28-5 - Turn on syntax highlighting by default only if lazy-lock is available. - Requires(post): coreutils in main package and -nox. From f32887eb1e9f168f8ea6d4c519f2befad7f1c264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Jul 2008 16:53:57 +0000 Subject: [PATCH 043/160] - Fix build with autoconf >= 2.62 (#449626). --- xemacs-21.5.28-autoconf262-449626.patch | 16 ++++++++++++++++ xemacs.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.28-autoconf262-449626.patch diff --git a/xemacs-21.5.28-autoconf262-449626.patch b/xemacs-21.5.28-autoconf262-449626.patch new file mode 100644 index 0000000..59e49f1 --- /dev/null +++ b/xemacs-21.5.28-autoconf262-449626.patch @@ -0,0 +1,16 @@ +diff -r 78738a40e31e -r 86283c809984 configure.ac +--- a/configure.ac Sun Jun 29 11:06:16 2008 +0200 ++++ b/configure.ac Sun Jul 06 19:46:19 2008 +0300 +@@ -387,9 +387,11 @@ + dnl + dnl Internal macro to recursively expand all the options in the option list. + dnl ++dnl m4_fst disappeared without a trace in autoconf 2.62 ++m4_define([xe_fst], [$1])dnl + define([XE_EXPAND_COMPLEX_OPTIONS], + [m4_if([$2], [], [], +- [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl ++ [XE_EXPAND_COMPLEX_OPTION([$1], xe_fst($2))[]dnl + XE_EXPAND_COMPLEX_OPTIONS([$1], XE_CDR($2))])])dnl + dnl + dnl XE_INIT_COMPLEX_OPTION(prefix, option_list) diff --git a/xemacs.spec b/xemacs.spec index af31caa..d644d81 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -45,6 +45,7 @@ Patch7: %{name}-21.5.27-finder-lisp-dir.patch Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.28-destdir.patch Patch10: %{name}-21.5.28-revert-modified-245017.patch +Patch11: %{name}-21.5.28-autoconf262-449626.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -201,6 +202,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch8 -p0 %patch9 -p1 %patch10 -p0 +%patch11 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -541,6 +543,9 @@ fi %changelog +* Sun Jul 6 2008 Ville Skyttä - 21.5.28-7 +- Fix build with autoconf >= 2.62 (#449626). + * Tue Feb 19 2008 Fedora Release Engineering - 21.5.28-6 - Autorebuild for GCC 4.3 From 06662e0a0e8300574763ba9d5f2ab1028e240175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 6 Jul 2008 21:14:09 +0000 Subject: [PATCH 044/160] - Apply upstream fix for detection of 3D Athena widget sets. --- xemacs-21.5.28-3d-athena.patch | 24 ++++++++++++++++++++++++ xemacs.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.28-3d-athena.patch diff --git a/xemacs-21.5.28-3d-athena.patch b/xemacs-21.5.28-3d-athena.patch new file mode 100644 index 0000000..5c4f56e --- /dev/null +++ b/xemacs-21.5.28-3d-athena.patch @@ -0,0 +1,24 @@ +--- a/configure.ac Sat Mar 15 12:21:11 2008 +0100 ++++ b/configure.ac Fri Apr 04 10:48:58 2008 -0700 +@@ -4241,17 +4241,17 @@ if test "$with_x11" = "yes" -a "$detect_ + AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, + [ + dnl Must not be a 3d library... +- AC_CHECK_LIB($athena_variant, threeDClassRec, ++ AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, + [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], + athena_lib=$athena_variant) + ], + AC_MSG_WARN([Could not find an Athena widget library.])) + else + dnl The real configuration, need 3d library +- AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, ++ AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant, + dnl OK, couldn't find it with a proper name, try the standard Athena lib + dnl If that is 3d, presume the user asked for what they have installed. +- AC_CHECK_LIB(Xaw, threeDClassRec, ++ AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB, + [ + athena_lib=Xaw; + AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); + diff --git a/xemacs.spec b/xemacs.spec index d644d81..4cd046e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -46,6 +46,7 @@ Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.28-destdir.patch Patch10: %{name}-21.5.28-revert-modified-245017.patch Patch11: %{name}-21.5.28-autoconf262-449626.patch +Patch12: %{name}-21.5.28-3d-athena.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -203,6 +204,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch9 -p1 %patch10 -p0 %patch11 -p1 +%patch12 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -543,6 +545,9 @@ fi %changelog +* Sun Jul 6 2008 Ville Skyttä - 21.5.28-8 +- Apply upstream fix for detection of 3D Athena widget sets. + * Sun Jul 6 2008 Ville Skyttä - 21.5.28-7 - Fix build with autoconf >= 2.62 (#449626). From 61bca8f2dfde88b04dc2e27c8474ecd144d35892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 20 Jul 2008 15:44:23 +0000 Subject: [PATCH 045/160] - Rebuild. --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 4cd046e..6627aa7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -545,6 +545,9 @@ fi %changelog +* Sun Jul 20 2008 Ville Skyttä - 21.5.28-9 +- Rebuild. + * Sun Jul 6 2008 Ville Skyttä - 21.5.28-8 - Apply upstream fix for detection of 3D Athena widget sets. From 18454a516d163aa601ac5a391b1152038ab04bfc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 08:26:41 +0000 Subject: [PATCH 046/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 6627aa7..fad0f5e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.28 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -545,6 +545,9 @@ fi %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 21.5.28-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Jul 20 2008 Ville Skyttä - 21.5.28-9 - Rebuild. From 1496ae4522296ee715d89cc34cbf62e08015d5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 26 Feb 2009 20:56:01 +0000 Subject: [PATCH 047/160] - Apply upstream autoload changes to be able to build recent XEmacs packages. - Make support for XIM optional at build time, still enabled by default. - Drop support for building without stack protector compiler flags. - Make -info subpackage noarch when built for Fedora >= 10. - Improve icon cache and desktop database refresh scriptlets. - Use %global instead of %define. --- xemacs-21.5.28-xemacs-base-autoloads.patch | 119 +++++++++++++++++++++ xemacs.spec | 46 ++++---- 2 files changed, 147 insertions(+), 18 deletions(-) create mode 100644 xemacs-21.5.28-xemacs-base-autoloads.patch diff --git a/xemacs-21.5.28-xemacs-base-autoloads.patch b/xemacs-21.5.28-xemacs-base-autoloads.patch new file mode 100644 index 0000000..db8d6d1 --- /dev/null +++ b/xemacs-21.5.28-xemacs-base-autoloads.patch @@ -0,0 +1,119 @@ +diff -up xemacs-21.5.28/lisp/autoload.el~ xemacs-21.5.28/lisp/autoload.el +--- xemacs-21.5.28/lisp/autoload.el~ 2006-05-30 00:25:49.000000000 +0300 ++++ xemacs-21.5.28/lisp/autoload.el 2009-02-22 23:36:20.000000000 +0200 +@@ -226,6 +226,41 @@ the section of autoloads for a file.") + ;; Parsing the source file text. + ;; Autoloads in C source differ from those in Lisp source. + ++; Add operator definitions to autoload-operators.el in the xemacs-base ++; package. ++(ignore-errors (require 'autoload-operators)) ++ ++; As autoload-operators is new, provide stopgap measure for a while. ++(if (not (boundp 'autoload-make-autoload-operators)) ++ (progn ++ (defvar autoload-make-autoload-operators ++ '(defun define-skeleton defmacro define-derived-mode define-generic-mode ++ easy-mmode-define-minor-mode easy-mmode-define-global-mode ++ define-minor-mode defun* defmacro*) ++ "`defun'-like operators that use `autoload' to load the library.") ++ ++ (defvar autoload-make-autoload-complex-operators ++ '(easy-mmode-define-minor-mode easy-mmode-define-global-mode ++ define-minor-mode) ++ "`defun'-like operators to macroexpand before using `autoload'.") ++ ++ (put 'autoload 'doc-string-elt 3) ++ (put 'defun 'doc-string-elt 3) ++ (put 'defun* 'doc-string-elt 3) ++ (put 'defvar 'doc-string-elt 3) ++ (put 'defcustom 'doc-string-elt 3) ++ (put 'defconst 'doc-string-elt 3) ++ (put 'defmacro 'doc-string-elt 3) ++ (put 'defmacro* 'doc-string-elt 3) ++ (put 'defsubst 'doc-string-elt 3) ++ (put 'define-skeleton 'doc-string-elt 2) ++ (put 'define-derived-mode 'doc-string-elt 4) ++ (put 'easy-mmode-define-minor-mode 'doc-string-elt 2) ++ (put 'define-minor-mode 'doc-string-elt 2) ++ (put 'define-generic-mode 'doc-string-elt 7) ++ ;; defin-global-mode has no explicit docstring. ++ (put 'easy-mmode-define-global-mode 'doc-string-elt 1000))) ++ + (defun make-autoload (form file) + "Turn FORM into an autoload or defvar for source file FILE. + Returns nil if FORM is not a special autoload form (i.e. a function definition +@@ -233,8 +268,7 @@ or macro definition or a defcustom)." + (let ((car (car-safe form)) expand) + (cond + ;; For complex cases, try again on the macro-expansion. +- ((and (memq car '(easy-mmode-define-global-mode +- easy-mmode-define-minor-mode define-minor-mode)) ++ ((and (memq car autoload-make-autoload-complex-operators) + (setq expand (let ((load-file-name file)) (macroexpand form))) + (eq (car expand) 'progn) + (memq :autoload-end expand)) +@@ -246,10 +280,7 @@ or macro definition or a defcustom)." + (cdr expand))))) + + ;; For special function-like operators, use the `autoload' function. +- ((memq car '(defun define-skeleton defmacro define-derived-mode +- define-generic-mode easy-mmode-define-minor-mode +- easy-mmode-define-global-mode +- define-minor-mode defun* defmacro*)) ++ ((memq car autoload-make-autoload-operators) + (let* ((macrop (memq car '(defmacro defmacro*))) + (name (nth 1 form)) + (body (nthcdr (get car 'doc-string-elt) form)) +@@ -513,7 +546,8 @@ Updates AUTOLOADS-DONE and returns the n + (let ((begin (point))) + (forward-sexp) + (forward-line 1) +- (princ (buffer-substring begin (point)) outbuf))) ++ (princ (buffer-substring begin (point)) outbuf)) ++ (setq autoloads-done (cons ' autoloads-done))) + (t + (princ (buffer-substring + (progn +@@ -767,41 +801,6 @@ at the beginning of lines and ^L charact + (insert "\\^L"))) + (goto-char p2)))))))) + +-;;; Forms which have doc-strings which should be printed specially. +-;;; A doc-string-elt property of ELT says that (nth ELT FORM) is +-;;; the doc-string in FORM. +-;;; +-;;; There used to be the following note here: +-;;; ;;; Note: defconst and defvar should NOT be marked in this way. +-;;; ;;; We don't want to produce defconsts and defvars that +-;;; ;;; make-docfile can grok, because then it would grok them twice, +-;;; ;;; once in foo.el (where they are given with ;;;###autoload) and +-;;; ;;; once in loaddefs.el. +-;;; +-;;; Counter-note: Yes, they should be marked in this way. +-;;; make-docfile only processes those files that are loaded into the +-;;; dumped Emacs, and those files should never have anything +-;;; autoloaded here. The above-feared problem only occurs with files +-;;; which have autoloaded entries *and* are processed by make-docfile; +-;;; there should be no such files. +- +-(put 'autoload 'doc-string-elt 3) +-(put 'defun 'doc-string-elt 3) +-(put 'defun* 'doc-string-elt 3) +-(put 'defvar 'doc-string-elt 3) +-(put 'defcustom 'doc-string-elt 3) +-(put 'defconst 'doc-string-elt 3) +-(put 'defmacro 'doc-string-elt 3) +-(put 'defmacro* 'doc-string-elt 3) +-(put 'defsubst 'doc-string-elt 3) +-(put 'define-skeleton 'doc-string-elt 2) +-(put 'define-derived-mode 'doc-string-elt 4) +-(put 'easy-mmode-define-minor-mode 'doc-string-elt 2) +-(put 'define-minor-mode 'doc-string-elt 2) +-(put 'define-generic-mode 'doc-string-elt 7) +-;; defin-global-mode has no explicit docstring. +-(put 'easy-mmode-define-global-mode 'doc-string-elt 1000) +- + (defun autoload-trim-file-name (file) + "Returns relative pathname of FILE including the last directory. + diff --git a/xemacs.spec b/xemacs.spec index fad0f5e..912de0d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -8,19 +8,16 @@ %bcond_with xft %bcond_without mule %bcond_without nox -%bcond_without stackprot +%bcond_without xim %ifarch ia64 %bcond_with modules %else %bcond_without modules %endif -%define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') -%define xbuild %(echo %{_build} | sed -e 's/^\\([^-]*-[^-]*-[^-]*\\).*/\\1/') - Name: xemacs Version: 21.5.28 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -47,6 +44,8 @@ Patch9: %{name}-21.5.28-destdir.patch Patch10: %{name}-21.5.28-revert-modified-245017.patch Patch11: %{name}-21.5.28-autoconf262-449626.patch Patch12: %{name}-21.5.28-3d-athena.patch +# From upstream hg +Patch13: %{name}-21.5.28-xemacs-base-autoloads.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -94,6 +93,9 @@ Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} +%global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') +%global xbuild %(echo %{_build} | sed -e 's/^\\([^-]*-[^-]*-[^-]*\\).*/\\1/') + %description XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -155,6 +157,9 @@ interest when developing or debugging XEmacs itself. %package info Summary: XEmacs documentation in GNU texinfo format Group: Documentation +%if 0%{?fedora} >= 10 +BuildArch: noarch +%endif Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -205,6 +210,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch10 -p0 %patch11 -p1 %patch12 -p1 +%patch13 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -217,10 +223,6 @@ done %build CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" -%if ! %{with stackprot} -CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" -CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" -%endif %if %{with gtk} CFLAGS="$CFLAGS $(pkg-config libglade --cflags)" %endif @@ -296,7 +298,7 @@ done --with-widgets=athena \ --with-dialogs=athena \ --with-scrollbars=lucid \ - --with-xim=xlib \ + --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ %endif %if ! %{with wnn} --without-wnn @@ -426,22 +428,22 @@ rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-%{xver} 80 touch --no-create %{_datadir}/icons/hicolor &>/dev/null -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor -fi -update-desktop-database -q %{_datadir}/applications 2>/dev/null : %postun [ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} -touch --no-create %{_datadir}/icons/hicolor &>/dev/null -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +if [ $1 -eq 0 ] ; then + update-desktop-database %{_datadir}/applications &>/dev/null + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null fi -update-desktop-database -q %{_datadir}/applications 2>/dev/null : +%posttrans +update-desktop-database %{_datadir}/applications &>/dev/null +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %post nox # rm because alternatives won't overwrite pre-alternatives symlink, bug? rm -f %{_bindir}/xemacs && \ @@ -545,6 +547,14 @@ fi %changelog +* Thu Feb 26 2009 Ville Skyttä - 21.5.28-11 +- Apply upstream autoload changes to be able to build recent XEmacs packages. +- Make support for XIM optional at build time, still enabled by default. +- Drop support for building without stack protector compiler flags. +- Make -info subpackage noarch when built for Fedora >= 10. +- Improve icon cache and desktop database refresh scriptlets. +- Use %%global instead of %%define. + * Thu Feb 26 2009 Fedora Release Engineering - 21.5.28-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From d8308e82c1ce2f6d40f87e8a4b097b02a8c52d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 8 Mar 2009 20:24:26 +0000 Subject: [PATCH 048/160] - Make XFontSet support optional at build time and disable it by default to work around #478370. --- xemacs.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 912de0d..97fe57d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -5,6 +5,7 @@ %bcond_with gtk %bcond_with wnn %bcond_with xaw3d +%bcond_with xfs %bcond_with xft %bcond_without mule %bcond_without nox @@ -17,7 +18,7 @@ Name: xemacs Version: 21.5.28 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -287,8 +288,10 @@ done %if %{with xft} --with-xft=all \ %else +%if %{with xfs} --with-xfs \ %endif +%endif %if %{with gtk} --with-gtk \ --with-gnome \ @@ -547,6 +550,10 @@ fi %changelog +* Sun Mar 8 2009 Ville Skyttä - 21.5.28-12 +- Make XFontSet support optional at build time and disable it by default + to work around #478370. + * Thu Feb 26 2009 Ville Skyttä - 21.5.28-11 - Apply upstream autoload changes to be able to build recent XEmacs packages. - Make support for XIM optional at build time, still enabled by default. From 2f2825c4dc35ddc36d799ffb893af516600f5ca6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 12 Mar 2009 17:01:29 +0000 Subject: [PATCH 049/160] - Add possibility to build upstream hg snapshots. - Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune). - Include Installation{,-nox} in docs. --- xemacs-21.5.28-courier-default.patch | 11 +- xemacs-beta-destdir.patch | 366 +++++++++++++++++++++++++++ xemacs-beta-infodir.patch | 12 + xemacs-snapshot.sh | 34 +++ xemacs.spec | 49 +++- 5 files changed, 455 insertions(+), 17 deletions(-) create mode 100644 xemacs-beta-destdir.patch create mode 100644 xemacs-beta-infodir.patch create mode 100755 xemacs-snapshot.sh diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index 19b5904..f7af72f 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,16 +1,7 @@ --- src/faces.c 22 Apr 2007 19:58:59 -0000 1.55 +++ src/faces.c 21 May 2007 14:51:50 -0000 -@@ -2397,11 +2397,12 @@ - THAT WAS A GOOD IDEA?!?!) The other fonts that used to be specified - here gave horrendous results. */ - -+ /* Fedora change: no such issues here, back to courier for backcompat. */ - inst_list = - Fcons - (Fcons +@@ -2399,3 +2399,3 @@ (list1 (device_symbol), - build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), + build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), inst_list); - - #endif /* !USE_XFT */ diff --git a/xemacs-beta-destdir.patch b/xemacs-beta-destdir.patch new file mode 100644 index 0000000..225b6f9 --- /dev/null +++ b/xemacs-beta-destdir.patch @@ -0,0 +1,366 @@ +diff -up xemacs-beta/dynodump/Makefile.in.in~ xemacs-beta/dynodump/Makefile.in.in +--- xemacs-beta/dynodump/Makefile.in.in~ 2009-03-08 15:00:21.000000000 +0200 ++++ xemacs-beta/dynodump/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +@@ -22,6 +22,8 @@ + + ## Synched up with: Not synched with FSF. + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules. + .SUFFIXES: + .SUFFIXES: .c .o .i .h +diff -up xemacs-beta/etc/tests/external-widget/Makefile~ xemacs-beta/etc/tests/external-widget/Makefile +--- xemacs-beta/etc/tests/external-widget/Makefile~ 2009-03-08 15:00:22.000000000 +0200 ++++ xemacs-beta/etc/tests/external-widget/Makefile 2009-03-08 23:57:58.000000000 +0200 +@@ -1,3 +1,5 @@ ++DESTDIR= ++ + CFLAGS += -Xc -g -DTOOLTALK + EMACSHOME = ../../.. + EMACSLIBDIR = $(EMACSHOME)/editor/src +diff -up xemacs-beta/lib-src/Makefile.in.in~ xemacs-beta/lib-src/Makefile.in.in +--- xemacs-beta/lib-src/Makefile.in.in~ 2009-03-08 15:00:23.000000000 +0200 ++++ xemacs-beta/lib-src/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +@@ -24,6 +24,8 @@ + ## above a certain point in this file are in shell format instead of + ## in C format. How the hell is this supposed to work? */ + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules + .SUFFIXES: + .SUFFIXES: .c .h .o +@@ -246,26 +248,26 @@ do-blessmail: $(blessmail) + ## just run them directly from lib-src. + ${archlibdir}: all + @echo; echo "Installing utilities run internally by XEmacs." +- ./make-path ${archlibdir} ++ ./make-path $(DESTDIR)${archlibdir} + if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \ + for f in ${PRIVATE_INSTALLABLE_EXES}; do \ +- (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \ ++ (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \ + done ; \ + fi + if test "`(cd ${archlibdir} && $(pwd))`" \ + != "`(cd ${srcdir} && $(pwd))`"; then \ + for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \ +- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \ ++ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \ + done ; \ + fi + + install: ${archlibdir} + @echo; echo "Installing utilities for users to run." + for file in ${PUBLIC_INSTALLABLE_EXES} ; do \ +- (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ ++ (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \ + done + for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \ +- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \ ++ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \ + done + + uninstall: +diff -up xemacs-beta/lwlib/Makefile.in.in~ xemacs-beta/lwlib/Makefile.in.in +--- xemacs-beta/lwlib/Makefile.in.in~ 2009-03-08 15:00:24.000000000 +0200 ++++ xemacs-beta/lwlib/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +@@ -22,6 +22,8 @@ + ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + ## Boston, MA 02111-1307, USA. + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules + .SUFFIXES: + .SUFFIXES: .c .h .o .i .s +diff -up xemacs-beta/Makefile.in.in~ xemacs-beta/Makefile.in.in +--- xemacs-beta/Makefile.in.in~ 2009-03-08 15:00:21.000000000 +0200 ++++ xemacs-beta/Makefile.in.in 2009-03-09 00:00:02.000000000 +0200 +@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS= + RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ + #endif + ++DESTDIR= ++ + SHELL = /bin/sh + LANG = C + LC_ALL = C +@@ -394,37 +396,37 @@ install-arch-dep: mkdir + (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \ + exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ + archlibdir=${archlibdir}) ; done +- if test "`(cd ${archlibdir} && $(pwd))`" != \ ++ if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != \ + "`(cd ./lib-src && $(pwd))`"; then \ + if test -f ../Installation; then \ +- ${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \ ++ ${INSTALL_DATA} ../Installation $(DESTDIR)${archlibdir}/Installation; \ + fi; \ +- ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \ +- ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \ ++ ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \ ++ ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \ + for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ + do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ + else true; fi + #if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE)) +- ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp ++ ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp + #endif + #ifdef WIN32_NATIVE +- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} +- -chmod 0755 ${bindir}/${PROGNAME} ++ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME} ++ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME} + #else + # ifdef CYGWIN +- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe +- -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe +- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} +- cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME} ++ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe ++ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe ++ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} ++ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME} + # else +- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} +- -chmod 0755 ${bindir}/${PROGNAME}-${version} +- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} +- cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME} ++ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version} ++ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version} ++ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} ++ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME} + # endif /* CYGWIN */ + #endif /* WIN32_NATIVE */ + if test "${prefix}" != "${exec_prefix}"; then \ +- $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \ ++ $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \ + for dir in \ + lib/${inststaticdir} \ + lib/${instvardir}/etc \ +@@ -435,13 +437,13 @@ install-arch-dep: mkdir + done; \ + fi + #ifdef HAVE_SHLIB +- $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir) ++ $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir) + #endif + + install-arch-indep: mkdir info + -@set ${COPYDESTS} ; \ + for dir in ${COPYDIR} ; do \ +- if test "`(cd $$1 && $(pwd))`" != \ ++ if test "`(cd $(DESTDIR)$$1 && $(pwd))`" != \ + "`(cd $${dir} && $(pwd))`"; then \ + : do nothing - echo "rm -rf $$1" ; \ + fi ; \ +@@ -449,35 +451,35 @@ install-arch-indep: mkdir info + done + -set ${COPYDESTS} ; \ + for dir in ${COPYDESTS} ; do \ +- if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \ ++ if test ! -d $${dir} ; then mkdir $(DESTDIR)$${dir} ; fi ; \ + done ; \ + for dir in ${COPYDIR} ; do \ + dest=$$1 ; shift ; \ + test -d $${dir} \ + -a "`(cd $${dir} && $(pwd))`" != \ +- "`(cd $${dest} && $(pwd))`" \ ++ "`(cd $(DESTDIR)$${dest} && $(pwd))`" \ + && (echo "Copying $${dir}..." ; \ + (cd $${dir} && $(TAR) -cf - . ) | \ +- (cd $${dest} && umask 022 && $(TAR) -xf - );\ +- chmod 0755 $${dest}; \ +- for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ ++ (cd $(DESTDIR)$${dest} && umask 022 && $(TAR) -xf - );\ ++ chmod 0755 $(DESTDIR)$${dest}; \ ++ for subdir in `find $(DESTDIR)$${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ + (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \ + done) ; \ + done + if test "`(cd ${srcdir}/info && $(pwd))`" != \ +- "`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ +- if test ! -f ${infodir}/dir -a -f dir ; then \ +- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \ ++ "`(cd $(DESTDIR)${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ ++ if test ! -f $(DESTDIR)${infodir}/dir -a -f dir ; then \ ++ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \ + fi ; \ + for file in *.info* ; do \ +- ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \ +- chmod 0644 ${infodir}/$${file}; \ ++ ${INSTALL_DATA} $${file} $(DESTDIR)${infodir}/$${file} ; \ ++ chmod 0644 $(DESTDIR)${infodir}/$${file}; \ + done ; \ + fi + cd ${srcdir}/etc && \ + for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ +- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ +- chmod 0644 ${mandir}/$${page}${manext} ; \ ++ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \ ++ chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \ + done + @echo "If you would like to save approximately 4M of disk space, do" + @echo "make gzip-el" +@@ -487,19 +489,23 @@ install-arch-indep: mkdir info + @echo "${lispdir}" + + gzip-el: +- $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir} ++ $(SHELL) ${srcdir}/lib-src/gzip-el.sh $(DESTDIR)${lispdir} + + ## Build all the directories to install XEmacs in. + ## Since we may be creating several layers of directories, + ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use + ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. + mkdir: FRC.mkdir +- ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ +- ${mandir} ${bindir} ${datadir} ${libdir} \ ++ for dir in \ ++ ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ ++ ${mandir} ${bindir} ${datadir} ${libdir} \ + #ifdef HAVE_SHLIB +- ${moduledir} ${sitemoduledir} \ ++ ${moduledir} ${sitemoduledir} \ + #endif +- ${sitelispdir} ++ ${sitelispdir} ; \ ++ do \ ++ ${MAKEPATH} $(DESTDIR)$${dir} ; \ ++ done ; + + ## Install bundled packages, if present. + +diff -up xemacs-beta/man/Makefile~ xemacs-beta/man/Makefile +--- xemacs-beta/man/Makefile~ 2009-03-08 15:00:24.000000000 +0200 ++++ xemacs-beta/man/Makefile 2009-03-08 23:57:58.000000000 +0200 +@@ -20,6 +20,8 @@ + # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + # Boston, MA 02111-1307, USA. + ++DESTDIR= ++ + SHELL = /bin/sh + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi +diff -up xemacs-beta/modules/base64/Makefile~ xemacs-beta/modules/base64/Makefile +--- xemacs-beta/modules/base64/Makefile~ 2009-03-08 15:00:25.000000000 +0200 ++++ xemacs-beta/modules/base64/Makefile 2009-03-08 23:57:58.000000000 +0200 +@@ -7,6 +7,8 @@ + # 'installed'. + # + ++DESTDIR= ++ + SHELL=/bin/sh + RM=rm -f + CC=../../lib-src/ellcc +diff -up xemacs-beta/modules/common/Makefile.common~ xemacs-beta/modules/common/Makefile.common +--- xemacs-beta/modules/common/Makefile.common~ 2009-03-08 15:00:25.000000000 +0200 ++++ xemacs-beta/modules/common/Makefile.common 2009-03-08 23:57:58.000000000 +0200 +@@ -31,6 +31,8 @@ + #define NOT_C_CODE + #include "../../src/config.h" + ++DESTDIR= ++ + SHELL=/bin/sh + RM=rm -f + PROGNAME=@PROGNAME@ +@@ -98,7 +100,7 @@ extraclean: realclean + -$(RM) *~ \#* + + install: $(OBJECT_TO_BUILD) +- $(INSTALL_PROGRAM) $< $(INSTALLPATH) ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(INSTALLPATH) + + ## + ## Local Variables: +diff -up xemacs-beta/modules/zlib/Makefile~ xemacs-beta/modules/zlib/Makefile +--- xemacs-beta/modules/zlib/Makefile~ 2009-03-08 15:00:25.000000000 +0200 ++++ xemacs-beta/modules/zlib/Makefile 2009-03-08 23:57:58.000000000 +0200 +@@ -8,6 +8,8 @@ + # 'installed'. + # + ++DESTDIR= ++ + SHELL=/bin/sh + RM=rm -f + CC=../../lib-src/ellcc +diff -up xemacs-beta/netinstall/Makefile.in.in~ xemacs-beta/netinstall/Makefile.in.in +--- xemacs-beta/netinstall/Makefile.in.in~ 2009-03-08 15:00:25.000000000 +0200 ++++ xemacs-beta/netinstall/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +@@ -14,6 +14,8 @@ + ## + ## Makefile for Cygwin installer + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules + .SUFFIXES: + .SUFFIXES: .c .cc .h .o +@@ -173,7 +175,7 @@ setup-bin.ini: + install: + @echo; echo "Installing net setup." + for file in ${INSTALLABLES} ; do \ +- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \ ++ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \ + done + + version.c : $(srcdir)/ChangeLog Makefile +diff -up xemacs-beta/src/Makefile.in.in~ xemacs-beta/src/Makefile.in.in +--- xemacs-beta/src/Makefile.in.in~ 2009-03-08 15:00:26.000000000 +0200 ++++ xemacs-beta/src/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS= + RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ + #endif + ++DESTDIR= ++ + PROGNAME=@PROGNAME@ + prefix=@prefix@ + SRC=@srcdir@ +@@ -1065,7 +1067,7 @@ relock: + #ifdef HAVE_SHLIB + MAKEPATH=../lib-src/make-path + install: $(PROGNAME) +- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s ++ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s + -@echo "Copying include files for ellcc..." + -@hdir=`pwd`; \ + cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ +@@ -1079,12 +1081,12 @@ install: $(PROGNAME) + test -d s && hdrtars="$$hdrtars s/*"; \ + test -d m && hdrtars="$$hdrtars m/*"; \ + test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ +- (cd $(archlibdir)/include && umask 022 && tar xf -); \ +- chmod 755 $(archlibdir)/include; \ +- test -d $(archlibdir)/include/s && \ +- chmod 755 $(archlibdir)/include/s; \ +- test -d $(archlibdir)/include/m && \ +- chmod 755 $(archlibdir)/include/s;) \ ++ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include; \ ++ test -d $(DESTDIR)$(archlibdir)/include/s && \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \ ++ test -d $(DESTDIR)$(archlibdir)/include/m && \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \ + done) + #endif + +diff -up xemacs-beta/tests/tooltalk/Makefile~ xemacs-beta/tests/tooltalk/Makefile +--- xemacs-beta/tests/tooltalk/Makefile~ 2009-03-08 15:00:28.000000000 +0200 ++++ xemacs-beta/tests/tooltalk/Makefile 2009-03-08 23:57:58.000000000 +0200 +@@ -12,6 +12,8 @@ + + ### Code: + ++DESTDIR= ++ + CC = cc -Xc + CPPFLAGS = -I/usr/openwin/include + CFLAGS = -g -v -DNeedFunctionPrototypes diff --git a/xemacs-beta-infodir.patch b/xemacs-beta-infodir.patch new file mode 100644 index 0000000..803afe9 --- /dev/null +++ b/xemacs-beta-infodir.patch @@ -0,0 +1,12 @@ +diff -up xemacs-beta/configure.ac~ xemacs-beta/configure.ac +--- xemacs-beta/configure.ac~ 2009-03-08 15:00:21.000000000 +0200 ++++ xemacs-beta/configure.ac 2009-03-09 23:39:52.000000000 +0200 +@@ -1090,7 +1090,7 @@ then + AC_DEFINE(DOCDIR_USER_DEFINED) + fi + +-if test "x$infodir_expanded" != "x${prefix_expanded}/share/info" ++if test "x$infodir" != 'x${datarootdir}/info' + then + AC_DEFINE(INFODIR_USER_DEFINED) + else diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh new file mode 100755 index 0000000..0d4d64a --- /dev/null +++ b/xemacs-snapshot.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -e + +if [ -z "$1" -o $# -ne 1 ]; then + echo "Usage: $0 " + exit 2 +fi + +rev="$1" +tmp=$(mktemp -d) +tarball="xemacs-$(date +%Y%m%d)hg$rev.tar" + +trap cleanup EXIT +cleanup() { + set +e + [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" +} + +unset CDPATH +pwd=$(pwd) +now=$(date +%Y%m%d) + +cd "$tmp" +hg clone http://hg.debian.org/hg/xemacs/xemacs-beta +cd xemacs-beta +hg update -r "$rev" +# Hack to avoid needing .hg/ around but still getting xemacs-extra-name right +hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac +rm -r .hg* +cd .. +tar cf "$pwd/$tarball" xemacs-beta +lzma -f "$pwd/$tarball" +cd - >/dev/null diff --git a/xemacs.spec b/xemacs.spec index 97fe57d..d3f0e44 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,4 +1,4 @@ -# TODO: review desktop entry associations +# TODO: review desktop entry associations (does text/* work?) # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el # TODO: non-ASCII in buffer tabs @@ -16,15 +16,21 @@ %bcond_without modules %endif +#global snap 20090311hg4626 + Name: xemacs Version: 21.5.28 -Release: 12%{?dist} +Release: 13%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors License: GPLv2+ URL: http://www.xemacs.org/ +%if 0%{?snap:1} +Source0: %{name}-%{snap}.tar.lzma +%else Source0: http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz +%endif Source1: %{name}.png Source2: xemacs.desktop Source3: dotxemacs-init.el @@ -33,23 +39,38 @@ Source5: xemacs-sitestart.el Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch +# Upstreamed post 21.5.28 Patch2: %{name}-21.5.28-doc-encodings.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch +# Upstreamed post 21.5.28 # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html Patch6: %{name}-21.5.26-gtk-gcc4.patch +# Upstreamed post 21.5.28 Patch7: %{name}-21.5.27-finder-lisp-dir.patch Patch8: %{name}-21.5.28-courier-default.patch +%if 0%{?snap:1} +Patch9: %{name}-beta-destdir.patch +%else Patch9: %{name}-21.5.28-destdir.patch +%endif +# Upstreamed post 21.5.28 Patch10: %{name}-21.5.28-revert-modified-245017.patch +# Upstreamed post 21.5.28 Patch11: %{name}-21.5.28-autoconf262-449626.patch +# Upstreamed post 21.5.28 Patch12: %{name}-21.5.28-3d-athena.patch -# From upstream hg +# From upstream hg post 21.5.28 Patch13: %{name}-21.5.28-xemacs-base-autoloads.patch +# Sent upstream 2009-03-12 +Patch14: %{name}-beta-infodir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%if 0%{?snap:1} +BuildRequires: lzma +%endif BuildRequires: autoconf BuildRequires: sed >= 3.95 BuildRequires: texinfo @@ -91,6 +112,7 @@ Requires: xemacs-packages-base >= 20060510 Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi +Requires: xorg-x11-fonts-misc Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -190,13 +212,12 @@ This package contains XEmacs development support files. %prep -%setup -q +%setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f rm -f configure.in sed -i -e /tetris/d lisp/menubar-items.el %patch0 -p1 %patch1 -p1 -%patch2 -p0 %patch3 -p1 %ifarch ia64 touch -r aclocal.m4 aclocal.m4-stamp @@ -204,14 +225,19 @@ touch -r aclocal.m4 aclocal.m4-stamp touch -r aclocal.m4-stamp aclocal.m4 %endif %patch5 -p1 +%patch8 -p0 -F 1 +%patch9 -p1 +%if 0%{?snap:1} +%patch14 -p1 +%else +%patch2 -p0 %patch6 -p1 %patch7 -p0 -%patch8 -p0 -%patch9 -p1 %patch10 -p0 %patch11 -p1 %patch12 -p1 %patch13 -p1 +%endif sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -276,6 +302,7 @@ make EMACSDEBUGPATHS=yes # toplevel parallel make fails mv lib-src/DOC{,-nox} mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} +mv Installation{,-nox} # grab these from -nox, the X ones may have deps on ALSA, X, etc for file in {e,oo}tags gnuserv {fake,move}mail yow ; do mv lib-src/$file{,-mindep} @@ -482,6 +509,7 @@ fi %files %defattr(-,root,root,-) +%doc Installation # gnuclient needs X libs, so not in -common %{_bindir}/gnuclient %{_bindir}/gnudoit @@ -501,6 +529,7 @@ fi %if %{with nox} %files nox %defattr(-,root,root,-) +%doc Installation-nox %ghost %{_bindir}/xemacs %{_bindir}/xemacs-nox %{_bindir}/xemacs-nox-%{xver} @@ -514,6 +543,7 @@ fi %doc etc/editclient.sh %{_bindir}/etags.xemacs %{_bindir}/ootags +%{_bindir}/xemacs-script %dir %{_libdir}/xemacs-%{xver}/ %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/ %{_libdir}/xemacs-%{xver}/%{xbuild}/[acdfghprsvwy]* @@ -550,6 +580,11 @@ fi %changelog +* Thu Mar 12 2009 Ville Skyttä - 21.5.28-13 +- Add possibility to build upstream hg snapshots. +- Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune). +- Include Installation{,-nox} in docs. + * Sun Mar 8 2009 Ville Skyttä - 21.5.28-12 - Make XFontSet support optional at build time and disable it by default to work around #478370. From 8fce066163faa5e402d8c932ab85d049239f03b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 20 May 2009 21:10:39 +0000 Subject: [PATCH 050/160] - Update to 21.5.29; gtk-gcc4, finder-lisp-dir, 3d-athena, autoconf262, doc-encodings, revert-modified, and xemacs-base-autoloads patches applied upstream. --- .cvsignore | 2 +- sources | 2 +- xemacs-21.5.26-gtk-gcc4.patch | 29 -- xemacs-21.5.27-finder-lisp-dir.patch | 15 - xemacs-21.5.28-3d-athena.patch | 24 -- xemacs-21.5.28-autoconf262-449626.patch | 16 - xemacs-21.5.28-destdir.patch | 362 ------------------ xemacs-21.5.28-doc-encodings.patch | 104 ----- xemacs-21.5.28-revert-modified-245017.patch | 40 -- xemacs-21.5.28-xemacs-base-autoloads.patch | 119 ------ ...tdir.patch => xemacs-21.5.29-destdir.patch | 72 ++-- xemacs.spec | 40 +- 12 files changed, 46 insertions(+), 779 deletions(-) delete mode 100644 xemacs-21.5.26-gtk-gcc4.patch delete mode 100644 xemacs-21.5.27-finder-lisp-dir.patch delete mode 100644 xemacs-21.5.28-3d-athena.patch delete mode 100644 xemacs-21.5.28-autoconf262-449626.patch delete mode 100644 xemacs-21.5.28-destdir.patch delete mode 100644 xemacs-21.5.28-doc-encodings.patch delete mode 100644 xemacs-21.5.28-revert-modified-245017.patch delete mode 100644 xemacs-21.5.28-xemacs-base-autoloads.patch rename xemacs-beta-destdir.patch => xemacs-21.5.29-destdir.patch (80%) diff --git a/.cvsignore b/.cvsignore index d5bf0fb..cecbdf8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xemacs-21.5.28.tar.gz +xemacs-21.5.29.tar.gz diff --git a/sources b/sources index 39c18a8..ad2d8ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12e35715c5239c63651a8189973527ab xemacs-21.5.28.tar.gz +5364192ae0d3de23d9f4ce197e6493b5 xemacs-21.5.29.tar.gz diff --git a/xemacs-21.5.26-gtk-gcc4.patch b/xemacs-21.5.26-gtk-gcc4.patch deleted file mode 100644 index 9591542..0000000 --- a/xemacs-21.5.26-gtk-gcc4.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- xemacs-21.5.26/src/glyphs-gtk.c~ 2005-11-22 13:24:44.000000000 +0200 -+++ xemacs-21.5.26/src/glyphs-gtk.c 2006-04-14 23:57:23.000000000 +0300 -@@ -796,7 +796,7 @@ - find_keyword_in_vector (instantiator, Q_file); - - IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap; -- IMAGE_INSTANCE_GTK_MASK (ii) = 0; -+ IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0; - IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width; - IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height; - IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth; -@@ -837,7 +837,7 @@ - - IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = Qnil; - IMAGE_INSTANCE_GTK_PIXMAP (ii) = gdk_pixmap; -- IMAGE_INSTANCE_GTK_MASK (ii) = 0; -+ IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0; - IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = width; - IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = height; - IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth; -@@ -2972,7 +2972,7 @@ - IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP; - /* Make sure there aren't two pointers to the same mask, causing - it to get freed twice. */ -- IMAGE_INSTANCE_GTK_MASK (p) = 0; -+ IMAGE_INSTANCE_PIXMAP_MASK (p) = 0; - break; - - default: diff --git a/xemacs-21.5.27-finder-lisp-dir.patch b/xemacs-21.5.27-finder-lisp-dir.patch deleted file mode 100644 index 607f5fb..0000000 --- a/xemacs-21.5.27-finder-lisp-dir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/Makefile.in.in -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v -retrieving revision 1.125 -diff -u -u -r1.125 Makefile.in.in ---- src/Makefile.in.in 23 Apr 2006 16:11:32 -0000 1.125 -+++ src/Makefile.in.in 2 Sep 2006 15:28:21 -0000 -@@ -649,6 +649,7 @@ - @echo "Building finder database ..." - $(RM) $(LISP)/finder-inf.el - $(XEMACS_BATCH) -eval "(setq finder-compile-keywords-quiet t)" \ -+ -eval "(setq lisp-directory \"$(LISP)\")" \ - -l finder -f finder-compile-keywords - @echo "Building finder database ...(done)" - diff --git a/xemacs-21.5.28-3d-athena.patch b/xemacs-21.5.28-3d-athena.patch deleted file mode 100644 index 5c4f56e..0000000 --- a/xemacs-21.5.28-3d-athena.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/configure.ac Sat Mar 15 12:21:11 2008 +0100 -+++ b/configure.ac Fri Apr 04 10:48:58 2008 -0700 -@@ -4241,17 +4241,17 @@ if test "$with_x11" = "yes" -a "$detect_ - AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, - [ - dnl Must not be a 3d library... -- AC_CHECK_LIB($athena_variant, threeDClassRec, -+ AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, - [AC_MSG_WARN([Could not find a non-3d Athena widget library.])], - athena_lib=$athena_variant) - ], - AC_MSG_WARN([Could not find an Athena widget library.])) - else - dnl The real configuration, need 3d library -- AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, -+ AC_CHECK_LIB($athena_variant, XawSme3dComputeTopShadowRGB, athena_lib=$athena_variant, - dnl OK, couldn't find it with a proper name, try the standard Athena lib - dnl If that is 3d, presume the user asked for what they have installed. -- AC_CHECK_LIB(Xaw, threeDClassRec, -+ AC_CHECK_LIB(Xaw, XawSme3dComputeTopShadowRGB, - [ - athena_lib=Xaw; - AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); - diff --git a/xemacs-21.5.28-autoconf262-449626.patch b/xemacs-21.5.28-autoconf262-449626.patch deleted file mode 100644 index 59e49f1..0000000 --- a/xemacs-21.5.28-autoconf262-449626.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -r 78738a40e31e -r 86283c809984 configure.ac ---- a/configure.ac Sun Jun 29 11:06:16 2008 +0200 -+++ b/configure.ac Sun Jul 06 19:46:19 2008 +0300 -@@ -387,9 +387,11 @@ - dnl - dnl Internal macro to recursively expand all the options in the option list. - dnl -+dnl m4_fst disappeared without a trace in autoconf 2.62 -+m4_define([xe_fst], [$1])dnl - define([XE_EXPAND_COMPLEX_OPTIONS], - [m4_if([$2], [], [], -- [XE_EXPAND_COMPLEX_OPTION([$1], m4_fst($2))[]dnl -+ [XE_EXPAND_COMPLEX_OPTION([$1], xe_fst($2))[]dnl - XE_EXPAND_COMPLEX_OPTIONS([$1], XE_CDR($2))])])dnl - dnl - dnl XE_INIT_COMPLEX_OPTION(prefix, option_list) diff --git a/xemacs-21.5.28-destdir.patch b/xemacs-21.5.28-destdir.patch deleted file mode 100644 index 6e08635..0000000 --- a/xemacs-21.5.28-destdir.patch +++ /dev/null @@ -1,362 +0,0 @@ -diff -ru xemacs-21.5.24.orig/Makefile.in.in xemacs-21.5.24/Makefile.in.in ---- xemacs-21.5.24.orig/Makefile.in.in 2005-12-27 18:11:00.000000000 +0100 -+++ xemacs-21.5.24/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 -@@ -61,6 +61,8 @@ - RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ - #endif - -+DESTDIR= -+ - SHELL = /bin/sh - LANG = C - LC_ALL = C -@@ -382,35 +384,35 @@ - (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \ - exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ - archlibdir=${archlibdir}) ; done -- if test "`(cd ${archlibdir} && $(pwd))`" != \ -+ if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != \ - "`(cd ./lib-src && $(pwd))`"; then \ - if test -f ../Installation; then \ -- ${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \ -+ ${INSTALL_DATA} ../Installation $(DESTDIR)${archlibdir}/Installation; \ - fi; \ -- ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \ -- ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \ -+ ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \ -+ ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \ - for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ - do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ - else true; fi - #if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE)) -- ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp -+ ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp - #endif - #ifdef WIN32_NATIVE -- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} -- -chmod 0755 ${bindir}/${PROGNAME} -+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME} -+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME} - #else - # ifdef CYGWIN -- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe -- -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe -- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} -+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe -+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe -+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} - # else -- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} -- -chmod 0755 ${bindir}/${PROGNAME}-${version} -- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} -+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version} -+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version} -+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} - # endif /* CYGWIN */ - #endif /* WIN32_NATIVE */ - if test "${prefix}" != "${exec_prefix}"; then \ -- $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \ -+ $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \ - for dir in \ - lib/${inststaticdir} \ - lib/${instvardir}/etc \ -@@ -421,13 +423,13 @@ - done; \ - fi - #ifdef HAVE_SHLIB -- $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir) -+ $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir) - #endif - - install-arch-indep: mkdir info - -@set ${COPYDESTS} ; \ - for dir in ${COPYDIR} ; do \ -- if test "`(cd $$1 && $(pwd))`" != \ -+ if test "`(cd $(DESTDIR)$$1 && $(pwd))`" != \ - "`(cd $${dir} && $(pwd))`"; then \ - : do nothing - echo "rm -rf $$1" ; \ - fi ; \ -@@ -435,35 +437,35 @@ - done - -set ${COPYDESTS} ; \ - for dir in ${COPYDESTS} ; do \ -- if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \ -+ if test ! -d $${dir} ; then mkdir $(DESTDIR)$${dir} ; fi ; \ - done ; \ - for dir in ${COPYDIR} ; do \ - dest=$$1 ; shift ; \ - test -d $${dir} \ - -a "`(cd $${dir} && $(pwd))`" != \ -- "`(cd $${dest} && $(pwd))`" \ -+ "`(cd $(DESTDIR)$${dest} && $(pwd))`" \ - && (echo "Copying $${dir}..." ; \ - (cd $${dir} && $(TAR) -cf - . ) | \ -- (cd $${dest} && umask 022 && $(TAR) -xf - );\ -- chmod 0755 $${dest}; \ -- for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ -+ (cd $(DESTDIR)$${dest} && umask 022 && $(TAR) -xf - );\ -+ chmod 0755 $(DESTDIR)$${dest}; \ -+ for subdir in `find $(DESTDIR)$${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ - (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \ - done) ; \ - done - if test "`(cd ${srcdir}/info && $(pwd))`" != \ -- "`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ -- if test ! -f ${infodir}/dir -a -f dir ; then \ -- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \ -+ "`(cd $(DESTDIR)${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ -+ if test ! -f $(DESTDIR)${infodir}/dir -a -f dir ; then \ -+ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \ - fi ; \ - for file in *.info* ; do \ -- ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \ -- chmod 0644 ${infodir}/$${file}; \ -+ ${INSTALL_DATA} $${file} $(DESTDIR)${infodir}/$${file} ; \ -+ chmod 0644 $(DESTDIR)${infodir}/$${file}; \ - done ; \ - fi - cd ${srcdir}/etc && \ - for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ -- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ -- chmod 0644 ${mandir}/$${page}${manext} ; \ -+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \ -+ chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \ - done - @echo "If you would like to save approximately 4M of disk space, do" - @echo "make gzip-el" -@@ -473,19 +475,23 @@ - @echo "${lispdir}" - - gzip-el: -- $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir} -+ $(SHELL) ${srcdir}/lib-src/gzip-el.sh $(DESTDIR)${lispdir} - - ## Build all the directories to install XEmacs in. - ## Since we may be creating several layers of directories, - ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use - ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. - mkdir: FRC.mkdir -- ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ -- ${mandir} ${bindir} ${datadir} ${libdir} \ -+ for dir in \ -+ ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ -+ ${mandir} ${bindir} ${datadir} ${libdir} \ - #ifdef HAVE_SHLIB -- ${moduledir} ${sitemoduledir} \ -+ ${moduledir} ${sitemoduledir} \ - #endif -- ${sitelispdir} -+ ${sitelispdir} ; \ -+ do \ -+ ${MAKEPATH} $(DESTDIR)$${dir} ; \ -+ done ; - - ## Delete all the installed files that the `install' target would - ## create (but not the noninstalled files such as `make all' would -diff -ru xemacs-21.5.24.orig/dynodump/Makefile.in.in xemacs-21.5.24/dynodump/Makefile.in.in ---- xemacs-21.5.24.orig/dynodump/Makefile.in.in 2005-12-27 18:11:04.000000000 +0100 -+++ xemacs-21.5.24/dynodump/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 -@@ -22,6 +22,8 @@ - - ## Synched up with: Not synched with FSF. - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules. - .SUFFIXES: - .SUFFIXES: .c .o .i .h -diff -ru xemacs-21.5.24.orig/etc/tests/external-widget/Makefile xemacs-21.5.24/etc/tests/external-widget/Makefile ---- xemacs-21.5.24.orig/etc/tests/external-widget/Makefile 1996-12-18 23:42:31.000000000 +0100 -+++ xemacs-21.5.24/etc/tests/external-widget/Makefile 2005-12-27 19:00:48.000000000 +0100 -@@ -1,3 +1,5 @@ -+DESTDIR= -+ - CFLAGS += -Xc -g -DTOOLTALK - EMACSHOME = ../../.. - EMACSLIBDIR = $(EMACSHOME)/editor/src -diff -ru xemacs-21.5.24.orig/lib-src/Makefile.in.in xemacs-21.5.24/lib-src/Makefile.in.in ---- xemacs-21.5.24.orig/lib-src/Makefile.in.in 2005-12-27 18:11:23.000000000 +0100 -+++ xemacs-21.5.24/lib-src/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 -@@ -24,6 +24,8 @@ - ## above a certain point in this file are in shell format instead of - ## in C format. How the hell is this supposed to work? */ - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .h .o -@@ -244,26 +246,26 @@ - ## just run them directly from lib-src. - ${archlibdir}: all - @echo; echo "Installing utilities run internally by XEmacs." -- ./make-path ${archlibdir} -+ ./make-path $(DESTDIR)${archlibdir} - if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \ - for f in ${PRIVATE_INSTALLABLE_EXES}; do \ -- (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \ -+ (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \ - done ; \ - fi - if test "`(cd ${archlibdir} && $(pwd))`" \ - != "`(cd ${srcdir} && $(pwd))`"; then \ - for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \ -- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \ -+ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \ - done ; \ - fi - - install: ${archlibdir} - @echo; echo "Installing utilities for users to run." - for file in ${PUBLIC_INSTALLABLE_EXES} ; do \ -- (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \ -- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - - uninstall: -diff -ru xemacs-21.5.24.orig/lwlib/Makefile.in.in xemacs-21.5.24/lwlib/Makefile.in.in ---- xemacs-21.5.24.orig/lwlib/Makefile.in.in 2005-12-27 18:11:45.000000000 +0100 -+++ xemacs-21.5.24/lwlib/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 -@@ -22,6 +22,8 @@ - ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - ## Boston, MA 02111-1307, USA. - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .h .o .i .s -diff -ru xemacs-21.5.24.orig/man/Makefile xemacs-21.5.24/man/Makefile ---- xemacs-21.5.24.orig/man/Makefile 2005-12-27 18:11:52.000000000 +0100 -+++ xemacs-21.5.24/man/Makefile 2005-12-27 19:00:48.000000000 +0100 -@@ -20,6 +20,8 @@ - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - -+DESTDIR= -+ - SHELL = /bin/sh - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi -diff -ru xemacs-21.5.24.orig/modules/base64/Makefile xemacs-21.5.24/modules/base64/Makefile ---- xemacs-21.5.24.orig/modules/base64/Makefile 2001-04-12 20:22:33.000000000 +0200 -+++ xemacs-21.5.24/modules/base64/Makefile 2005-12-27 19:00:48.000000000 +0100 -@@ -7,6 +7,8 @@ - # 'installed'. - # - -+DESTDIR= -+ - SHELL=/bin/sh - RM=rm -f - CC=../../lib-src/ellcc -diff -ru xemacs-21.5.24.orig/modules/common/Makefile.common xemacs-21.5.24/modules/common/Makefile.common ---- xemacs-21.5.24.orig/modules/common/Makefile.common 2005-12-27 18:11:58.000000000 +0100 -+++ xemacs-21.5.24/modules/common/Makefile.common 2005-12-27 19:01:49.000000000 +0100 -@@ -31,6 +31,8 @@ - #define NOT_C_CODE - #include "../../src/config.h" - -+DESTDIR= -+ - SHELL=/bin/sh - RM=rm -f - PROGNAME=@PROGNAME@ -@@ -98,7 +100,7 @@ - -$(RM) *~ \#* - - install: $(OBJECT_TO_BUILD) -- $(INSTALL_PROGRAM) $< $(INSTALLPATH) -+ $(INSTALL_PROGRAM) $< $(DESTDIR)$(INSTALLPATH) - - ## - ## Local Variables: -diff -ru xemacs-21.5.24.orig/modules/zlib/Makefile xemacs-21.5.24/modules/zlib/Makefile ---- xemacs-21.5.24.orig/modules/zlib/Makefile 2001-04-12 20:22:40.000000000 +0200 -+++ xemacs-21.5.24/modules/zlib/Makefile 2005-12-27 19:00:48.000000000 +0100 -@@ -8,6 +8,8 @@ - # 'installed'. - # - -+DESTDIR= -+ - SHELL=/bin/sh - RM=rm -f - CC=../../lib-src/ellcc -diff -ru xemacs-21.5.24.orig/netinstall/Makefile.in.in xemacs-21.5.24/netinstall/Makefile.in.in ---- xemacs-21.5.24.orig/netinstall/Makefile.in.in 2005-12-27 18:11:58.000000000 +0100 -+++ xemacs-21.5.24/netinstall/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 -@@ -14,6 +14,8 @@ - ## - ## Makefile for Cygwin installer - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .cc .h .o -@@ -172,7 +174,7 @@ - install: - @echo; echo "Installing net setup." - for file in ${INSTALLABLES} ; do \ -- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - - version.c : $(srcdir)/ChangeLog Makefile -diff -ru xemacs-21.5.24.orig/src/Makefile.in.in xemacs-21.5.24/src/Makefile.in.in ---- xemacs-21.5.24.orig/src/Makefile.in.in 2005-12-27 18:12:02.000000000 +0100 -+++ xemacs-21.5.24/src/Makefile.in.in 2005-12-27 19:00:48.000000000 +0100 -@@ -39,6 +39,8 @@ - RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ - #endif - -+DESTDIR= -+ - PROGNAME=@PROGNAME@ - prefix=@prefix@ - SRC=@srcdir@ -@@ -1068,7 +1070,7 @@ - #ifdef HAVE_SHLIB - MAKEPATH=../lib-src/make-path - install: $(PROGNAME) -- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s -+ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s - -@echo "Copying include files for ellcc..." - -@hdir=`pwd`; \ - cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ -@@ -1082,12 +1084,12 @@ - test -d s && hdrtars="$$hdrtars s/*"; \ - test -d m && hdrtars="$$hdrtars m/*"; \ - test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ -- (cd $(archlibdir)/include && umask 022 && tar xf -); \ -- chmod 755 $(archlibdir)/include; \ -- test -d $(archlibdir)/include/s && \ -- chmod 755 $(archlibdir)/include/s; \ -- test -d $(archlibdir)/include/m && \ -- chmod 755 $(archlibdir)/include/s;) \ -+ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include; \ -+ test -d $(DESTDIR)$(archlibdir)/include/s && \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \ -+ test -d $(DESTDIR)$(archlibdir)/include/m && \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \ - done) - #endif - -diff -ru xemacs-21.5.24.orig/tests/tooltalk/Makefile xemacs-21.5.24/tests/tooltalk/Makefile ---- xemacs-21.5.24.orig/tests/tooltalk/Makefile 1996-12-18 23:44:15.000000000 +0100 -+++ xemacs-21.5.24/tests/tooltalk/Makefile 2005-12-27 19:00:48.000000000 +0100 -@@ -12,6 +12,8 @@ - - ### Code: - -+DESTDIR= -+ - CC = cc -Xc - CPPFLAGS = -I/usr/openwin/include - CFLAGS = -g -v -DNeedFunctionPrototypes diff --git a/xemacs-21.5.28-doc-encodings.patch b/xemacs-21.5.28-doc-encodings.patch deleted file mode 100644 index 71f6794..0000000 --- a/xemacs-21.5.28-doc-encodings.patch +++ /dev/null @@ -1,104 +0,0 @@ -Index: man/internals/internals.texi -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v -retrieving revision 1.80 -diff -u -r1.80 internals.texi ---- man/internals/internals.texi 15 May 2007 10:25:16 -0000 1.80 -+++ man/internals/internals.texi 21 May 2007 10:06:28 -0000 -@@ -2178,8 +2178,8 @@ - rather than technical. The XEmacs maintainers would like to have issues - resolved by examining them technically and deciding what makes the most - sense from a technical prospective. RMS however, wants to proceed on a --tit for tat kind of basis, which is to say, If we support this feature --of yours, we also get to support this other feature of mine. The -+tit for tat kind of basis, which is to say, ``If we support this feature -+of yours, we also get to support this other feature of mine.'' The - result of such a process is typically a big mess, because there is no - overarching design but instead a great deal of incompatible things - hodgepodged together. -@@ -13441,7 +13441,7 @@ - dependent on the current locale setting, which includes the locale - code page. (For more information, see Locale-Dependent Routines.) By - default, all locale-dependent routines in the Microsoft run-time --library use the code page that corresponds to the ?locale. At -+library use the code page that corresponds to the locale. At - run-time you can change or query the locale code page in use with a - call to setlocale. - -@@ -13453,7 +13453,7 @@ - - -- The "C" locale is defined by ANSI to correspond to the locale in - which C programs have traditionally executed. The code page for the --"C" locale (?code page) corresponds to the ASCII character -+"C" locale (code page) corresponds to the ASCII character - set. For example, in the "C" locale, islower returns true for the - values 0x61 ?0x7A only. In another locale, islower may return true - for these as well as other values, as defined by that locale. -@@ -29710,7 +29710,6 @@ - -- - In order to save my hands, I am cutting back on my responses, especially - to XEmacs-related mail. You _will_ get a response, but please be patient. -- - If you need an immediate response and it is not apparent in your message, - please say so. Thanks for your understanding. - -@@ -30033,11 +30032,10 @@ - ben - - -- --In order to save my hands, I am cutting back on my responses, especially to --XEmacs-related mail. You --_will_ get a response, but please be patient. If you need an immediate --response and its not apparent in --your message, please say so. Thanks for your understanding. -+In order to save my hands, I am cutting back on my responses, especially -+to XEmacs-related mail. You_will_ get a response, but please be patient. -+If you need an immediate response and it's not apparent in your message, -+please say so. Thanks for your understanding. - - - -@@ -30125,11 +30123,10 @@ - ben - - -- --In order to save my hands, I am cutting back on my responses, especially to --XEmacs-related mail. You --_will_ get a response, but please be patient. If you need an immediate --response and its not apparent in --your message, please say so. Thanks for your understanding. -+In order to save my hands, I am cutting back on my responses, especially -+to XEmacs-related mail. You _will_ get a response, but please be patient. -+If you need an immediate response and it's not apparent in your message, -+please say so. Thanks for your understanding. - - - -@@ -31577,10 +31574,8 @@ - - -- - In order to save my hands, I am cutting back on my responses, especially --to XEmacs-related mail. You _will_ get a response, but please be --patient. -+to XEmacs-related mail. You _will_ get a response, but please be patient. - If you need an immediate response and it is not apparent in your message, -- - please say so. Thanks for your understanding. - @end example - -Index: man/lispref/ldap.texi -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/ldap.texi,v -retrieving revision 1.3 -diff -u -r1.3 ldap.texi ---- man/lispref/ldap.texi 10 Oct 2003 12:39:34 -0000 1.3 -+++ man/lispref/ldap.texi 21 May 2007 10:06:28 -0000 -@@ -105,7 +105,7 @@ - library XEmacs was compiled with, they may include @code{simple}, - @code{krbv41} and @code{krbv42}. - @item base --The base for the search. This may look like @samp{c, ome}, see -+The base for the search. This may look like @samp{o=ACME, c=US}, see - RFC 1779 for syntax details. - @item scope - One of the symbols @code{base}, @code{onelevel} or @code{subtree} diff --git a/xemacs-21.5.28-revert-modified-245017.patch b/xemacs-21.5.28-revert-modified-245017.patch deleted file mode 100644 index 557fba0..0000000 --- a/xemacs-21.5.28-revert-modified-245017.patch +++ /dev/null @@ -1,40 +0,0 @@ -2007-06-22 Aidan Kehoe - - * files.el (revert-buffer): - * files.el (recover-file): - Pass NOMODIFY to set-buffer-file-coding-systems after reverting a - buffer and after recovering a file. - - -XEmacs Trunk source patch: -Diff command: cvs -q diff -Nu -Files affected: lisp/files.el -=================================================================== -RCS - -Index: lisp/files.el -=================================================================== -RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v -retrieving revision 1.77 -diff -u -u -r1.77 files.el ---- lisp/files.el 2006/11/30 07:29:36 1.77 -+++ lisp/files.el 2007/06/21 22:49:14 -@@ -3473,7 +3473,7 @@ - (coding-system-base - buffer-file-coding-system-when-loaded) - buffer-file-coding-system-when-loaded) -- (not adjust-eol)))))) -+ (not adjust-eol) t))))) - (goto-char (min opoint (point-max))) - ;; Recompute the truename in case changes in symlinks - ;; have changed the truename. -@@ -3616,7 +3616,8 @@ - (coding-system-for-read 'escape-quoted)) - (erase-buffer) - (insert-file-contents file-name nil) -- (set-buffer-file-coding-system coding-system)) -+ (set-buffer-file-coding-system coding-system -+ nil t)) - (after-find-file nil nil t) - (return nil)) - (diff diff --git a/xemacs-21.5.28-xemacs-base-autoloads.patch b/xemacs-21.5.28-xemacs-base-autoloads.patch deleted file mode 100644 index db8d6d1..0000000 --- a/xemacs-21.5.28-xemacs-base-autoloads.patch +++ /dev/null @@ -1,119 +0,0 @@ -diff -up xemacs-21.5.28/lisp/autoload.el~ xemacs-21.5.28/lisp/autoload.el ---- xemacs-21.5.28/lisp/autoload.el~ 2006-05-30 00:25:49.000000000 +0300 -+++ xemacs-21.5.28/lisp/autoload.el 2009-02-22 23:36:20.000000000 +0200 -@@ -226,6 +226,41 @@ the section of autoloads for a file.") - ;; Parsing the source file text. - ;; Autoloads in C source differ from those in Lisp source. - -+; Add operator definitions to autoload-operators.el in the xemacs-base -+; package. -+(ignore-errors (require 'autoload-operators)) -+ -+; As autoload-operators is new, provide stopgap measure for a while. -+(if (not (boundp 'autoload-make-autoload-operators)) -+ (progn -+ (defvar autoload-make-autoload-operators -+ '(defun define-skeleton defmacro define-derived-mode define-generic-mode -+ easy-mmode-define-minor-mode easy-mmode-define-global-mode -+ define-minor-mode defun* defmacro*) -+ "`defun'-like operators that use `autoload' to load the library.") -+ -+ (defvar autoload-make-autoload-complex-operators -+ '(easy-mmode-define-minor-mode easy-mmode-define-global-mode -+ define-minor-mode) -+ "`defun'-like operators to macroexpand before using `autoload'.") -+ -+ (put 'autoload 'doc-string-elt 3) -+ (put 'defun 'doc-string-elt 3) -+ (put 'defun* 'doc-string-elt 3) -+ (put 'defvar 'doc-string-elt 3) -+ (put 'defcustom 'doc-string-elt 3) -+ (put 'defconst 'doc-string-elt 3) -+ (put 'defmacro 'doc-string-elt 3) -+ (put 'defmacro* 'doc-string-elt 3) -+ (put 'defsubst 'doc-string-elt 3) -+ (put 'define-skeleton 'doc-string-elt 2) -+ (put 'define-derived-mode 'doc-string-elt 4) -+ (put 'easy-mmode-define-minor-mode 'doc-string-elt 2) -+ (put 'define-minor-mode 'doc-string-elt 2) -+ (put 'define-generic-mode 'doc-string-elt 7) -+ ;; defin-global-mode has no explicit docstring. -+ (put 'easy-mmode-define-global-mode 'doc-string-elt 1000))) -+ - (defun make-autoload (form file) - "Turn FORM into an autoload or defvar for source file FILE. - Returns nil if FORM is not a special autoload form (i.e. a function definition -@@ -233,8 +268,7 @@ or macro definition or a defcustom)." - (let ((car (car-safe form)) expand) - (cond - ;; For complex cases, try again on the macro-expansion. -- ((and (memq car '(easy-mmode-define-global-mode -- easy-mmode-define-minor-mode define-minor-mode)) -+ ((and (memq car autoload-make-autoload-complex-operators) - (setq expand (let ((load-file-name file)) (macroexpand form))) - (eq (car expand) 'progn) - (memq :autoload-end expand)) -@@ -246,10 +280,7 @@ or macro definition or a defcustom)." - (cdr expand))))) - - ;; For special function-like operators, use the `autoload' function. -- ((memq car '(defun define-skeleton defmacro define-derived-mode -- define-generic-mode easy-mmode-define-minor-mode -- easy-mmode-define-global-mode -- define-minor-mode defun* defmacro*)) -+ ((memq car autoload-make-autoload-operators) - (let* ((macrop (memq car '(defmacro defmacro*))) - (name (nth 1 form)) - (body (nthcdr (get car 'doc-string-elt) form)) -@@ -513,7 +546,8 @@ Updates AUTOLOADS-DONE and returns the n - (let ((begin (point))) - (forward-sexp) - (forward-line 1) -- (princ (buffer-substring begin (point)) outbuf))) -+ (princ (buffer-substring begin (point)) outbuf)) -+ (setq autoloads-done (cons ' autoloads-done))) - (t - (princ (buffer-substring - (progn -@@ -767,41 +801,6 @@ at the beginning of lines and ^L charact - (insert "\\^L"))) - (goto-char p2)))))))) - --;;; Forms which have doc-strings which should be printed specially. --;;; A doc-string-elt property of ELT says that (nth ELT FORM) is --;;; the doc-string in FORM. --;;; --;;; There used to be the following note here: --;;; ;;; Note: defconst and defvar should NOT be marked in this way. --;;; ;;; We don't want to produce defconsts and defvars that --;;; ;;; make-docfile can grok, because then it would grok them twice, --;;; ;;; once in foo.el (where they are given with ;;;###autoload) and --;;; ;;; once in loaddefs.el. --;;; --;;; Counter-note: Yes, they should be marked in this way. --;;; make-docfile only processes those files that are loaded into the --;;; dumped Emacs, and those files should never have anything --;;; autoloaded here. The above-feared problem only occurs with files --;;; which have autoloaded entries *and* are processed by make-docfile; --;;; there should be no such files. -- --(put 'autoload 'doc-string-elt 3) --(put 'defun 'doc-string-elt 3) --(put 'defun* 'doc-string-elt 3) --(put 'defvar 'doc-string-elt 3) --(put 'defcustom 'doc-string-elt 3) --(put 'defconst 'doc-string-elt 3) --(put 'defmacro 'doc-string-elt 3) --(put 'defmacro* 'doc-string-elt 3) --(put 'defsubst 'doc-string-elt 3) --(put 'define-skeleton 'doc-string-elt 2) --(put 'define-derived-mode 'doc-string-elt 4) --(put 'easy-mmode-define-minor-mode 'doc-string-elt 2) --(put 'define-minor-mode 'doc-string-elt 2) --(put 'define-generic-mode 'doc-string-elt 7) --;; defin-global-mode has no explicit docstring. --(put 'easy-mmode-define-global-mode 'doc-string-elt 1000) -- - (defun autoload-trim-file-name (file) - "Returns relative pathname of FILE including the last directory. - diff --git a/xemacs-beta-destdir.patch b/xemacs-21.5.29-destdir.patch similarity index 80% rename from xemacs-beta-destdir.patch rename to xemacs-21.5.29-destdir.patch index 225b6f9..54d57b2 100644 --- a/xemacs-beta-destdir.patch +++ b/xemacs-21.5.29-destdir.patch @@ -1,6 +1,6 @@ -diff -up xemacs-beta/dynodump/Makefile.in.in~ xemacs-beta/dynodump/Makefile.in.in ---- xemacs-beta/dynodump/Makefile.in.in~ 2009-03-08 15:00:21.000000000 +0200 -+++ xemacs-beta/dynodump/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/dynodump/Makefile.in.in~ xemacs-21.5.29/dynodump/Makefile.in.in +--- xemacs-21.5.29/dynodump/Makefile.in.in~ 2009-05-18 17:51:05.000000000 +0300 ++++ xemacs-21.5.29/dynodump/Makefile.in.in 2009-05-20 22:42:21.000000000 +0300 @@ -22,6 +22,8 @@ ## Synched up with: Not synched with FSF. @@ -10,18 +10,18 @@ diff -up xemacs-beta/dynodump/Makefile.in.in~ xemacs-beta/dynodump/Makefile.in.i ## For performance and consistency, no built-in rules. .SUFFIXES: .SUFFIXES: .c .o .i .h -diff -up xemacs-beta/etc/tests/external-widget/Makefile~ xemacs-beta/etc/tests/external-widget/Makefile ---- xemacs-beta/etc/tests/external-widget/Makefile~ 2009-03-08 15:00:22.000000000 +0200 -+++ xemacs-beta/etc/tests/external-widget/Makefile 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/etc/tests/external-widget/Makefile~ xemacs-21.5.29/etc/tests/external-widget/Makefile +--- xemacs-21.5.29/etc/tests/external-widget/Makefile~ 2009-05-18 17:51:05.000000000 +0300 ++++ xemacs-21.5.29/etc/tests/external-widget/Makefile 2009-05-20 22:42:23.000000000 +0300 @@ -1,3 +1,5 @@ +DESTDIR= + CFLAGS += -Xc -g -DTOOLTALK EMACSHOME = ../../.. EMACSLIBDIR = $(EMACSHOME)/editor/src -diff -up xemacs-beta/lib-src/Makefile.in.in~ xemacs-beta/lib-src/Makefile.in.in ---- xemacs-beta/lib-src/Makefile.in.in~ 2009-03-08 15:00:23.000000000 +0200 -+++ xemacs-beta/lib-src/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/lib-src/Makefile.in.in~ xemacs-21.5.29/lib-src/Makefile.in.in +--- xemacs-21.5.29/lib-src/Makefile.in.in~ 2009-05-18 17:51:06.000000000 +0300 ++++ xemacs-21.5.29/lib-src/Makefile.in.in 2009-05-20 22:42:25.000000000 +0300 @@ -24,6 +24,8 @@ ## above a certain point in this file are in shell format instead of ## in C format. How the hell is this supposed to work? */ @@ -63,9 +63,9 @@ diff -up xemacs-beta/lib-src/Makefile.in.in~ xemacs-beta/lib-src/Makefile.in.in done uninstall: -diff -up xemacs-beta/lwlib/Makefile.in.in~ xemacs-beta/lwlib/Makefile.in.in ---- xemacs-beta/lwlib/Makefile.in.in~ 2009-03-08 15:00:24.000000000 +0200 -+++ xemacs-beta/lwlib/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/lwlib/Makefile.in.in~ xemacs-21.5.29/lwlib/Makefile.in.in +--- xemacs-21.5.29/lwlib/Makefile.in.in~ 2009-05-18 17:51:07.000000000 +0300 ++++ xemacs-21.5.29/lwlib/Makefile.in.in 2009-05-20 22:42:27.000000000 +0300 @@ -22,6 +22,8 @@ ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, ## Boston, MA 02111-1307, USA. @@ -75,9 +75,9 @@ diff -up xemacs-beta/lwlib/Makefile.in.in~ xemacs-beta/lwlib/Makefile.in.in ## For performance and consistency, no built-in rules .SUFFIXES: .SUFFIXES: .c .h .o .i .s -diff -up xemacs-beta/Makefile.in.in~ xemacs-beta/Makefile.in.in ---- xemacs-beta/Makefile.in.in~ 2009-03-08 15:00:21.000000000 +0200 -+++ xemacs-beta/Makefile.in.in 2009-03-09 00:00:02.000000000 +0200 +diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in +--- xemacs-21.5.29/Makefile.in.in~ 2009-05-18 17:51:05.000000000 +0300 ++++ xemacs-21.5.29/Makefile.in.in 2009-05-20 22:42:17.000000000 +0300 @@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS= RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ #endif @@ -234,9 +234,9 @@ diff -up xemacs-beta/Makefile.in.in~ xemacs-beta/Makefile.in.in ## Install bundled packages, if present. -diff -up xemacs-beta/man/Makefile~ xemacs-beta/man/Makefile ---- xemacs-beta/man/Makefile~ 2009-03-08 15:00:24.000000000 +0200 -+++ xemacs-beta/man/Makefile 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/man/Makefile~ xemacs-21.5.29/man/Makefile +--- xemacs-21.5.29/man/Makefile~ 2009-05-18 17:51:07.000000000 +0300 ++++ xemacs-21.5.29/man/Makefile 2009-05-20 22:42:28.000000000 +0300 @@ -20,6 +20,8 @@ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. @@ -246,9 +246,9 @@ diff -up xemacs-beta/man/Makefile~ xemacs-beta/man/Makefile SHELL = /bin/sh MAKEINFO = makeinfo TEXI2DVI = texi2dvi -diff -up xemacs-beta/modules/base64/Makefile~ xemacs-beta/modules/base64/Makefile ---- xemacs-beta/modules/base64/Makefile~ 2009-03-08 15:00:25.000000000 +0200 -+++ xemacs-beta/modules/base64/Makefile 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/modules/base64/Makefile~ xemacs-21.5.29/modules/base64/Makefile +--- xemacs-21.5.29/modules/base64/Makefile~ 2009-05-18 17:51:07.000000000 +0300 ++++ xemacs-21.5.29/modules/base64/Makefile 2009-05-20 22:42:29.000000000 +0300 @@ -7,6 +7,8 @@ # 'installed'. # @@ -258,9 +258,9 @@ diff -up xemacs-beta/modules/base64/Makefile~ xemacs-beta/modules/base64/Makefil SHELL=/bin/sh RM=rm -f CC=../../lib-src/ellcc -diff -up xemacs-beta/modules/common/Makefile.common~ xemacs-beta/modules/common/Makefile.common ---- xemacs-beta/modules/common/Makefile.common~ 2009-03-08 15:00:25.000000000 +0200 -+++ xemacs-beta/modules/common/Makefile.common 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/modules/common/Makefile.common~ xemacs-21.5.29/modules/common/Makefile.common +--- xemacs-21.5.29/modules/common/Makefile.common~ 2009-05-18 17:51:07.000000000 +0300 ++++ xemacs-21.5.29/modules/common/Makefile.common 2009-05-20 22:42:31.000000000 +0300 @@ -31,6 +31,8 @@ #define NOT_C_CODE #include "../../src/config.h" @@ -279,9 +279,9 @@ diff -up xemacs-beta/modules/common/Makefile.common~ xemacs-beta/modules/common/ ## ## Local Variables: -diff -up xemacs-beta/modules/zlib/Makefile~ xemacs-beta/modules/zlib/Makefile ---- xemacs-beta/modules/zlib/Makefile~ 2009-03-08 15:00:25.000000000 +0200 -+++ xemacs-beta/modules/zlib/Makefile 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/modules/zlib/Makefile~ xemacs-21.5.29/modules/zlib/Makefile +--- xemacs-21.5.29/modules/zlib/Makefile~ 2009-05-18 17:51:07.000000000 +0300 ++++ xemacs-21.5.29/modules/zlib/Makefile 2009-05-20 22:42:33.000000000 +0300 @@ -8,6 +8,8 @@ # 'installed'. # @@ -291,9 +291,9 @@ diff -up xemacs-beta/modules/zlib/Makefile~ xemacs-beta/modules/zlib/Makefile SHELL=/bin/sh RM=rm -f CC=../../lib-src/ellcc -diff -up xemacs-beta/netinstall/Makefile.in.in~ xemacs-beta/netinstall/Makefile.in.in ---- xemacs-beta/netinstall/Makefile.in.in~ 2009-03-08 15:00:25.000000000 +0200 -+++ xemacs-beta/netinstall/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/netinstall/Makefile.in.in~ xemacs-21.5.29/netinstall/Makefile.in.in +--- xemacs-21.5.29/netinstall/Makefile.in.in~ 2009-05-18 17:51:07.000000000 +0300 ++++ xemacs-21.5.29/netinstall/Makefile.in.in 2009-05-20 22:42:34.000000000 +0300 @@ -14,6 +14,8 @@ ## ## Makefile for Cygwin installer @@ -312,9 +312,9 @@ diff -up xemacs-beta/netinstall/Makefile.in.in~ xemacs-beta/netinstall/Makefile. done version.c : $(srcdir)/ChangeLog Makefile -diff -up xemacs-beta/src/Makefile.in.in~ xemacs-beta/src/Makefile.in.in ---- xemacs-beta/src/Makefile.in.in~ 2009-03-08 15:00:26.000000000 +0200 -+++ xemacs-beta/src/Makefile.in.in 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/src/Makefile.in.in~ xemacs-21.5.29/src/Makefile.in.in +--- xemacs-21.5.29/src/Makefile.in.in~ 2009-05-18 17:51:08.000000000 +0300 ++++ xemacs-21.5.29/src/Makefile.in.in 2009-05-20 22:42:36.000000000 +0300 @@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS= RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ #endif @@ -352,9 +352,9 @@ diff -up xemacs-beta/src/Makefile.in.in~ xemacs-beta/src/Makefile.in.in done) #endif -diff -up xemacs-beta/tests/tooltalk/Makefile~ xemacs-beta/tests/tooltalk/Makefile ---- xemacs-beta/tests/tooltalk/Makefile~ 2009-03-08 15:00:28.000000000 +0200 -+++ xemacs-beta/tests/tooltalk/Makefile 2009-03-08 23:57:58.000000000 +0200 +diff -up xemacs-21.5.29/tests/tooltalk/Makefile~ xemacs-21.5.29/tests/tooltalk/Makefile +--- xemacs-21.5.29/tests/tooltalk/Makefile~ 2009-05-18 17:51:10.000000000 +0300 ++++ xemacs-21.5.29/tests/tooltalk/Makefile 2009-05-20 22:42:15.000000000 +0300 @@ -12,6 +12,8 @@ ### Code: diff --git a/xemacs.spec b/xemacs.spec index d3f0e44..588488b 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,8 +19,8 @@ #global snap 20090311hg4626 Name: xemacs -Version: 21.5.28 -Release: 13%{?snap:.%{snap}}%{?dist} +Version: 21.5.29 +Release: 1%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -39,30 +39,11 @@ Source5: xemacs-sitestart.el Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch -# Upstreamed post 21.5.28 -Patch2: %{name}-21.5.28-doc-encodings.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch -# Upstreamed post 21.5.28 -# http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html -Patch6: %{name}-21.5.26-gtk-gcc4.patch -# Upstreamed post 21.5.28 -Patch7: %{name}-21.5.27-finder-lisp-dir.patch Patch8: %{name}-21.5.28-courier-default.patch -%if 0%{?snap:1} -Patch9: %{name}-beta-destdir.patch -%else -Patch9: %{name}-21.5.28-destdir.patch -%endif -# Upstreamed post 21.5.28 -Patch10: %{name}-21.5.28-revert-modified-245017.patch -# Upstreamed post 21.5.28 -Patch11: %{name}-21.5.28-autoconf262-449626.patch -# Upstreamed post 21.5.28 -Patch12: %{name}-21.5.28-3d-athena.patch -# From upstream hg post 21.5.28 -Patch13: %{name}-21.5.28-xemacs-base-autoloads.patch +Patch9: %{name}-21.5.29-destdir.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -227,17 +208,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch5 -p1 %patch8 -p0 -F 1 %patch9 -p1 -%if 0%{?snap:1} %patch14 -p1 -%else -%patch2 -p0 -%patch6 -p1 -%patch7 -p0 -%patch10 -p0 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%endif sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -580,6 +551,11 @@ fi %changelog +* Wed May 20 2009 Ville Skyttä - 21.5.29-1 +- Update to 21.5.29; gtk-gcc4, finder-lisp-dir, 3d-athena, autoconf262, + doc-encodings, revert-modified, and xemacs-base-autoloads patches applied + upstream. + * Thu Mar 12 2009 Ville Skyttä - 21.5.28-13 - Add possibility to build upstream hg snapshots. - Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune). From f0f24042e5f4fd31ba457b23a17c22980747682b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:46:08 +0000 Subject: [PATCH 051/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 588488b..88a0498 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.29 -Release: 1%{?snap:.%{snap}}%{?dist} +Release: 2%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -551,6 +551,9 @@ fi %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 21.5.29-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed May 20 2009 Ville Skyttä - 21.5.29-1 - Update to 21.5.29; gtk-gcc4, finder-lisp-dir, 3d-athena, autoconf262, doc-encodings, revert-modified, and xemacs-base-autoloads patches applied From 60ea3e13635aa9f20afbf6d1de1833fb0bb95f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 13 Aug 2009 11:46:46 +0000 Subject: [PATCH 052/160] Note why (probably) modules are disabled on ia64. --- xemacs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xemacs.spec b/xemacs.spec index 88a0498..1106943 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -11,6 +11,7 @@ %bcond_without nox %bcond_without xim %ifarch ia64 +# no-expdyn-ia64 patch, https://bugzilla.redhat.com/show_bug.cgi?id=106744#c39 %bcond_with modules %else %bcond_without modules From 69cf9379c936e329aa65235a651d2ab000a4e125 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 24 Aug 2009 21:11:52 +0000 Subject: [PATCH 053/160] - Fix image overflow bug (CVE-2009-2688). - Fix calling xft-font-create-object in non-Xft builds (#512623). - Rebase patches to eliminate fuzz/offsets. --- xemacs-21.5.25-mk-nochk-features.patch | 2 +- xemacs-21.5.25-x-paths.patch | 2 +- xemacs-21.5.28-courier-default.patch | 12 ++-- xemacs-21.5.29-image-overflow.patch | 83 ++++++++++++++++++++++++++ xemacs-21.5.29-no-xft.patch | 10 ++++ xemacs.spec | 15 ++++- 6 files changed, 116 insertions(+), 8 deletions(-) create mode 100644 xemacs-21.5.29-image-overflow.patch create mode 100644 xemacs-21.5.29-no-xft.patch diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch index 6b0e810..5dc625a 100644 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ b/xemacs-21.5.25-mk-nochk-features.patch @@ -1,6 +1,6 @@ --- xemacs-21.5.25/Makefile.in.in.orig 2005-12-31 14:41:23.000000000 +0200 +++ xemacs-21.5.25/Makefile.in.in 2006-03-30 23:53:48.000000000 +0300 -@@ -375,7 +375,7 @@ +@@ -387,7 +387,7 @@ install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep diff --git a/xemacs-21.5.25-x-paths.patch b/xemacs-21.5.25-x-paths.patch index 7421744..04f87e2 100644 --- a/xemacs-21.5.25-x-paths.patch +++ b/xemacs-21.5.25-x-paths.patch @@ -11,7 +11,7 @@ ! personal customizations should be put into ~/.Xresources instead.) --- xemacs-21.5.25/etc/xemacs.1.orig 2001-04-12 21:20:52.000000000 +0300 +++ xemacs-21.5.25/etc/xemacs.1 2006-03-30 23:36:47.000000000 +0300 -@@ -293,7 +293,7 @@ +@@ -288,7 +288,7 @@ Sets the color of the text. See the file diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index f7af72f..0af7786 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,7 +1,11 @@ ---- src/faces.c 22 Apr 2007 19:58:59 -0000 1.55 -+++ src/faces.c 21 May 2007 14:51:50 -0000 -@@ -2399,3 +2399,3 @@ - (list1 (device_symbol), +--- xemacs-21.5.28/src/faces.c 2009-05-18 14:51:08.000000000 -0000 ++++ xemacs-21.5.28/src/faces.c 2009-08-24 17:07:03.000000000 -0000 +@@ -2411,7 +2411,7 @@ + Fcons + (Fcons + (list1 (device_symbol), - build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), + build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), inst_list); + + #endif /* !USE_XFT */ diff --git a/xemacs-21.5.29-image-overflow.patch b/xemacs-21.5.29-image-overflow.patch new file mode 100644 index 0000000..35cf873 --- /dev/null +++ b/xemacs-21.5.29-image-overflow.patch @@ -0,0 +1,83 @@ +--- xemacs-21.5.29/src/glyphs-eimage.c 2009-05-18 08:51:08.000000000 -0600 ++++ xemacs-21.5.29/src/glyphs-eimage.c 2009-08-24 10:21:21.274947236 -0600 +@@ -409,6 +409,7 @@ + */ + + { ++ UINT_64_BIT pixels_sq; + int jpeg_gray = 0; /* if we're dealing with a grayscale */ + /* Step 4: set parameters for decompression. */ + +@@ -431,7 +432,10 @@ + jpeg_start_decompress (&cinfo); + + /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/ +- ++ pixels_sq = ++ (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height; ++ if (pixels_sq > ((size_t) -1) / 3) ++ signal_image_error ("JPEG image too large to instantiate", instantiator); + unwind.eimage = + xnew_binbytes (cinfo.output_width * cinfo.output_height * 3); + if (!unwind.eimage) +@@ -677,6 +681,7 @@ + { + ColorMapObject *cmo = unwind.giffile->SColorMap; + int i, j, row, pass, interlace, slice; ++ UINT_64_BIT pixels_sq; + Binbyte *eip; + /* interlaced gifs have rows in this order: + 0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ... */ +@@ -685,6 +690,9 @@ + + height = unwind.giffile->SHeight; + width = unwind.giffile->SWidth; ++ pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; ++ if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount)) ++ signal_image_error ("GIF image too large to instantiate", instantiator); + unwind.eimage = + xnew_binbytes (width * height * 3 * unwind.giffile->ImageCount); + if (!unwind.eimage) +@@ -948,11 +956,15 @@ + { + int y; + Binbyte **row_pointers; ++ UINT_64_BIT pixels_sq; + height = info_ptr->height; + width = info_ptr->width; ++ pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; ++ if (pixels_sq > ((size_t) -1) / 3) ++ signal_image_error ("PNG image too large to instantiate", instantiator); + + /* Wow, allocate all the memory. Truly, exciting. */ +- unwind.eimage = xnew_array_and_zero (Binbyte, width * height * 3); ++ unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3)); + /* libpng expects that the image buffer passed in contains a + picture to draw on top of if the png has any transparencies. + This could be a good place to pass that in... */ +@@ -1299,6 +1311,7 @@ + + uint32 *raster; + Binbyte *ep; ++ UINT_64_BIT pixels_sq; + + assert (!NILP (data)); + +@@ -1321,12 +1334,15 @@ + + TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width); + TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height); +- unwind.eimage = xnew_binbytes (width * height * 3); ++ pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; ++ if (pixels_sq >= 1 << 29) ++ signal_image_error ("TIFF image too large to instantiate", instantiator); ++ unwind.eimage = xnew_binbytes ((size_t) pixels_sq * 3); + + /* #### This is little more than proof-of-concept/function testing. + It needs to be reimplemented via scanline reads for both memory + compactness. */ +- raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32)); ++ raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32))); + if (raster != NULL) + { + int i, j; diff --git a/xemacs-21.5.29-no-xft.patch b/xemacs-21.5.29-no-xft.patch new file mode 100644 index 0000000..07d3e10 --- /dev/null +++ b/xemacs-21.5.29-no-xft.patch @@ -0,0 +1,10 @@ +--- xemacs-21.5.29/lisp/font.el 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lisp/font.el 2009-08-24 13:24:14.634385245 -0600 +@@ -582,6 +582,7 @@ + (if (or (not (stringp fontname)) + (not (string-match font-x-font-regexp fontname))) + (if (and (stringp fontname) ++ (featurep 'xft-fonts) + (string-match font-xft-font-regexp fontname)) + ;; Return an XFT font. + (xft-font-create-object fontname) diff --git a/xemacs.spec b/xemacs.spec index 1106943..25b2f62 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 2%{?snap:.%{snap}}%{?dist} +Release: 3%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -40,9 +40,13 @@ Source5: xemacs-sitestart.el Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch +# Applied upstream 2009-07-01 +Patch2: %{name}-21.5.29-image-overflow.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch +# Sent upstream 2009-08-24 +Patch6: %{name}-21.5.29-no-xft.patch Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.29-destdir.patch # Sent upstream 2009-03-12 @@ -200,6 +204,7 @@ rm -f configure.in sed -i -e /tetris/d lisp/menubar-items.el %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch3 -p1 %ifarch ia64 touch -r aclocal.m4 aclocal.m4-stamp @@ -207,7 +212,8 @@ touch -r aclocal.m4 aclocal.m4-stamp touch -r aclocal.m4-stamp aclocal.m4 %endif %patch5 -p1 -%patch8 -p0 -F 1 +%patch6 -p1 +%patch8 -p1 %patch9 -p1 %patch14 -p1 @@ -552,6 +558,11 @@ fi %changelog +* Mon Aug 24 2009 Jerry James - 21.5.29-3 +- Fix image overflow bug (CVE-2009-2688). +- Fix calling xft-font-create-object in non-Xft builds (#512623). +- Rebase patches to eliminate fuzz/offsets. + * Mon Jul 27 2009 Fedora Release Engineering - 21.5.29-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 5e86d9136106409eda292929a1a7f36537512fd4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 26 Aug 2009 20:57:27 +0000 Subject: [PATCH 054/160] - Use upstream's attempt at fixing #512623 instead of mine, which didn't work. --- xemacs-21.5.29-no-xft.patch | 62 +++++++++++++++++++++++++++++++------ xemacs.spec | 7 +++-- 2 files changed, 57 insertions(+), 12 deletions(-) diff --git a/xemacs-21.5.29-no-xft.patch b/xemacs-21.5.29-no-xft.patch index 07d3e10..ccfa99c 100644 --- a/xemacs-21.5.29-no-xft.patch +++ b/xemacs-21.5.29-no-xft.patch @@ -1,10 +1,52 @@ ---- xemacs-21.5.29/lisp/font.el 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lisp/font.el 2009-08-24 13:24:14.634385245 -0600 -@@ -582,6 +582,7 @@ - (if (or (not (stringp fontname)) - (not (string-match font-x-font-regexp fontname))) - (if (and (stringp fontname) -+ (featurep 'xft-fonts) - (string-match font-xft-font-regexp fontname)) - ;; Return an XFT font. - (xft-font-create-object fontname) +diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el +--- xemacs-21.5.29/lisp/font.el 2009-08-26 14:49:58.859385283 -0600 ++++ xemacs-21.5.29/lisp/font.el 2009-08-26 14:49:20.000998807 -0600 +@@ -753,14 +753,23 @@ + + (defvar font-xft-font-regexp + (concat "\\`" +- #r"\(\\-\|\\:\|\\,\|[^:-]\)*" ; optional foundry and family ++ #r"\(\\[-,]|[^-:,*]\)*" ; optional foundry and family + ; (allows for escaped colons, +- ; dashes, commas) ++ ; dashes, commas, asterisks) + "\\(-[0-9]*\\(\\.[0-9]*\\)?\\)?" ; optional size (points) + "\\(:[^:]*\\)*" ; optional properties + ; not necessarily key=value!! + "\\'" +- )) ++ ) ++ "Regexp matching fontconfig font names. ++Unfortunately, there is no explicit standard specifying these. We disallow ++hyphen and comma in family names unless escaped, because they have a syntactic ++role in fontconfig names. We disallow colon because it is part of fontconfig ++name syntax, and asterisk because of the potential for confusion with an XLFD. ++We do not allow escapes for colon and asterisk because the fontconfig ++documentation doesn't specify whether they can be escaped, or how a redundant ++escape character is treated. ++#### The name of this variable is subject to change.") + + (defvar font-xft-family-mappings + ;; #### FIXME this shouldn't be needed or used for Xft +@@ -799,6 +808,8 @@ + "Return a font descriptor object for FONTNAME, appropriate for Xft. + + Optional DEVICE defaults to `default-x-device'." ++ (unless (featurep 'font-mgr) ++ (error 'unimplemented 'font-mgr "fontconfig-style font names")) + (let* ((name fontname) + (device (or device (default-x-device))) + (pattern (fc-font-match device (fc-name-parse name))) +diff -dur xemacs-21.5.29.ORIG/lisp/font-mgr.el xemacs-21.5.29/lisp/font-mgr.el +--- xemacs-21.5.29/lisp/font-mgr.el 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lisp/font-mgr.el 2009-08-26 14:46:44.073953826 -0600 +@@ -39,7 +39,8 @@ + + ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'? + +-(provide 'font-mgr) ++;; #### implementation is incomplete ++;; (provide 'font-mgr) + + (defvar xft-xlfd-font-regexp + (concat diff --git a/xemacs.spec b/xemacs.spec index 25b2f62..71f0408 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 3%{?snap:.%{snap}}%{?dist} +Release: 4%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -45,7 +45,7 @@ Patch2: %{name}-21.5.29-image-overflow.patch Patch3: %{name}-21.5.25-mk-nochk-features.patch Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch -# Sent upstream 2009-08-24 +# Proposed by upstream 2009-08-25 Patch6: %{name}-21.5.29-no-xft.patch Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.29-destdir.patch @@ -558,6 +558,9 @@ fi %changelog +* Wed Aug 26 2009 Jerry James - 21.5.29-4 +- Use upstream's attempt at fixing #512623 instead of mine, which didn't work. + * Mon Aug 24 2009 Jerry James - 21.5.29-3 - Fix image overflow bug (CVE-2009-2688). - Fix calling xft-font-create-object in non-Xft builds (#512623). From 99272aaa78c5500762c7bdaf8d7ca308b90cb5b6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 24 Sep 2009 14:13:39 +0000 Subject: [PATCH 055/160] Wed S ep 23 2009 Jerry James - 21.5.29-5 - Final fix for bz 512623, which is actually two bugs, because ... - ... the courier font patch breaks TTY font detection. Do not apply the patch for now until I understand what is going on - Add macros.xemacs (bz 480546) - Add png patch to fix a problem with reading PNG files --- xemacs-21.5.28-courier-default.patch | 11 --- xemacs-21.5.29-no-xft.patch | 19 +--- xemacs-21.5.29-png.patch | 133 +++++++++++++++++++++++++++ xemacs.spec | 34 ++++++- 4 files changed, 167 insertions(+), 30 deletions(-) delete mode 100644 xemacs-21.5.28-courier-default.patch create mode 100644 xemacs-21.5.29-png.patch diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch deleted file mode 100644 index 0af7786..0000000 --- a/xemacs-21.5.28-courier-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xemacs-21.5.28/src/faces.c 2009-05-18 14:51:08.000000000 -0000 -+++ xemacs-21.5.28/src/faces.c 2009-08-24 17:07:03.000000000 -0000 -@@ -2411,7 +2411,7 @@ - Fcons - (Fcons - (list1 (device_symbol), -- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), -+ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), - inst_list); - - #endif /* !USE_XFT */ diff --git a/xemacs-21.5.29-no-xft.patch b/xemacs-21.5.29-no-xft.patch index ccfa99c..41d9848 100644 --- a/xemacs-21.5.29-no-xft.patch +++ b/xemacs-21.5.29-no-xft.patch @@ -1,12 +1,12 @@ diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el ---- xemacs-21.5.29/lisp/font.el 2009-08-26 14:49:58.859385283 -0600 -+++ xemacs-21.5.29/lisp/font.el 2009-08-26 14:49:20.000998807 -0600 +--- xemacs-21.5.29.ORIG/lisp/font.el 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lisp/font.el 2009-09-23 15:13:48.543673471 -0600 @@ -753,14 +753,23 @@ (defvar font-xft-font-regexp (concat "\\`" - #r"\(\\-\|\\:\|\\,\|[^:-]\)*" ; optional foundry and family -+ #r"\(\\[-,]|[^-:,*]\)*" ; optional foundry and family ++ #r"\(\\-\|\\:\|\\,\|[^-:*]\)*" ; optional foundry and family ; (allows for escaped colons, - ; dashes, commas) + ; dashes, commas, asterisks) @@ -37,16 +37,3 @@ diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el (let* ((name fontname) (device (or device (default-x-device))) (pattern (fc-font-match device (fc-name-parse name))) -diff -dur xemacs-21.5.29.ORIG/lisp/font-mgr.el xemacs-21.5.29/lisp/font-mgr.el ---- xemacs-21.5.29/lisp/font-mgr.el 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lisp/font-mgr.el 2009-08-26 14:46:44.073953826 -0600 -@@ -39,7 +39,8 @@ - - ;; #### should we wrap the world in `(unless (featurep 'font-mgr) ... )'? - --(provide 'font-mgr) -+;; #### implementation is incomplete -+;; (provide 'font-mgr) - - (defvar xft-xlfd-font-regexp - (concat diff --git a/xemacs-21.5.29-png.patch b/xemacs-21.5.29-png.patch new file mode 100644 index 0000000..d0ec00f --- /dev/null +++ b/xemacs-21.5.29-png.patch @@ -0,0 +1,133 @@ +--- xemacs-21.5.29/src/glyphs-eimage.c 2009-09-23 12:58:39.770625034 -0600 ++++ xemacs-21.5.29/src/glyphs-eimage.c 2009-09-23 13:06:23.662801742 -0600 +@@ -954,7 +954,7 @@ + png_read_info (png_ptr, info_ptr); + + { +- int y; ++ int y, padding; + Binbyte **row_pointers; + UINT_64_BIT pixels_sq; + height = info_ptr->height; +@@ -963,14 +963,22 @@ + if (pixels_sq > ((size_t) -1) / 3) + signal_image_error ("PNG image too large to instantiate", instantiator); + +- /* Wow, allocate all the memory. Truly, exciting. */ +- unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3)); ++ /* Wow, allocate all the memory. Truly, exciting. ++ Well, yes, there's excitement to be had. It turns out that libpng ++ strips in place, so the last row overruns the buffer if depth is 16 ++ or there's an alpha channel. This is a crash on Linux. So we need ++ to add padding. ++ The worst case is reducing 8 bytes (16-bit RGBA) to 3 (8-bit RGB). */ ++ ++ padding = 5 * width; ++ unwind.eimage = xnew_array_and_zero (Binbyte, ++ (size_t) (pixels_sq * 3 + padding)); ++ + /* libpng expects that the image buffer passed in contains a + picture to draw on top of if the png has any transparencies. + This could be a good place to pass that in... */ + + row_pointers = xnew_array (png_byte *, height); +- + for (y = 0; y < height; y++) + row_pointers[y] = unwind.eimage + (width * 3 * y); + +@@ -990,16 +998,15 @@ + } + else + { +- Lisp_Color_Instance *c; +- Lisp_Object rgblist; +- +- c = XCOLOR_INSTANCE (bkgd); +- rgblist = MAYBE_LISP_DEVMETH (XDEVICE (c->device), +- color_instance_rgb_components, +- (c)); +- my_background.red = (unsigned short) XINT (XCAR (rgblist)); +- my_background.green = (unsigned short) XINT (XCAR (XCDR (rgblist))); +- my_background.blue = (unsigned short) XINT (XCAR (XCDR (XCDR (rgblist)))); ++ Lisp_Color_Instance *c = XCOLOR_INSTANCE (bkgd); ++ Lisp_Object rgb = MAYBE_LISP_DEVMETH (XDEVICE (c->device), ++ color_instance_rgb_components, ++ (c)); ++#define GETCOLOR(col) my_background.col = (unsigned short) XINT (XCAR (rgb)) ++ GETCOLOR(red); rgb = XCDR (rgb); ++ GETCOLOR(green); rgb = XCDR (rgb); ++ GETCOLOR(blue); ++#undef GETCOLOR + } + + if (png_get_bKGD (png_ptr, info_ptr, &image_background)) +@@ -1012,41 +1019,38 @@ + + /* Now that we're using EImage, ask for 8bit RGB triples for any type + of image*/ +- /* convert palette images to full RGB */ ++ /* convert palette images to RGB */ + if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) +- png_set_expand (png_ptr); +- /* send grayscale images to RGB too */ +- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || +- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ png_set_palette_to_rgb (png_ptr); ++ /* convert grayscale images to RGB */ ++ else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || ++ info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) + png_set_gray_to_rgb (png_ptr); +- /* we can't handle alpha values */ +- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) +- png_set_strip_alpha (png_ptr); +- /* tell libpng to strip 16 bit depth files down to 8 bits */ +- if (info_ptr->bit_depth == 16) +- png_set_strip_16 (png_ptr); +- /* if the image is < 8 bits, pad it out */ +- if (info_ptr->bit_depth < 8) ++ /* pad images with depth < 8 bits */ ++ else if (info_ptr->bit_depth < 8) + { + if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) + png_set_expand (png_ptr); + else + png_set_packing (png_ptr); + } ++ /* strip 16-bit depth files down to 8 bits */ ++ if (info_ptr->bit_depth == 16) ++ png_set_strip_16 (png_ptr); ++ /* strip alpha channel ++ #### shouldn't we handle this? ++ first call png_read_update_info in case above transformations ++ have generated an alpha channel */ ++ png_read_update_info(png_ptr, info_ptr); ++ if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) ++ png_set_strip_alpha (png_ptr); + + png_read_image (png_ptr, row_pointers); + png_read_end (png_ptr, info_ptr); + +-#if 1 /* def PNG_SHOW_COMMENTS */ +- /* #### +- * I turn this off by default now, because the !%^@#!% comments +- * show up every time the image is instantiated, which can get +- * really really annoying. There should be some way to pass this +- * type of data down into the glyph code, where you can get to it +- * from lisp anyway. - WMP +- */ +- /* #### I've turned this on, since these warnings are now +- unobtrusive. */ ++ /* #### There should be some way to pass this type of data down ++ * into the glyph code, where you can get to it from lisp ++ * anyway. - WMP */ + { + int i; + DECLARE_EISTRING (key); +@@ -1066,7 +1070,6 @@ + eidata(key), eidata(text)); + } + } +-#endif + + xfree (row_pointers, Binbyte **); + } diff --git a/xemacs.spec b/xemacs.spec index 71f0408..79074be 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 4%{?snap:.%{snap}}%{?dist} +Release: 5%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -47,7 +47,8 @@ Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch5: %{name}-21.5.25-wnnfix-128362.patch # Proposed by upstream 2009-08-25 Patch6: %{name}-21.5.29-no-xft.patch -Patch8: %{name}-21.5.28-courier-default.patch +# Applied upstream 2009-09-23 +Patch7: %{name}-21.5.29-png.patch Patch9: %{name}-21.5.29-destdir.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -99,6 +100,7 @@ Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc +Requires: bitmap-fonts Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -212,8 +214,10 @@ touch -r aclocal.m4 aclocal.m4-stamp touch -r aclocal.m4-stamp aclocal.m4 %endif %patch5 -p1 +%if %{without xft} %patch6 -p1 -%patch8 -p1 +%endif +%patch7 -p1 %patch9 -p1 %patch14 -p1 @@ -331,6 +335,19 @@ Cflags: -I${includedir} %endif EOF +cat > macros.xemacs << EOF +%%_xemacs_version %{version} +%%_xemacs_ev %{?epoch:%{epoch}:}%{version} +%%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release} +%%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages +%%_xemacs_sitelispdir %{_datadir}/xemacs/site-packages/lisp +%%_xemacs_sitestartdir %{_datadir}/xemacs/site-packages/lisp/site-start.d +%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -f batch-byte-compile +%if %{with modules} +%%_xemacs_includedir %{_libdir}/xemacs-%{xver}/%{xbuild}/include +%%_xemacs_sitemoduledir %{_libdir}/xemacs/site-modules +%endif +EOF %install rm -rf $RPM_BUILD_ROOT @@ -389,6 +406,9 @@ install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png +# macro file +install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs + # make sure nothing is 0400 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} @@ -503,6 +523,7 @@ fi %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* %{_mandir}/man1/gnudoit.1* +%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs %if %{with nox} %files nox @@ -558,6 +579,13 @@ fi %changelog +* Wed Sep 23 2009 Jerry James - 21.5.29-5 +- Final fix for bz 512623, which is actually two bugs, because ... +- ... the courier font patch breaks TTY font detection. Removed that patch + and Require bitmap-fonts to supply the original font name. +- Add macros.xemacs (bz 480546) +- Add png patch to fix a problem with reading PNG files + * Wed Aug 26 2009 Jerry James - 21.5.29-4 - Use upstream's attempt at fixing #512623 instead of mine, which didn't work. From d728ca56cd8c336c6c6389fdc9c28bd59070c217 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 07:20:57 +0000 Subject: [PATCH 056/160] Initialize branch F-12 for xemacs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From e9de69921e6b85013038a94ab4385ee922e68026 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 29 Oct 2009 16:34:31 +0000 Subject: [PATCH 057/160] - Bring back the courier font patch; that was a red herring. - Really, seriously fix bz 512623 with a TTY font patch. - Fix the version number in macros.xemacs. - Build with bignum support. - Turn off OSS support. --- xemacs-21.5.28-courier-default.patch | 11 +++++++++++ xemacs-21.5.29-tty-font-512623.patch | 28 ++++++++++++++++++++++++++++ xemacs.spec | 26 +++++++++++++++++++++++--- 3 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 xemacs-21.5.28-courier-default.patch create mode 100644 xemacs-21.5.29-tty-font-512623.patch diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch new file mode 100644 index 0000000..0af7786 --- /dev/null +++ b/xemacs-21.5.28-courier-default.patch @@ -0,0 +1,11 @@ +--- xemacs-21.5.28/src/faces.c 2009-05-18 14:51:08.000000000 -0000 ++++ xemacs-21.5.28/src/faces.c 2009-08-24 17:07:03.000000000 -0000 +@@ -2411,7 +2411,7 @@ + Fcons + (Fcons + (list1 (device_symbol), +- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), ++ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), + inst_list); + + #endif /* !USE_XFT */ diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch new file mode 100644 index 0000000..13e6294 --- /dev/null +++ b/xemacs-21.5.29-tty-font-512623.patch @@ -0,0 +1,28 @@ +diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c +--- xemacs-21.5.29.ORIG/src/objects.c 2009-05-18 08:51:09.000000000 -0600 ++++ xemacs-21.5.29/src/objects.c 2009-10-29 09:09:21.562935348 -0600 +@@ -892,6 +892,11 @@ + instantiator = Ffont_instance_name (instantiator); + } + ++#ifdef HAVE_TTY ++ if (LISTP (instantiator)) ++ instantiator = build_string ("normal"); ++#endif ++ + if (STRINGP (instantiator)) + { + #ifdef MULE +@@ -981,7 +986,11 @@ + static void + font_validate (Lisp_Object instantiator) + { +- if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)) ++ if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator) ++#ifdef HAVE_TTY ++ || LISTP (instantiator) ++#endif ++ ) + return; + if (VECTORP (instantiator)) + { diff --git a/xemacs.spec b/xemacs.spec index 79074be..8a7646c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -18,10 +18,11 @@ %endif #global snap 20090311hg4626 +%global majver 21.5 Name: xemacs Version: 21.5.29 -Release: 5%{?snap:.%{snap}}%{?dist} +Release: 6%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -30,7 +31,7 @@ URL: http://www.xemacs.org/ %if 0%{?snap:1} Source0: %{name}-%{snap}.tar.lzma %else -Source0: http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz +Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz %endif Source1: %{name}.png Source2: xemacs.desktop @@ -49,7 +50,10 @@ Patch5: %{name}-21.5.25-wnnfix-128362.patch Patch6: %{name}-21.5.29-no-xft.patch # Applied upstream 2009-09-23 Patch7: %{name}-21.5.29-png.patch +Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.29-destdir.patch +# Sent upstream 2009-10-28 +Patch10: %{name}-21.5.29-tty-font-512623.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -80,6 +84,7 @@ BuildRequires: xmkmf BuildRequires: libXau-devel BuildRequires: libXpm-devel BuildRequires: alsa-lib-devel +BuildRequires: gmp-devel %if %{with gtk} BuildRequires: gtk+-devel BuildRequires: libglade-devel @@ -154,6 +159,9 @@ This package contains XEmacs built without X Windows support. Summary: Emacs lisp source files for XEmacs Group: Development/Libraries Requires: %{name}-common = %{version}-%{release} +%if 0%{?fedora} >= 10 +BuildArch: noarch +%endif %description el XEmacs is a highly customizable open source text editor and @@ -218,7 +226,9 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch6 -p1 %endif %patch7 -p1 +%patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -269,6 +279,7 @@ common_options=" %endif --with-debug --with-error-checking=none + --enable-bignum=gmp " %if %{with nox} @@ -294,6 +305,7 @@ done # build with X %configure $common_options \ --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ + --with-sound=nonative,alsa \ %if %{with xft} --with-xft=all \ %else @@ -336,7 +348,7 @@ Cflags: -I${includedir} EOF cat > macros.xemacs << EOF -%%_xemacs_version %{version} +%%_xemacs_version %{majver} %%_xemacs_ev %{?epoch:%{epoch}:}%{version} %%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release} %%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages @@ -411,6 +423,7 @@ install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs # make sure nothing is 0400 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} +chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh # clean up unneeded stuff (TODO: there's probably much more) find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm @@ -579,6 +592,13 @@ fi %changelog +* Wed Oct 28 2009 Jerry James - 21.5.29-6 +- Bring back the courier font patch; that was a red herring. +- Really, seriously fix bz 512623 with a TTY font patch. +- Fix the version number in macros.xemacs. +- Build with bignum support. +- Turn off OSS support. + * Wed Sep 23 2009 Jerry James - 21.5.29-5 - Final fix for bz 512623, which is actually two bugs, because ... - ... the courier font patch breaks TTY font detection. Removed that patch From c9246fc366d01f6c56835df9fb7f02a270311a5d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 29 Oct 2009 16:34:31 +0000 Subject: [PATCH 058/160] - Bring back the courier font patch; that was a red herring. - Really, seriously fix bz 512623 with a TTY font patch. - Fix the version number in macros.xemacs. - Build with bignum support. - Turn off OSS support. --- xemacs-21.5.28-courier-default.patch | 11 +++++++++++ xemacs-21.5.29-tty-font-512623.patch | 28 ++++++++++++++++++++++++++++ xemacs.spec | 26 +++++++++++++++++++++++--- 3 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 xemacs-21.5.28-courier-default.patch create mode 100644 xemacs-21.5.29-tty-font-512623.patch diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch new file mode 100644 index 0000000..0af7786 --- /dev/null +++ b/xemacs-21.5.28-courier-default.patch @@ -0,0 +1,11 @@ +--- xemacs-21.5.28/src/faces.c 2009-05-18 14:51:08.000000000 -0000 ++++ xemacs-21.5.28/src/faces.c 2009-08-24 17:07:03.000000000 -0000 +@@ -2411,7 +2411,7 @@ + Fcons + (Fcons + (list1 (device_symbol), +- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), ++ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), + inst_list); + + #endif /* !USE_XFT */ diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch new file mode 100644 index 0000000..13e6294 --- /dev/null +++ b/xemacs-21.5.29-tty-font-512623.patch @@ -0,0 +1,28 @@ +diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c +--- xemacs-21.5.29.ORIG/src/objects.c 2009-05-18 08:51:09.000000000 -0600 ++++ xemacs-21.5.29/src/objects.c 2009-10-29 09:09:21.562935348 -0600 +@@ -892,6 +892,11 @@ + instantiator = Ffont_instance_name (instantiator); + } + ++#ifdef HAVE_TTY ++ if (LISTP (instantiator)) ++ instantiator = build_string ("normal"); ++#endif ++ + if (STRINGP (instantiator)) + { + #ifdef MULE +@@ -981,7 +986,11 @@ + static void + font_validate (Lisp_Object instantiator) + { +- if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)) ++ if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator) ++#ifdef HAVE_TTY ++ || LISTP (instantiator) ++#endif ++ ) + return; + if (VECTORP (instantiator)) + { diff --git a/xemacs.spec b/xemacs.spec index 79074be..8a7646c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -18,10 +18,11 @@ %endif #global snap 20090311hg4626 +%global majver 21.5 Name: xemacs Version: 21.5.29 -Release: 5%{?snap:.%{snap}}%{?dist} +Release: 6%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -30,7 +31,7 @@ URL: http://www.xemacs.org/ %if 0%{?snap:1} Source0: %{name}-%{snap}.tar.lzma %else -Source0: http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz +Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz %endif Source1: %{name}.png Source2: xemacs.desktop @@ -49,7 +50,10 @@ Patch5: %{name}-21.5.25-wnnfix-128362.patch Patch6: %{name}-21.5.29-no-xft.patch # Applied upstream 2009-09-23 Patch7: %{name}-21.5.29-png.patch +Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.29-destdir.patch +# Sent upstream 2009-10-28 +Patch10: %{name}-21.5.29-tty-font-512623.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -80,6 +84,7 @@ BuildRequires: xmkmf BuildRequires: libXau-devel BuildRequires: libXpm-devel BuildRequires: alsa-lib-devel +BuildRequires: gmp-devel %if %{with gtk} BuildRequires: gtk+-devel BuildRequires: libglade-devel @@ -154,6 +159,9 @@ This package contains XEmacs built without X Windows support. Summary: Emacs lisp source files for XEmacs Group: Development/Libraries Requires: %{name}-common = %{version}-%{release} +%if 0%{?fedora} >= 10 +BuildArch: noarch +%endif %description el XEmacs is a highly customizable open source text editor and @@ -218,7 +226,9 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch6 -p1 %endif %patch7 -p1 +%patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -269,6 +279,7 @@ common_options=" %endif --with-debug --with-error-checking=none + --enable-bignum=gmp " %if %{with nox} @@ -294,6 +305,7 @@ done # build with X %configure $common_options \ --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ + --with-sound=nonative,alsa \ %if %{with xft} --with-xft=all \ %else @@ -336,7 +348,7 @@ Cflags: -I${includedir} EOF cat > macros.xemacs << EOF -%%_xemacs_version %{version} +%%_xemacs_version %{majver} %%_xemacs_ev %{?epoch:%{epoch}:}%{version} %%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release} %%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages @@ -411,6 +423,7 @@ install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs # make sure nothing is 0400 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} +chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh # clean up unneeded stuff (TODO: there's probably much more) find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm @@ -579,6 +592,13 @@ fi %changelog +* Wed Oct 28 2009 Jerry James - 21.5.29-6 +- Bring back the courier font patch; that was a red herring. +- Really, seriously fix bz 512623 with a TTY font patch. +- Fix the version number in macros.xemacs. +- Build with bignum support. +- Turn off OSS support. + * Wed Sep 23 2009 Jerry James - 21.5.29-5 - Final fix for bz 512623, which is actually two bugs, because ... - ... the courier font patch breaks TTY font detection. Removed that patch From 7ad3f1d3a2fb482e9e96134b45f0addb9925f52f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 29 Oct 2009 17:00:40 +0000 Subject: [PATCH 059/160] The -el subpackage ought to be noarch, but the auto-autoloads.el file contains the build host name and a timestamp. Real fix coming later... --- xemacs.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 8a7646c..e270cf8 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -159,9 +159,6 @@ This package contains XEmacs built without X Windows support. Summary: Emacs lisp source files for XEmacs Group: Development/Libraries Requires: %{name}-common = %{version}-%{release} -%if 0%{?fedora} >= 10 -BuildArch: noarch -%endif %description el XEmacs is a highly customizable open source text editor and From 144b5fc71f7894cbd38540676b61439ef177e6f7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 29 Oct 2009 17:00:40 +0000 Subject: [PATCH 060/160] The -el subpackage ought to be noarch, but the auto-autoloads.el file contains the build host name and a timestamp. Real fix coming later... --- xemacs.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 8a7646c..e270cf8 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -159,9 +159,6 @@ This package contains XEmacs built without X Windows support. Summary: Emacs lisp source files for XEmacs Group: Development/Libraries Requires: %{name}-common = %{version}-%{release} -%if 0%{?fedora} >= 10 -BuildArch: noarch -%endif %description el XEmacs is a highly customizable open source text editor and From 9ea7f8693c6d93acf84efa01491d0a746e9b9604 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 3 Nov 2009 16:59:51 +0000 Subject: [PATCH 061/160] - Make the desktop file consistent with Emacs (bz 532296). --- xemacs.desktop | 2 +- xemacs.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xemacs.desktop b/xemacs.desktop index 320b8c0..9296058 100644 --- a/xemacs.desktop +++ b/xemacs.desktop @@ -29,5 +29,5 @@ Exec=xemacs %f Icon=xemacs Type=Application Terminal=false -Categories=Development;TextEditor; +Categories=Application;Utility;TextEditor StartupWMClass=XEmacs diff --git a/xemacs.spec b/xemacs.spec index e270cf8..5ba1e24 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 6%{?snap:.%{snap}}%{?dist} +Release: 7%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -589,6 +589,9 @@ fi %changelog +* Tue Nov 3 2009 Jerry James - 21.5.29-7 +- Make the desktop file consistent with Emacs (bz 532296). + * Wed Oct 28 2009 Jerry James - 21.5.29-6 - Bring back the courier font patch; that was a red herring. - Really, seriously fix bz 512623 with a TTY font patch. From 1dfeb401c251c669b203c848b7460efa21c95ae3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 3 Nov 2009 16:59:51 +0000 Subject: [PATCH 062/160] - Make the desktop file consistent with Emacs (bz 532296). --- xemacs.desktop | 2 +- xemacs.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xemacs.desktop b/xemacs.desktop index 320b8c0..9296058 100644 --- a/xemacs.desktop +++ b/xemacs.desktop @@ -29,5 +29,5 @@ Exec=xemacs %f Icon=xemacs Type=Application Terminal=false -Categories=Development;TextEditor; +Categories=Application;Utility;TextEditor StartupWMClass=XEmacs diff --git a/xemacs.spec b/xemacs.spec index e270cf8..5ba1e24 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 6%{?snap:.%{snap}}%{?dist} +Release: 7%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -589,6 +589,9 @@ fi %changelog +* Tue Nov 3 2009 Jerry James - 21.5.29-7 +- Make the desktop file consistent with Emacs (bz 532296). + * Wed Oct 28 2009 Jerry James - 21.5.29-6 - Bring back the courier font patch; that was a red herring. - Really, seriously fix bz 512623 with a TTY font patch. From b1f8da41d9dd8da8ced2a7173c5ca22cc3fb3312 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2009 16:50:46 +0000 Subject: [PATCH 063/160] - Move macros.xemacs to the -common subpackage (bz 533611). - Updated TTY font patch from upstream. --- xemacs-21.5.29-tty-font-512623.patch | 159 ++++++++++++++++++++++----- xemacs.spec | 8 +- 2 files changed, 138 insertions(+), 29 deletions(-) diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch index 13e6294..b4fb526 100644 --- a/xemacs-21.5.29-tty-font-512623.patch +++ b/xemacs-21.5.29-tty-font-512623.patch @@ -1,28 +1,133 @@ -diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c ---- xemacs-21.5.29.ORIG/src/objects.c 2009-05-18 08:51:09.000000000 -0600 -+++ xemacs-21.5.29/src/objects.c 2009-10-29 09:09:21.562935348 -0600 -@@ -892,6 +892,11 @@ - instantiator = Ffont_instance_name (instantiator); - } - -+#ifdef HAVE_TTY -+ if (LISTP (instantiator)) -+ instantiator = build_string ("normal"); -+#endif +diff -r 80d74fed5399 lisp/ChangeLog +--- a/lisp/ChangeLog Mon Nov 09 09:21:59 2009 -0700 ++++ b/lisp/ChangeLog Mon Nov 09 09:39:16 2009 -0700 +@@ -1,3 +1,17 @@ ++2009-11-01 Stephen Turnbull + - if (STRINGP (instantiator)) - { - #ifdef MULE -@@ -981,7 +986,11 @@ - static void - font_validate (Lisp_Object instantiator) - { -- if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)) -+ if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator) -+#ifdef HAVE_TTY -+ || LISTP (instantiator) -+#endif -+ ) - return; - if (VECTORP (instantiator)) - { ++ * faces.el (Face-frob-property): ++ Give mapper for TTYs 2 args. ++ (make-face-family): ++ (make-face-size): ++ Generic mapper ignores TTYs and null devices. ++ (make-face-bold): ++ (make-face-italic): ++ (make-face-bold-italic): ++ (make-face-unbold): ++ (make-face-unitalic): ++ TTY mapper takes 2 args. ++ + 2009-11-09 Didier Verna + + * minibuf.el (read-buffer): New optional argument 'exclude' for +diff -r 80d74fed5399 lisp/faces.el +--- a/lisp/faces.el Mon Nov 09 09:21:59 2009 -0700 ++++ b/lisp/faces.el Mon Nov 09 09:39:16 2009 -0700 +@@ -933,10 +933,11 @@ + ;; and EXACT-P are as in that call. UNFROBBED-FACE and FROBBED-FACE are + ;; what we expect the original face and the result to look like, + ;; respectively. TTY-PROPS is a list of face properties to frob in place +- ;; of `font' for TTY's. FROB-MAPPING is either a plist mapping device ++ ;; of `font' for TTYs. FROB-MAPPING is either a plist mapping device + ;; types to functions of two args (NAME DEVICE) that will frob the +- ;; instantiator as appropriate for the device type (this includes TTY's), +- ;; or a function to handle the mapping for all device types. ++ ;; instantiator to NAME as appropriate for DEVICE's type (this includes ++ ;; TTYs #### TTYs are not passed the device, just the symbol 'tty), or a ++ ;; function to handle the mapping for all device types. + ;; STANDARD-FACE-MAPPING is an alist of mappings of inheritance + ;; instantiators to be replaced with other inheritance instantiators, meant + ;; for e.g. converting [bold] into [bold-italic]. +@@ -1038,7 +1039,11 @@ + (t + (let ((value + (if (eq devtype-spec 'tty) +- (funcall mapper x) ++ ;; #### not quite right but need ++ ;; two args to match documentation ++ ;; mostly we just ignore TTYs so ++ ;; for now just pass the devtype ++ (funcall mapper x 'tty) + (funcall mapper x + (derive-domain-from-locale + locale devtype-spec +@@ -1194,10 +1199,14 @@ + (Face-frob-property face locale tags exact-p + nil nil 'font nil + `(lambda (f d) +- ;; keep the dependency on font.el for now +- (let ((fo (font-create-object f d))) +- (set-font-family fo ,family) +- (font-create-name fo d))) ++ ;; keep the dependency on font.el for now ++ ;; #### The filter on null d is a band-aid. ++ ;; Frob-face-property should not be passing in ++ ;; null devices. ++ (unless (or (null d) (eq d 'tty)) ++ (let ((fo (font-create-object f d))) ++ (set-font-family fo ,family) ++ (font-create-name fo d)))) + nil)) + + ;; Style (ie, typographical face) frobbing +@@ -1311,7 +1320,7 @@ + (interactive (list (read-face-name "Make which face bold: "))) + (Face-frob-property face locale tags exact-p + 'default 'bold 'font '(highlight) +- '(tty (lambda (x) t) ++ '(tty (lambda (f d) t) + x x-make-font-bold + gtk gtk-make-font-bold + mswindows mswindows-make-font-bold +@@ -1330,7 +1339,7 @@ + (interactive (list (read-face-name "Make which face italic: "))) + (Face-frob-property face locale tags exact-p + 'default 'italic 'font '(underline) +- '(tty (lambda (x) t) ++ '(tty (lambda (f d) t) + x x-make-font-italic + gtk gtk-make-font-italic + mswindows mswindows-make-font-italic +@@ -1349,7 +1358,7 @@ + (interactive (list (read-face-name "Make which face bold-italic: "))) + (Face-frob-property face locale tags exact-p + 'default 'bold-italic 'font '(underline highlight) +- '(tty (lambda (x) t) ++ '(tty (lambda (f d) t) + x x-make-font-bold-italic + gtk gtk-make-font-bold-italic + mswindows mswindows-make-font-bold-italic +@@ -1369,7 +1378,7 @@ + (interactive (list (read-face-name "Make which face non-bold: "))) + (Face-frob-property face locale tags exact-p + 'bold 'default 'font '(highlight) +- '(tty (lambda (x) nil) ++ '(tty (lambda (f d) nil) + x x-make-font-unbold + gtk gtk-make-font-unbold + mswindows mswindows-make-font-unbold +@@ -1388,7 +1397,7 @@ + (interactive (list (read-face-name "Make which face non-italic: "))) + (Face-frob-property face locale tags exact-p + 'italic 'default 'font '(underline) +- '(tty (lambda (x) nil) ++ '(tty (lambda (f d) nil) + x x-make-font-unitalic + gtk gtk-make-font-unitalic + mswindows mswindows-make-font-unitalic +@@ -1410,9 +1419,13 @@ + nil nil 'font nil + `(lambda (f d) + ;; keep the dependency on font.el for now +- (let ((fo (font-create-object f d))) +- (set-font-size fo ,size) +- (font-create-name fo d))) ++ ;; #### The filter on null d is a band-aid. ++ ;; Frob-face-property should not be passing in ++ ;; null devices. ++ (unless (or (null d) (eq d 'tty)) ++ (let ((fo (font-create-object f d))) ++ (set-font-size fo ,size) ++ (font-create-name fo d)))) + nil)) + + ;; Why do the following two functions lose so badly in so many diff --git a/xemacs.spec b/xemacs.spec index 5ba1e24..5d7fcd8 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 7%{?snap:.%{snap}}%{?dist} +Release: 8%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -533,7 +533,6 @@ fi %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* %{_mandir}/man1/gnudoit.1* -%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs %if %{with nox} %files nox @@ -563,6 +562,7 @@ fi %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc %endif +%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs %config(noreplace) %{_sysconfdir}/skel/.xemacs/ %{_mandir}/man1/etags.xemacs.1* %{_mandir}/man1/gnuserv.1* @@ -589,6 +589,10 @@ fi %changelog +* Mon Nov 9 2009 Jerry James - 21.5.29-8 +- Move macros.xemacs to the -common subpackage (bz 533611). +- Updated TTY font patch from upstream. + * Tue Nov 3 2009 Jerry James - 21.5.29-7 - Make the desktop file consistent with Emacs (bz 532296). From a77d07c41103a847109097e5fdf8e0fd79067ab0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2009 16:50:46 +0000 Subject: [PATCH 064/160] - Move macros.xemacs to the -common subpackage (bz 533611). - Updated TTY font patch from upstream. --- xemacs-21.5.29-tty-font-512623.patch | 159 ++++++++++++++++++++++----- xemacs.spec | 8 +- 2 files changed, 138 insertions(+), 29 deletions(-) diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch index 13e6294..b4fb526 100644 --- a/xemacs-21.5.29-tty-font-512623.patch +++ b/xemacs-21.5.29-tty-font-512623.patch @@ -1,28 +1,133 @@ -diff -dur xemacs-21.5.29.ORIG/src/objects.c xemacs-21.5.29/src/objects.c ---- xemacs-21.5.29.ORIG/src/objects.c 2009-05-18 08:51:09.000000000 -0600 -+++ xemacs-21.5.29/src/objects.c 2009-10-29 09:09:21.562935348 -0600 -@@ -892,6 +892,11 @@ - instantiator = Ffont_instance_name (instantiator); - } - -+#ifdef HAVE_TTY -+ if (LISTP (instantiator)) -+ instantiator = build_string ("normal"); -+#endif +diff -r 80d74fed5399 lisp/ChangeLog +--- a/lisp/ChangeLog Mon Nov 09 09:21:59 2009 -0700 ++++ b/lisp/ChangeLog Mon Nov 09 09:39:16 2009 -0700 +@@ -1,3 +1,17 @@ ++2009-11-01 Stephen Turnbull + - if (STRINGP (instantiator)) - { - #ifdef MULE -@@ -981,7 +986,11 @@ - static void - font_validate (Lisp_Object instantiator) - { -- if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator)) -+ if (FONT_INSTANCEP (instantiator) || STRINGP (instantiator) -+#ifdef HAVE_TTY -+ || LISTP (instantiator) -+#endif -+ ) - return; - if (VECTORP (instantiator)) - { ++ * faces.el (Face-frob-property): ++ Give mapper for TTYs 2 args. ++ (make-face-family): ++ (make-face-size): ++ Generic mapper ignores TTYs and null devices. ++ (make-face-bold): ++ (make-face-italic): ++ (make-face-bold-italic): ++ (make-face-unbold): ++ (make-face-unitalic): ++ TTY mapper takes 2 args. ++ + 2009-11-09 Didier Verna + + * minibuf.el (read-buffer): New optional argument 'exclude' for +diff -r 80d74fed5399 lisp/faces.el +--- a/lisp/faces.el Mon Nov 09 09:21:59 2009 -0700 ++++ b/lisp/faces.el Mon Nov 09 09:39:16 2009 -0700 +@@ -933,10 +933,11 @@ + ;; and EXACT-P are as in that call. UNFROBBED-FACE and FROBBED-FACE are + ;; what we expect the original face and the result to look like, + ;; respectively. TTY-PROPS is a list of face properties to frob in place +- ;; of `font' for TTY's. FROB-MAPPING is either a plist mapping device ++ ;; of `font' for TTYs. FROB-MAPPING is either a plist mapping device + ;; types to functions of two args (NAME DEVICE) that will frob the +- ;; instantiator as appropriate for the device type (this includes TTY's), +- ;; or a function to handle the mapping for all device types. ++ ;; instantiator to NAME as appropriate for DEVICE's type (this includes ++ ;; TTYs #### TTYs are not passed the device, just the symbol 'tty), or a ++ ;; function to handle the mapping for all device types. + ;; STANDARD-FACE-MAPPING is an alist of mappings of inheritance + ;; instantiators to be replaced with other inheritance instantiators, meant + ;; for e.g. converting [bold] into [bold-italic]. +@@ -1038,7 +1039,11 @@ + (t + (let ((value + (if (eq devtype-spec 'tty) +- (funcall mapper x) ++ ;; #### not quite right but need ++ ;; two args to match documentation ++ ;; mostly we just ignore TTYs so ++ ;; for now just pass the devtype ++ (funcall mapper x 'tty) + (funcall mapper x + (derive-domain-from-locale + locale devtype-spec +@@ -1194,10 +1199,14 @@ + (Face-frob-property face locale tags exact-p + nil nil 'font nil + `(lambda (f d) +- ;; keep the dependency on font.el for now +- (let ((fo (font-create-object f d))) +- (set-font-family fo ,family) +- (font-create-name fo d))) ++ ;; keep the dependency on font.el for now ++ ;; #### The filter on null d is a band-aid. ++ ;; Frob-face-property should not be passing in ++ ;; null devices. ++ (unless (or (null d) (eq d 'tty)) ++ (let ((fo (font-create-object f d))) ++ (set-font-family fo ,family) ++ (font-create-name fo d)))) + nil)) + + ;; Style (ie, typographical face) frobbing +@@ -1311,7 +1320,7 @@ + (interactive (list (read-face-name "Make which face bold: "))) + (Face-frob-property face locale tags exact-p + 'default 'bold 'font '(highlight) +- '(tty (lambda (x) t) ++ '(tty (lambda (f d) t) + x x-make-font-bold + gtk gtk-make-font-bold + mswindows mswindows-make-font-bold +@@ -1330,7 +1339,7 @@ + (interactive (list (read-face-name "Make which face italic: "))) + (Face-frob-property face locale tags exact-p + 'default 'italic 'font '(underline) +- '(tty (lambda (x) t) ++ '(tty (lambda (f d) t) + x x-make-font-italic + gtk gtk-make-font-italic + mswindows mswindows-make-font-italic +@@ -1349,7 +1358,7 @@ + (interactive (list (read-face-name "Make which face bold-italic: "))) + (Face-frob-property face locale tags exact-p + 'default 'bold-italic 'font '(underline highlight) +- '(tty (lambda (x) t) ++ '(tty (lambda (f d) t) + x x-make-font-bold-italic + gtk gtk-make-font-bold-italic + mswindows mswindows-make-font-bold-italic +@@ -1369,7 +1378,7 @@ + (interactive (list (read-face-name "Make which face non-bold: "))) + (Face-frob-property face locale tags exact-p + 'bold 'default 'font '(highlight) +- '(tty (lambda (x) nil) ++ '(tty (lambda (f d) nil) + x x-make-font-unbold + gtk gtk-make-font-unbold + mswindows mswindows-make-font-unbold +@@ -1388,7 +1397,7 @@ + (interactive (list (read-face-name "Make which face non-italic: "))) + (Face-frob-property face locale tags exact-p + 'italic 'default 'font '(underline) +- '(tty (lambda (x) nil) ++ '(tty (lambda (f d) nil) + x x-make-font-unitalic + gtk gtk-make-font-unitalic + mswindows mswindows-make-font-unitalic +@@ -1410,9 +1419,13 @@ + nil nil 'font nil + `(lambda (f d) + ;; keep the dependency on font.el for now +- (let ((fo (font-create-object f d))) +- (set-font-size fo ,size) +- (font-create-name fo d))) ++ ;; #### The filter on null d is a band-aid. ++ ;; Frob-face-property should not be passing in ++ ;; null devices. ++ (unless (or (null d) (eq d 'tty)) ++ (let ((fo (font-create-object f d))) ++ (set-font-size fo ,size) ++ (font-create-name fo d)))) + nil)) + + ;; Why do the following two functions lose so badly in so many diff --git a/xemacs.spec b/xemacs.spec index 5ba1e24..5d7fcd8 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 7%{?snap:.%{snap}}%{?dist} +Release: 8%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -533,7 +533,6 @@ fi %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* %{_mandir}/man1/gnudoit.1* -%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs %if %{with nox} %files nox @@ -563,6 +562,7 @@ fi %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc %endif +%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs %config(noreplace) %{_sysconfdir}/skel/.xemacs/ %{_mandir}/man1/etags.xemacs.1* %{_mandir}/man1/gnuserv.1* @@ -589,6 +589,10 @@ fi %changelog +* Mon Nov 9 2009 Jerry James - 21.5.29-8 +- Move macros.xemacs to the -common subpackage (bz 533611). +- Updated TTY font patch from upstream. + * Tue Nov 3 2009 Jerry James - 21.5.29-7 - Make the desktop file consistent with Emacs (bz 532296). From 32b6385c889a3cca27b3a7585b4bb75382ea242a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2009 17:14:39 +0000 Subject: [PATCH 065/160] Context of the ChangeLog hunk of the upstream TTY font patch needed to be adjusted a bit. Also adjust the line numbers of the no-expdyn-ia64 patch so that it applies silently. --- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 2 +- xemacs-21.5.29-tty-font-512623.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 0133bc6..6379255 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -20,7 +20,7 @@ case "$xehost_os" in --- xemacs-21.5.27/configure~ 2006-05-16 07:16:04.000000000 +0300 +++ xemacs-21.5.27/configure 2007-01-04 00:34:35.000000000 +0200 -@@ -21584,11 +21584,6 @@ +@@ -22928,11 +22928,6 @@ fi # End of if cc_produces_so = no diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch index b4fb526..cc36f25 100644 --- a/xemacs-21.5.29-tty-font-512623.patch +++ b/xemacs-21.5.29-tty-font-512623.patch @@ -16,9 +16,9 @@ diff -r 80d74fed5399 lisp/ChangeLog + (make-face-unitalic): + TTY mapper takes 2 args. + - 2009-11-09 Didier Verna + 2009-05-18 Stephen J. Turnbull - * minibuf.el (read-buffer): New optional argument 'exclude' for + * XEmacs 21.5.29 "garbanzo" is released. diff -r 80d74fed5399 lisp/faces.el --- a/lisp/faces.el Mon Nov 09 09:21:59 2009 -0700 +++ b/lisp/faces.el Mon Nov 09 09:39:16 2009 -0700 From a99d0eb341fdc615f841c726b7e0956cd2ddf8ad Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2009 17:14:39 +0000 Subject: [PATCH 066/160] Context of the ChangeLog hunk of the upstream TTY font patch needed to be adjusted a bit. Also adjust the line numbers of the no-expdyn-ia64 patch so that it applies silently. --- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 2 +- xemacs-21.5.29-tty-font-512623.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 0133bc6..6379255 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -20,7 +20,7 @@ case "$xehost_os" in --- xemacs-21.5.27/configure~ 2006-05-16 07:16:04.000000000 +0300 +++ xemacs-21.5.27/configure 2007-01-04 00:34:35.000000000 +0200 -@@ -21584,11 +21584,6 @@ +@@ -22928,11 +22928,6 @@ fi # End of if cc_produces_so = no diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch index b4fb526..cc36f25 100644 --- a/xemacs-21.5.29-tty-font-512623.patch +++ b/xemacs-21.5.29-tty-font-512623.patch @@ -16,9 +16,9 @@ diff -r 80d74fed5399 lisp/ChangeLog + (make-face-unitalic): + TTY mapper takes 2 args. + - 2009-11-09 Didier Verna + 2009-05-18 Stephen J. Turnbull - * minibuf.el (read-buffer): New optional argument 'exclude' for + * XEmacs 21.5.29 "garbanzo" is released. diff -r 80d74fed5399 lisp/faces.el --- a/lisp/faces.el Mon Nov 09 09:21:59 2009 -0700 +++ b/lisp/faces.el Mon Nov 09 09:39:16 2009 -0700 From afdf25dd7ca1fbbfa5dd97b0b8585c197bd037c0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:56 +0000 Subject: [PATCH 067/160] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2b27083..a757c80 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xemacs -# $Id$ +# $Id: Makefile,v 1.1 2005/03/01 22:05:24 scop Exp $ NAME := xemacs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 3066b33699b70a53cee93254d90ff65e9e9ebcb3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:30:31 +0000 Subject: [PATCH 068/160] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2b27083..a757c80 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: xemacs -# $Id$ +# $Id: Makefile,v 1.1 2005/03/01 22:05:24 scop Exp $ NAME := xemacs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 17c0f2d363f782e9e6061bbddcd11d7e6584aca9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 8 Dec 2009 17:17:37 +0000 Subject: [PATCH 069/160] - Add patch to use memmove in etags (bz 545399). --- xemacs-21.5.29-etags-memmove-545399.patch | 31 +++++++++++++++++++++++ xemacs.spec | 8 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.29-etags-memmove-545399.patch diff --git a/xemacs-21.5.29-etags-memmove-545399.patch b/xemacs-21.5.29-etags-memmove-545399.patch new file mode 100644 index 0000000..040cc30 --- /dev/null +++ b/xemacs-21.5.29-etags-memmove-545399.patch @@ -0,0 +1,31 @@ +diff -dur xemacs-21.5.29.ORIG/lib-src/ChangeLog xemacs-21.5.29/lib-src/ChangeLog +--- xemacs-21.5.29.ORIG/lib-src/ChangeLog 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lib-src/ChangeLog 2009-12-08 10:09:57.753594714 -0700 +@@ -1,3 +1,8 @@ ++2009-12-08 Sjoerd Mullender ++ ++ * etags.c (absolute_filename): Use memmove instead of strcpy to move ++ characters within a string. ++ + 2009-05-18 Stephen J. Turnbull + + * XEmacs 21.5.29 "garbanzo" is released. +diff -dur xemacs-21.5.29.ORIG/lib-src/etags.c xemacs-21.5.29/lib-src/etags.c +--- xemacs-21.5.29.ORIG/lib-src/etags.c 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lib-src/etags.c 2009-12-08 10:09:09.100592092 -0700 +@@ -6829,13 +6829,13 @@ + else if (cp[0] != '/') + cp = slashp; + #endif +- strcpy (cp, slashp + 3); ++ memmove (cp, slashp + 3, strlen (slashp + 3) + 1); + slashp = cp; + continue; + } + else if (slashp[2] == '/' || slashp[2] == '\0') + { +- strcpy (slashp, slashp + 2); ++ memmove (slashp, slashp + 2, strlen (slashp + 2) + 1); + continue; + } + } diff --git a/xemacs.spec b/xemacs.spec index 5d7fcd8..5d8e38a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 8%{?snap:.%{snap}}%{?dist} +Release: 9%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -54,6 +54,8 @@ Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.29-destdir.patch # Sent upstream 2009-10-28 Patch10: %{name}-21.5.29-tty-font-512623.patch +# Sent upstream 2009-12-08 +Patch11: %{name}-21.5.29-etags-memmove-545399.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -226,6 +228,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -589,6 +592,9 @@ fi %changelog +* Tue Dec 8 2009 Jerry James - 21.5.29-9 +- Add patch to use memmove in etags (bz 545399). + * Mon Nov 9 2009 Jerry James - 21.5.29-8 - Move macros.xemacs to the -common subpackage (bz 533611). - Updated TTY font patch from upstream. From 0009332b44bc6c5e6e640ab933c33d6d73175df9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 8 Dec 2009 17:17:38 +0000 Subject: [PATCH 070/160] - Add patch to use memmove in etags (bz 545399). --- xemacs-21.5.29-etags-memmove-545399.patch | 31 +++++++++++++++++++++++ xemacs.spec | 8 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.29-etags-memmove-545399.patch diff --git a/xemacs-21.5.29-etags-memmove-545399.patch b/xemacs-21.5.29-etags-memmove-545399.patch new file mode 100644 index 0000000..040cc30 --- /dev/null +++ b/xemacs-21.5.29-etags-memmove-545399.patch @@ -0,0 +1,31 @@ +diff -dur xemacs-21.5.29.ORIG/lib-src/ChangeLog xemacs-21.5.29/lib-src/ChangeLog +--- xemacs-21.5.29.ORIG/lib-src/ChangeLog 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lib-src/ChangeLog 2009-12-08 10:09:57.753594714 -0700 +@@ -1,3 +1,8 @@ ++2009-12-08 Sjoerd Mullender ++ ++ * etags.c (absolute_filename): Use memmove instead of strcpy to move ++ characters within a string. ++ + 2009-05-18 Stephen J. Turnbull + + * XEmacs 21.5.29 "garbanzo" is released. +diff -dur xemacs-21.5.29.ORIG/lib-src/etags.c xemacs-21.5.29/lib-src/etags.c +--- xemacs-21.5.29.ORIG/lib-src/etags.c 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lib-src/etags.c 2009-12-08 10:09:09.100592092 -0700 +@@ -6829,13 +6829,13 @@ + else if (cp[0] != '/') + cp = slashp; + #endif +- strcpy (cp, slashp + 3); ++ memmove (cp, slashp + 3, strlen (slashp + 3) + 1); + slashp = cp; + continue; + } + else if (slashp[2] == '/' || slashp[2] == '\0') + { +- strcpy (slashp, slashp + 2); ++ memmove (slashp, slashp + 2, strlen (slashp + 2) + 1); + continue; + } + } diff --git a/xemacs.spec b/xemacs.spec index 5d7fcd8..5d8e38a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 8%{?snap:.%{snap}}%{?dist} +Release: 9%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -54,6 +54,8 @@ Patch8: %{name}-21.5.28-courier-default.patch Patch9: %{name}-21.5.29-destdir.patch # Sent upstream 2009-10-28 Patch10: %{name}-21.5.29-tty-font-512623.patch +# Sent upstream 2009-12-08 +Patch11: %{name}-21.5.29-etags-memmove-545399.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -226,6 +228,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -589,6 +592,9 @@ fi %changelog +* Tue Dec 8 2009 Jerry James - 21.5.29-9 +- Add patch to use memmove in etags (bz 545399). + * Mon Nov 9 2009 Jerry James - 21.5.29-8 - Move macros.xemacs to the -common subpackage (bz 533611). - Updated TTY font patch from upstream. From 7e4aad7e1ad5fbc03d29e3cdc65f00db6463fcff Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 21 Dec 2009 23:27:03 +0000 Subject: [PATCH 071/160] - Don't crash with a Persian keyboard layout (bz 547840). --- xemacs-21.5.29-arabic-547840.patch | 161 +++++++++++++++++++++++++++++ xemacs.spec | 8 +- 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.29-arabic-547840.patch diff --git a/xemacs-21.5.29-arabic-547840.patch b/xemacs-21.5.29-arabic-547840.patch new file mode 100644 index 0000000..127561c --- /dev/null +++ b/xemacs-21.5.29-arabic-547840.patch @@ -0,0 +1,161 @@ +diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog +--- xemacs-21.5.29.ORIG/lisp/ChangeLog 2009-12-21 16:14:56.870726786 -0700 ++++ xemacs-21.5.29/lisp/ChangeLog 2009-12-21 16:16:50.931726958 -0700 +@@ -1,3 +1,13 @@ ++2009-12-21 Aidan Kehoe ++ ++ * mule/arabic.el (arabic-iso8859-6): ++ Move the creation of this character set to this (dumped) file, ++ since it's needed for input on X11. ++ * mule/iso-with-esc.el: ++ Remove arabic-iso8859-6 and its Unicode map from this file. ++ * unicode.el (load-unicode-tables): ++ Load arabic-iso8859-6 on startup again. ++ + 2009-11-01 Stephen Turnbull + + * faces.el (Face-frob-property): +diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el +--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lisp/mule/arabic.el 2009-12-21 16:15:16.751751709 -0700 +@@ -28,8 +28,34 @@ + + ;;; Code: + +-;; See iso-with-esc.el for commentary on the ISO standard Arabic character +-;; set. ++;; ISO 8859-6 is such a useless character set that it seems a waste of ++;; codespace to dump it. Let me count the ways: ++;; ++;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite ++;; plenty of unallocated code points. ++;; ++;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that ++;; they are necessary, even for the Arabs, for basic things like ++;; dictionary entries, children's books, and occasional disambiguation. ++;; ++;; 3. The Arabs don't use it, they use Windows-1256, which also supports ++;; Persian, at least, as well as the French characters necessary in ++;; Lebanon and North Africa. ++ ++;; But; it's necessary for input on X11. ++ ++(make-charset ++ 'arabic-iso8859-6 ++ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" ++ '(dimension 1 ++ registry "ISO8859-6" ++ chars 96 ++ columns 1 ++ direction r2l ++ final ?G ++ graphic 1 ++ short-name "RHP of ISO8859/6" ++ long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127")) + + (make-8-bit-coding-system + 'iso-8859-6 +diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el +--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2009-12-21 16:15:16.752749776 -0700 +@@ -120,89 +120,6 @@ + safe-charsets (ascii greek-iso8859-7) + mnemonic "Grk")) + +-;; ISO 8859-6 is such a useless character set that it seems a waste of +-;; codespace to dump it. Let me count the ways: +-;; +-;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite +-;; plenty of unallocated code points. +-;; +-;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that +-;; they are necessary, even for the Arabs, for basic things like +-;; dictionary entries, children's books, and occasional disambiguation. +-;; +-;; 3. The Arabs don't use it, they use Windows-1256, which also supports +-;; Persian, at least, as well as the French characters necessary in +-;; Lebanon and North Africa. +- +-(make-charset +- 'arabic-iso8859-6 +- "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" +- '(dimension 1 +- registry "ISO8859-6" +- chars 96 +- columns 1 +- direction r2l +- final ?G +- graphic 1 +- short-name "RHP of ISO8859/6" +- long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127")) +- +-(loop +- for (iso8859-6 unicode) +- in '((#xA0 #x00A0) ;; NO-BREAK SPACE +- (#xA4 #x00A4) ;; CURRENCY SIGN +- (#xAC #x060C) ;; ARABIC COMMA +- (#xAD #x00AD) ;; SOFT HYPHEN +- (#xBB #x061B) ;; ARABIC SEMICOLON +- (#xBF #x061F) ;; ARABIC QUESTION MARK +- (#xC1 #x0621) ;; ARABIC LETTER HAMZA +- (#xC2 #x0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE +- (#xC3 #x0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE +- (#xC4 #x0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE +- (#xC5 #x0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW +- (#xC6 #x0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE +- (#xC7 #x0627) ;; ARABIC LETTER ALEF +- (#xC8 #x0628) ;; ARABIC LETTER BEH +- (#xC9 #x0629) ;; ARABIC LETTER TEH MARBUTA +- (#xCA #x062A) ;; ARABIC LETTER TEH +- (#xCB #x062B) ;; ARABIC LETTER THEH +- (#xCC #x062C) ;; ARABIC LETTER JEEM +- (#xCD #x062D) ;; ARABIC LETTER HAH +- (#xCE #x062E) ;; ARABIC LETTER KHAH +- (#xCF #x062F) ;; ARABIC LETTER DAL +- (#xD0 #x0630) ;; ARABIC LETTER THAL +- (#xD1 #x0631) ;; ARABIC LETTER REH +- (#xD2 #x0632) ;; ARABIC LETTER ZAIN +- (#xD3 #x0633) ;; ARABIC LETTER SEEN +- (#xD4 #x0634) ;; ARABIC LETTER SHEEN +- (#xD5 #x0635) ;; ARABIC LETTER SAD +- (#xD6 #x0636) ;; ARABIC LETTER DAD +- (#xD7 #x0637) ;; ARABIC LETTER TAH +- (#xD8 #x0638) ;; ARABIC LETTER ZAH +- (#xD9 #x0639) ;; ARABIC LETTER AIN +- (#xDA #x063A) ;; ARABIC LETTER GHAIN +- (#xE0 #x0640) ;; ARABIC TATWEEL +- (#xE1 #x0641) ;; ARABIC LETTER FEH +- (#xE2 #x0642) ;; ARABIC LETTER QAF +- (#xE3 #x0643) ;; ARABIC LETTER KAF +- (#xE4 #x0644) ;; ARABIC LETTER LAM +- (#xE5 #x0645) ;; ARABIC LETTER MEEM +- (#xE6 #x0646) ;; ARABIC LETTER NOON +- (#xE7 #x0647) ;; ARABIC LETTER HEH +- (#xE8 #x0648) ;; ARABIC LETTER WAW +- (#xE9 #x0649) ;; ARABIC LETTER ALEF MAKSURA +- (#xEA #x064A) ;; ARABIC LETTER YEH +- (#xEB #x064B) ;; ARABIC FATHATAN +- (#xEC #x064C) ;; ARABIC DAMMATAN +- (#xED #x064D) ;; ARABIC KASRATAN +- (#xEE #x064E) ;; ARABIC FATHA +- (#xEF #x064F) ;; ARABIC DAMMA +- (#xF0 #x0650) ;; ARABIC KASRA +- (#xF1 #x0651) ;; ARABIC SHADDA +- (#xF2 #x0652));; ARABIC SUKUN +- do (set-unicode-conversion (make-char 'arabic-iso8859-6 iso8859-6) +- unicode)) +- + ;;;###autoload + (make-coding-system + 'arabic-iso-8bit-with-esc 'iso2022 ;; GNU's iso-8859-6 is +diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el +--- xemacs-21.5.29.ORIG/lisp/unicode.el 2009-05-18 08:51:07.000000000 -0600 ++++ xemacs-21.5.29/lisp/unicode.el 2009-12-21 16:15:16.752749776 -0700 +@@ -73,6 +73,7 @@ + ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80) + ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80) + ("8859-5.TXT" cyrillic-iso8859-5 #xA0 #xFF #x-80) ++ ("8859-6.TXT" arabic-iso8859-6 #xA0 #xFF #x-80) + ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80) + ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80) + ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80) diff --git a/xemacs.spec b/xemacs.spec index 5d8e38a..9c7542b 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 9%{?snap:.%{snap}}%{?dist} +Release: 10%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -56,6 +56,8 @@ Patch9: %{name}-21.5.29-destdir.patch Patch10: %{name}-21.5.29-tty-font-512623.patch # Sent upstream 2009-12-08 Patch11: %{name}-21.5.29-etags-memmove-545399.patch +# Applied upstream 2009-12-21 +Patch12: %{name}-21.5.29-arabic-547840.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -229,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -592,6 +595,9 @@ fi %changelog +* Mon Dec 21 2009 Jerry James - 21.5.29-10 +- Don't crash with a Persian keyboard layout (bz 547840) + * Tue Dec 8 2009 Jerry James - 21.5.29-9 - Add patch to use memmove in etags (bz 545399). From 580b10920c5becd2245e90033403586f2db402c0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 21 Dec 2009 23:27:03 +0000 Subject: [PATCH 072/160] - Don't crash with a Persian keyboard layout (bz 547840). --- xemacs-21.5.29-arabic-547840.patch | 161 +++++++++++++++++++++++++++++ xemacs.spec | 8 +- 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.29-arabic-547840.patch diff --git a/xemacs-21.5.29-arabic-547840.patch b/xemacs-21.5.29-arabic-547840.patch new file mode 100644 index 0000000..127561c --- /dev/null +++ b/xemacs-21.5.29-arabic-547840.patch @@ -0,0 +1,161 @@ +diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog +--- xemacs-21.5.29.ORIG/lisp/ChangeLog 2009-12-21 16:14:56.870726786 -0700 ++++ xemacs-21.5.29/lisp/ChangeLog 2009-12-21 16:16:50.931726958 -0700 +@@ -1,3 +1,13 @@ ++2009-12-21 Aidan Kehoe ++ ++ * mule/arabic.el (arabic-iso8859-6): ++ Move the creation of this character set to this (dumped) file, ++ since it's needed for input on X11. ++ * mule/iso-with-esc.el: ++ Remove arabic-iso8859-6 and its Unicode map from this file. ++ * unicode.el (load-unicode-tables): ++ Load arabic-iso8859-6 on startup again. ++ + 2009-11-01 Stephen Turnbull + + * faces.el (Face-frob-property): +diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el +--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lisp/mule/arabic.el 2009-12-21 16:15:16.751751709 -0700 +@@ -28,8 +28,34 @@ + + ;;; Code: + +-;; See iso-with-esc.el for commentary on the ISO standard Arabic character +-;; set. ++;; ISO 8859-6 is such a useless character set that it seems a waste of ++;; codespace to dump it. Let me count the ways: ++;; ++;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite ++;; plenty of unallocated code points. ++;; ++;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that ++;; they are necessary, even for the Arabs, for basic things like ++;; dictionary entries, children's books, and occasional disambiguation. ++;; ++;; 3. The Arabs don't use it, they use Windows-1256, which also supports ++;; Persian, at least, as well as the French characters necessary in ++;; Lebanon and North Africa. ++ ++;; But; it's necessary for input on X11. ++ ++(make-charset ++ 'arabic-iso8859-6 ++ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" ++ '(dimension 1 ++ registry "ISO8859-6" ++ chars 96 ++ columns 1 ++ direction r2l ++ final ?G ++ graphic 1 ++ short-name "RHP of ISO8859/6" ++ long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127")) + + (make-8-bit-coding-system + 'iso-8859-6 +diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el +--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2009-05-18 08:51:06.000000000 -0600 ++++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2009-12-21 16:15:16.752749776 -0700 +@@ -120,89 +120,6 @@ + safe-charsets (ascii greek-iso8859-7) + mnemonic "Grk")) + +-;; ISO 8859-6 is such a useless character set that it seems a waste of +-;; codespace to dump it. Let me count the ways: +-;; +-;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite +-;; plenty of unallocated code points. +-;; +-;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that +-;; they are necessary, even for the Arabs, for basic things like +-;; dictionary entries, children's books, and occasional disambiguation. +-;; +-;; 3. The Arabs don't use it, they use Windows-1256, which also supports +-;; Persian, at least, as well as the French characters necessary in +-;; Lebanon and North Africa. +- +-(make-charset +- 'arabic-iso8859-6 +- "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" +- '(dimension 1 +- registry "ISO8859-6" +- chars 96 +- columns 1 +- direction r2l +- final ?G +- graphic 1 +- short-name "RHP of ISO8859/6" +- long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127")) +- +-(loop +- for (iso8859-6 unicode) +- in '((#xA0 #x00A0) ;; NO-BREAK SPACE +- (#xA4 #x00A4) ;; CURRENCY SIGN +- (#xAC #x060C) ;; ARABIC COMMA +- (#xAD #x00AD) ;; SOFT HYPHEN +- (#xBB #x061B) ;; ARABIC SEMICOLON +- (#xBF #x061F) ;; ARABIC QUESTION MARK +- (#xC1 #x0621) ;; ARABIC LETTER HAMZA +- (#xC2 #x0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE +- (#xC3 #x0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE +- (#xC4 #x0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE +- (#xC5 #x0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW +- (#xC6 #x0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE +- (#xC7 #x0627) ;; ARABIC LETTER ALEF +- (#xC8 #x0628) ;; ARABIC LETTER BEH +- (#xC9 #x0629) ;; ARABIC LETTER TEH MARBUTA +- (#xCA #x062A) ;; ARABIC LETTER TEH +- (#xCB #x062B) ;; ARABIC LETTER THEH +- (#xCC #x062C) ;; ARABIC LETTER JEEM +- (#xCD #x062D) ;; ARABIC LETTER HAH +- (#xCE #x062E) ;; ARABIC LETTER KHAH +- (#xCF #x062F) ;; ARABIC LETTER DAL +- (#xD0 #x0630) ;; ARABIC LETTER THAL +- (#xD1 #x0631) ;; ARABIC LETTER REH +- (#xD2 #x0632) ;; ARABIC LETTER ZAIN +- (#xD3 #x0633) ;; ARABIC LETTER SEEN +- (#xD4 #x0634) ;; ARABIC LETTER SHEEN +- (#xD5 #x0635) ;; ARABIC LETTER SAD +- (#xD6 #x0636) ;; ARABIC LETTER DAD +- (#xD7 #x0637) ;; ARABIC LETTER TAH +- (#xD8 #x0638) ;; ARABIC LETTER ZAH +- (#xD9 #x0639) ;; ARABIC LETTER AIN +- (#xDA #x063A) ;; ARABIC LETTER GHAIN +- (#xE0 #x0640) ;; ARABIC TATWEEL +- (#xE1 #x0641) ;; ARABIC LETTER FEH +- (#xE2 #x0642) ;; ARABIC LETTER QAF +- (#xE3 #x0643) ;; ARABIC LETTER KAF +- (#xE4 #x0644) ;; ARABIC LETTER LAM +- (#xE5 #x0645) ;; ARABIC LETTER MEEM +- (#xE6 #x0646) ;; ARABIC LETTER NOON +- (#xE7 #x0647) ;; ARABIC LETTER HEH +- (#xE8 #x0648) ;; ARABIC LETTER WAW +- (#xE9 #x0649) ;; ARABIC LETTER ALEF MAKSURA +- (#xEA #x064A) ;; ARABIC LETTER YEH +- (#xEB #x064B) ;; ARABIC FATHATAN +- (#xEC #x064C) ;; ARABIC DAMMATAN +- (#xED #x064D) ;; ARABIC KASRATAN +- (#xEE #x064E) ;; ARABIC FATHA +- (#xEF #x064F) ;; ARABIC DAMMA +- (#xF0 #x0650) ;; ARABIC KASRA +- (#xF1 #x0651) ;; ARABIC SHADDA +- (#xF2 #x0652));; ARABIC SUKUN +- do (set-unicode-conversion (make-char 'arabic-iso8859-6 iso8859-6) +- unicode)) +- + ;;;###autoload + (make-coding-system + 'arabic-iso-8bit-with-esc 'iso2022 ;; GNU's iso-8859-6 is +diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el +--- xemacs-21.5.29.ORIG/lisp/unicode.el 2009-05-18 08:51:07.000000000 -0600 ++++ xemacs-21.5.29/lisp/unicode.el 2009-12-21 16:15:16.752749776 -0700 +@@ -73,6 +73,7 @@ + ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80) + ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80) + ("8859-5.TXT" cyrillic-iso8859-5 #xA0 #xFF #x-80) ++ ("8859-6.TXT" arabic-iso8859-6 #xA0 #xFF #x-80) + ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80) + ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80) + ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80) diff --git a/xemacs.spec b/xemacs.spec index 5d8e38a..9c7542b 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 9%{?snap:.%{snap}}%{?dist} +Release: 10%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -56,6 +56,8 @@ Patch9: %{name}-21.5.29-destdir.patch Patch10: %{name}-21.5.29-tty-font-512623.patch # Sent upstream 2009-12-08 Patch11: %{name}-21.5.29-etags-memmove-545399.patch +# Applied upstream 2009-12-21 +Patch12: %{name}-21.5.29-arabic-547840.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch @@ -229,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -592,6 +595,9 @@ fi %changelog +* Mon Dec 21 2009 Jerry James - 21.5.29-10 +- Don't crash with a Persian keyboard layout (bz 547840) + * Tue Dec 8 2009 Jerry James - 21.5.29-9 - Add patch to use memmove in etags (bz 545399). From 4b2a75614461e4aa03494d8120809634065ae032 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 7 Jan 2010 17:05:12 +0000 Subject: [PATCH 073/160] - New upstream patch for bz 547840. - Add dired patch for large files (bz 550145). - Replace "lzma" with "xz" for snapshots. --- xemacs-21.5.29-arabic-547840.patch | 166 +++++++++++++++++++++-------- xemacs-21.5.29-dired-550145.patch | 28 +++++ xemacs-snapshot.sh | 2 +- xemacs.spec | 15 ++- 4 files changed, 158 insertions(+), 53 deletions(-) create mode 100644 xemacs-21.5.29-dired-550145.patch diff --git a/xemacs-21.5.29-arabic-547840.patch b/xemacs-21.5.29-arabic-547840.patch index 127561c..4668602 100644 --- a/xemacs-21.5.29-arabic-547840.patch +++ b/xemacs-21.5.29-arabic-547840.patch @@ -1,63 +1,35 @@ diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog ---- xemacs-21.5.29.ORIG/lisp/ChangeLog 2009-12-21 16:14:56.870726786 -0700 -+++ xemacs-21.5.29/lisp/ChangeLog 2009-12-21 16:16:50.931726958 -0700 -@@ -1,3 +1,13 @@ -+2009-12-21 Aidan Kehoe +--- xemacs-21.5.29.ORIG/lisp/ChangeLog 2010-01-07 09:52:09.259674650 -0700 ++++ xemacs-21.5.29/lisp/ChangeLog 2010-01-07 09:31:59.498550275 -0700 +@@ -1,3 +1,12 @@ ++2010-01-07 Aidan Kehoe + -+ * mule/arabic.el (arabic-iso8859-6): -+ Move the creation of this character set to this (dumped) file, -+ since it's needed for input on X11. -+ * mule/iso-with-esc.el: -+ Remove arabic-iso8859-6 and its Unicode map from this file. -+ * unicode.el (load-unicode-tables): -+ Load arabic-iso8859-6 on startup again. ++ * unicode.el (load-unicode-tables): ++ * mule/mule-msw-init-late.el: ++ * mule/mule-category.el (predefined-category-list): ++ * mule/arabic.el: ++ Move arabic-iso8859-6 back to C, it needs to be there, otherwise ++ X11 character input lookup fails. + 2009-11-01 Stephen Turnbull * faces.el (Face-frob-property): diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el ---- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lisp/mule/arabic.el 2009-12-21 16:15:16.751751709 -0700 -@@ -28,8 +28,34 @@ +--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2010-01-07 09:52:09.260680256 -0700 ++++ xemacs-21.5.29/lisp/mule/arabic.el 2010-01-07 09:31:59.499595394 -0700 +@@ -28,9 +28,6 @@ ;;; Code: -;; See iso-with-esc.el for commentary on the ISO standard Arabic character -;; set. -+;; ISO 8859-6 is such a useless character set that it seems a waste of -+;; codespace to dump it. Let me count the ways: -+;; -+;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite -+;; plenty of unallocated code points. -+;; -+;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that -+;; they are necessary, even for the Arabs, for basic things like -+;; dictionary entries, children's books, and occasional disambiguation. -+;; -+;; 3. The Arabs don't use it, they use Windows-1256, which also supports -+;; Persian, at least, as well as the French characters necessary in -+;; Lebanon and North Africa. -+ -+;; But; it's necessary for input on X11. -+ -+(make-charset -+ 'arabic-iso8859-6 -+ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" -+ '(dimension 1 -+ registry "ISO8859-6" -+ chars 96 -+ columns 1 -+ direction r2l -+ final ?G -+ graphic 1 -+ short-name "RHP of ISO8859/6" -+ long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127")) - +- (make-8-bit-coding-system 'iso-8859-6 + '((#x80 ?\u0080) ;; diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el ---- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2009-12-21 16:15:16.752749776 -0700 +--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2010-01-07 09:52:09.260680256 -0700 ++++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2010-01-07 09:31:59.522633894 -0700 @@ -120,89 +120,6 @@ safe-charsets (ascii greek-iso8859-7) mnemonic "Grk")) @@ -148,9 +120,31 @@ diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule ;;;###autoload (make-coding-system 'arabic-iso-8bit-with-esc 'iso2022 ;; GNU's iso-8859-6 is +diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-category.el xemacs-21.5.29/lisp/mule/mule-category.el +--- xemacs-21.5.29.ORIG/lisp/mule/mule-category.el 2010-01-07 09:52:09.261601694 -0700 ++++ xemacs-21.5.29/lisp/mule/mule-category.el 2010-01-07 09:31:59.523637910 -0700 +@@ -244,6 +244,7 @@ + (latin-iso8859-4 ?l) + (latin-iso8859-9 ?l) + (cyrillic-iso8859-5 ?y "Cyrillic character set") ++ (arabic-iso8859-6 ?b "Arabic character set") + (greek-iso8859-7 ?g "Greek character set") + (hebrew-iso8859-8 ?w "Hebrew character set") + (katakana-jisx0201 ?k "Japanese 1-byte Katakana character set") +diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el xemacs-21.5.29/lisp/mule/mule-msw-init-late.el +--- xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el 2010-01-07 09:52:09.261601694 -0700 ++++ xemacs-21.5.29/lisp/mule/mule-msw-init-late.el 2010-01-07 09:31:59.523637910 -0700 +@@ -37,6 +37,7 @@ + (greek-iso8859-7 . "Greek") + (latin-iso8859-9 . "Turkish") + (hebrew-iso8859-8 . "Hebrew") ++ (arabic-iso8859-6 . "Arabic") + (latin-iso8859-4 . "Baltic") + (vietnamese-viscii-lower . "Viet Nam") + (vietnamese-viscii-upper . "Viet Nam") diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el ---- xemacs-21.5.29.ORIG/lisp/unicode.el 2009-05-18 08:51:07.000000000 -0600 -+++ xemacs-21.5.29/lisp/unicode.el 2009-12-21 16:15:16.752749776 -0700 +--- xemacs-21.5.29.ORIG/lisp/unicode.el 2010-01-07 09:52:09.262618232 -0700 ++++ xemacs-21.5.29/lisp/unicode.el 2010-01-07 09:31:59.524639374 -0700 @@ -73,6 +73,7 @@ ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80) ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80) @@ -159,3 +153,81 @@ diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80) ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80) ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80) +@@ -153,7 +154,7 @@ + '(ascii control-1 latin-iso8859-1 latin-iso8859-2 latin-iso8859-15 + greek-iso8859-7 hebrew-iso8859-8 ipa cyrillic-iso8859-5 + latin-iso8859-16 latin-iso8859-3 latin-iso8859-4 latin-iso8859-9 +- vietnamese-viscii-lower vietnamese-viscii-upper ++ vietnamese-viscii-lower vietnamese-viscii-upper arabic-iso8859-6 + jit-ucs-charset-0 japanese-jisx0208 japanese-jisx0208-1978 + japanese-jisx0212 japanese-jisx0213-1 japanese-jisx0213-2 + chinese-gb2312 chinese-sisheng chinese-big5-1 chinese-big5-2 +diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog +--- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:52:09.282677438 -0700 ++++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700 +@@ -1,3 +1,11 @@ ++2010-01-07 Aidan Kehoe ++ ++ * mule-charset.c: ++ (syms_of_mule_charset, complex_vars_of_mule_charset): ++ * lisp.h: ++ Restore the creation of arabic-iso8859-6 in C, having it in Lisp ++ isn't sufficient for X11 input to work. ++ + 2009-05-18 Stephen J. Turnbull + + * XEmacs 21.5.29 "garbanzo" is released. +diff -dur xemacs-21.5.29.ORIG/src/lisp.h xemacs-21.5.29/src/lisp.h +--- xemacs-21.5.29.ORIG/src/lisp.h 2010-01-07 09:52:09.288552467 -0700 ++++ xemacs-21.5.29/src/lisp.h 2010-01-07 09:31:59.541637463 -0700 +@@ -5233,6 +5233,7 @@ + extern Lisp_Object Vcharset_latin_iso8859_4; + extern Lisp_Object Vcharset_thai_tis620; + extern Lisp_Object Vcharset_greek_iso8859_7; ++extern Lisp_Object Vcharset_arabic_iso8859_6; + extern Lisp_Object Vcharset_hebrew_iso8859_8; + extern Lisp_Object Vcharset_katakana_jisx0201; + extern Lisp_Object Vcharset_latin_jisx0201; +diff -dur xemacs-21.5.29.ORIG/src/mule-charset.c xemacs-21.5.29/src/mule-charset.c +--- xemacs-21.5.29.ORIG/src/mule-charset.c 2010-01-07 09:52:09.290552365 -0700 ++++ xemacs-21.5.29/src/mule-charset.c 2010-01-07 09:53:06.329578948 -0700 +@@ -47,6 +47,7 @@ + Lisp_Object Vcharset_latin_iso8859_4; + Lisp_Object Vcharset_thai_tis620; + Lisp_Object Vcharset_greek_iso8859_7; ++Lisp_Object Vcharset_arabic_iso8859_6; + Lisp_Object Vcharset_hebrew_iso8859_8; + Lisp_Object Vcharset_katakana_jisx0201; + Lisp_Object Vcharset_latin_jisx0201; +@@ -93,6 +94,7 @@ + Qlatin_iso8859_4, + Qthai_tis620, + Qgreek_iso8859_7, ++ Qarabic_iso8859_6, + Qhebrew_iso8859_8, + Qkatakana_jisx0201, + Qlatin_jisx0201, +@@ -1110,6 +1112,7 @@ + DEFSYMBOL (Qlatin_iso8859_4); + DEFSYMBOL (Qthai_tis620); + DEFSYMBOL (Qgreek_iso8859_7); ++ DEFSYMBOL (Qarabic_iso8859_6); + DEFSYMBOL (Qhebrew_iso8859_8); + DEFSYMBOL (Qkatakana_jisx0201); + DEFSYMBOL (Qlatin_jisx0201); +@@ -1233,6 +1236,15 @@ + build_msg_string ("ISO8859-7 (Greek)"), + build_msg_string ("ISO8859-7 (Greek)"), + vector1(build_string("iso8859-7")), 0, 0); ++ staticpro (&Vcharset_arabic_iso8859_6); ++ Vcharset_arabic_iso8859_6 = ++ make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, ++ CHARSET_TYPE_96, 1, 1, 'G', ++ CHARSET_RIGHT_TO_LEFT, ++ build_string ("ISO8859-6"), ++ build_msg_string ("ISO8859-6 (Arabic)"), ++ build_msg_string ("ISO8859-6 (Arabic)"), ++ vector1(build_string ("iso8859-6")), 0, 0); + staticpro (&Vcharset_hebrew_iso8859_8); + Vcharset_hebrew_iso8859_8 = + make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, diff --git a/xemacs-21.5.29-dired-550145.patch b/xemacs-21.5.29-dired-550145.patch new file mode 100644 index 0000000..8f3c178 --- /dev/null +++ b/xemacs-21.5.29-dired-550145.patch @@ -0,0 +1,28 @@ +diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog +--- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700 ++++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:32:56.046643371 -0700 +@@ -1,3 +1,8 @@ ++2010-01-07 Henrique Martins ++ ++ * dired.c (file_name_completion): If a file is too big to stat(), ++ ignore the error, since we don't use the size. ++ + 2010-01-07 Aidan Kehoe + + * mule-charset.c: +diff -dur xemacs-21.5.29.ORIG/src/dired.c xemacs-21.5.29/src/dired.c +--- xemacs-21.5.29.ORIG/src/dired.c 2009-05-18 08:51:08.000000000 -0600 ++++ xemacs-21.5.29/src/dired.c 2010-01-07 09:34:05.666614699 -0700 +@@ -371,8 +371,10 @@ + || 0 <= scmp (d_name, XSTRING_DATA (file), file_name_length)) + continue; + +- if (file_name_completion_stat (directory, dp, &st) < 0) +- continue; ++ /* Ignore file-too-large conditions; the mode is still filled in. */ ++ if (file_name_completion_stat (directory, dp, &st) < 0 && ++ errno != EOVERFLOW) ++ continue; + + directoryp = ((st.st_mode & S_IFMT) == S_IFDIR); + if (directoryp) diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh index 0d4d64a..7e13cd7 100755 --- a/xemacs-snapshot.sh +++ b/xemacs-snapshot.sh @@ -30,5 +30,5 @@ hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac rm -r .hg* cd .. tar cf "$pwd/$tarball" xemacs-beta -lzma -f "$pwd/$tarball" +xz -f "$pwd/$tarball" cd - >/dev/null diff --git a/xemacs.spec b/xemacs.spec index 9c7542b..67833e9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,14 +22,14 @@ Name: xemacs Version: 21.5.29 -Release: 10%{?snap:.%{snap}}%{?dist} +Release: 11%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors License: GPLv2+ URL: http://www.xemacs.org/ %if 0%{?snap:1} -Source0: %{name}-%{snap}.tar.lzma +Source0: %{name}-%{snap}.tar.xz %else Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz %endif @@ -58,14 +58,13 @@ Patch10: %{name}-21.5.29-tty-font-512623.patch Patch11: %{name}-21.5.29-etags-memmove-545399.patch # Applied upstream 2009-12-21 Patch12: %{name}-21.5.29-arabic-547840.patch +# Applied upstream 2009-01-07 +Patch13: %{name}-21.5.29-dired-550145.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?snap:1} -BuildRequires: lzma -%endif BuildRequires: autoconf BuildRequires: sed >= 3.95 BuildRequires: texinfo @@ -232,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -595,6 +595,11 @@ fi %changelog +* Thu Jan 7 2010 Jerry James - 21.5.29-11 +- New upstream patch for bz 547840. +- Add dired patch for large files (bz 550145). +- Replace "lzma" with "xz" for snapshots. + * Mon Dec 21 2009 Jerry James - 21.5.29-10 - Don't crash with a Persian keyboard layout (bz 547840) From 206f64abb67e8daa7a2767e05cbf056626a9cf24 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 7 Jan 2010 17:05:12 +0000 Subject: [PATCH 074/160] - New upstream patch for bz 547840. - Add dired patch for large files (bz 550145). - Replace "lzma" with "xz" for snapshots. --- xemacs-21.5.29-arabic-547840.patch | 166 +++++++++++++++++++++-------- xemacs-21.5.29-dired-550145.patch | 28 +++++ xemacs-snapshot.sh | 2 +- xemacs.spec | 15 ++- 4 files changed, 158 insertions(+), 53 deletions(-) create mode 100644 xemacs-21.5.29-dired-550145.patch diff --git a/xemacs-21.5.29-arabic-547840.patch b/xemacs-21.5.29-arabic-547840.patch index 127561c..4668602 100644 --- a/xemacs-21.5.29-arabic-547840.patch +++ b/xemacs-21.5.29-arabic-547840.patch @@ -1,63 +1,35 @@ diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog ---- xemacs-21.5.29.ORIG/lisp/ChangeLog 2009-12-21 16:14:56.870726786 -0700 -+++ xemacs-21.5.29/lisp/ChangeLog 2009-12-21 16:16:50.931726958 -0700 -@@ -1,3 +1,13 @@ -+2009-12-21 Aidan Kehoe +--- xemacs-21.5.29.ORIG/lisp/ChangeLog 2010-01-07 09:52:09.259674650 -0700 ++++ xemacs-21.5.29/lisp/ChangeLog 2010-01-07 09:31:59.498550275 -0700 +@@ -1,3 +1,12 @@ ++2010-01-07 Aidan Kehoe + -+ * mule/arabic.el (arabic-iso8859-6): -+ Move the creation of this character set to this (dumped) file, -+ since it's needed for input on X11. -+ * mule/iso-with-esc.el: -+ Remove arabic-iso8859-6 and its Unicode map from this file. -+ * unicode.el (load-unicode-tables): -+ Load arabic-iso8859-6 on startup again. ++ * unicode.el (load-unicode-tables): ++ * mule/mule-msw-init-late.el: ++ * mule/mule-category.el (predefined-category-list): ++ * mule/arabic.el: ++ Move arabic-iso8859-6 back to C, it needs to be there, otherwise ++ X11 character input lookup fails. + 2009-11-01 Stephen Turnbull * faces.el (Face-frob-property): diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el ---- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lisp/mule/arabic.el 2009-12-21 16:15:16.751751709 -0700 -@@ -28,8 +28,34 @@ +--- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2010-01-07 09:52:09.260680256 -0700 ++++ xemacs-21.5.29/lisp/mule/arabic.el 2010-01-07 09:31:59.499595394 -0700 +@@ -28,9 +28,6 @@ ;;; Code: -;; See iso-with-esc.el for commentary on the ISO standard Arabic character -;; set. -+;; ISO 8859-6 is such a useless character set that it seems a waste of -+;; codespace to dump it. Let me count the ways: -+;; -+;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite -+;; plenty of unallocated code points. -+;; -+;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that -+;; they are necessary, even for the Arabs, for basic things like -+;; dictionary entries, children's books, and occasional disambiguation. -+;; -+;; 3. The Arabs don't use it, they use Windows-1256, which also supports -+;; Persian, at least, as well as the French characters necessary in -+;; Lebanon and North Africa. -+ -+;; But; it's necessary for input on X11. -+ -+(make-charset -+ 'arabic-iso8859-6 -+ "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" -+ '(dimension 1 -+ registry "ISO8859-6" -+ chars 96 -+ columns 1 -+ direction r2l -+ final ?G -+ graphic 1 -+ short-name "RHP of ISO8859/6" -+ long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127")) - +- (make-8-bit-coding-system 'iso-8859-6 + '((#x80 ?\u0080) ;; diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el ---- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2009-12-21 16:15:16.752749776 -0700 +--- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2010-01-07 09:52:09.260680256 -0700 ++++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2010-01-07 09:31:59.522633894 -0700 @@ -120,89 +120,6 @@ safe-charsets (ascii greek-iso8859-7) mnemonic "Grk")) @@ -148,9 +120,31 @@ diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule ;;;###autoload (make-coding-system 'arabic-iso-8bit-with-esc 'iso2022 ;; GNU's iso-8859-6 is +diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-category.el xemacs-21.5.29/lisp/mule/mule-category.el +--- xemacs-21.5.29.ORIG/lisp/mule/mule-category.el 2010-01-07 09:52:09.261601694 -0700 ++++ xemacs-21.5.29/lisp/mule/mule-category.el 2010-01-07 09:31:59.523637910 -0700 +@@ -244,6 +244,7 @@ + (latin-iso8859-4 ?l) + (latin-iso8859-9 ?l) + (cyrillic-iso8859-5 ?y "Cyrillic character set") ++ (arabic-iso8859-6 ?b "Arabic character set") + (greek-iso8859-7 ?g "Greek character set") + (hebrew-iso8859-8 ?w "Hebrew character set") + (katakana-jisx0201 ?k "Japanese 1-byte Katakana character set") +diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el xemacs-21.5.29/lisp/mule/mule-msw-init-late.el +--- xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el 2010-01-07 09:52:09.261601694 -0700 ++++ xemacs-21.5.29/lisp/mule/mule-msw-init-late.el 2010-01-07 09:31:59.523637910 -0700 +@@ -37,6 +37,7 @@ + (greek-iso8859-7 . "Greek") + (latin-iso8859-9 . "Turkish") + (hebrew-iso8859-8 . "Hebrew") ++ (arabic-iso8859-6 . "Arabic") + (latin-iso8859-4 . "Baltic") + (vietnamese-viscii-lower . "Viet Nam") + (vietnamese-viscii-upper . "Viet Nam") diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el ---- xemacs-21.5.29.ORIG/lisp/unicode.el 2009-05-18 08:51:07.000000000 -0600 -+++ xemacs-21.5.29/lisp/unicode.el 2009-12-21 16:15:16.752749776 -0700 +--- xemacs-21.5.29.ORIG/lisp/unicode.el 2010-01-07 09:52:09.262618232 -0700 ++++ xemacs-21.5.29/lisp/unicode.el 2010-01-07 09:31:59.524639374 -0700 @@ -73,6 +73,7 @@ ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80) ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80) @@ -159,3 +153,81 @@ diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80) ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80) ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80) +@@ -153,7 +154,7 @@ + '(ascii control-1 latin-iso8859-1 latin-iso8859-2 latin-iso8859-15 + greek-iso8859-7 hebrew-iso8859-8 ipa cyrillic-iso8859-5 + latin-iso8859-16 latin-iso8859-3 latin-iso8859-4 latin-iso8859-9 +- vietnamese-viscii-lower vietnamese-viscii-upper ++ vietnamese-viscii-lower vietnamese-viscii-upper arabic-iso8859-6 + jit-ucs-charset-0 japanese-jisx0208 japanese-jisx0208-1978 + japanese-jisx0212 japanese-jisx0213-1 japanese-jisx0213-2 + chinese-gb2312 chinese-sisheng chinese-big5-1 chinese-big5-2 +diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog +--- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:52:09.282677438 -0700 ++++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700 +@@ -1,3 +1,11 @@ ++2010-01-07 Aidan Kehoe ++ ++ * mule-charset.c: ++ (syms_of_mule_charset, complex_vars_of_mule_charset): ++ * lisp.h: ++ Restore the creation of arabic-iso8859-6 in C, having it in Lisp ++ isn't sufficient for X11 input to work. ++ + 2009-05-18 Stephen J. Turnbull + + * XEmacs 21.5.29 "garbanzo" is released. +diff -dur xemacs-21.5.29.ORIG/src/lisp.h xemacs-21.5.29/src/lisp.h +--- xemacs-21.5.29.ORIG/src/lisp.h 2010-01-07 09:52:09.288552467 -0700 ++++ xemacs-21.5.29/src/lisp.h 2010-01-07 09:31:59.541637463 -0700 +@@ -5233,6 +5233,7 @@ + extern Lisp_Object Vcharset_latin_iso8859_4; + extern Lisp_Object Vcharset_thai_tis620; + extern Lisp_Object Vcharset_greek_iso8859_7; ++extern Lisp_Object Vcharset_arabic_iso8859_6; + extern Lisp_Object Vcharset_hebrew_iso8859_8; + extern Lisp_Object Vcharset_katakana_jisx0201; + extern Lisp_Object Vcharset_latin_jisx0201; +diff -dur xemacs-21.5.29.ORIG/src/mule-charset.c xemacs-21.5.29/src/mule-charset.c +--- xemacs-21.5.29.ORIG/src/mule-charset.c 2010-01-07 09:52:09.290552365 -0700 ++++ xemacs-21.5.29/src/mule-charset.c 2010-01-07 09:53:06.329578948 -0700 +@@ -47,6 +47,7 @@ + Lisp_Object Vcharset_latin_iso8859_4; + Lisp_Object Vcharset_thai_tis620; + Lisp_Object Vcharset_greek_iso8859_7; ++Lisp_Object Vcharset_arabic_iso8859_6; + Lisp_Object Vcharset_hebrew_iso8859_8; + Lisp_Object Vcharset_katakana_jisx0201; + Lisp_Object Vcharset_latin_jisx0201; +@@ -93,6 +94,7 @@ + Qlatin_iso8859_4, + Qthai_tis620, + Qgreek_iso8859_7, ++ Qarabic_iso8859_6, + Qhebrew_iso8859_8, + Qkatakana_jisx0201, + Qlatin_jisx0201, +@@ -1110,6 +1112,7 @@ + DEFSYMBOL (Qlatin_iso8859_4); + DEFSYMBOL (Qthai_tis620); + DEFSYMBOL (Qgreek_iso8859_7); ++ DEFSYMBOL (Qarabic_iso8859_6); + DEFSYMBOL (Qhebrew_iso8859_8); + DEFSYMBOL (Qkatakana_jisx0201); + DEFSYMBOL (Qlatin_jisx0201); +@@ -1233,6 +1236,15 @@ + build_msg_string ("ISO8859-7 (Greek)"), + build_msg_string ("ISO8859-7 (Greek)"), + vector1(build_string("iso8859-7")), 0, 0); ++ staticpro (&Vcharset_arabic_iso8859_6); ++ Vcharset_arabic_iso8859_6 = ++ make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, ++ CHARSET_TYPE_96, 1, 1, 'G', ++ CHARSET_RIGHT_TO_LEFT, ++ build_string ("ISO8859-6"), ++ build_msg_string ("ISO8859-6 (Arabic)"), ++ build_msg_string ("ISO8859-6 (Arabic)"), ++ vector1(build_string ("iso8859-6")), 0, 0); + staticpro (&Vcharset_hebrew_iso8859_8); + Vcharset_hebrew_iso8859_8 = + make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, diff --git a/xemacs-21.5.29-dired-550145.patch b/xemacs-21.5.29-dired-550145.patch new file mode 100644 index 0000000..8f3c178 --- /dev/null +++ b/xemacs-21.5.29-dired-550145.patch @@ -0,0 +1,28 @@ +diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog +--- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700 ++++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:32:56.046643371 -0700 +@@ -1,3 +1,8 @@ ++2010-01-07 Henrique Martins ++ ++ * dired.c (file_name_completion): If a file is too big to stat(), ++ ignore the error, since we don't use the size. ++ + 2010-01-07 Aidan Kehoe + + * mule-charset.c: +diff -dur xemacs-21.5.29.ORIG/src/dired.c xemacs-21.5.29/src/dired.c +--- xemacs-21.5.29.ORIG/src/dired.c 2009-05-18 08:51:08.000000000 -0600 ++++ xemacs-21.5.29/src/dired.c 2010-01-07 09:34:05.666614699 -0700 +@@ -371,8 +371,10 @@ + || 0 <= scmp (d_name, XSTRING_DATA (file), file_name_length)) + continue; + +- if (file_name_completion_stat (directory, dp, &st) < 0) +- continue; ++ /* Ignore file-too-large conditions; the mode is still filled in. */ ++ if (file_name_completion_stat (directory, dp, &st) < 0 && ++ errno != EOVERFLOW) ++ continue; + + directoryp = ((st.st_mode & S_IFMT) == S_IFDIR); + if (directoryp) diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh index 0d4d64a..7e13cd7 100755 --- a/xemacs-snapshot.sh +++ b/xemacs-snapshot.sh @@ -30,5 +30,5 @@ hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac rm -r .hg* cd .. tar cf "$pwd/$tarball" xemacs-beta -lzma -f "$pwd/$tarball" +xz -f "$pwd/$tarball" cd - >/dev/null diff --git a/xemacs.spec b/xemacs.spec index 9c7542b..67833e9 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,14 +22,14 @@ Name: xemacs Version: 21.5.29 -Release: 10%{?snap:.%{snap}}%{?dist} +Release: 11%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors License: GPLv2+ URL: http://www.xemacs.org/ %if 0%{?snap:1} -Source0: %{name}-%{snap}.tar.lzma +Source0: %{name}-%{snap}.tar.xz %else Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz %endif @@ -58,14 +58,13 @@ Patch10: %{name}-21.5.29-tty-font-512623.patch Patch11: %{name}-21.5.29-etags-memmove-545399.patch # Applied upstream 2009-12-21 Patch12: %{name}-21.5.29-arabic-547840.patch +# Applied upstream 2009-01-07 +Patch13: %{name}-21.5.29-dired-550145.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?snap:1} -BuildRequires: lzma -%endif BuildRequires: autoconf BuildRequires: sed >= 3.95 BuildRequires: texinfo @@ -232,6 +231,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %patch14 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -595,6 +595,11 @@ fi %changelog +* Thu Jan 7 2010 Jerry James - 21.5.29-11 +- New upstream patch for bz 547840. +- Add dired patch for large files (bz 550145). +- Replace "lzma" with "xz" for snapshots. + * Mon Dec 21 2009 Jerry James - 21.5.29-10 - Don't crash with a Persian keyboard layout (bz 547840) From 7ad9584e4216dfe90b18b910f535cf0dbca90944 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:29:19 +0000 Subject: [PATCH 075/160] Initialize branch F-13 for xemacs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 8bb098c6f9d8a6040230e74881b6c5da78d80180 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 2 Mar 2010 15:38:30 +0000 Subject: [PATCH 076/160] - Remove the bitmap-fonts dependency. --- xemacs.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 67833e9..ffd0fc4 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 11%{?snap:.%{snap}}%{?dist} +Release: 12%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -108,7 +108,6 @@ Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc -Requires: bitmap-fonts Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -595,6 +594,9 @@ fi %changelog +* Tue Mar 2 2010 Jerry James - 21.5.29-12 +- Remove the bitmap-fonts dependency. + * Thu Jan 7 2010 Jerry James - 21.5.29-11 - New upstream patch for bz 547840. - Add dired patch for large files (bz 550145). From d13f8a134b55db49b24e546adc77900e655fa241 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 2 Mar 2010 15:38:30 +0000 Subject: [PATCH 077/160] - Remove the bitmap-fonts dependency. --- xemacs.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 67833e9..ffd0fc4 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -22,7 +22,7 @@ Name: xemacs Version: 21.5.29 -Release: 11%{?snap:.%{snap}}%{?dist} +Release: 12%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -108,7 +108,6 @@ Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc -Requires: bitmap-fonts Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -595,6 +594,9 @@ fi %changelog +* Tue Mar 2 2010 Jerry James - 21.5.29-12 +- Remove the bitmap-fonts dependency. + * Thu Jan 7 2010 Jerry James - 21.5.29-11 - New upstream patch for bz 547840. - Add dired patch for large files (bz 550145). From f495692dd01dc747d313299868d566ce0dcde7b5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 6 Jul 2010 19:15:36 +0000 Subject: [PATCH 078/160] - Add db4 support (bz 581614). - Add -xft subpackage (bz 356961). - Recognize Fedora's X server. --- xemacs-21.5.29-x-server.patch | 12 +++++ xemacs.spec | 88 ++++++++++++++++++++++++++++++++--- 2 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 xemacs-21.5.29-x-server.patch diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch new file mode 100644 index 0000000..2ff022f --- /dev/null +++ b/xemacs-21.5.29-x-server.patch @@ -0,0 +1,12 @@ +diff -dur xemacs-21.5.29.ORIG/lisp/x-init.el xemacs-21.5.29/lisp/x-init.el +--- xemacs-21.5.29.ORIG/lisp/x-init.el 2009-05-18 08:51:07.000000000 -0600 ++++ xemacs-21.5.29/lisp/x-init.el 2010-07-06 12:07:24.064305596 -0600 +@@ -243,7 +243,7 @@ + (string-equal "X Consortium" vendor)) + ;; Ok, we think this could be a Sun keyboard. Run the Sun code. + (x-win-init-sun device)) +- ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) ++ ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation\|Fedora Project" vendor) + ;; Those XFree86 people do some weird keysym stuff, too. + (x-win-init-xfree86 device))))) + diff --git a/xemacs.spec b/xemacs.spec index ffd0fc4..cee0598 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -6,7 +6,6 @@ %bcond_with wnn %bcond_with xaw3d %bcond_with xfs -%bcond_with xft %bcond_without mule %bcond_without nox %bcond_without xim @@ -22,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 12%{?snap:.%{snap}}%{?dist} +Release: 13%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -62,6 +61,7 @@ Patch12: %{name}-21.5.29-arabic-547840.patch Patch13: %{name}-21.5.29-dired-550145.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch +Patch15: %{name}-21.5.29-x-server.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +87,7 @@ BuildRequires: xmkmf BuildRequires: libXau-devel BuildRequires: libXpm-devel BuildRequires: alsa-lib-devel +BuildRequires: db4-devel BuildRequires: gmp-devel %if %{with gtk} BuildRequires: gtk+-devel @@ -99,9 +100,7 @@ BuildRequires: Xaw3d-devel BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk -%if %{with xft} BuildRequires: libXft-devel -%endif # xft # Note: no xemacs-packages-extra dependency here, need main pkg to build it. Requires: xemacs-packages-base >= 20060510 Requires: %{name}-common = %{version}-%{release} @@ -157,6 +156,23 @@ and an open software development model, similar to Linux. This package contains XEmacs built without X Windows support. +%package xft +Summary: Different version of Emacs built with Xft/fontconfig support +Group: Applications/Editors +Requires: %{name}-common = %{version}-%{release} +Requires: xemacs-packages-base >= 20060510 +Requires(post): coreutils +Provides: xemacs(bin) = %{version}-%{release} + +%description xft +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. + +This package contains XEmacs built with Xft and fontconfig support. + %package el Summary: Emacs lisp source files for XEmacs Group: Development/Libraries @@ -221,9 +237,7 @@ touch -r aclocal.m4 aclocal.m4-stamp touch -r aclocal.m4-stamp aclocal.m4 %endif %patch5 -p1 -%if %{without xft} %patch6 -p1 -%endif %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -232,6 +246,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -266,7 +281,7 @@ common_options=" --with-mule %endif --with-clash-detection - --with-database=no + --with-database=berkdb --without-ldap --without-postgresql --with-mail-locking=lockf @@ -304,6 +319,31 @@ for file in {e,oo}tags gnuserv {fake,move}mail yow ; do done %endif # nox +# build with Xft +%configure $common_options \ + --with-docdir=%{_libdir}/xemacs-%{xver}/doc-xft \ + --with-sound=nonative,alsa \ + --with-xft=all \ +%if %{with gtk} + --with-gtk \ + --with-gnome \ +%else + --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ + --with-menubars=lucid \ + --with-widgets=athena \ + --with-dialogs=athena \ + --with-scrollbars=lucid \ + --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ +%endif +%if ! %{with wnn} + --without-wnn +%endif +make EMACSDEBUGPATHS=yes # toplevel parallel make fails +mv lib-src/DOC{,-xft} +mv src/xemacs{,-xft-%{xver}} +mv lib-src/config.values{,-xft} +mv Installation{,-xft} + # build with X %configure $common_options \ --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ @@ -385,6 +425,16 @@ install -pm 644 lib-src/config.values-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values %endif # nox +# install xft files +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1 +install -pm 755 src/xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir} +ln -s xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-xft +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft +install -pm 644 lib-src/DOC-xft \ + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/DOC +install -pm 644 lib-src/config.values-xft \ + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/config.values + # these clash with GNU Emacs mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} @@ -497,6 +547,16 @@ rm -f %{_bindir}/xemacs && \ [ -e %{_bindir}/xemacs-nox-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : +%post xft +# rm because alternatives won't overwrite pre-alternatives symlink, bug? +rm -f %{_bindir}/xemacs && \ +%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ + %{_bindir}/xemacs-xft-%{xver} 40 || : + +%postun xft +[ -e %{_bindir}/xemacs-xft-%{xver} ] || \ +%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-xft-%{xver} || : + %post common %{_sbindir}/alternatives --install %{_bindir}/etags etags \ %{_bindir}/etags.xemacs 40 || : @@ -550,6 +610,15 @@ fi %{_mandir}/man1/xemacs-nox.1* %endif +%files xft +%defattr(-,root,root,-) +%doc Installation-xft +%ghost %{_bindir}/xemacs +%{_bindir}/xemacs-xft +%{_bindir}/xemacs-xft-%{xver} +%{_libdir}/xemacs-%{xver}/doc-xft/ +%{_mandir}/man1/xemacs-xft.1* + %files common -f base-files %defattr(-,root,root,-) %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL @@ -594,6 +663,11 @@ fi %changelog +* Tue Jul 6 2010 Jerry James - 21.5.29-13 +- Add db4 support (bz 581614). +- Add -xft subpackage (bz 356961). +- Recognize Fedora's X server. + * Tue Mar 2 2010 Jerry James - 21.5.29-12 - Remove the bitmap-fonts dependency. From 583a2def60f09841108c28de5152b35e017f3b72 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 6 Jul 2010 19:15:36 +0000 Subject: [PATCH 079/160] - Add db4 support (bz 581614). - Add -xft subpackage (bz 356961). - Recognize Fedora's X server. --- xemacs-21.5.29-x-server.patch | 12 +++++ xemacs.spec | 92 ++++++++++++++++++++++++++++++++--- 2 files changed, 96 insertions(+), 8 deletions(-) create mode 100644 xemacs-21.5.29-x-server.patch diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch new file mode 100644 index 0000000..2ff022f --- /dev/null +++ b/xemacs-21.5.29-x-server.patch @@ -0,0 +1,12 @@ +diff -dur xemacs-21.5.29.ORIG/lisp/x-init.el xemacs-21.5.29/lisp/x-init.el +--- xemacs-21.5.29.ORIG/lisp/x-init.el 2009-05-18 08:51:07.000000000 -0600 ++++ xemacs-21.5.29/lisp/x-init.el 2010-07-06 12:07:24.064305596 -0600 +@@ -243,7 +243,7 @@ + (string-equal "X Consortium" vendor)) + ;; Ok, we think this could be a Sun keyboard. Run the Sun code. + (x-win-init-sun device)) +- ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) ++ ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation\|Fedora Project" vendor) + ;; Those XFree86 people do some weird keysym stuff, too. + (x-win-init-xfree86 device))))) + diff --git a/xemacs.spec b/xemacs.spec index 67833e9..cee0598 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -6,7 +6,6 @@ %bcond_with wnn %bcond_with xaw3d %bcond_with xfs -%bcond_with xft %bcond_without mule %bcond_without nox %bcond_without xim @@ -22,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 11%{?snap:.%{snap}}%{?dist} +Release: 13%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -62,6 +61,7 @@ Patch12: %{name}-21.5.29-arabic-547840.patch Patch13: %{name}-21.5.29-dired-550145.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch +Patch15: %{name}-21.5.29-x-server.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +87,7 @@ BuildRequires: xmkmf BuildRequires: libXau-devel BuildRequires: libXpm-devel BuildRequires: alsa-lib-devel +BuildRequires: db4-devel BuildRequires: gmp-devel %if %{with gtk} BuildRequires: gtk+-devel @@ -99,16 +100,13 @@ BuildRequires: Xaw3d-devel BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk -%if %{with xft} BuildRequires: libXft-devel -%endif # xft # Note: no xemacs-packages-extra dependency here, need main pkg to build it. Requires: xemacs-packages-base >= 20060510 Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc -Requires: bitmap-fonts Requires(post): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -158,6 +156,23 @@ and an open software development model, similar to Linux. This package contains XEmacs built without X Windows support. +%package xft +Summary: Different version of Emacs built with Xft/fontconfig support +Group: Applications/Editors +Requires: %{name}-common = %{version}-%{release} +Requires: xemacs-packages-base >= 20060510 +Requires(post): coreutils +Provides: xemacs(bin) = %{version}-%{release} + +%description xft +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. + +This package contains XEmacs built with Xft and fontconfig support. + %package el Summary: Emacs lisp source files for XEmacs Group: Development/Libraries @@ -222,9 +237,7 @@ touch -r aclocal.m4 aclocal.m4-stamp touch -r aclocal.m4-stamp aclocal.m4 %endif %patch5 -p1 -%if %{without xft} %patch6 -p1 -%endif %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -233,6 +246,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -267,7 +281,7 @@ common_options=" --with-mule %endif --with-clash-detection - --with-database=no + --with-database=berkdb --without-ldap --without-postgresql --with-mail-locking=lockf @@ -305,6 +319,31 @@ for file in {e,oo}tags gnuserv {fake,move}mail yow ; do done %endif # nox +# build with Xft +%configure $common_options \ + --with-docdir=%{_libdir}/xemacs-%{xver}/doc-xft \ + --with-sound=nonative,alsa \ + --with-xft=all \ +%if %{with gtk} + --with-gtk \ + --with-gnome \ +%else + --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ + --with-menubars=lucid \ + --with-widgets=athena \ + --with-dialogs=athena \ + --with-scrollbars=lucid \ + --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ +%endif +%if ! %{with wnn} + --without-wnn +%endif +make EMACSDEBUGPATHS=yes # toplevel parallel make fails +mv lib-src/DOC{,-xft} +mv src/xemacs{,-xft-%{xver}} +mv lib-src/config.values{,-xft} +mv Installation{,-xft} + # build with X %configure $common_options \ --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ @@ -386,6 +425,16 @@ install -pm 644 lib-src/config.values-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values %endif # nox +# install xft files +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1 +install -pm 755 src/xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir} +ln -s xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-xft +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft +install -pm 644 lib-src/DOC-xft \ + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/DOC +install -pm 644 lib-src/config.values-xft \ + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/config.values + # these clash with GNU Emacs mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} @@ -498,6 +547,16 @@ rm -f %{_bindir}/xemacs && \ [ -e %{_bindir}/xemacs-nox-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : +%post xft +# rm because alternatives won't overwrite pre-alternatives symlink, bug? +rm -f %{_bindir}/xemacs && \ +%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ + %{_bindir}/xemacs-xft-%{xver} 40 || : + +%postun xft +[ -e %{_bindir}/xemacs-xft-%{xver} ] || \ +%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-xft-%{xver} || : + %post common %{_sbindir}/alternatives --install %{_bindir}/etags etags \ %{_bindir}/etags.xemacs 40 || : @@ -551,6 +610,15 @@ fi %{_mandir}/man1/xemacs-nox.1* %endif +%files xft +%defattr(-,root,root,-) +%doc Installation-xft +%ghost %{_bindir}/xemacs +%{_bindir}/xemacs-xft +%{_bindir}/xemacs-xft-%{xver} +%{_libdir}/xemacs-%{xver}/doc-xft/ +%{_mandir}/man1/xemacs-xft.1* + %files common -f base-files %defattr(-,root,root,-) %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL @@ -595,6 +663,14 @@ fi %changelog +* Tue Jul 6 2010 Jerry James - 21.5.29-13 +- Add db4 support (bz 581614). +- Add -xft subpackage (bz 356961). +- Recognize Fedora's X server. + +* Tue Mar 2 2010 Jerry James - 21.5.29-12 +- Remove the bitmap-fonts dependency. + * Thu Jan 7 2010 Jerry James - 21.5.29-11 - New upstream patch for bz 547840. - Add dired patch for large files (bz 550145). From 6f6b339ed52322fac4ef56ff68bbb54fdb8e2cd0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 6 Jul 2010 19:15:36 +0000 Subject: [PATCH 080/160] - Add db4 support (bz 581614). - Add -xft subpackage (bz 356961). - Recognize Fedora's X server. --- xemacs-21.5.29-x-server.patch | 12 +++++ xemacs.spec | 88 ++++++++++++++++++++++++++++++++--- 2 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 xemacs-21.5.29-x-server.patch diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch new file mode 100644 index 0000000..2ff022f --- /dev/null +++ b/xemacs-21.5.29-x-server.patch @@ -0,0 +1,12 @@ +diff -dur xemacs-21.5.29.ORIG/lisp/x-init.el xemacs-21.5.29/lisp/x-init.el +--- xemacs-21.5.29.ORIG/lisp/x-init.el 2009-05-18 08:51:07.000000000 -0600 ++++ xemacs-21.5.29/lisp/x-init.el 2010-07-06 12:07:24.064305596 -0600 +@@ -243,7 +243,7 @@ + (string-equal "X Consortium" vendor)) + ;; Ok, we think this could be a Sun keyboard. Run the Sun code. + (x-win-init-sun device)) +- ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) ++ ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation\|Fedora Project" vendor) + ;; Those XFree86 people do some weird keysym stuff, too. + (x-win-init-xfree86 device))))) + diff --git a/xemacs.spec b/xemacs.spec index ffd0fc4..cee0598 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -6,7 +6,6 @@ %bcond_with wnn %bcond_with xaw3d %bcond_with xfs -%bcond_with xft %bcond_without mule %bcond_without nox %bcond_without xim @@ -22,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 12%{?snap:.%{snap}}%{?dist} +Release: 13%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -62,6 +61,7 @@ Patch12: %{name}-21.5.29-arabic-547840.patch Patch13: %{name}-21.5.29-dired-550145.patch # Sent upstream 2009-03-12 Patch14: %{name}-beta-infodir.patch +Patch15: %{name}-21.5.29-x-server.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -87,6 +87,7 @@ BuildRequires: xmkmf BuildRequires: libXau-devel BuildRequires: libXpm-devel BuildRequires: alsa-lib-devel +BuildRequires: db4-devel BuildRequires: gmp-devel %if %{with gtk} BuildRequires: gtk+-devel @@ -99,9 +100,7 @@ BuildRequires: Xaw3d-devel BuildRequires: neXtaw-devel %endif # xaw3d %endif # gtk -%if %{with xft} BuildRequires: libXft-devel -%endif # xft # Note: no xemacs-packages-extra dependency here, need main pkg to build it. Requires: xemacs-packages-base >= 20060510 Requires: %{name}-common = %{version}-%{release} @@ -157,6 +156,23 @@ and an open software development model, similar to Linux. This package contains XEmacs built without X Windows support. +%package xft +Summary: Different version of Emacs built with Xft/fontconfig support +Group: Applications/Editors +Requires: %{name}-common = %{version}-%{release} +Requires: xemacs-packages-base >= 20060510 +Requires(post): coreutils +Provides: xemacs(bin) = %{version}-%{release} + +%description xft +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. + +This package contains XEmacs built with Xft and fontconfig support. + %package el Summary: Emacs lisp source files for XEmacs Group: Development/Libraries @@ -221,9 +237,7 @@ touch -r aclocal.m4 aclocal.m4-stamp touch -r aclocal.m4-stamp aclocal.m4 %endif %patch5 -p1 -%if %{without xft} %patch6 -p1 -%endif %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -232,6 +246,7 @@ touch -r aclocal.m4-stamp aclocal.m4 %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -266,7 +281,7 @@ common_options=" --with-mule %endif --with-clash-detection - --with-database=no + --with-database=berkdb --without-ldap --without-postgresql --with-mail-locking=lockf @@ -304,6 +319,31 @@ for file in {e,oo}tags gnuserv {fake,move}mail yow ; do done %endif # nox +# build with Xft +%configure $common_options \ + --with-docdir=%{_libdir}/xemacs-%{xver}/doc-xft \ + --with-sound=nonative,alsa \ + --with-xft=all \ +%if %{with gtk} + --with-gtk \ + --with-gnome \ +%else + --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ + --with-menubars=lucid \ + --with-widgets=athena \ + --with-dialogs=athena \ + --with-scrollbars=lucid \ + --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ +%endif +%if ! %{with wnn} + --without-wnn +%endif +make EMACSDEBUGPATHS=yes # toplevel parallel make fails +mv lib-src/DOC{,-xft} +mv src/xemacs{,-xft-%{xver}} +mv lib-src/config.values{,-xft} +mv Installation{,-xft} + # build with X %configure $common_options \ --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ @@ -385,6 +425,16 @@ install -pm 644 lib-src/config.values-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values %endif # nox +# install xft files +echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1 +install -pm 755 src/xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir} +ln -s xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-xft +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft +install -pm 644 lib-src/DOC-xft \ + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/DOC +install -pm 644 lib-src/config.values-xft \ + $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/config.values + # these clash with GNU Emacs mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} @@ -497,6 +547,16 @@ rm -f %{_bindir}/xemacs && \ [ -e %{_bindir}/xemacs-nox-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : +%post xft +# rm because alternatives won't overwrite pre-alternatives symlink, bug? +rm -f %{_bindir}/xemacs && \ +%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ + %{_bindir}/xemacs-xft-%{xver} 40 || : + +%postun xft +[ -e %{_bindir}/xemacs-xft-%{xver} ] || \ +%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-xft-%{xver} || : + %post common %{_sbindir}/alternatives --install %{_bindir}/etags etags \ %{_bindir}/etags.xemacs 40 || : @@ -550,6 +610,15 @@ fi %{_mandir}/man1/xemacs-nox.1* %endif +%files xft +%defattr(-,root,root,-) +%doc Installation-xft +%ghost %{_bindir}/xemacs +%{_bindir}/xemacs-xft +%{_bindir}/xemacs-xft-%{xver} +%{_libdir}/xemacs-%{xver}/doc-xft/ +%{_mandir}/man1/xemacs-xft.1* + %files common -f base-files %defattr(-,root,root,-) %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL @@ -594,6 +663,11 @@ fi %changelog +* Tue Jul 6 2010 Jerry James - 21.5.29-13 +- Add db4 support (bz 581614). +- Add -xft subpackage (bz 356961). +- Recognize Fedora's X server. + * Tue Mar 2 2010 Jerry James - 21.5.29-12 - Remove the bitmap-fonts dependency. From aa836cfcd763839f672890bc733d488265726564 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:38:55 +0000 Subject: [PATCH 081/160] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a757c80..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xemacs -# $Id: Makefile,v 1.1 2005/03/01 22:05:24 scop Exp $ -NAME := xemacs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 961b3d9667c09609c572b6fda958397385aba116 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:38:59 +0000 Subject: [PATCH 082/160] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a757c80..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xemacs -# $Id: Makefile,v 1.1 2005/03/01 22:05:24 scop Exp $ -NAME := xemacs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From 33788635a9edede41c3860ca940d4ea0fb9467c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:39:08 +0000 Subject: [PATCH 083/160] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a757c80..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xemacs -# $Id: Makefile,v 1.1 2005/03/01 22:05:24 scop Exp $ -NAME := xemacs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 0c3befe3efc492581b3722fd24db0208f7dfa601 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 10 Nov 2010 16:37:07 -0700 Subject: [PATCH 084/160] Create and own subdirectories of /usr/share/xemacs/site-packages. --- xemacs.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index cee0598..d8f6e8a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 13%{?snap:.%{snap}}%{?dist} +Release: 14%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -473,6 +473,13 @@ install -Dpm 644 %{SOURCE1} \ # macro file install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs +# Empty directories for external packages to use +mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/etc +mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/info +mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lib-src +mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/man +mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/pkginfo + # make sure nothing is 0400 chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh @@ -663,6 +670,9 @@ fi %changelog +* Wed Nov 10 2010 Jerry James - 21.5.29-14 +- Create and own subdirectories of site-packages + * Tue Jul 6 2010 Jerry James - 21.5.29-13 - Add db4 support (bz 581614). - Add -xft subpackage (bz 356961). From c205855ccdd0dccbabfb5ef99b808092291b024e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 1 Dec 2010 10:09:57 -0700 Subject: [PATCH 085/160] * Wed Dec 1 2010 Jerry James - 21.5.29-15 - Don't create /var/lock/xemacs; it is not used (bz 656723). - Drop the BuildRoot tag. - Ship COPYING with the -info subpackage. --- xemacs.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index d8f6e8a..b272405 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 14%{?snap:.%{snap}}%{?dist} +Release: 15%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -63,8 +63,6 @@ Patch13: %{name}-21.5.29-dired-550145.patch Patch14: %{name}-beta-infodir.patch Patch15: %{name}-21.5.29-x-server.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: autoconf BuildRequires: sed >= 3.95 BuildRequires: texinfo @@ -451,9 +449,6 @@ desktop-file-install --vendor=fedora --mode=644 \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} -# lockdir -install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/lock/xemacs - # site-start.el install -dm 755 \ $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d @@ -648,7 +643,6 @@ fi %{_mandir}/man1/etags.xemacs.1* %{_mandir}/man1/gnuserv.1* %{_mandir}/man1/xemacs.1* -%dir %{_localstatedir}/lock/xemacs/ %files el -f el-files %defattr(-,root,root,-) @@ -658,6 +652,7 @@ fi %files info -f info-files %defattr(-,root,root,-) +%doc COPYING %{_infodir}/*.info* %files devel @@ -670,6 +665,11 @@ fi %changelog +* Wed Dec 1 2010 Jerry James - 21.5.29-15 +- Don't create /var/lock/xemacs; it is not used (bz 656723). +- Drop the BuildRoot tag. +- Ship COPYING with the -info subpackage. + * Wed Nov 10 2010 Jerry James - 21.5.29-14 - Create and own subdirectories of site-packages From e75894698f668ceb4ab8e8e877435d97b4c0c64d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 22:02:12 -0600 Subject: [PATCH 086/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index b272405..c6b7952 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 15%{?snap:.%{snap}}%{?dist} +Release: 16%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -665,6 +665,9 @@ fi %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 21.5.29-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Dec 1 2010 Jerry James - 21.5.29-15 - Don't create /var/lock/xemacs; it is not used (bz 656723). - Drop the BuildRoot tag. From 5c56d55d4cbffce427b7e5b6b143bbdfb472f71d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 1 Mar 2011 11:20:21 -0700 Subject: [PATCH 087/160] * Tue Mar 1 2011 Jerry James - 21.5.29-17 - Add filesystem subpackage (bz 672093). - Add gnuclient desktop file. - Fix CFLAGS so -fno-strict-aliasing actually gets used. - Add . to the default load-path in _xemacs_bytecompile. - Update Requires for pre/post(un) scripts. --- gnuclient.desktop | 11 +++++++ xemacs.desktop | 1 + xemacs.spec | 74 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 gnuclient.desktop diff --git a/gnuclient.desktop b/gnuclient.desktop new file mode 100644 index 0000000..9dfdb5e --- /dev/null +++ b/gnuclient.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=XEmacs Client +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=gnuclient %f +Icon=xemacs +Type=Application +Terminal=false +Categories=Application;Utility;TextEditor; +StartupWMClass=XEmacs diff --git a/xemacs.desktop b/xemacs.desktop index 9296058..2ab2a7a 100644 --- a/xemacs.desktop +++ b/xemacs.desktop @@ -24,6 +24,7 @@ Name[sl]=Urejevalnik XEmacs Name[uk]=Редактор XEmacs GenericName=Text Editor Comment=Edit text +Comment[zh_TW]=編輯文字 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 diff --git a/xemacs.spec b/xemacs.spec index c6b7952..b080abb 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 16%{?snap:.%{snap}}%{?dist} +Release: 17%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -37,6 +37,7 @@ Source2: xemacs.desktop Source3: dotxemacs-init.el Source4: default.el Source5: xemacs-sitestart.el +Source6: gnuclient.desktop Patch0: %{name}-21.5.26-utf8-fonts.patch Patch1: %{name}-21.5.25-x-paths.patch @@ -105,7 +106,14 @@ Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc +Requires(post): chkconfig Requires(post): coreutils +Requires(post): desktop-file-utils +Requires(post): gtk2 +Requires(postun): chkconfig +Requires(postun): coreutils +Requires(postun): desktop-file-utils +Requires(postun): gtk2 Provides: xemacs(bin) = %{version}-%{release} %global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') @@ -123,9 +131,9 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Byte-compiled lisp files and other common files for XEmacs Group: Applications/Editors -Requires: xemacs(bin) = %{version}-%{release} -Requires(post): %{_sbindir}/alternatives -Requires(preun): %{_sbindir}/alternatives +Requires: %{name}-filesystem = %{version}-%{release} +Requires(post): chkconfig +Requires(preun): chkconfig %description common XEmacs is a highly customizable open source text editor and @@ -142,7 +150,9 @@ Group: Applications/Editors # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} +Requires(post): chkconfig Requires(post): coreutils +Requires(postun): chkconfig Provides: xemacs(bin) = %{version}-%{release} %description nox @@ -159,7 +169,9 @@ Summary: Different version of Emacs built with Xft/fontconfig support Group: Applications/Editors Requires: %{name}-common = %{version}-%{release} Requires: xemacs-packages-base >= 20060510 +Requires(post): chkconfig Requires(post): coreutils +Requires(postun): chkconfig Provides: xemacs(bin) = %{version}-%{release} %description xft @@ -174,7 +186,7 @@ This package contains XEmacs built with Xft and fontconfig support. %package el Summary: Emacs lisp source files for XEmacs Group: Development/Libraries -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-filesystem = %{version}-%{release} %description el XEmacs is a highly customizable open source text editor and @@ -192,8 +204,8 @@ Group: Documentation %if 0%{?fedora} >= 10 BuildArch: noarch %endif -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Requires(post): info +Requires(preun): info %description info XEmacs is a highly customizable open source text editor and @@ -219,6 +231,19 @@ and an open software development model, similar to Linux. This package contains XEmacs development support files. +%package filesystem +Summary: XEmacs filesystem layout +Group: Applications/Editors + +%description filesystem +XEmacs is a highly customizable open source text editor and +application development system. It is protected under the GNU General +Public License and related to other versions of Emacs, in particular +GNU Emacs. Its emphasis is on modern graphical user interface support +and an open software development model, similar to Linux. + +This package contains directories that are required by other packages that +add functionality to XEmacs. %prep %setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} @@ -256,9 +281,10 @@ done %build -CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" %if %{with gtk} -CFLAGS="$CFLAGS $(pkg-config libglade --cflags)" +CFLAGS="$CFLAGS $(pkg-config libglade --cflags) -fno-strict-aliasing" +%else +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %endif export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule @@ -394,7 +420,7 @@ cat > macros.xemacs << EOF %%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages %%_xemacs_sitelispdir %{_datadir}/xemacs/site-packages/lisp %%_xemacs_sitestartdir %{_datadir}/xemacs/site-packages/lisp/site-start.d -%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -f batch-byte-compile +%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -eval '(push "." load-path)' -f batch-byte-compile %if %{with modules} %%_xemacs_includedir %{_libdir}/xemacs-%{xver}/%{xbuild}/include %%_xemacs_sitemoduledir %{_libdir}/xemacs/site-modules @@ -449,6 +475,10 @@ desktop-file-install --vendor=fedora --mode=644 \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} +desktop-file-install --vendor=fedora --mode=644 \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ + %{SOURCE6} + # site-start.el install -dm 755 \ $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d @@ -493,10 +523,10 @@ echo "%%defattr(-,root,root,-)" > base-files echo "%%defattr(-,root,root,-)" > el-files echo "%%defattr(-,root,root,-)" > info-files -find $RPM_BUILD_ROOT{%{_datadir}/xemacs-%{xver},%{_datadir}/xemacs} \ +find $RPM_BUILD_ROOT%{_datadir}/xemacs{-%{xver},/site-packages/lisp/*} \ \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ \( -type d -name info -fprint info.files -prune \) -o \ - \( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \ + \( -type d -not -name site-start.d -fprintf dir.files "%%%%dir %%p\n" \) -o \ \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ -fprint base-el-not-bytecomped.files \) \) sed -i -e "s|$RPM_BUILD_ROOT||" *.files @@ -597,6 +627,7 @@ fi %endif %endif %{_datadir}/applications/*-%{name}.desktop +%{_datadir}/applications/gnuclient.desktop %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* %{_mandir}/man1/gnudoit.1* @@ -663,8 +694,27 @@ fi %endif %{_libdir}/pkgconfig/xemacs.pc +%files filesystem +%defattr(-,root,root,-) +%dir %{_datadir}/xemacs +%dir %{_datadir}/xemacs/site-lisp +%dir %{_datadir}/xemacs/site-packages +%dir %{_datadir}/xemacs/site-packages/etc +%dir %{_datadir}/xemacs/site-packages/info +%dir %{_datadir}/xemacs/site-packages/lib-src +%dir %{_datadir}/xemacs/site-packages/lisp +%dir %{_datadir}/xemacs/site-packages/lisp/site-start.d +%dir %{_datadir}/xemacs/site-packages/man +%dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Mar 1 2011 Jerry James - 21.5.29-17 +- Add filesystem subpackage (bz 672093). +- Add gnuclient desktop file. +- Fix CFLAGS so -fno-strict-aliasing actually gets used. +- Add . to the default load-path in _xemacs_bytecompile. +- Update Requires for pre/post(un) scripts. + * Mon Feb 07 2011 Fedora Release Engineering - 21.5.29-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From d0cdbb4592435147691b1f20e0f143ecb3a9eb5a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 1 Mar 2011 12:30:31 -0700 Subject: [PATCH 088/160] Fix 2 typos that break the build. --- xemacs.desktop | 2 +- xemacs.spec | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xemacs.desktop b/xemacs.desktop index 2ab2a7a..817c6d9 100644 --- a/xemacs.desktop +++ b/xemacs.desktop @@ -30,5 +30,5 @@ Exec=xemacs %f Icon=xemacs Type=Application Terminal=false -Categories=Application;Utility;TextEditor +Categories=Application;Utility;TextEditor; StartupWMClass=XEmacs diff --git a/xemacs.spec b/xemacs.spec index b080abb..a5a41a2 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -471,12 +471,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/standards* rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* rm -f $RPM_BUILD_ROOT%{_infodir}/dir -desktop-file-install --vendor=fedora --mode=644 \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ +desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} -desktop-file-install --vendor=fedora --mode=644 \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ +desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE6} # site-start.el @@ -626,7 +624,7 @@ fi %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/canna_api.ell %endif %endif -%{_datadir}/applications/*-%{name}.desktop +%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/gnuclient.desktop %{_datadir}/icons/hicolor/48x48/apps/xemacs.png %{_mandir}/man1/gnuclient.1* From a6da04b4de66d2f51312a0f70281075ffd250eb9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 1 Mar 2011 14:22:09 -0700 Subject: [PATCH 089/160] Make the -filesystem subpackage be noarch. --- xemacs.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index a5a41a2..1f1bd8e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.29 -Release: 17%{?snap:.%{snap}}%{?dist} +Release: 18%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -234,6 +234,9 @@ This package contains XEmacs development support files. %package filesystem Summary: XEmacs filesystem layout Group: Applications/Editors +%if 0%{?fedora} >= 10 +BuildArch: noarch +%endif %description filesystem XEmacs is a highly customizable open source text editor and @@ -706,6 +709,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Mar 1 2011 Jerry James - 21.5.29-18 +- Make -filesystem subpackage be noarch. + * Tue Mar 1 2011 Jerry James - 21.5.29-17 - Add filesystem subpackage (bz 672093). - Add gnuclient desktop file. From 77761d7c199e2bc7aba57ca78b39b3efcf2eb538 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 3 May 2011 20:37:36 -0600 Subject: [PATCH 090/160] Update to 21.5.31. License is now GPLv3+. Drop upstreamed patches: x-paths, image-overflow, no-xft, png, tty-font, etags-memmove, arabic, dired, and infodir. Rebase and renumber remaining patches. Drop workaround for ancient alternatives bug. --- .gitignore | 2 +- gnuclient.desktop | 2 +- sources | 2 +- xemacs-21.5.25-mk-nochk-features.patch | 6 +- xemacs-21.5.25-wnnfix-128362.patch | 18 +- xemacs-21.5.25-x-paths.patch | 22 -- xemacs-21.5.26-utf8-fonts.patch | 10 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 54 ++--- xemacs-21.5.28-courier-default.patch | 12 +- xemacs-21.5.29-arabic-547840.patch | 233 ------------------- xemacs-21.5.29-destdir.patch | 257 +++++++++------------ xemacs-21.5.29-dired-550145.patch | 28 --- xemacs-21.5.29-etags-memmove-545399.patch | 31 --- xemacs-21.5.29-image-overflow.patch | 83 ------- xemacs-21.5.29-no-xft.patch | 39 ---- xemacs-21.5.29-png.patch | 133 ----------- xemacs-21.5.29-tty-font-512623.patch | 133 ----------- xemacs-21.5.29-x-server.patch | 7 +- xemacs-beta-infodir.patch | 12 - xemacs.spec | 96 +++----- 20 files changed, 189 insertions(+), 991 deletions(-) delete mode 100644 xemacs-21.5.25-x-paths.patch delete mode 100644 xemacs-21.5.29-arabic-547840.patch delete mode 100644 xemacs-21.5.29-dired-550145.patch delete mode 100644 xemacs-21.5.29-etags-memmove-545399.patch delete mode 100644 xemacs-21.5.29-image-overflow.patch delete mode 100644 xemacs-21.5.29-no-xft.patch delete mode 100644 xemacs-21.5.29-png.patch delete mode 100644 xemacs-21.5.29-tty-font-512623.patch delete mode 100644 xemacs-beta-infodir.patch diff --git a/.gitignore b/.gitignore index cecbdf8..e5004a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -xemacs-21.5.29.tar.gz +xemacs-21.5.31.tar.gz diff --git a/gnuclient.desktop b/gnuclient.desktop index 9dfdb5e..c06d946 100644 --- a/gnuclient.desktop +++ b/gnuclient.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Name=XEmacs Client +Name=Gnuclient 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++; diff --git a/sources b/sources index ad2d8ce..39e46de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5364192ae0d3de23d9f4ce197e6493b5 xemacs-21.5.29.tar.gz +0185fe905d0b8d8d094d9b60cf262d4a xemacs-21.5.31.tar.gz diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch index 5dc625a..1adfa6b 100644 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ b/xemacs-21.5.25-mk-nochk-features.patch @@ -1,6 +1,6 @@ ---- xemacs-21.5.25/Makefile.in.in.orig 2005-12-31 14:41:23.000000000 +0200 -+++ xemacs-21.5.25/Makefile.in.in 2006-03-30 23:53:48.000000000 +0300 -@@ -387,7 +387,7 @@ +--- Makefile.in.in.orig 2011-04-29 07:31:05.000000000 -0600 ++++ Makefile.in.in 2011-05-03 13:50:06.283333766 -0600 +@@ -391,7 +391,7 @@ install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep diff --git a/xemacs-21.5.25-wnnfix-128362.patch b/xemacs-21.5.25-wnnfix-128362.patch index 6153740..0b64249 100644 --- a/xemacs-21.5.25-wnnfix-128362.patch +++ b/xemacs-21.5.25-wnnfix-128362.patch @@ -1,6 +1,6 @@ ---- xemacs-21.5.25/src/mule-wnnfns.c.orig 2004-11-05 01:06:43.000000000 +0200 -+++ xemacs-21.5.25/src/mule-wnnfns.c 2006-03-31 00:20:37.000000000 +0300 -@@ -318,7 +318,7 @@ +--- src/mule-wnnfns.c.orig 2011-04-29 07:31:16.000000000 -0600 ++++ src/mule-wnnfns.c 2011-05-03 14:00:02.625969757 -0600 +@@ -316,7 +316,7 @@ Lisp_Object Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji; Lisp_Object Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko; Lisp_Object Vwnn_server_type; @@ -8,8 +8,8 @@ +//Lisp_Object Vcwnn_zhuyin; Lisp_Object Vwnnenv_sticky; Lisp_Object Vwnn_uniq_level; - Fixnum lb_sisheng; -@@ -1897,9 +1897,11 @@ + Lisp_Object Qchinese_sisheng; +@@ -1914,9 +1914,11 @@ DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /* *jserver, cserver .. */ ); @@ -22,7 +22,7 @@ DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /* *If non-nil, make environment sticky */ ); -@@ -1908,7 +1910,7 @@ +@@ -1925,7 +1927,7 @@ */ ); Vwnn_server_type = Qjserver; @@ -30,8 +30,8 @@ + //Vcwnn_zhuyin = Qnil; Vwnnenv_sticky = Qnil; - Vwnn_uniq_level = Qwnn_uniq; -@@ -1930,10 +1932,14 @@ + DEFSYMBOL (Qchinese_sisheng); +@@ -1952,10 +1954,14 @@ case 0x80: if (EQ(Vwnn_server_type, Qcserver)) { @@ -46,7 +46,7 @@ for (i = 0; i < len; i++) { if (pzy[i] & 0x80) -@@ -2036,8 +2042,12 @@ +@@ -2055,8 +2061,12 @@ else *pin = *w; w++; pin++; } diff --git a/xemacs-21.5.25-x-paths.patch b/xemacs-21.5.25-x-paths.patch deleted file mode 100644 index 04f87e2..0000000 --- a/xemacs-21.5.25-x-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- xemacs-21.5.25/etc/Emacs.ad.orig 2003-03-27 14:57:44.000000000 +0200 -+++ xemacs-21.5.25/etc/Emacs.ad 2006-03-30 23:36:47.000000000 +0300 -@@ -9,7 +9,7 @@ - ! changes to .../etc/Emacs.ad made after XEmacs has been built will have no - ! effect. - ! --! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs -+! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs - ! (or whatever the standard app-defaults directory is at your site) to cause - ! it to be consulted at run-time. (Do this only for site-wide customizations: - ! personal customizations should be put into ~/.Xresources instead.) ---- xemacs-21.5.25/etc/xemacs.1.orig 2001-04-12 21:20:52.000000000 +0300 -+++ xemacs-21.5.25/etc/xemacs.1 2006-03-30 23:36:47.000000000 +0300 -@@ -288,7 +288,7 @@ - Sets the color of the text. - - See the file --.I /usr/lib/X11/rgb.txt -+.I /usr/share/X11/rgb.txt - for a list of valid - color names. - .TP diff --git a/xemacs-21.5.26-utf8-fonts.patch b/xemacs-21.5.26-utf8-fonts.patch index 02b842b..ae0a2a8 100644 --- a/xemacs-21.5.26-utf8-fonts.patch +++ b/xemacs-21.5.26-utf8-fonts.patch @@ -1,6 +1,6 @@ ---- xemacs-21.5.26/etc/Emacs.ad.orig 2003-03-27 14:57:44.000000000 +0200 -+++ xemacs-21.5.26/etc/Emacs.ad 2006-04-14 20:37:56.000000000 +0300 -@@ -198,8 +198,12 @@ +--- etc/Emacs.ad.orig 2011-04-29 07:31:05.000000000 -0600 ++++ etc/Emacs.ad 2011-05-03 13:45:02.269991498 -0600 +@@ -222,8 +222,12 @@ ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 ! @@ -15,7 +15,7 @@ *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -*-*-*-*-*-*-*-120-*-iso10646-1, \ -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -@@ -211,7 +215,7 @@ +@@ -235,7 +239,7 @@ ! Gui elements share this font ! @@ -24,7 +24,7 @@ ! Font in the Motif dialog boxes. ! (Motif uses `fontList' while most other things use `font' - if you don't -@@ -227,7 +231,7 @@ +@@ -251,7 +255,7 @@ ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 6379255..225c168 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,34 +1,28 @@ ---- xemacs-21.5.27/aclocal.m4~ 2006-03-28 18:55:49.000000000 +0300 -+++ xemacs-21.5.27/aclocal.m4 2007-01-04 00:34:57.000000000 +0200 -@@ -549,11 +549,12 @@ - dnl usually need to be prefix with ${wl} or some other such thing. - dnl +--- ./configure.orig 2011-04-29 07:31:38.000000000 -0600 ++++ ./configure 2011-05-03 13:57:42.432352166 -0600 +@@ -14638,7 +14638,10 @@ + ;; --if test "$xe_gnu_ld" = yes; then -- if test "$ld_shlibs" = yes; then + *) - ld_dynamic_link_flags="${wl}-export-dynamic" -- fi --fi -+dnl dnl avoid -export-dynamic on ia64 -+dnl if test "$xe_gnu_ld" = yes; then -+dnl if test "$ld_shlibs" = yes; then -+dnl ld_dynamic_link_flags="${wl}-export-dynamic" -+dnl fi -+dnl fi ++ dnl avoid -export-dynamic on ia64 ++ if test "$xehost_cpu" != "ia64"; then ++ ld_dynamic_link_flags="${wl}-export-dynamic" ++ fi + ;; + esac + fi +--- ./aclocal.m4.orig 2011-04-29 07:31:05.000000000 -0600 ++++ ./aclocal.m4 2011-05-03 13:56:08.899939431 -0600 +@@ -533,7 +533,10 @@ + ;; - if test -z "$ld_dynamic_link_flags"; then - case "$xehost_os" in ---- xemacs-21.5.27/configure~ 2006-05-16 07:16:04.000000000 +0300 -+++ xemacs-21.5.27/configure 2007-01-04 00:34:35.000000000 +0200 -@@ -22928,11 +22928,6 @@ - fi # End of if cc_produces_so = no - - --if test "$xe_gnu_ld" = yes; then -- if test "$ld_shlibs" = yes; then + *) - ld_dynamic_link_flags="${wl}-export-dynamic" -- fi --fi - - if test -z "$ld_dynamic_link_flags"; then - case "$xehost_os" in ++ dnl avoid -export-dynamic on ia64 ++ if test "$xehost_cpu" != "ia64"; then ++ ld_dynamic_link_flags="${wl}-export-dynamic" ++ fi + ;; + esac + fi diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index 0af7786..e8ffe1c 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,11 +1,11 @@ ---- xemacs-21.5.28/src/faces.c 2009-05-18 14:51:08.000000000 -0000 -+++ xemacs-21.5.28/src/faces.c 2009-08-24 17:07:03.000000000 -0000 -@@ -2411,7 +2411,7 @@ +--- src/faces.c.orig 2011-04-29 07:31:15.000000000 -0600 ++++ src/faces.c 2011-05-03 14:07:19.571887005 -0600 +@@ -2426,7 +2426,7 @@ Fcons (Fcons (list1 (device_symbol), -- build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), -+ build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), +- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), ++ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), inst_list); - #endif /* !USE_XFT */ + #endif /* !HAVE_XFT */ diff --git a/xemacs-21.5.29-arabic-547840.patch b/xemacs-21.5.29-arabic-547840.patch deleted file mode 100644 index 4668602..0000000 --- a/xemacs-21.5.29-arabic-547840.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff -dur xemacs-21.5.29.ORIG/lisp/ChangeLog xemacs-21.5.29/lisp/ChangeLog ---- xemacs-21.5.29.ORIG/lisp/ChangeLog 2010-01-07 09:52:09.259674650 -0700 -+++ xemacs-21.5.29/lisp/ChangeLog 2010-01-07 09:31:59.498550275 -0700 -@@ -1,3 +1,12 @@ -+2010-01-07 Aidan Kehoe -+ -+ * unicode.el (load-unicode-tables): -+ * mule/mule-msw-init-late.el: -+ * mule/mule-category.el (predefined-category-list): -+ * mule/arabic.el: -+ Move arabic-iso8859-6 back to C, it needs to be there, otherwise -+ X11 character input lookup fails. -+ - 2009-11-01 Stephen Turnbull - - * faces.el (Face-frob-property): -diff -dur xemacs-21.5.29.ORIG/lisp/mule/arabic.el xemacs-21.5.29/lisp/mule/arabic.el ---- xemacs-21.5.29.ORIG/lisp/mule/arabic.el 2010-01-07 09:52:09.260680256 -0700 -+++ xemacs-21.5.29/lisp/mule/arabic.el 2010-01-07 09:31:59.499595394 -0700 -@@ -28,9 +28,6 @@ - - ;;; Code: - --;; See iso-with-esc.el for commentary on the ISO standard Arabic character --;; set. -- - (make-8-bit-coding-system - 'iso-8859-6 - '((#x80 ?\u0080) ;; -diff -dur xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el xemacs-21.5.29/lisp/mule/iso-with-esc.el ---- xemacs-21.5.29.ORIG/lisp/mule/iso-with-esc.el 2010-01-07 09:52:09.260680256 -0700 -+++ xemacs-21.5.29/lisp/mule/iso-with-esc.el 2010-01-07 09:31:59.522633894 -0700 -@@ -120,89 +120,6 @@ - safe-charsets (ascii greek-iso8859-7) - mnemonic "Grk")) - --;; ISO 8859-6 is such a useless character set that it seems a waste of --;; codespace to dump it. Let me count the ways: --;; --;; 1. It doesn't support Persian or Urdu, let alone Sinhalese, despite --;; plenty of unallocated code points. --;; --;; 2. It doesn't encode all the vowel diacritics (the Harakaat) despite that --;; they are necessary, even for the Arabs, for basic things like --;; dictionary entries, children's books, and occasional disambiguation. --;; --;; 3. The Arabs don't use it, they use Windows-1256, which also supports --;; Persian, at least, as well as the French characters necessary in --;; Lebanon and North Africa. -- --(make-charset -- 'arabic-iso8859-6 -- "Right-Hand Part of Latin/Arabic Alphabet (ISO/IEC 8859-6): ISO-IR-127" -- '(dimension 1 -- registry "ISO8859-6" -- chars 96 -- columns 1 -- direction r2l -- final ?G -- graphic 1 -- short-name "RHP of ISO8859/6" -- long-name "RHP of Arabic (ISO 8859-6): ISO-IR-127")) -- --(loop -- for (iso8859-6 unicode) -- in '((#xA0 #x00A0) ;; NO-BREAK SPACE -- (#xA4 #x00A4) ;; CURRENCY SIGN -- (#xAC #x060C) ;; ARABIC COMMA -- (#xAD #x00AD) ;; SOFT HYPHEN -- (#xBB #x061B) ;; ARABIC SEMICOLON -- (#xBF #x061F) ;; ARABIC QUESTION MARK -- (#xC1 #x0621) ;; ARABIC LETTER HAMZA -- (#xC2 #x0622) ;; ARABIC LETTER ALEF WITH MADDA ABOVE -- (#xC3 #x0623) ;; ARABIC LETTER ALEF WITH HAMZA ABOVE -- (#xC4 #x0624) ;; ARABIC LETTER WAW WITH HAMZA ABOVE -- (#xC5 #x0625) ;; ARABIC LETTER ALEF WITH HAMZA BELOW -- (#xC6 #x0626) ;; ARABIC LETTER YEH WITH HAMZA ABOVE -- (#xC7 #x0627) ;; ARABIC LETTER ALEF -- (#xC8 #x0628) ;; ARABIC LETTER BEH -- (#xC9 #x0629) ;; ARABIC LETTER TEH MARBUTA -- (#xCA #x062A) ;; ARABIC LETTER TEH -- (#xCB #x062B) ;; ARABIC LETTER THEH -- (#xCC #x062C) ;; ARABIC LETTER JEEM -- (#xCD #x062D) ;; ARABIC LETTER HAH -- (#xCE #x062E) ;; ARABIC LETTER KHAH -- (#xCF #x062F) ;; ARABIC LETTER DAL -- (#xD0 #x0630) ;; ARABIC LETTER THAL -- (#xD1 #x0631) ;; ARABIC LETTER REH -- (#xD2 #x0632) ;; ARABIC LETTER ZAIN -- (#xD3 #x0633) ;; ARABIC LETTER SEEN -- (#xD4 #x0634) ;; ARABIC LETTER SHEEN -- (#xD5 #x0635) ;; ARABIC LETTER SAD -- (#xD6 #x0636) ;; ARABIC LETTER DAD -- (#xD7 #x0637) ;; ARABIC LETTER TAH -- (#xD8 #x0638) ;; ARABIC LETTER ZAH -- (#xD9 #x0639) ;; ARABIC LETTER AIN -- (#xDA #x063A) ;; ARABIC LETTER GHAIN -- (#xE0 #x0640) ;; ARABIC TATWEEL -- (#xE1 #x0641) ;; ARABIC LETTER FEH -- (#xE2 #x0642) ;; ARABIC LETTER QAF -- (#xE3 #x0643) ;; ARABIC LETTER KAF -- (#xE4 #x0644) ;; ARABIC LETTER LAM -- (#xE5 #x0645) ;; ARABIC LETTER MEEM -- (#xE6 #x0646) ;; ARABIC LETTER NOON -- (#xE7 #x0647) ;; ARABIC LETTER HEH -- (#xE8 #x0648) ;; ARABIC LETTER WAW -- (#xE9 #x0649) ;; ARABIC LETTER ALEF MAKSURA -- (#xEA #x064A) ;; ARABIC LETTER YEH -- (#xEB #x064B) ;; ARABIC FATHATAN -- (#xEC #x064C) ;; ARABIC DAMMATAN -- (#xED #x064D) ;; ARABIC KASRATAN -- (#xEE #x064E) ;; ARABIC FATHA -- (#xEF #x064F) ;; ARABIC DAMMA -- (#xF0 #x0650) ;; ARABIC KASRA -- (#xF1 #x0651) ;; ARABIC SHADDA -- (#xF2 #x0652));; ARABIC SUKUN -- do (set-unicode-conversion (make-char 'arabic-iso8859-6 iso8859-6) -- unicode)) -- - ;;;###autoload - (make-coding-system - 'arabic-iso-8bit-with-esc 'iso2022 ;; GNU's iso-8859-6 is -diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-category.el xemacs-21.5.29/lisp/mule/mule-category.el ---- xemacs-21.5.29.ORIG/lisp/mule/mule-category.el 2010-01-07 09:52:09.261601694 -0700 -+++ xemacs-21.5.29/lisp/mule/mule-category.el 2010-01-07 09:31:59.523637910 -0700 -@@ -244,6 +244,7 @@ - (latin-iso8859-4 ?l) - (latin-iso8859-9 ?l) - (cyrillic-iso8859-5 ?y "Cyrillic character set") -+ (arabic-iso8859-6 ?b "Arabic character set") - (greek-iso8859-7 ?g "Greek character set") - (hebrew-iso8859-8 ?w "Hebrew character set") - (katakana-jisx0201 ?k "Japanese 1-byte Katakana character set") -diff -dur xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el xemacs-21.5.29/lisp/mule/mule-msw-init-late.el ---- xemacs-21.5.29.ORIG/lisp/mule/mule-msw-init-late.el 2010-01-07 09:52:09.261601694 -0700 -+++ xemacs-21.5.29/lisp/mule/mule-msw-init-late.el 2010-01-07 09:31:59.523637910 -0700 -@@ -37,6 +37,7 @@ - (greek-iso8859-7 . "Greek") - (latin-iso8859-9 . "Turkish") - (hebrew-iso8859-8 . "Hebrew") -+ (arabic-iso8859-6 . "Arabic") - (latin-iso8859-4 . "Baltic") - (vietnamese-viscii-lower . "Viet Nam") - (vietnamese-viscii-upper . "Viet Nam") -diff -dur xemacs-21.5.29.ORIG/lisp/unicode.el xemacs-21.5.29/lisp/unicode.el ---- xemacs-21.5.29.ORIG/lisp/unicode.el 2010-01-07 09:52:09.262618232 -0700 -+++ xemacs-21.5.29/lisp/unicode.el 2010-01-07 09:31:59.524639374 -0700 -@@ -73,6 +73,7 @@ - ("8859-3.TXT" latin-iso8859-3 #xA0 #xFF #x-80) - ("8859-4.TXT" latin-iso8859-4 #xA0 #xFF #x-80) - ("8859-5.TXT" cyrillic-iso8859-5 #xA0 #xFF #x-80) -+ ("8859-6.TXT" arabic-iso8859-6 #xA0 #xFF #x-80) - ("8859-7.TXT" greek-iso8859-7 #xA0 #xFF #x-80) - ("8859-8.TXT" hebrew-iso8859-8 #xA0 #xFF #x-80) - ("8859-9.TXT" latin-iso8859-9 #xA0 #xFF #x-80) -@@ -153,7 +154,7 @@ - '(ascii control-1 latin-iso8859-1 latin-iso8859-2 latin-iso8859-15 - greek-iso8859-7 hebrew-iso8859-8 ipa cyrillic-iso8859-5 - latin-iso8859-16 latin-iso8859-3 latin-iso8859-4 latin-iso8859-9 -- vietnamese-viscii-lower vietnamese-viscii-upper -+ vietnamese-viscii-lower vietnamese-viscii-upper arabic-iso8859-6 - jit-ucs-charset-0 japanese-jisx0208 japanese-jisx0208-1978 - japanese-jisx0212 japanese-jisx0213-1 japanese-jisx0213-2 - chinese-gb2312 chinese-sisheng chinese-big5-1 chinese-big5-2 -diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog ---- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:52:09.282677438 -0700 -+++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700 -@@ -1,3 +1,11 @@ -+2010-01-07 Aidan Kehoe -+ -+ * mule-charset.c: -+ (syms_of_mule_charset, complex_vars_of_mule_charset): -+ * lisp.h: -+ Restore the creation of arabic-iso8859-6 in C, having it in Lisp -+ isn't sufficient for X11 input to work. -+ - 2009-05-18 Stephen J. Turnbull - - * XEmacs 21.5.29 "garbanzo" is released. -diff -dur xemacs-21.5.29.ORIG/src/lisp.h xemacs-21.5.29/src/lisp.h ---- xemacs-21.5.29.ORIG/src/lisp.h 2010-01-07 09:52:09.288552467 -0700 -+++ xemacs-21.5.29/src/lisp.h 2010-01-07 09:31:59.541637463 -0700 -@@ -5233,6 +5233,7 @@ - extern Lisp_Object Vcharset_latin_iso8859_4; - extern Lisp_Object Vcharset_thai_tis620; - extern Lisp_Object Vcharset_greek_iso8859_7; -+extern Lisp_Object Vcharset_arabic_iso8859_6; - extern Lisp_Object Vcharset_hebrew_iso8859_8; - extern Lisp_Object Vcharset_katakana_jisx0201; - extern Lisp_Object Vcharset_latin_jisx0201; -diff -dur xemacs-21.5.29.ORIG/src/mule-charset.c xemacs-21.5.29/src/mule-charset.c ---- xemacs-21.5.29.ORIG/src/mule-charset.c 2010-01-07 09:52:09.290552365 -0700 -+++ xemacs-21.5.29/src/mule-charset.c 2010-01-07 09:53:06.329578948 -0700 -@@ -47,6 +47,7 @@ - Lisp_Object Vcharset_latin_iso8859_4; - Lisp_Object Vcharset_thai_tis620; - Lisp_Object Vcharset_greek_iso8859_7; -+Lisp_Object Vcharset_arabic_iso8859_6; - Lisp_Object Vcharset_hebrew_iso8859_8; - Lisp_Object Vcharset_katakana_jisx0201; - Lisp_Object Vcharset_latin_jisx0201; -@@ -93,6 +94,7 @@ - Qlatin_iso8859_4, - Qthai_tis620, - Qgreek_iso8859_7, -+ Qarabic_iso8859_6, - Qhebrew_iso8859_8, - Qkatakana_jisx0201, - Qlatin_jisx0201, -@@ -1110,6 +1112,7 @@ - DEFSYMBOL (Qlatin_iso8859_4); - DEFSYMBOL (Qthai_tis620); - DEFSYMBOL (Qgreek_iso8859_7); -+ DEFSYMBOL (Qarabic_iso8859_6); - DEFSYMBOL (Qhebrew_iso8859_8); - DEFSYMBOL (Qkatakana_jisx0201); - DEFSYMBOL (Qlatin_jisx0201); -@@ -1233,6 +1236,15 @@ - build_msg_string ("ISO8859-7 (Greek)"), - build_msg_string ("ISO8859-7 (Greek)"), - vector1(build_string("iso8859-7")), 0, 0); -+ staticpro (&Vcharset_arabic_iso8859_6); -+ Vcharset_arabic_iso8859_6 = -+ make_charset (LEADING_BYTE_ARABIC_ISO8859_6, Qarabic_iso8859_6, 2, -+ CHARSET_TYPE_96, 1, 1, 'G', -+ CHARSET_RIGHT_TO_LEFT, -+ build_string ("ISO8859-6"), -+ build_msg_string ("ISO8859-6 (Arabic)"), -+ build_msg_string ("ISO8859-6 (Arabic)"), -+ vector1(build_string ("iso8859-6")), 0, 0); - staticpro (&Vcharset_hebrew_iso8859_8); - Vcharset_hebrew_iso8859_8 = - make_charset (LEADING_BYTE_HEBREW_ISO8859_8, Qhebrew_iso8859_8, 2, diff --git a/xemacs-21.5.29-destdir.patch b/xemacs-21.5.29-destdir.patch index 54d57b2..2686e27 100644 --- a/xemacs-21.5.29-destdir.patch +++ b/xemacs-21.5.29-destdir.patch @@ -1,28 +1,56 @@ -diff -up xemacs-21.5.29/dynodump/Makefile.in.in~ xemacs-21.5.29/dynodump/Makefile.in.in ---- xemacs-21.5.29/dynodump/Makefile.in.in~ 2009-05-18 17:51:05.000000000 +0300 -+++ xemacs-21.5.29/dynodump/Makefile.in.in 2009-05-20 22:42:21.000000000 +0300 -@@ -22,6 +22,8 @@ - - ## Synched up with: Not synched with FSF. +--- ./src/Makefile.in.in.orig 2011-04-29 07:31:14.000000000 -0600 ++++ ./src/Makefile.in.in 2011-05-03 14:09:39.714499623 -0600 +@@ -37,6 +37,8 @@ + RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ + #endif +DESTDIR= + - ## For performance and consistency, no built-in rules. + PROGNAME=@PROGNAME@ + prefix=@prefix@ + SRC=@srcdir@ +@@ -1019,7 +1021,7 @@ + #ifdef HAVE_SHLIB + MAKEPATH=../lib-src/make-path + install: $(PROGNAME) +- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s ++ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s + -@echo "Copying include files for ellcc..." + -@hdir=`pwd`; \ + cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ +@@ -1033,12 +1035,12 @@ + test -d s && hdrtars="$$hdrtars s/*"; \ + test -d m && hdrtars="$$hdrtars m/*"; \ + test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ +- (cd $(archlibdir)/include && umask 022 && tar xf -); \ +- chmod 755 $(archlibdir)/include; \ +- test -d $(archlibdir)/include/s && \ +- chmod 755 $(archlibdir)/include/s; \ +- test -d $(archlibdir)/include/m && \ +- chmod 755 $(archlibdir)/include/s;) \ ++ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include; \ ++ test -d $(DESTDIR)$(archlibdir)/include/s && \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \ ++ test -d $(DESTDIR)$(archlibdir)/include/m && \ ++ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \ + done) + #endif + +--- ./lwlib/Makefile.in.in.orig 2011-04-29 07:31:10.000000000 -0600 ++++ ./lwlib/Makefile.in.in 2011-05-03 14:09:39.703499575 -0600 +@@ -21,6 +21,8 @@ + ## along with the Lucid Widget Library. If not, see + ## . + ++DESTDIR= ++ + ## For performance and consistency, no built-in rules .SUFFIXES: - .SUFFIXES: .c .o .i .h -diff -up xemacs-21.5.29/etc/tests/external-widget/Makefile~ xemacs-21.5.29/etc/tests/external-widget/Makefile ---- xemacs-21.5.29/etc/tests/external-widget/Makefile~ 2009-05-18 17:51:05.000000000 +0300 -+++ xemacs-21.5.29/etc/tests/external-widget/Makefile 2009-05-20 22:42:23.000000000 +0300 -@@ -1,3 +1,5 @@ -+DESTDIR= -+ - CFLAGS += -Xc -g -DTOOLTALK - EMACSHOME = ../../.. - EMACSLIBDIR = $(EMACSHOME)/editor/src -diff -up xemacs-21.5.29/lib-src/Makefile.in.in~ xemacs-21.5.29/lib-src/Makefile.in.in ---- xemacs-21.5.29/lib-src/Makefile.in.in~ 2009-05-18 17:51:06.000000000 +0300 -+++ xemacs-21.5.29/lib-src/Makefile.in.in 2009-05-20 22:42:25.000000000 +0300 -@@ -24,6 +24,8 @@ + .SUFFIXES: .c .h .o .i .s +--- ./lib-src/Makefile.in.in.orig 2011-04-29 07:31:08.000000000 -0600 ++++ ./lib-src/Makefile.in.in 2011-05-03 14:09:39.702499571 -0600 +@@ -22,6 +22,8 @@ ## above a certain point in this file are in shell format instead of ## in C format. How the hell is this supposed to work? */ @@ -31,7 +59,7 @@ diff -up xemacs-21.5.29/lib-src/Makefile.in.in~ xemacs-21.5.29/lib-src/Makefile. ## For performance and consistency, no built-in rules .SUFFIXES: .SUFFIXES: .c .h .o -@@ -246,26 +248,26 @@ do-blessmail: $(blessmail) +@@ -242,26 +244,26 @@ ## just run them directly from lib-src. ${archlibdir}: all @echo; echo "Installing utilities run internally by XEmacs." @@ -63,22 +91,42 @@ diff -up xemacs-21.5.29/lib-src/Makefile.in.in~ xemacs-21.5.29/lib-src/Makefile. done uninstall: -diff -up xemacs-21.5.29/lwlib/Makefile.in.in~ xemacs-21.5.29/lwlib/Makefile.in.in ---- xemacs-21.5.29/lwlib/Makefile.in.in~ 2009-05-18 17:51:07.000000000 +0300 -+++ xemacs-21.5.29/lwlib/Makefile.in.in 2009-05-20 22:42:27.000000000 +0300 -@@ -22,6 +22,8 @@ - ## the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - ## Boston, MA 02111-1307, USA. +--- ./tests/tooltalk/Makefile.orig 2011-04-29 07:31:17.000000000 -0600 ++++ ./tests/tooltalk/Makefile 2011-05-03 14:09:39.715499628 -0600 +@@ -27,6 +27,8 @@ + + ### Code: +DESTDIR= + - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .h .o .i .s -diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in ---- xemacs-21.5.29/Makefile.in.in~ 2009-05-18 17:51:05.000000000 +0300 -+++ xemacs-21.5.29/Makefile.in.in 2009-05-20 22:42:17.000000000 +0300 -@@ -61,6 +61,8 @@ RECURSIVE_MAKE_ARGS= + CC = cc -Xc + CPPFLAGS = -I/usr/openwin/include + CFLAGS = -g -v -DNeedFunctionPrototypes +--- ./man/Makefile.orig 2011-04-29 07:31:11.000000000 -0600 ++++ ./man/Makefile 2011-05-03 14:09:39.711499611 -0600 +@@ -18,6 +18,8 @@ + # You should have received a copy of the GNU General Public License + # along with XEmacs. If not, see . + ++DESTDIR= ++ + SHELL = /bin/sh + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi +--- ./etc/tests/external-widget/Makefile.orig 2011-04-29 07:31:06.000000000 -0600 ++++ ./etc/tests/external-widget/Makefile 2011-05-03 14:10:13.269646148 -0600 +@@ -16,6 +16,8 @@ + ## You should have received a copy of the GNU General Public License + ## along with XEmacs. If not, see . + ++DESTDIR= ++ + CFLAGS += -Xc -g -DTOOLTALK + EMACSHOME = ../../.. + EMACSLIBDIR = $(EMACSHOME)/editor/src +--- ./Makefile.in.in.orig 2011-05-03 13:50:06.283333766 -0600 ++++ ./Makefile.in.in 2011-05-03 14:15:27.424015117 -0600 +@@ -59,6 +59,8 @@ RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ #endif @@ -87,7 +135,7 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in SHELL = /bin/sh LANG = C LC_ALL = C -@@ -394,37 +396,37 @@ install-arch-dep: mkdir +@@ -398,43 +400,43 @@ (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \ exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ archlibdir=${archlibdir}) ; done @@ -135,15 +183,6 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in + cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME} # endif /* CYGWIN */ #endif /* WIN32_NATIVE */ - if test "${prefix}" != "${exec_prefix}"; then \ -- $(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \ -+ $(MAKEPATH) $(DESTDIR)${exec_prefix}/lib/${instvardir}; \ - for dir in \ - lib/${inststaticdir} \ - lib/${instvardir}/etc \ -@@ -435,13 +437,13 @@ install-arch-dep: mkdir - done; \ - fi #ifdef HAVE_SHLIB - $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir) + $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir) @@ -157,7 +196,7 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in "`(cd $${dir} && $(pwd))`"; then \ : do nothing - echo "rm -rf $$1" ; \ fi ; \ -@@ -449,35 +451,35 @@ install-arch-indep: mkdir info +@@ -442,35 +444,35 @@ done -set ${COPYDESTS} ; \ for dir in ${COPYDESTS} ; do \ @@ -205,7 +244,7 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in done @echo "If you would like to save approximately 4M of disk space, do" @echo "make gzip-el" -@@ -487,19 +489,23 @@ install-arch-indep: mkdir info +@@ -480,19 +482,23 @@ @echo "${lispdir}" gzip-el: @@ -234,22 +273,9 @@ diff -up xemacs-21.5.29/Makefile.in.in~ xemacs-21.5.29/Makefile.in.in ## Install bundled packages, if present. -diff -up xemacs-21.5.29/man/Makefile~ xemacs-21.5.29/man/Makefile ---- xemacs-21.5.29/man/Makefile~ 2009-05-18 17:51:07.000000000 +0300 -+++ xemacs-21.5.29/man/Makefile 2009-05-20 22:42:28.000000000 +0300 -@@ -20,6 +20,8 @@ - # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - # Boston, MA 02111-1307, USA. - -+DESTDIR= -+ - SHELL = /bin/sh - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi -diff -up xemacs-21.5.29/modules/base64/Makefile~ xemacs-21.5.29/modules/base64/Makefile ---- xemacs-21.5.29/modules/base64/Makefile~ 2009-05-18 17:51:07.000000000 +0300 -+++ xemacs-21.5.29/modules/base64/Makefile 2009-05-20 22:42:29.000000000 +0300 -@@ -7,6 +7,8 @@ +--- ./modules/base64/Makefile.orig 2011-04-29 07:31:12.000000000 -0600 ++++ ./modules/base64/Makefile 2011-05-03 14:09:39.712499615 -0600 +@@ -25,6 +25,8 @@ # 'installed'. # @@ -258,10 +284,20 @@ diff -up xemacs-21.5.29/modules/base64/Makefile~ xemacs-21.5.29/modules/base64/M SHELL=/bin/sh RM=rm -f CC=../../lib-src/ellcc -diff -up xemacs-21.5.29/modules/common/Makefile.common~ xemacs-21.5.29/modules/common/Makefile.common ---- xemacs-21.5.29/modules/common/Makefile.common~ 2009-05-18 17:51:07.000000000 +0300 -+++ xemacs-21.5.29/modules/common/Makefile.common 2009-05-20 22:42:31.000000000 +0300 -@@ -31,6 +31,8 @@ +--- ./modules/zlib/Makefile.orig 2011-04-29 07:31:13.000000000 -0600 ++++ ./modules/zlib/Makefile 2011-05-03 14:09:39.713499619 -0600 +@@ -26,6 +26,8 @@ + # 'installed'. + # + ++DESTDIR= ++ + SHELL=/bin/sh + RM=rm -f + CC=../../lib-src/ellcc +--- ./modules/common/Makefile.common.orig 2011-04-29 07:31:12.000000000 -0600 ++++ ./modules/common/Makefile.common 2011-05-03 14:09:39.712499615 -0600 +@@ -29,6 +29,8 @@ #define NOT_C_CODE #include "../../src/config.h" @@ -270,7 +306,7 @@ diff -up xemacs-21.5.29/modules/common/Makefile.common~ xemacs-21.5.29/modules/c SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ -@@ -98,7 +100,7 @@ extraclean: realclean +@@ -96,7 +98,7 @@ -$(RM) *~ \#* install: $(OBJECT_TO_BUILD) @@ -279,88 +315,3 @@ diff -up xemacs-21.5.29/modules/common/Makefile.common~ xemacs-21.5.29/modules/c ## ## Local Variables: -diff -up xemacs-21.5.29/modules/zlib/Makefile~ xemacs-21.5.29/modules/zlib/Makefile ---- xemacs-21.5.29/modules/zlib/Makefile~ 2009-05-18 17:51:07.000000000 +0300 -+++ xemacs-21.5.29/modules/zlib/Makefile 2009-05-20 22:42:33.000000000 +0300 -@@ -8,6 +8,8 @@ - # 'installed'. - # - -+DESTDIR= -+ - SHELL=/bin/sh - RM=rm -f - CC=../../lib-src/ellcc -diff -up xemacs-21.5.29/netinstall/Makefile.in.in~ xemacs-21.5.29/netinstall/Makefile.in.in ---- xemacs-21.5.29/netinstall/Makefile.in.in~ 2009-05-18 17:51:07.000000000 +0300 -+++ xemacs-21.5.29/netinstall/Makefile.in.in 2009-05-20 22:42:34.000000000 +0300 -@@ -14,6 +14,8 @@ - ## - ## Makefile for Cygwin installer - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .cc .h .o -@@ -173,7 +175,7 @@ setup-bin.ini: - install: - @echo; echo "Installing net setup." - for file in ${INSTALLABLES} ; do \ -- (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) netinstall/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - - version.c : $(srcdir)/ChangeLog Makefile -diff -up xemacs-21.5.29/src/Makefile.in.in~ xemacs-21.5.29/src/Makefile.in.in ---- xemacs-21.5.29/src/Makefile.in.in~ 2009-05-18 17:51:08.000000000 +0300 -+++ xemacs-21.5.29/src/Makefile.in.in 2009-05-20 22:42:36.000000000 +0300 -@@ -39,6 +39,8 @@ RECURSIVE_MAKE_ARGS= - RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ - #endif - -+DESTDIR= -+ - PROGNAME=@PROGNAME@ - prefix=@prefix@ - SRC=@srcdir@ -@@ -1065,7 +1067,7 @@ relock: - #ifdef HAVE_SHLIB - MAKEPATH=../lib-src/make-path - install: $(PROGNAME) -- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s -+ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s - -@echo "Copying include files for ellcc..." - -@hdir=`pwd`; \ - cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ -@@ -1079,12 +1081,12 @@ install: $(PROGNAME) - test -d s && hdrtars="$$hdrtars s/*"; \ - test -d m && hdrtars="$$hdrtars m/*"; \ - test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ -- (cd $(archlibdir)/include && umask 022 && tar xf -); \ -- chmod 755 $(archlibdir)/include; \ -- test -d $(archlibdir)/include/s && \ -- chmod 755 $(archlibdir)/include/s; \ -- test -d $(archlibdir)/include/m && \ -- chmod 755 $(archlibdir)/include/s;) \ -+ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include; \ -+ test -d $(DESTDIR)$(archlibdir)/include/s && \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \ -+ test -d $(DESTDIR)$(archlibdir)/include/m && \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \ - done) - #endif - -diff -up xemacs-21.5.29/tests/tooltalk/Makefile~ xemacs-21.5.29/tests/tooltalk/Makefile ---- xemacs-21.5.29/tests/tooltalk/Makefile~ 2009-05-18 17:51:10.000000000 +0300 -+++ xemacs-21.5.29/tests/tooltalk/Makefile 2009-05-20 22:42:15.000000000 +0300 -@@ -12,6 +12,8 @@ - - ### Code: - -+DESTDIR= -+ - CC = cc -Xc - CPPFLAGS = -I/usr/openwin/include - CFLAGS = -g -v -DNeedFunctionPrototypes diff --git a/xemacs-21.5.29-dired-550145.patch b/xemacs-21.5.29-dired-550145.patch deleted file mode 100644 index 8f3c178..0000000 --- a/xemacs-21.5.29-dired-550145.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -dur xemacs-21.5.29.ORIG/src/ChangeLog xemacs-21.5.29/src/ChangeLog ---- xemacs-21.5.29.ORIG/src/ChangeLog 2010-01-07 09:31:59.535640632 -0700 -+++ xemacs-21.5.29/src/ChangeLog 2010-01-07 09:32:56.046643371 -0700 -@@ -1,3 +1,8 @@ -+2010-01-07 Henrique Martins -+ -+ * dired.c (file_name_completion): If a file is too big to stat(), -+ ignore the error, since we don't use the size. -+ - 2010-01-07 Aidan Kehoe - - * mule-charset.c: -diff -dur xemacs-21.5.29.ORIG/src/dired.c xemacs-21.5.29/src/dired.c ---- xemacs-21.5.29.ORIG/src/dired.c 2009-05-18 08:51:08.000000000 -0600 -+++ xemacs-21.5.29/src/dired.c 2010-01-07 09:34:05.666614699 -0700 -@@ -371,8 +371,10 @@ - || 0 <= scmp (d_name, XSTRING_DATA (file), file_name_length)) - continue; - -- if (file_name_completion_stat (directory, dp, &st) < 0) -- continue; -+ /* Ignore file-too-large conditions; the mode is still filled in. */ -+ if (file_name_completion_stat (directory, dp, &st) < 0 && -+ errno != EOVERFLOW) -+ continue; - - directoryp = ((st.st_mode & S_IFMT) == S_IFDIR); - if (directoryp) diff --git a/xemacs-21.5.29-etags-memmove-545399.patch b/xemacs-21.5.29-etags-memmove-545399.patch deleted file mode 100644 index 040cc30..0000000 --- a/xemacs-21.5.29-etags-memmove-545399.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -dur xemacs-21.5.29.ORIG/lib-src/ChangeLog xemacs-21.5.29/lib-src/ChangeLog ---- xemacs-21.5.29.ORIG/lib-src/ChangeLog 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lib-src/ChangeLog 2009-12-08 10:09:57.753594714 -0700 -@@ -1,3 +1,8 @@ -+2009-12-08 Sjoerd Mullender -+ -+ * etags.c (absolute_filename): Use memmove instead of strcpy to move -+ characters within a string. -+ - 2009-05-18 Stephen J. Turnbull - - * XEmacs 21.5.29 "garbanzo" is released. -diff -dur xemacs-21.5.29.ORIG/lib-src/etags.c xemacs-21.5.29/lib-src/etags.c ---- xemacs-21.5.29.ORIG/lib-src/etags.c 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lib-src/etags.c 2009-12-08 10:09:09.100592092 -0700 -@@ -6829,13 +6829,13 @@ - else if (cp[0] != '/') - cp = slashp; - #endif -- strcpy (cp, slashp + 3); -+ memmove (cp, slashp + 3, strlen (slashp + 3) + 1); - slashp = cp; - continue; - } - else if (slashp[2] == '/' || slashp[2] == '\0') - { -- strcpy (slashp, slashp + 2); -+ memmove (slashp, slashp + 2, strlen (slashp + 2) + 1); - continue; - } - } diff --git a/xemacs-21.5.29-image-overflow.patch b/xemacs-21.5.29-image-overflow.patch deleted file mode 100644 index 35cf873..0000000 --- a/xemacs-21.5.29-image-overflow.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- xemacs-21.5.29/src/glyphs-eimage.c 2009-05-18 08:51:08.000000000 -0600 -+++ xemacs-21.5.29/src/glyphs-eimage.c 2009-08-24 10:21:21.274947236 -0600 -@@ -409,6 +409,7 @@ - */ - - { -+ UINT_64_BIT pixels_sq; - int jpeg_gray = 0; /* if we're dealing with a grayscale */ - /* Step 4: set parameters for decompression. */ - -@@ -431,7 +432,10 @@ - jpeg_start_decompress (&cinfo); - - /* Step 6: Read in the data and put into EImage format (8bit RGB triples)*/ -- -+ pixels_sq = -+ (UINT_64_BIT) cinfo.output_width * (UINT_64_BIT) cinfo.output_height; -+ if (pixels_sq > ((size_t) -1) / 3) -+ signal_image_error ("JPEG image too large to instantiate", instantiator); - unwind.eimage = - xnew_binbytes (cinfo.output_width * cinfo.output_height * 3); - if (!unwind.eimage) -@@ -677,6 +681,7 @@ - { - ColorMapObject *cmo = unwind.giffile->SColorMap; - int i, j, row, pass, interlace, slice; -+ UINT_64_BIT pixels_sq; - Binbyte *eip; - /* interlaced gifs have rows in this order: - 0, 8, 16, ..., 4, 12, 20, ..., 2, 6, 10, ..., 1, 3, 5, ... */ -@@ -685,6 +690,9 @@ - - height = unwind.giffile->SHeight; - width = unwind.giffile->SWidth; -+ pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; -+ if (pixels_sq > ((size_t) -1) / (3 * unwind.giffile->ImageCount)) -+ signal_image_error ("GIF image too large to instantiate", instantiator); - unwind.eimage = - xnew_binbytes (width * height * 3 * unwind.giffile->ImageCount); - if (!unwind.eimage) -@@ -948,11 +956,15 @@ - { - int y; - Binbyte **row_pointers; -+ UINT_64_BIT pixels_sq; - height = info_ptr->height; - width = info_ptr->width; -+ pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; -+ if (pixels_sq > ((size_t) -1) / 3) -+ signal_image_error ("PNG image too large to instantiate", instantiator); - - /* Wow, allocate all the memory. Truly, exciting. */ -- unwind.eimage = xnew_array_and_zero (Binbyte, width * height * 3); -+ unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3)); - /* libpng expects that the image buffer passed in contains a - picture to draw on top of if the png has any transparencies. - This could be a good place to pass that in... */ -@@ -1299,6 +1311,7 @@ - - uint32 *raster; - Binbyte *ep; -+ UINT_64_BIT pixels_sq; - - assert (!NILP (data)); - -@@ -1321,12 +1334,15 @@ - - TIFFGetField (unwind.tiff, TIFFTAG_IMAGEWIDTH, &width); - TIFFGetField (unwind.tiff, TIFFTAG_IMAGELENGTH, &height); -- unwind.eimage = xnew_binbytes (width * height * 3); -+ pixels_sq = (UINT_64_BIT) width * (UINT_64_BIT) height; -+ if (pixels_sq >= 1 << 29) -+ signal_image_error ("TIFF image too large to instantiate", instantiator); -+ unwind.eimage = xnew_binbytes ((size_t) pixels_sq * 3); - - /* #### This is little more than proof-of-concept/function testing. - It needs to be reimplemented via scanline reads for both memory - compactness. */ -- raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32)); -+ raster = (uint32*) _TIFFmalloc ((tsize_t) (pixels_sq * sizeof (uint32))); - if (raster != NULL) - { - int i, j; diff --git a/xemacs-21.5.29-no-xft.patch b/xemacs-21.5.29-no-xft.patch deleted file mode 100644 index 41d9848..0000000 --- a/xemacs-21.5.29-no-xft.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -dur xemacs-21.5.29.ORIG/lisp/font.el xemacs-21.5.29/lisp/font.el ---- xemacs-21.5.29.ORIG/lisp/font.el 2009-05-18 08:51:06.000000000 -0600 -+++ xemacs-21.5.29/lisp/font.el 2009-09-23 15:13:48.543673471 -0600 -@@ -753,14 +753,23 @@ - - (defvar font-xft-font-regexp - (concat "\\`" -- #r"\(\\-\|\\:\|\\,\|[^:-]\)*" ; optional foundry and family -+ #r"\(\\-\|\\:\|\\,\|[^-:*]\)*" ; optional foundry and family - ; (allows for escaped colons, -- ; dashes, commas) -+ ; dashes, commas, asterisks) - "\\(-[0-9]*\\(\\.[0-9]*\\)?\\)?" ; optional size (points) - "\\(:[^:]*\\)*" ; optional properties - ; not necessarily key=value!! - "\\'" -- )) -+ ) -+ "Regexp matching fontconfig font names. -+Unfortunately, there is no explicit standard specifying these. We disallow -+hyphen and comma in family names unless escaped, because they have a syntactic -+role in fontconfig names. We disallow colon because it is part of fontconfig -+name syntax, and asterisk because of the potential for confusion with an XLFD. -+We do not allow escapes for colon and asterisk because the fontconfig -+documentation doesn't specify whether they can be escaped, or how a redundant -+escape character is treated. -+#### The name of this variable is subject to change.") - - (defvar font-xft-family-mappings - ;; #### FIXME this shouldn't be needed or used for Xft -@@ -799,6 +808,8 @@ - "Return a font descriptor object for FONTNAME, appropriate for Xft. - - Optional DEVICE defaults to `default-x-device'." -+ (unless (featurep 'font-mgr) -+ (error 'unimplemented 'font-mgr "fontconfig-style font names")) - (let* ((name fontname) - (device (or device (default-x-device))) - (pattern (fc-font-match device (fc-name-parse name))) diff --git a/xemacs-21.5.29-png.patch b/xemacs-21.5.29-png.patch deleted file mode 100644 index d0ec00f..0000000 --- a/xemacs-21.5.29-png.patch +++ /dev/null @@ -1,133 +0,0 @@ ---- xemacs-21.5.29/src/glyphs-eimage.c 2009-09-23 12:58:39.770625034 -0600 -+++ xemacs-21.5.29/src/glyphs-eimage.c 2009-09-23 13:06:23.662801742 -0600 -@@ -954,7 +954,7 @@ - png_read_info (png_ptr, info_ptr); - - { -- int y; -+ int y, padding; - Binbyte **row_pointers; - UINT_64_BIT pixels_sq; - height = info_ptr->height; -@@ -963,14 +963,22 @@ - if (pixels_sq > ((size_t) -1) / 3) - signal_image_error ("PNG image too large to instantiate", instantiator); - -- /* Wow, allocate all the memory. Truly, exciting. */ -- unwind.eimage = xnew_array_and_zero (Binbyte, (size_t) (pixels_sq * 3)); -+ /* Wow, allocate all the memory. Truly, exciting. -+ Well, yes, there's excitement to be had. It turns out that libpng -+ strips in place, so the last row overruns the buffer if depth is 16 -+ or there's an alpha channel. This is a crash on Linux. So we need -+ to add padding. -+ The worst case is reducing 8 bytes (16-bit RGBA) to 3 (8-bit RGB). */ -+ -+ padding = 5 * width; -+ unwind.eimage = xnew_array_and_zero (Binbyte, -+ (size_t) (pixels_sq * 3 + padding)); -+ - /* libpng expects that the image buffer passed in contains a - picture to draw on top of if the png has any transparencies. - This could be a good place to pass that in... */ - - row_pointers = xnew_array (png_byte *, height); -- - for (y = 0; y < height; y++) - row_pointers[y] = unwind.eimage + (width * 3 * y); - -@@ -990,16 +998,15 @@ - } - else - { -- Lisp_Color_Instance *c; -- Lisp_Object rgblist; -- -- c = XCOLOR_INSTANCE (bkgd); -- rgblist = MAYBE_LISP_DEVMETH (XDEVICE (c->device), -- color_instance_rgb_components, -- (c)); -- my_background.red = (unsigned short) XINT (XCAR (rgblist)); -- my_background.green = (unsigned short) XINT (XCAR (XCDR (rgblist))); -- my_background.blue = (unsigned short) XINT (XCAR (XCDR (XCDR (rgblist)))); -+ Lisp_Color_Instance *c = XCOLOR_INSTANCE (bkgd); -+ Lisp_Object rgb = MAYBE_LISP_DEVMETH (XDEVICE (c->device), -+ color_instance_rgb_components, -+ (c)); -+#define GETCOLOR(col) my_background.col = (unsigned short) XINT (XCAR (rgb)) -+ GETCOLOR(red); rgb = XCDR (rgb); -+ GETCOLOR(green); rgb = XCDR (rgb); -+ GETCOLOR(blue); -+#undef GETCOLOR - } - - if (png_get_bKGD (png_ptr, info_ptr, &image_background)) -@@ -1012,41 +1019,38 @@ - - /* Now that we're using EImage, ask for 8bit RGB triples for any type - of image*/ -- /* convert palette images to full RGB */ -+ /* convert palette images to RGB */ - if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) -- png_set_expand (png_ptr); -- /* send grayscale images to RGB too */ -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ png_set_palette_to_rgb (png_ptr); -+ /* convert grayscale images to RGB */ -+ else if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -+ info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - png_set_gray_to_rgb (png_ptr); -- /* we can't handle alpha values */ -- if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) -- png_set_strip_alpha (png_ptr); -- /* tell libpng to strip 16 bit depth files down to 8 bits */ -- if (info_ptr->bit_depth == 16) -- png_set_strip_16 (png_ptr); -- /* if the image is < 8 bits, pad it out */ -- if (info_ptr->bit_depth < 8) -+ /* pad images with depth < 8 bits */ -+ else if (info_ptr->bit_depth < 8) - { - if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) - png_set_expand (png_ptr); - else - png_set_packing (png_ptr); - } -+ /* strip 16-bit depth files down to 8 bits */ -+ if (info_ptr->bit_depth == 16) -+ png_set_strip_16 (png_ptr); -+ /* strip alpha channel -+ #### shouldn't we handle this? -+ first call png_read_update_info in case above transformations -+ have generated an alpha channel */ -+ png_read_update_info(png_ptr, info_ptr); -+ if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) -+ png_set_strip_alpha (png_ptr); - - png_read_image (png_ptr, row_pointers); - png_read_end (png_ptr, info_ptr); - --#if 1 /* def PNG_SHOW_COMMENTS */ -- /* #### -- * I turn this off by default now, because the !%^@#!% comments -- * show up every time the image is instantiated, which can get -- * really really annoying. There should be some way to pass this -- * type of data down into the glyph code, where you can get to it -- * from lisp anyway. - WMP -- */ -- /* #### I've turned this on, since these warnings are now -- unobtrusive. */ -+ /* #### There should be some way to pass this type of data down -+ * into the glyph code, where you can get to it from lisp -+ * anyway. - WMP */ - { - int i; - DECLARE_EISTRING (key); -@@ -1066,7 +1070,6 @@ - eidata(key), eidata(text)); - } - } --#endif - - xfree (row_pointers, Binbyte **); - } diff --git a/xemacs-21.5.29-tty-font-512623.patch b/xemacs-21.5.29-tty-font-512623.patch deleted file mode 100644 index cc36f25..0000000 --- a/xemacs-21.5.29-tty-font-512623.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -r 80d74fed5399 lisp/ChangeLog ---- a/lisp/ChangeLog Mon Nov 09 09:21:59 2009 -0700 -+++ b/lisp/ChangeLog Mon Nov 09 09:39:16 2009 -0700 -@@ -1,3 +1,17 @@ -+2009-11-01 Stephen Turnbull -+ -+ * faces.el (Face-frob-property): -+ Give mapper for TTYs 2 args. -+ (make-face-family): -+ (make-face-size): -+ Generic mapper ignores TTYs and null devices. -+ (make-face-bold): -+ (make-face-italic): -+ (make-face-bold-italic): -+ (make-face-unbold): -+ (make-face-unitalic): -+ TTY mapper takes 2 args. -+ - 2009-05-18 Stephen J. Turnbull - - * XEmacs 21.5.29 "garbanzo" is released. -diff -r 80d74fed5399 lisp/faces.el ---- a/lisp/faces.el Mon Nov 09 09:21:59 2009 -0700 -+++ b/lisp/faces.el Mon Nov 09 09:39:16 2009 -0700 -@@ -933,10 +933,11 @@ - ;; and EXACT-P are as in that call. UNFROBBED-FACE and FROBBED-FACE are - ;; what we expect the original face and the result to look like, - ;; respectively. TTY-PROPS is a list of face properties to frob in place -- ;; of `font' for TTY's. FROB-MAPPING is either a plist mapping device -+ ;; of `font' for TTYs. FROB-MAPPING is either a plist mapping device - ;; types to functions of two args (NAME DEVICE) that will frob the -- ;; instantiator as appropriate for the device type (this includes TTY's), -- ;; or a function to handle the mapping for all device types. -+ ;; instantiator to NAME as appropriate for DEVICE's type (this includes -+ ;; TTYs #### TTYs are not passed the device, just the symbol 'tty), or a -+ ;; function to handle the mapping for all device types. - ;; STANDARD-FACE-MAPPING is an alist of mappings of inheritance - ;; instantiators to be replaced with other inheritance instantiators, meant - ;; for e.g. converting [bold] into [bold-italic]. -@@ -1038,7 +1039,11 @@ - (t - (let ((value - (if (eq devtype-spec 'tty) -- (funcall mapper x) -+ ;; #### not quite right but need -+ ;; two args to match documentation -+ ;; mostly we just ignore TTYs so -+ ;; for now just pass the devtype -+ (funcall mapper x 'tty) - (funcall mapper x - (derive-domain-from-locale - locale devtype-spec -@@ -1194,10 +1199,14 @@ - (Face-frob-property face locale tags exact-p - nil nil 'font nil - `(lambda (f d) -- ;; keep the dependency on font.el for now -- (let ((fo (font-create-object f d))) -- (set-font-family fo ,family) -- (font-create-name fo d))) -+ ;; keep the dependency on font.el for now -+ ;; #### The filter on null d is a band-aid. -+ ;; Frob-face-property should not be passing in -+ ;; null devices. -+ (unless (or (null d) (eq d 'tty)) -+ (let ((fo (font-create-object f d))) -+ (set-font-family fo ,family) -+ (font-create-name fo d)))) - nil)) - - ;; Style (ie, typographical face) frobbing -@@ -1311,7 +1320,7 @@ - (interactive (list (read-face-name "Make which face bold: "))) - (Face-frob-property face locale tags exact-p - 'default 'bold 'font '(highlight) -- '(tty (lambda (x) t) -+ '(tty (lambda (f d) t) - x x-make-font-bold - gtk gtk-make-font-bold - mswindows mswindows-make-font-bold -@@ -1330,7 +1339,7 @@ - (interactive (list (read-face-name "Make which face italic: "))) - (Face-frob-property face locale tags exact-p - 'default 'italic 'font '(underline) -- '(tty (lambda (x) t) -+ '(tty (lambda (f d) t) - x x-make-font-italic - gtk gtk-make-font-italic - mswindows mswindows-make-font-italic -@@ -1349,7 +1358,7 @@ - (interactive (list (read-face-name "Make which face bold-italic: "))) - (Face-frob-property face locale tags exact-p - 'default 'bold-italic 'font '(underline highlight) -- '(tty (lambda (x) t) -+ '(tty (lambda (f d) t) - x x-make-font-bold-italic - gtk gtk-make-font-bold-italic - mswindows mswindows-make-font-bold-italic -@@ -1369,7 +1378,7 @@ - (interactive (list (read-face-name "Make which face non-bold: "))) - (Face-frob-property face locale tags exact-p - 'bold 'default 'font '(highlight) -- '(tty (lambda (x) nil) -+ '(tty (lambda (f d) nil) - x x-make-font-unbold - gtk gtk-make-font-unbold - mswindows mswindows-make-font-unbold -@@ -1388,7 +1397,7 @@ - (interactive (list (read-face-name "Make which face non-italic: "))) - (Face-frob-property face locale tags exact-p - 'italic 'default 'font '(underline) -- '(tty (lambda (x) nil) -+ '(tty (lambda (f d) nil) - x x-make-font-unitalic - gtk gtk-make-font-unitalic - mswindows mswindows-make-font-unitalic -@@ -1410,9 +1419,13 @@ - nil nil 'font nil - `(lambda (f d) - ;; keep the dependency on font.el for now -- (let ((fo (font-create-object f d))) -- (set-font-size fo ,size) -- (font-create-name fo d))) -+ ;; #### The filter on null d is a band-aid. -+ ;; Frob-face-property should not be passing in -+ ;; null devices. -+ (unless (or (null d) (eq d 'tty)) -+ (let ((fo (font-create-object f d))) -+ (set-font-size fo ,size) -+ (font-create-name fo d)))) - nil)) - - ;; Why do the following two functions lose so badly in so many diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch index 2ff022f..ea69c92 100644 --- a/xemacs-21.5.29-x-server.patch +++ b/xemacs-21.5.29-x-server.patch @@ -1,7 +1,6 @@ -diff -dur xemacs-21.5.29.ORIG/lisp/x-init.el xemacs-21.5.29/lisp/x-init.el ---- xemacs-21.5.29.ORIG/lisp/x-init.el 2009-05-18 08:51:07.000000000 -0600 -+++ xemacs-21.5.29/lisp/x-init.el 2010-07-06 12:07:24.064305596 -0600 -@@ -243,7 +243,7 @@ +--- lisp/x-init.el.orig 2011-04-29 07:31:10.000000000 -0600 ++++ lisp/x-init.el 2011-05-03 14:24:00.865240901 -0600 +@@ -242,7 +242,7 @@ (string-equal "X Consortium" vendor)) ;; Ok, we think this could be a Sun keyboard. Run the Sun code. (x-win-init-sun device)) diff --git a/xemacs-beta-infodir.patch b/xemacs-beta-infodir.patch deleted file mode 100644 index 803afe9..0000000 --- a/xemacs-beta-infodir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xemacs-beta/configure.ac~ xemacs-beta/configure.ac ---- xemacs-beta/configure.ac~ 2009-03-08 15:00:21.000000000 +0200 -+++ xemacs-beta/configure.ac 2009-03-09 23:39:52.000000000 +0200 -@@ -1090,7 +1090,7 @@ then - AC_DEFINE(DOCDIR_USER_DEFINED) - fi - --if test "x$infodir_expanded" != "x${prefix_expanded}/share/info" -+if test "x$infodir" != 'x${datarootdir}/info' - then - AC_DEFINE(INFODIR_USER_DEFINED) - else diff --git a/xemacs.spec b/xemacs.spec index 1f1bd8e..20fc075 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,12 +20,12 @@ %global majver 21.5 Name: xemacs -Version: 21.5.29 -Release: 18%{?snap:.%{snap}}%{?dist} +Version: 21.5.31 +Release: 1%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors -License: GPLv2+ +License: GPLv3+ URL: http://www.xemacs.org/ %if 0%{?snap:1} Source0: %{name}-%{snap}.tar.xz @@ -39,30 +39,13 @@ Source4: default.el Source5: xemacs-sitestart.el Source6: gnuclient.desktop -Patch0: %{name}-21.5.26-utf8-fonts.patch -Patch1: %{name}-21.5.25-x-paths.patch -# Applied upstream 2009-07-01 -Patch2: %{name}-21.5.29-image-overflow.patch -Patch3: %{name}-21.5.25-mk-nochk-features.patch -Patch4: %{name}-21.5.27-no-expdyn-ia64-106744.patch -Patch5: %{name}-21.5.25-wnnfix-128362.patch -# Proposed by upstream 2009-08-25 -Patch6: %{name}-21.5.29-no-xft.patch -# Applied upstream 2009-09-23 -Patch7: %{name}-21.5.29-png.patch -Patch8: %{name}-21.5.28-courier-default.patch -Patch9: %{name}-21.5.29-destdir.patch -# Sent upstream 2009-10-28 -Patch10: %{name}-21.5.29-tty-font-512623.patch -# Sent upstream 2009-12-08 -Patch11: %{name}-21.5.29-etags-memmove-545399.patch -# Applied upstream 2009-12-21 -Patch12: %{name}-21.5.29-arabic-547840.patch -# Applied upstream 2009-01-07 -Patch13: %{name}-21.5.29-dired-550145.patch -# Sent upstream 2009-03-12 -Patch14: %{name}-beta-infodir.patch -Patch15: %{name}-21.5.29-x-server.patch +Patch0: %{name}-21.5.25-mk-nochk-features.patch +Patch1: %{name}-21.5.25-wnnfix-128362.patch +Patch2: %{name}-21.5.26-utf8-fonts.patch +Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch +Patch4: %{name}-21.5.28-courier-default.patch +Patch5: %{name}-21.5.29-destdir.patch +Patch6: %{name}-21.5.29-x-server.patch BuildRequires: autoconf BuildRequires: sed >= 3.95 @@ -75,6 +58,7 @@ BuildRequires: libjpeg-devel BuildRequires: compface-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: giflib-devel BuildRequires: desktop-file-utils %if %{with mule} BuildRequires: Canna-devel @@ -108,12 +92,8 @@ Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc Requires(post): chkconfig Requires(post): coreutils -Requires(post): desktop-file-utils -Requires(post): gtk2 Requires(postun): chkconfig Requires(postun): coreutils -Requires(postun): desktop-file-utils -Requires(postun): gtk2 Provides: xemacs(bin) = %{version}-%{release} %global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') @@ -253,33 +233,22 @@ add functionality to XEmacs. find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f rm -f configure.in sed -i -e /tetris/d lisp/menubar-items.el -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%ifarch ia64 -touch -r aclocal.m4 aclocal.m4-stamp -%patch4 -p1 -touch -r aclocal.m4-stamp aclocal.m4 -%endif -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 +%patch0 +%patch1 +%patch2 +%patch3 +%patch4 +%patch5 +%patch6 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el -autoconf --force # for DESTDIR patch +autoconf --force # for DESTDIR and NO-EXPDYN-IA64 patches for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do - iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f + iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f + touch -r $f $f.utf8 + mv -f $f.utf8 $f done @@ -341,7 +310,7 @@ mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} mv Installation{,-nox} # grab these from -nox, the X ones may have deps on ALSA, X, etc -for file in {e,oo}tags gnuserv {fake,move}mail yow ; do +for file in {e,oo}tags gnuserv {fake,move}mail ; do mv lib-src/$file{,-mindep} done %endif # nox @@ -515,7 +484,7 @@ find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/%{xbuild}/gzip-el.sh rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc -rm -r editclient.sh InstallGuide sparcworks tests XKeysymDB *.sco *.1 +rm -r InstallGuide tests XKeysymDB *.1 cd - # separate files @@ -549,12 +518,9 @@ rm -rf $RPM_BUILD_ROOT %post -# rm because alternatives won't overwrite pre-alternatives symlink, bug? -rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-%{xver} 80 touch --no-create %{_datadir}/icons/hicolor &>/dev/null -: %postun [ -e %{_bindir}/xemacs-%{xver} ] || \ @@ -564,15 +530,12 @@ if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null fi -: %posttrans update-desktop-database %{_datadir}/applications &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post nox -# rm because alternatives won't overwrite pre-alternatives symlink, bug? -rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-nox-%{xver} 40 || : @@ -581,8 +544,6 @@ rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : %post xft -# rm because alternatives won't overwrite pre-alternatives symlink, bug? -rm -f %{_bindir}/xemacs && \ %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-xft-%{xver} 40 || : @@ -656,7 +617,6 @@ fi %files common -f base-files %defattr(-,root,root,-) %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL -%doc etc/editclient.sh %{_bindir}/etags.xemacs %{_bindir}/ootags %{_bindir}/xemacs-script @@ -709,6 +669,14 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue May 3 2011 Jerry James - 21.5.31-1 +- Update to 21.5.31 +- License is now GPLv3+ +- Drop upstreamed patches: x-paths, image-overflow, no-xft, png, tty-font, + etags-memmove, arabic, dired, infodir +- Rebase and renumber remaining patches +- Drop workaround for ancient alternatives bug + * Tue Mar 1 2011 Jerry James - 21.5.29-18 - Make -filesystem subpackage be noarch. From 13497f387b6c686b10f3eeeeb39e53b5950ad7f9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 3 May 2011 20:42:12 -0600 Subject: [PATCH 091/160] Drop %clean, and clean at start of %install. --- xemacs.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 20fc075..ea14455 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -400,8 +400,6 @@ cat > macros.xemacs << EOF EOF %install -rm -rf $RPM_BUILD_ROOT - %if %{with nox} # restore binaries with less dependencies; note: no -p nor move for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done @@ -513,10 +511,6 @@ cat info.files >> info-files install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc -%clean -rm -rf $RPM_BUILD_ROOT - - %post %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-%{xver} 80 From 6099603d63374537e11dc98b537f7445faad9a04 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 5 Aug 2011 13:23:03 -0600 Subject: [PATCH 092/160] Build --with-union-type to avoid a make-int bug in lisp-disunion.h. Add view-mode patch (bz 709399). Add get-other-frame patch from upstream. Add lib-src patch to eliminate unnecessary linkage. --- xemacs-21.5.31-get-other-frame.patch | 11 +++++++++++ xemacs-21.5.31-lib-src.patch | 20 +++++++++++++++++++ xemacs-21.5.31-view-mode.patch | 10 ++++++++++ xemacs.spec | 29 +++++++++++++++++++++++++++- 4 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.31-get-other-frame.patch create mode 100644 xemacs-21.5.31-lib-src.patch create mode 100644 xemacs-21.5.31-view-mode.patch diff --git a/xemacs-21.5.31-get-other-frame.patch b/xemacs-21.5.31-get-other-frame.patch new file mode 100644 index 0000000..6abfcfc --- /dev/null +++ b/xemacs-21.5.31-get-other-frame.patch @@ -0,0 +1,11 @@ +--- lisp/frame.el.orig 2011-04-29 07:31:09.000000000 -0600 ++++ lisp/frame.el 2011-08-05 12:13:03.208221581 -0600 +@@ -602,7 +602,7 @@ + (next (next-frame this 'visible-nomini))) + ;; then search iconified frames + (if (eq this next) +- (setq next (next-frame 'visible-iconic-nomini))) ++ (setq next (next-frame this 'visible-iconic-nomini))) + (if (eq this next) + ;; otherwise, make a new frame + (make-frame) diff --git a/xemacs-21.5.31-lib-src.patch b/xemacs-21.5.31-lib-src.patch new file mode 100644 index 0000000..3c8792f --- /dev/null +++ b/xemacs-21.5.31-lib-src.patch @@ -0,0 +1,20 @@ +--- lib-src/Makefile.in.in.orig 2011-08-05 12:04:52.445736351 -0600 ++++ lib-src/Makefile.in.in 2011-08-05 13:02:14.244239350 -0600 +@@ -191,7 +191,7 @@ + ## when #include'ing generated files. + cppflags = -I. -I../src -I$(srcdir) -I$(top_srcdir)/src $(CPPFLAGS) + cflags = $(CFLAGS) $(cppflags) $(c_switch_general) +-ldflags = $(LDFLAGS) $(ld_switch_general) $(ld_libs_general) ++ldflags = $(LDFLAGS) $(ld_switch_general) + + ## This is the default compilation command. + ## But we should never rely on it, because some make version +@@ -382,7 +382,7 @@ + #endif /* not DUMP_IN_EXEC */ + + cflags_gnuserv = $(CFLAGS) $(cppflags) $(c_switch_all) +-ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) @libs_xauth@ $(ld_libs_general) ++ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) -lXau + gnuslib.o: ${srcdir}/gnuslib.c ${srcdir}/gnuserv.h ../src/config.h + $(CC) -c $(cflags_gnuserv) ${srcdir}/gnuslib.c + gnuclient: ${srcdir}/gnuclient.c gnuslib.o ${srcdir}/gnuserv.h diff --git a/xemacs-21.5.31-view-mode.patch b/xemacs-21.5.31-view-mode.patch new file mode 100644 index 0000000..0013c23 --- /dev/null +++ b/xemacs-21.5.31-view-mode.patch @@ -0,0 +1,10 @@ +--- lisp/view-less.el.orig 2011-04-29 07:31:10.000000000 -0600 ++++ lisp/view-less.el 2011-08-05 10:33:22.849657806 -0600 +@@ -103,6 +103,7 @@ + (defcustom view-mode-line-string " View" + "*String to display in the modeline when View mode is active. + Set this to nil if you don't want a modeline indicator." ++ :group 'view + :type '(choice string + (const :tag "none" nil))) + diff --git a/xemacs.spec b/xemacs.spec index ea14455..af93f26 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.31 -Release: 1%{?snap:.%{snap}}%{?dist} +Release: 2%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -39,13 +39,30 @@ Source4: default.el Source5: xemacs-sitestart.el Source6: gnuclient.desktop +# Fedora-specific. Don't run the check-features Makefile target. It checks +# that necessary packages are installed, but they aren't installed while +# building an RPM. Patch0: %{name}-21.5.25-mk-nochk-features.patch +# Experimental patch. Fix WNN support. This patch is no longer sufficient. +# WNN still doesn't work. Patch1: %{name}-21.5.25-wnnfix-128362.patch +# Fedora-specific. Don't force ISO-8859 fonts. Patch2: %{name}-21.5.26-utf8-fonts.patch +# Experimental patch, to be sent upstream eventually. Don't use +# -export-dynamic on IA64; leads to segfaults due to function pointer issues. Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch +# Fedora-specific. Default to courier instead of lucidatypewriter. Patch4: %{name}-21.5.28-courier-default.patch +# Applied upstream. Support DESTDIR in the Makefiles. Patch5: %{name}-21.5.29-destdir.patch +# Fedora-specific. Recognize the Fedora X server. Patch6: %{name}-21.5.29-x-server.patch +# Applied upstream. Give view-mode-line-string a custom group. +Patch7: %{name}-21.5.31-view-mode.patch +# Applied upstream. Supply a missing argument to next-frame. +Patch8: %{name}-21.5.31-get-other-frame.patch +# Linux-specific patch. Eliminate unnecessary linkage in lib-src binaries. +Patch9: %{name}-21.5.31-lib-src.patch BuildRequires: autoconf BuildRequires: sed >= 3.95 @@ -240,6 +257,9 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 +%patch8 +%patch9 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -293,6 +313,7 @@ common_options=" --with-debug --with-error-checking=none --enable-bignum=gmp + --with-union-type " %if %{with nox} @@ -663,6 +684,12 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Aug 5 2011 Jerry James - 21.5.31-2 +- Build --with-union-type to avoid a make-int bug in lisp-disunion.h +- Add view-mode patch (bz 709399) +- Add get-other-frame patch from upstream +- Add lib-src patch to eliminate unnecessary linkage + * Tue May 3 2011 Jerry James - 21.5.31-1 - Update to 21.5.31 - License is now GPLv3+ From 8289a5eb621bd9b703892219e218917ecb013665 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 12 Oct 2011 11:09:15 +0200 Subject: [PATCH 093/160] rebuild with new gmp --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index af93f26..0fc24d5 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.31 -Release: 2%{?snap:.%{snap}}%{?dist} +Release: 2%{?snap:.%{snap}}%{?dist}.1 Summary: Different version of Emacs Group: Applications/Editors @@ -684,6 +684,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Oct 12 2011 Peter Schiffer - 21.5.31-2.1 +- rebuild with new gmp + * Fri Aug 5 2011 Jerry James - 21.5.31-2 - Build --with-union-type to avoid a make-int bug in lisp-disunion.h - Add view-mode patch (bz 709399) From f48577eb6cddfa9eb2c491686f31d56f54cf2133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Wed, 26 Oct 2011 15:46:29 +0200 Subject: [PATCH 094/160] rebuild with new gmp without compat lib --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 0fc24d5..d6b7a3d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.31 -Release: 2%{?snap:.%{snap}}%{?dist}.1 +Release: 2%{?snap:.%{snap}}%{?dist}.2 Summary: Different version of Emacs Group: Applications/Editors @@ -684,6 +684,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Oct 26 2011 Marcela Mašláňová - 21.5.31-2.2 +- rebuild with new gmp without compat lib + * Wed Oct 12 2011 Peter Schiffer - 21.5.31-2.1 - rebuild with new gmp From adee197643d4223c965d7c0b3a72b96e17c110e0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 7 Nov 2011 09:12:04 -0700 Subject: [PATCH 095/160] Rebuild with new libpng. --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index d6b7a3d..f58fd9c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.31 -Release: 2%{?snap:.%{snap}}%{?dist}.2 +Release: 3%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -684,6 +684,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Nov 7 2011 Jerry James - 21.5.31-3 +- Rebuild with new libpng + * Wed Oct 26 2011 Marcela Mašláňová - 21.5.31-2.2 - rebuild with new gmp without compat lib From 776cfdf8070f92ceb38bed63eff0927dc9a672e6 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 7 Jan 2012 14:11:48 -0700 Subject: [PATCH 096/160] Rebuild for GCC 4.7. Minor spec file cleanups. --- xemacs.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index f58fd9c..27a462a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.31 -Release: 3%{?snap:.%{snap}}%{?dist} +Release: 4%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -216,7 +216,7 @@ This package contains XEmacs documentation in GNU texinfo format. %package devel Summary: Development files for XEmacs Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -590,7 +590,6 @@ fi %files -%defattr(-,root,root,-) %doc Installation # gnuclient needs X libs, so not in -common %{_bindir}/gnuclient @@ -611,7 +610,6 @@ fi %if %{with nox} %files nox -%defattr(-,root,root,-) %doc Installation-nox %ghost %{_bindir}/xemacs %{_bindir}/xemacs-nox @@ -621,7 +619,6 @@ fi %endif %files xft -%defattr(-,root,root,-) %doc Installation-xft %ghost %{_bindir}/xemacs %{_bindir}/xemacs-xft @@ -630,7 +627,6 @@ fi %{_mandir}/man1/xemacs-xft.1* %files common -f base-files -%defattr(-,root,root,-) %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL %{_bindir}/etags.xemacs %{_bindir}/ootags @@ -652,18 +648,15 @@ fi %{_mandir}/man1/xemacs.1* %files el -f el-files -%defattr(-,root,root,-) %if %{with modules} %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el %endif %files info -f info-files -%defattr(-,root,root,-) %doc COPYING %{_infodir}/*.info* %files devel -%defattr(-,root,root,-) %if %{with modules} %{_bindir}/ellcc %{_libdir}/xemacs-%{xver}/%{xbuild}/include/ @@ -671,7 +664,6 @@ fi %{_libdir}/pkgconfig/xemacs.pc %files filesystem -%defattr(-,root,root,-) %dir %{_datadir}/xemacs %dir %{_datadir}/xemacs/site-lisp %dir %{_datadir}/xemacs/site-packages @@ -684,6 +676,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Jan 7 2012 Jerry James - 21.5.31-4 +- Rebuild for GCC 4.7 +- Minor spec file cleanups + * Mon Nov 7 2011 Jerry James - 21.5.31-3 - Rebuild with new libpng From 0a458e7a7f19f2dc598332e13087c8931da5ef66 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 23:52:25 -0500 Subject: [PATCH 097/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 27a462a..f60187d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.31 -Release: 4%{?snap:.%{snap}}%{?dist} +Release: 5%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -676,6 +676,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 21.5.31-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 7 2012 Jerry James - 21.5.31-4 - Rebuild for GCC 4.7 - Minor spec file cleanups From 0a18373711d115be41ad88aee8a3dac75832e91a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 6 Aug 2012 22:34:20 -0600 Subject: [PATCH 098/160] New upstream version. Drop upstreamed patches. Running autoconf no longer necessary. Drop conditionals for ancient versions of Fedora. Package X versions of lib-src binaries to get gnuclient linked with -lXau. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.25-mk-nochk-features.patch | 6 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 34 +-- xemacs-21.5.28-courier-default.patch | 6 +- xemacs-21.5.29-destdir.patch | 317 --------------------- xemacs-21.5.29-x-server.patch | 6 +- xemacs-21.5.31-get-other-frame.patch | 11 - xemacs-21.5.31-lib-src.patch | 20 -- xemacs-21.5.31-view-mode.patch | 6 +- xemacs.spec | 41 +-- 11 files changed, 43 insertions(+), 408 deletions(-) delete mode 100644 xemacs-21.5.29-destdir.patch delete mode 100644 xemacs-21.5.31-get-other-frame.patch delete mode 100644 xemacs-21.5.31-lib-src.patch diff --git a/.gitignore b/.gitignore index e5004a8..d6be7fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -xemacs-21.5.31.tar.gz +/xemacs-21.5.32.tar.gz diff --git a/sources b/sources index 39e46de..81c0782 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0185fe905d0b8d8d094d9b60cf262d4a xemacs-21.5.31.tar.gz +6917e21f58094d25d92911d372449fc5 xemacs-21.5.32.tar.gz diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch index 1adfa6b..66a2d70 100644 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ b/xemacs-21.5.25-mk-nochk-features.patch @@ -1,6 +1,6 @@ ---- Makefile.in.in.orig 2011-04-29 07:31:05.000000000 -0600 -+++ Makefile.in.in 2011-05-03 13:50:06.283333766 -0600 -@@ -391,7 +391,7 @@ +--- ./Makefile.in.in.orig 2012-08-02 12:38:27.000000000 -0600 ++++ ./Makefile.in.in 2012-08-06 20:27:16.084145753 -0600 +@@ -393,7 +393,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 225c168..469c8dc 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,20 +1,6 @@ ---- ./configure.orig 2011-04-29 07:31:38.000000000 -0600 -+++ ./configure 2011-05-03 13:57:42.432352166 -0600 -@@ -14638,7 +14638,10 @@ - ;; - - *) -- ld_dynamic_link_flags="${wl}-export-dynamic" -+ dnl avoid -export-dynamic on ia64 -+ if test "$xehost_cpu" != "ia64"; then -+ ld_dynamic_link_flags="${wl}-export-dynamic" -+ fi - ;; - esac - fi ---- ./aclocal.m4.orig 2011-04-29 07:31:05.000000000 -0600 -+++ ./aclocal.m4 2011-05-03 13:56:08.899939431 -0600 -@@ -533,7 +533,10 @@ +--- ./aclocal.m4.orig 2012-08-02 12:38:27.000000000 -0600 ++++ ./aclocal.m4 2012-08-06 20:28:23.842705270 -0600 +@@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) @@ -26,3 +12,17 @@ ;; esac fi +--- ./configure.orig 2012-08-02 12:39:01.000000000 -0600 ++++ ./configure 2012-08-06 20:28:23.841705350 -0600 +@@ -14670,7 +14670,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib + ;; + + *) +- ld_dynamic_link_flags="${wl}-export-dynamic" ++ dnl avoid -export-dynamic on ia64 ++ if test "$xehost_cpu" != "ia64"; then ++ ld_dynamic_link_flags="${wl}-export-dynamic" ++ fi + ;; + esac + fi diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index e8ffe1c..4e9cff4 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,6 +1,6 @@ ---- src/faces.c.orig 2011-04-29 07:31:15.000000000 -0600 -+++ src/faces.c 2011-05-03 14:07:19.571887005 -0600 -@@ -2426,7 +2426,7 @@ +--- ./src/faces.c.orig 2012-08-02 12:38:29.000000000 -0600 ++++ ./src/faces.c 2012-08-06 20:29:33.659097709 -0600 +@@ -2484,7 +2484,7 @@ complex_vars_of_faces (void) Fcons (Fcons (list1 (device_symbol), diff --git a/xemacs-21.5.29-destdir.patch b/xemacs-21.5.29-destdir.patch deleted file mode 100644 index 2686e27..0000000 --- a/xemacs-21.5.29-destdir.patch +++ /dev/null @@ -1,317 +0,0 @@ ---- ./src/Makefile.in.in.orig 2011-04-29 07:31:14.000000000 -0600 -+++ ./src/Makefile.in.in 2011-05-03 14:09:39.714499623 -0600 -@@ -37,6 +37,8 @@ - RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ - #endif - -+DESTDIR= -+ - PROGNAME=@PROGNAME@ - prefix=@prefix@ - SRC=@srcdir@ -@@ -1019,7 +1021,7 @@ - #ifdef HAVE_SHLIB - MAKEPATH=../lib-src/make-path - install: $(PROGNAME) -- $(MAKEPATH) $(archlibdir)/include $(archlibdir)/include/m $(archlibdir)/include/s -+ $(MAKEPATH) $(DESTDIR)$(archlibdir)/include $(DESTDIR)$(archlibdir)/include/m $(DESTDIR)$(archlibdir)/include/s - -@echo "Copying include files for ellcc..." - -@hdir=`pwd`; \ - cd $(SRC); hdrdir2=`pwd`; cd $$hdir; \ -@@ -1033,12 +1035,12 @@ - test -d s && hdrtars="$$hdrtars s/*"; \ - test -d m && hdrtars="$$hdrtars m/*"; \ - test -n "$$hdrtars" && (tar cf - $$hdrtars) | \ -- (cd $(archlibdir)/include && umask 022 && tar xf -); \ -- chmod 755 $(archlibdir)/include; \ -- test -d $(archlibdir)/include/s && \ -- chmod 755 $(archlibdir)/include/s; \ -- test -d $(archlibdir)/include/m && \ -- chmod 755 $(archlibdir)/include/s;) \ -+ (cd $(DESTDIR)$(archlibdir)/include && umask 022 && tar xf -); \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include; \ -+ test -d $(DESTDIR)$(archlibdir)/include/s && \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include/s; \ -+ test -d $(DESTDIR)$(archlibdir)/include/m && \ -+ chmod 755 $(DESTDIR)$(archlibdir)/include/s;) \ - done) - #endif - ---- ./lwlib/Makefile.in.in.orig 2011-04-29 07:31:10.000000000 -0600 -+++ ./lwlib/Makefile.in.in 2011-05-03 14:09:39.703499575 -0600 -@@ -21,6 +21,8 @@ - ## along with the Lucid Widget Library. If not, see - ## . - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .h .o .i .s ---- ./lib-src/Makefile.in.in.orig 2011-04-29 07:31:08.000000000 -0600 -+++ ./lib-src/Makefile.in.in 2011-05-03 14:09:39.702499571 -0600 -@@ -22,6 +22,8 @@ - ## above a certain point in this file are in shell format instead of - ## in C format. How the hell is this supposed to work? */ - -+DESTDIR= -+ - ## For performance and consistency, no built-in rules - .SUFFIXES: - .SUFFIXES: .c .h .o -@@ -242,26 +244,26 @@ - ## just run them directly from lib-src. - ${archlibdir}: all - @echo; echo "Installing utilities run internally by XEmacs." -- ./make-path ${archlibdir} -+ ./make-path $(DESTDIR)${archlibdir} - if test "`(cd ${archlibdir} && $(pwd))`" != "`$(pwd)`"; then \ - for f in ${PRIVATE_INSTALLABLE_EXES}; do \ -- (cd .. && $(INSTALL_PROGRAM) lib-src/$$f ${archlibdir}/$$f) ; \ -+ (cd .. && $(INSTALL_PROGRAM) lib-src/$$f $(DESTDIR)${archlibdir}/$$f) ; \ - done ; \ - fi - if test "`(cd ${archlibdir} && $(pwd))`" \ - != "`(cd ${srcdir} && $(pwd))`"; then \ - for f in ${PRIVATE_INSTALLABLE_SCRIPTS}; do \ -- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f ${archlibdir}/$$f); \ -+ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$$f $(DESTDIR)${archlibdir}/$$f); \ - done ; \ - fi - - install: ${archlibdir} - @echo; echo "Installing utilities for users to run." - for file in ${PUBLIC_INSTALLABLE_EXES} ; do \ -- (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) lib-src/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - for file in ${PUBLIC_INSTALLABLE_SCRIPTS} ; do \ -- (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file}) ; \ -+ (cd .. && $(INSTALL_PROGRAM) ${srcdir}/$${file} $(DESTDIR)${bindir}/$${file}) ; \ - done - - uninstall: ---- ./tests/tooltalk/Makefile.orig 2011-04-29 07:31:17.000000000 -0600 -+++ ./tests/tooltalk/Makefile 2011-05-03 14:09:39.715499628 -0600 -@@ -27,6 +27,8 @@ - - ### Code: - -+DESTDIR= -+ - CC = cc -Xc - CPPFLAGS = -I/usr/openwin/include - CFLAGS = -g -v -DNeedFunctionPrototypes ---- ./man/Makefile.orig 2011-04-29 07:31:11.000000000 -0600 -+++ ./man/Makefile 2011-05-03 14:09:39.711499611 -0600 -@@ -18,6 +18,8 @@ - # You should have received a copy of the GNU General Public License - # along with XEmacs. If not, see . - -+DESTDIR= -+ - SHELL = /bin/sh - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi ---- ./etc/tests/external-widget/Makefile.orig 2011-04-29 07:31:06.000000000 -0600 -+++ ./etc/tests/external-widget/Makefile 2011-05-03 14:10:13.269646148 -0600 -@@ -16,6 +16,8 @@ - ## You should have received a copy of the GNU General Public License - ## along with XEmacs. If not, see . - -+DESTDIR= -+ - CFLAGS += -Xc -g -DTOOLTALK - EMACSHOME = ../../.. - EMACSLIBDIR = $(EMACSHOME)/editor/src ---- ./Makefile.in.in.orig 2011-05-03 13:50:06.283333766 -0600 -+++ ./Makefile.in.in 2011-05-03 14:15:27.424015117 -0600 -@@ -59,6 +59,8 @@ - RECURSIVE_MAKE_ARGS=@RECURSIVE_MAKE_ARGS@ - #endif - -+DESTDIR= -+ - SHELL = /bin/sh - LANG = C - LC_ALL = C -@@ -398,43 +400,43 @@ - (cd ./$${subdir} && $(MAKE) $(RECURSIVE_MAKE_ARGS) install prefix=${prefix} \ - exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ - archlibdir=${archlibdir}) ; done -- if test "`(cd ${archlibdir} && $(pwd))`" != \ -+ if test "`(cd $(DESTDIR)${archlibdir} && $(pwd))`" != \ - "`(cd ./lib-src && $(pwd))`"; then \ - if test -f ../Installation; then \ -- ${INSTALL_DATA} ../Installation ${archlibdir}/Installation; \ -+ ${INSTALL_DATA} ../Installation $(DESTDIR)${archlibdir}/Installation; \ - fi; \ -- ${INSTALL_DATA} lib-src/config.values ${docdir}/config.values; \ -- ${INSTALL_DATA} lib-src/DOC ${docdir}/DOC; \ -+ ${INSTALL_DATA} lib-src/config.values $(DESTDIR)${docdir}/config.values; \ -+ ${INSTALL_DATA} lib-src/DOC $(DESTDIR)${docdir}/DOC; \ - for subdir in `find ${archlibdir} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; \ - do (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; done ; \ - else true; fi - #if (defined(PDUMP) && !defined (DUMP_IN_EXEC)) || (defined (PDUMP) && defined(WIN32_NATIVE)) -- ${INSTALL_DATA} src/${PROGNAME}.dmp ${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp -+ ${INSTALL_DATA} src/${PROGNAME}.dmp $(DESTDIR)${bindir}/${PROGNAME}-${version}-`src/${PROGNAME} -sd`.dmp - #endif - #ifdef WIN32_NATIVE -- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME} -- -chmod 0755 ${bindir}/${PROGNAME} -+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME} -+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME} - #else - # ifdef CYGWIN -- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}.exe -- -chmod 0755 ${bindir}/${PROGNAME}-${version}.exe -- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} -- cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME} -+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe -+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version}.exe -+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME} -+ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${SHEBANG_PROGNAME} - # else -- ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version} -- -chmod 0755 ${bindir}/${PROGNAME}-${version} -- cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} -- cd ${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME} -+ ${INSTALL_PROGRAM} src/${PROGNAME} $(DESTDIR)${bindir}/${PROGNAME}-${version} -+ -chmod 0755 $(DESTDIR)${bindir}/${PROGNAME}-${version} -+ cd $(DESTDIR)${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME} -+ cd $(DESTDIR)${bindir} && $(RM) ./${SHEBANG_PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${SHEBANG_PROGNAME} - # endif /* CYGWIN */ - #endif /* WIN32_NATIVE */ - #ifdef HAVE_SHLIB -- $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(moduledir) -+ $(INSTALL_DATA) $(srcdir)/modules/auto-autoloads.* $(DESTDIR)$(moduledir) - #endif - - install-arch-indep: mkdir info - -@set ${COPYDESTS} ; \ - for dir in ${COPYDIR} ; do \ -- if test "`(cd $$1 && $(pwd))`" != \ -+ if test "`(cd $(DESTDIR)$$1 && $(pwd))`" != \ - "`(cd $${dir} && $(pwd))`"; then \ - : do nothing - echo "rm -rf $$1" ; \ - fi ; \ -@@ -442,35 +444,35 @@ - done - -set ${COPYDESTS} ; \ - for dir in ${COPYDESTS} ; do \ -- if test ! -d $${dir} ; then mkdir $${dir} ; fi ; \ -+ if test ! -d $${dir} ; then mkdir $(DESTDIR)$${dir} ; fi ; \ - done ; \ - for dir in ${COPYDIR} ; do \ - dest=$$1 ; shift ; \ - test -d $${dir} \ - -a "`(cd $${dir} && $(pwd))`" != \ -- "`(cd $${dest} && $(pwd))`" \ -+ "`(cd $(DESTDIR)$${dest} && $(pwd))`" \ - && (echo "Copying $${dir}..." ; \ - (cd $${dir} && $(TAR) -cf - . ) | \ -- (cd $${dest} && umask 022 && $(TAR) -xf - );\ -- chmod 0755 $${dest}; \ -- for subdir in `find $${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ -+ (cd $(DESTDIR)$${dest} && umask 022 && $(TAR) -xf - );\ -+ chmod 0755 $(DESTDIR)$${dest}; \ -+ for subdir in `find $(DESTDIR)$${dest} -type d ! -name RCS ! -name SCCS ! -name CVS -print` ; do \ - (cd $${subdir} && $(RM) -r RCS CVS SCCS \#* *~) ; \ - done) ; \ - done - if test "`(cd ${srcdir}/info && $(pwd))`" != \ -- "`(cd ${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ -- if test ! -f ${infodir}/dir -a -f dir ; then \ -- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir ; \ -+ "`(cd $(DESTDIR)${infodir} && $(pwd))`" && cd ${srcdir}/info; then \ -+ if test ! -f $(DESTDIR)${infodir}/dir -a -f dir ; then \ -+ ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir ; \ - fi ; \ - for file in *.info* ; do \ -- ${INSTALL_DATA} $${file} ${infodir}/$${file} ; \ -- chmod 0644 ${infodir}/$${file}; \ -+ ${INSTALL_DATA} $${file} $(DESTDIR)${infodir}/$${file} ; \ -+ chmod 0644 $(DESTDIR)${infodir}/$${file}; \ - done ; \ - fi - cd ${srcdir}/etc && \ - for page in xemacs etags ctags gnuserv gnuclient gnuattach gnudoit; do \ -- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${mandir}/$${page}${manext} ; \ -- chmod 0644 ${mandir}/$${page}${manext} ; \ -+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $(DESTDIR)${mandir}/$${page}${manext} ; \ -+ chmod 0644 $(DESTDIR)${mandir}/$${page}${manext} ; \ - done - @echo "If you would like to save approximately 4M of disk space, do" - @echo "make gzip-el" -@@ -480,19 +482,23 @@ - @echo "${lispdir}" - - gzip-el: -- $(SHELL) ${srcdir}/lib-src/gzip-el.sh ${lispdir} -+ $(SHELL) ${srcdir}/lib-src/gzip-el.sh $(DESTDIR)${lispdir} - - ## Build all the directories to install XEmacs in. - ## Since we may be creating several layers of directories, - ## (e.g. /usr/local/lib/${PROGNAME}-20.5/sparc-sun-solaris2.6), we use - ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. - mkdir: FRC.mkdir -- ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ -- ${mandir} ${bindir} ${datadir} ${libdir} \ -+ for dir in \ -+ ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ -+ ${mandir} ${bindir} ${datadir} ${libdir} \ - #ifdef HAVE_SHLIB -- ${moduledir} ${sitemoduledir} \ -+ ${moduledir} ${sitemoduledir} \ - #endif -- ${sitelispdir} -+ ${sitelispdir} ; \ -+ do \ -+ ${MAKEPATH} $(DESTDIR)$${dir} ; \ -+ done ; - - ## Install bundled packages, if present. - ---- ./modules/base64/Makefile.orig 2011-04-29 07:31:12.000000000 -0600 -+++ ./modules/base64/Makefile 2011-05-03 14:09:39.712499615 -0600 -@@ -25,6 +25,8 @@ - # 'installed'. - # - -+DESTDIR= -+ - SHELL=/bin/sh - RM=rm -f - CC=../../lib-src/ellcc ---- ./modules/zlib/Makefile.orig 2011-04-29 07:31:13.000000000 -0600 -+++ ./modules/zlib/Makefile 2011-05-03 14:09:39.713499619 -0600 -@@ -26,6 +26,8 @@ - # 'installed'. - # - -+DESTDIR= -+ - SHELL=/bin/sh - RM=rm -f - CC=../../lib-src/ellcc ---- ./modules/common/Makefile.common.orig 2011-04-29 07:31:12.000000000 -0600 -+++ ./modules/common/Makefile.common 2011-05-03 14:09:39.712499615 -0600 -@@ -29,6 +29,8 @@ - #define NOT_C_CODE - #include "../../src/config.h" - -+DESTDIR= -+ - SHELL=/bin/sh - RM=rm -f - PROGNAME=@PROGNAME@ -@@ -96,7 +98,7 @@ - -$(RM) *~ \#* - - install: $(OBJECT_TO_BUILD) -- $(INSTALL_PROGRAM) $< $(INSTALLPATH) -+ $(INSTALL_PROGRAM) $< $(DESTDIR)$(INSTALLPATH) - - ## - ## Local Variables: diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch index ea69c92..f72b399 100644 --- a/xemacs-21.5.29-x-server.patch +++ b/xemacs-21.5.29-x-server.patch @@ -1,6 +1,6 @@ ---- lisp/x-init.el.orig 2011-04-29 07:31:10.000000000 -0600 -+++ lisp/x-init.el 2011-05-03 14:24:00.865240901 -0600 -@@ -242,7 +242,7 @@ +--- ./lisp/x-init.el.orig 2012-08-02 12:38:28.000000000 -0600 ++++ ./lisp/x-init.el 2012-08-06 20:31:09.330411828 -0600 +@@ -154,7 +154,7 @@ it was previously unaware of, the predic (string-equal "X Consortium" vendor)) ;; Ok, we think this could be a Sun keyboard. Run the Sun code. (x-win-init-sun device)) diff --git a/xemacs-21.5.31-get-other-frame.patch b/xemacs-21.5.31-get-other-frame.patch deleted file mode 100644 index 6abfcfc..0000000 --- a/xemacs-21.5.31-get-other-frame.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lisp/frame.el.orig 2011-04-29 07:31:09.000000000 -0600 -+++ lisp/frame.el 2011-08-05 12:13:03.208221581 -0600 -@@ -602,7 +602,7 @@ - (next (next-frame this 'visible-nomini))) - ;; then search iconified frames - (if (eq this next) -- (setq next (next-frame 'visible-iconic-nomini))) -+ (setq next (next-frame this 'visible-iconic-nomini))) - (if (eq this next) - ;; otherwise, make a new frame - (make-frame) diff --git a/xemacs-21.5.31-lib-src.patch b/xemacs-21.5.31-lib-src.patch deleted file mode 100644 index 3c8792f..0000000 --- a/xemacs-21.5.31-lib-src.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lib-src/Makefile.in.in.orig 2011-08-05 12:04:52.445736351 -0600 -+++ lib-src/Makefile.in.in 2011-08-05 13:02:14.244239350 -0600 -@@ -191,7 +191,7 @@ - ## when #include'ing generated files. - cppflags = -I. -I../src -I$(srcdir) -I$(top_srcdir)/src $(CPPFLAGS) - cflags = $(CFLAGS) $(cppflags) $(c_switch_general) --ldflags = $(LDFLAGS) $(ld_switch_general) $(ld_libs_general) -+ldflags = $(LDFLAGS) $(ld_switch_general) - - ## This is the default compilation command. - ## But we should never rely on it, because some make version -@@ -382,7 +382,7 @@ - #endif /* not DUMP_IN_EXEC */ - - cflags_gnuserv = $(CFLAGS) $(cppflags) $(c_switch_all) --ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) @libs_xauth@ $(ld_libs_general) -+ldflags_gnuserv = $(LDFLAGS) $(ld_switch_all) -lXau - gnuslib.o: ${srcdir}/gnuslib.c ${srcdir}/gnuserv.h ../src/config.h - $(CC) -c $(cflags_gnuserv) ${srcdir}/gnuslib.c - gnuclient: ${srcdir}/gnuclient.c gnuslib.o ${srcdir}/gnuserv.h diff --git a/xemacs-21.5.31-view-mode.patch b/xemacs-21.5.31-view-mode.patch index 0013c23..98e090d 100644 --- a/xemacs-21.5.31-view-mode.patch +++ b/xemacs-21.5.31-view-mode.patch @@ -1,6 +1,6 @@ ---- lisp/view-less.el.orig 2011-04-29 07:31:10.000000000 -0600 -+++ lisp/view-less.el 2011-08-05 10:33:22.849657806 -0600 -@@ -103,6 +103,7 @@ +--- ./lisp/view-less.el.orig 2012-08-02 12:38:28.000000000 -0600 ++++ ./lisp/view-less.el 2012-08-06 20:32:42.018964626 -0600 +@@ -108,6 +108,7 @@ (defcustom view-mode-line-string " View" "*String to display in the modeline when View mode is active. Set this to nil if you don't want a modeline indicator." diff --git a/xemacs.spec b/xemacs.spec index f60187d..f33a79d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,8 +20,8 @@ %global majver 21.5 Name: xemacs -Version: 21.5.31 -Release: 5%{?snap:.%{snap}}%{?dist} +Version: 21.5.32 +Release: 1%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -53,18 +53,11 @@ Patch2: %{name}-21.5.26-utf8-fonts.patch Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch # Fedora-specific. Default to courier instead of lucidatypewriter. Patch4: %{name}-21.5.28-courier-default.patch -# Applied upstream. Support DESTDIR in the Makefiles. -Patch5: %{name}-21.5.29-destdir.patch # Fedora-specific. Recognize the Fedora X server. -Patch6: %{name}-21.5.29-x-server.patch +Patch5: %{name}-21.5.29-x-server.patch # Applied upstream. Give view-mode-line-string a custom group. -Patch7: %{name}-21.5.31-view-mode.patch -# Applied upstream. Supply a missing argument to next-frame. -Patch8: %{name}-21.5.31-get-other-frame.patch -# Linux-specific patch. Eliminate unnecessary linkage in lib-src binaries. -Patch9: %{name}-21.5.31-lib-src.patch +Patch6: %{name}-21.5.31-view-mode.patch -BuildRequires: autoconf BuildRequires: sed >= 3.95 BuildRequires: texinfo BuildRequires: ncurses-devel @@ -198,9 +191,7 @@ interest when developing or debugging XEmacs itself. %package info Summary: XEmacs documentation in GNU texinfo format Group: Documentation -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif Requires(post): info Requires(preun): info @@ -231,9 +222,7 @@ This package contains XEmacs development support files. %package filesystem Summary: XEmacs filesystem layout Group: Applications/Editors -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif %description filesystem XEmacs is a highly customizable open source text editor and @@ -257,14 +246,9 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 -%patch7 -%patch8 -%patch9 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el -autoconf --force # for DESTDIR and NO-EXPDYN-IA64 patches - for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f touch -r $f $f.utf8 @@ -280,6 +264,7 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %endif export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule +export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed" # The --with-*dir args can probably go away in the future if/when upstream # configure learns to honor standard autofoo dirs better. @@ -330,10 +315,6 @@ mv lib-src/DOC{,-nox} mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} mv Installation{,-nox} -# grab these from -nox, the X ones may have deps on ALSA, X, etc -for file in {e,oo}tags gnuserv {fake,move}mail ; do - mv lib-src/$file{,-mindep} -done %endif # nox # build with Xft @@ -421,11 +402,6 @@ cat > macros.xemacs << EOF EOF %install -%if %{with nox} -# restore binaries with less dependencies; note: no -p nor move -for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done -%endif - make install DESTDIR=$RPM_BUILD_ROOT %if %{with nox} @@ -676,6 +652,13 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Aug 6 2012 Jerry James - 21.5.32-1 +- New upstream version +- Drop upstreamed patches +- Running autoconf no longer necessary +- Drop conditionals for ancient versions of Fedora +- Package X versions of lib-src binaries to get gnuclient linked with -lXau + * Sun Jul 22 2012 Fedora Release Engineering - 21.5.31-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 0aa026797fea279d3c0889e60e49c14b2db8b9ab Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 21 Dec 2012 20:40:40 +0100 Subject: [PATCH 099/160] rebuild against new libjpeg Signed-off-by: Adam Tkac --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index f33a79d..5f800c2 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.32 -Release: 1%{?snap:.%{snap}}%{?dist} +Release: 2%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -652,6 +652,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Dec 21 2012 Adam Tkac - 21.5.32-2 +- rebuild against new libjpeg + * Mon Aug 6 2012 Jerry James - 21.5.32-1 - New upstream version - Drop upstreamed patches From b65a7d77055cdf63fcabe7e2080158574ac5ccff Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 7 Jan 2013 14:48:00 -0700 Subject: [PATCH 100/160] New upstream version. Drop upstreamed view-mode patch. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.31-view-mode.patch | 10 ---------- xemacs.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 xemacs-21.5.31-view-mode.patch diff --git a/.gitignore b/.gitignore index d6be7fe..ff47ec5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xemacs-21.5.32.tar.gz +/xemacs-21.5.33.tar.gz diff --git a/sources b/sources index 81c0782..5d503a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6917e21f58094d25d92911d372449fc5 xemacs-21.5.32.tar.gz +15cd5c52d4d5dfba078a389ee79d09f0 xemacs-21.5.33.tar.gz diff --git a/xemacs-21.5.31-view-mode.patch b/xemacs-21.5.31-view-mode.patch deleted file mode 100644 index 98e090d..0000000 --- a/xemacs-21.5.31-view-mode.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./lisp/view-less.el.orig 2012-08-02 12:38:28.000000000 -0600 -+++ ./lisp/view-less.el 2012-08-06 20:32:42.018964626 -0600 -@@ -108,6 +108,7 @@ - (defcustom view-mode-line-string " View" - "*String to display in the modeline when View mode is active. - Set this to nil if you don't want a modeline indicator." -+ :group 'view - :type '(choice string - (const :tag "none" nil))) - diff --git a/xemacs.spec b/xemacs.spec index 5f800c2..2b665a7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,8 +20,8 @@ %global majver 21.5 Name: xemacs -Version: 21.5.32 -Release: 2%{?snap:.%{snap}}%{?dist} +Version: 21.5.33 +Release: 1%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -55,8 +55,6 @@ Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch4: %{name}-21.5.28-courier-default.patch # Fedora-specific. Recognize the Fedora X server. Patch5: %{name}-21.5.29-x-server.patch -# Applied upstream. Give view-mode-line-string a custom group. -Patch6: %{name}-21.5.31-view-mode.patch BuildRequires: sed >= 3.95 BuildRequires: texinfo @@ -245,7 +243,6 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch3 %patch4 %patch5 -%patch6 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -652,6 +649,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Jan 7 2013 Jerry James - 21.5.33-1 +- New upstream version +- Drop upstreamed view-mode patch + * Fri Dec 21 2012 Adam Tkac - 21.5.32-2 - rebuild against new libjpeg From dd722215a20e53f00913c5579505ebfa510027d3 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Mon, 21 Jan 2013 18:00:31 +0100 Subject: [PATCH 101/160] Rebuild due to "jpeg8-ABI" feature drop Signed-off-by: Adam Tkac --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 2b665a7..e1dfc47 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.33 -Release: 1%{?snap:.%{snap}}%{?dist} +Release: 2%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -649,6 +649,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Jan 21 2013 Adam Tkac - 21.5.33-2 +- rebuild due to "jpeg8-ABI" feature drop + * Mon Jan 7 2013 Jerry James - 21.5.33-1 - New upstream version - Drop upstreamed view-mode patch From 1df4ffb7d484925a918f3dbde8d0d8b0f9b65fe8 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 21 Jan 2013 11:09:27 -0700 Subject: [PATCH 102/160] Add -menubar patch to fix bz 890565. --- xemacs-21.5.33-menubar.patch | 31 +++++++++++++++++++++++++++++++ xemacs.spec | 8 +++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 xemacs-21.5.33-menubar.patch diff --git a/xemacs-21.5.33-menubar.patch b/xemacs-21.5.33-menubar.patch new file mode 100644 index 0000000..abcd13b --- /dev/null +++ b/xemacs-21.5.33-menubar.patch @@ -0,0 +1,31 @@ +--- src/menubar-x.c.orig 2013-01-04 09:57:15.000000000 -0700 ++++ src/menubar-x.c 2013-01-21 10:55:55.316470308 -0700 +@@ -516,6 +516,9 @@ pre_activate_callback (Widget widget, LW + } + } + ++/* Returns the converted menubar, or NULL if an error is encountered while ++ * converting the Lisp menu specification. ++ */ + static widget_value * + compute_menubar_data (struct frame *f, Lisp_Object menubar, int deep_p) + { +@@ -573,7 +576,8 @@ set_frame_menubar (struct frame *f, int + menubar_visible = !NILP (w->menubar_visible_p); + + data = compute_menubar_data (f, menubar, deep_p); +- assert (data && (data->next || data->contents)); ++ if (!data || (!data->next && !data->contents)) ++ return 0; + + if (!FRAME_X_MENUBAR_ID (f)) + FRAME_X_MENUBAR_ID (f) = new_lwlib_id (); +@@ -594,6 +598,8 @@ set_frame_menubar (struct frame *f, int + { + free_popup_widget_value_tree (data); + data = compute_menubar_data (f, menubar, 1); ++ if (!data || (!data->next && !data->contents)) ++ return 0; + } + + diff --git a/xemacs.spec b/xemacs.spec index e1dfc47..eaf703a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.33 -Release: 2%{?snap:.%{snap}}%{?dist} +Release: 3%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -55,6 +55,8 @@ Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch4: %{name}-21.5.28-courier-default.patch # Fedora-specific. Recognize the Fedora X server. Patch5: %{name}-21.5.29-x-server.patch +# Applied upstream. Fix a crash if given a bad menu specification. +Patch6: %{name}-21.5.33-menubar.patch BuildRequires: sed >= 3.95 BuildRequires: texinfo @@ -243,6 +245,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch3 %patch4 %patch5 +%patch6 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -649,6 +652,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Jan 21 2013 Jerry James - 21.5.33-3 +- Add -menubar patch to fix bz 890565 + * Mon Jan 21 2013 Adam Tkac - 21.5.33-2 - rebuild due to "jpeg8-ABI" feature drop From 10651de1508a68820d498e956a198bdbdc8a7500 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 5 Feb 2013 10:10:52 -0700 Subject: [PATCH 103/160] Update -menubar patch so :visible keyword is accepted in menus (bz 890565). --- xemacs-21.5.33-menubar.patch | 144 ++++++++++++++++++++++++++++++++++- xemacs.spec | 5 +- 2 files changed, 146 insertions(+), 3 deletions(-) diff --git a/xemacs-21.5.33-menubar.patch b/xemacs-21.5.33-menubar.patch index abcd13b..e9a5c6b 100644 --- a/xemacs-21.5.33-menubar.patch +++ b/xemacs-21.5.33-menubar.patch @@ -1,5 +1,78 @@ ---- src/menubar-x.c.orig 2013-01-04 09:57:15.000000000 -0700 -+++ src/menubar-x.c 2013-01-21 10:55:55.316470308 -0700 +--- ./lisp/menubar.el.orig 2013-01-04 09:57:14.000000000 -0700 ++++ ./lisp/menubar.el 2013-02-05 09:59:42.868427364 -0700 +@@ -79,9 +79,9 @@ See `current-menubar' for a description + (setq menu (cdr menu))) + (let (menuitem item) + (while (keywordp (setq item (car menu))) +- (or (memq item '(:config :included :filter :accelerator :active)) ++ (or (memq item '(:config :included :visible :filter :accelerator :active)) + (signal 'error +- (list "menu keyword must be :config, :included, :accelerator, :active or :filter" ++ (list "menu keyword must be :config, :included, :visible, :accelerator, :active or :filter" + item))) + (if (or (not (cdr menu)) + (vectorp (nth 1 menu)) +@@ -135,7 +135,7 @@ See `current-menubar' for a description + (setq item (aref menuitem i)) + (cond ((not (memq item '(:active :suffix :keys :style + :full :included :selected +- :accelerator))) ++ :visible :accelerator))) + (signal 'error + (list (if (keywordp item) + "unknown menu item keyword" +--- ./lisp/glyphs.el.orig 2013-01-04 09:57:13.000000000 -0700 ++++ ./lisp/glyphs.el 2013-02-05 09:58:48.573508226 -0700 +@@ -266,7 +266,7 @@ The valid keywords are: + \[WIDGET-KEYWORDS] stands for the standard keywords accepted by widgets: + These are `:selected', `:active', `:suffix', `:keys', `:style', + `:filter', `:config', `:included', `:key-sequence', `:accelerator', +-`:label', `:callback', `:initial-focus', and `:descriptor'. ++`:label', `:callback', `:initial-focus', `:descriptor', and ':visible'. + #### Document me. + + \[GUI-KEYWORDS] stands for keywords accepted by many widgets. +--- ./man/lispref/menus.texi.orig 2013-01-04 09:57:14.000000000 -0700 ++++ ./man/lispref/menus.texi 2013-02-05 10:00:53.460322321 -0700 +@@ -45,6 +45,7 @@ to five keyword-value pairs, as follows: + @item :included @var{form} + This can be used to control the visibility of a menu. The form is + evaluated and the menu will be omitted if the result is @code{nil}. ++The keyword @code{:visible} is an alias for @code{:included}. + + @item :config @var{symbol} + This is an efficient shorthand for @code{:included (memq @var{symbol} +@@ -224,7 +225,8 @@ evaluated and the menu item is only disp + non-@code{nil}. Note that this is different from @code{:active}: If + @code{:active} evaluates to @code{nil}, the item will be displayed + grayed out, while if @code{:included} evaluates to @code{nil}, the item +-will be omitted entirely. ++will be omitted entirely.. The keyword @code{:visible} is an alias for ++@code{:included}. + + @item :config @var{symbol} + This is an efficient shorthand for @code{:included (memq @var{symbol} +--- ./man/lispref/glyphs.texi.orig 2013-01-04 09:57:14.000000000 -0700 ++++ ./man/lispref/glyphs.texi 2013-02-05 10:00:02.476398191 -0700 +@@ -299,6 +299,7 @@ It defaults to gui-element-face. + @itemx :filter + @itemx :config + @itemx :included ++@itemx :visible + @itemx :key-sequence + @itemx :accelerator + @itemx :label +--- ./src/menubar-x.c.orig 2013-01-04 09:57:15.000000000 -0700 ++++ ./src/menubar-x.c 2013-02-05 10:05:27.299914481 -0700 +@@ -172,7 +172,7 @@ menu_item_descriptor_to_widget_value_1 ( + sferror ("Keyword in menu lacks a value", cascade); + val = Fcar (desc); + desc = Fcdr (desc); +- if (EQ (key, Q_included)) ++ if (EQ (key, Q_included) || EQ (key, Q_visible)) + include_p = val, included_spec = 1; + else if (EQ (key, Q_config)) + config_tag = val; @@ -516,6 +516,9 @@ pre_activate_callback (Widget widget, LW } } @@ -29,3 +102,70 @@ } +--- ./src/gui.c.orig 2013-02-05 10:01:22.773278691 -0700 ++++ ./src/gui.c 2013-02-05 10:04:22.436011132 -0700 +@@ -144,7 +144,6 @@ gui_item_add_keyval_pair (Lisp_Object gu + } + FROB (suffix) + FROB (active) +- FROB (included) + FROB (config) + FROB (filter) + FROB (style) +@@ -154,6 +153,14 @@ gui_item_add_keyval_pair (Lisp_Object gu + FROB (callback_ex) + FROB (value) + #undef FROB ++ else if (EQ (key, Q_included) || EQ (key, Q_visible)) ++ { ++ if (!EQ (pgui_item->included, val)) ++ { ++ retval = 1; ++ pgui_item->included = val; ++ } ++ } + else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatibility */ + else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */ + else if (EQ (key, Q_accelerator)) +--- ./src/general-slots.h.orig 2013-01-04 09:57:15.000000000 -0700 ++++ ./src/general-slots.h 2013-02-05 10:01:18.900284456 -0700 +@@ -312,6 +312,7 @@ SYMBOL (Quser_default); + SYMBOL_KEYWORD (Q_value); + SYMBOL (Qvalue_assoc); + SYMBOL (Qvertical); ++SYMBOL_KEYWORD (Q_visible); + SYMBOL (Qwarning); + SYMBOL (Qwidget); + SYMBOL (Qwidth); +--- ./src/menubar-gtk.c.orig 2013-01-04 09:57:15.000000000 -0700 ++++ ./src/menubar-gtk.c 2013-02-05 10:05:03.315950221 -0700 +@@ -631,7 +631,7 @@ menu_convert (Lisp_Object desc, GtkWidge + cascade); + val = Fcar (desc); + desc = Fcdr (desc); +- if (EQ (key, Q_included)) ++ if (EQ (key, Q_included) || EQ(key, Q_visible)) + include_p = val, included_spec = 1; + else if (EQ (key, Q_config)) + config_tag = val; +--- ./src/menubar.c.orig 2013-01-04 09:57:15.000000000 -0700 ++++ ./src/menubar.c 2013-02-05 10:05:59.428866597 -0700 +@@ -495,7 +495,7 @@ the first character has been tagged as a + + Immediately following the name string of the menu, various optional + keyword-value pairs are permitted: currently, :filter, :active, :included, +-and :config. (See below.) ++:visible, and :config. (See below.) + + If an element of a menu (or menubar) is a string, then that string will be + presented as unselectable text. +@@ -597,7 +597,8 @@ The possible keywords are: + + :included
This can be used to control the visibility of a menu or + menu item. The form is evaluated and the menu or menu +- item is only displayed if the result is non-nil. ++ item is only displayed if the result is non-nil. The ++ keyword :visible is an alias for :included. + + :config This is an efficient shorthand for + :included (memq symbol menubar-configuration) diff --git a/xemacs.spec b/xemacs.spec index eaf703a..b957b6e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.33 -Release: 3%{?snap:.%{snap}}%{?dist} +Release: 4%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -652,6 +652,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Feb 5 2013 Jerry James - 21.5.33-4 +- Update -menubar patch so :visible keyword is accepted in menus (bz 890565) + * Mon Jan 21 2013 Jerry James - 21.5.33-3 - Add -menubar patch to fix bz 890565 From ea83992740151b7336d16c262db39802f05ffefa Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 8 Apr 2013 17:19:51 -0600 Subject: [PATCH 104/160] Add -texinfo patch to fix problems with texinfo 5 (bz 923365). Add -aarch64 patch (bz 926766). Build with libdb version 5. Emacs started shipping cl and widget info files, so we drop them. --- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 4 +- xemacs-21.5.33-aarch64.patch | 1469 ++++++++++++++++++++ xemacs-21.5.33-info.patch | 537 +++++++ xemacs.spec | 21 +- 4 files changed, 2025 insertions(+), 6 deletions(-) create mode 100644 xemacs-21.5.33-aarch64.patch create mode 100644 xemacs-21.5.33-info.patch diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 469c8dc..0755992 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -5,7 +5,7 @@ *) - ld_dynamic_link_flags="${wl}-export-dynamic" -+ dnl avoid -export-dynamic on ia64 ++ # avoid -export-dynamic on ia64 + if test "$xehost_cpu" != "ia64"; then + ld_dynamic_link_flags="${wl}-export-dynamic" + fi @@ -19,7 +19,7 @@ *) - ld_dynamic_link_flags="${wl}-export-dynamic" -+ dnl avoid -export-dynamic on ia64 ++ # avoid -export-dynamic on ia64 + if test "$xehost_cpu" != "ia64"; then + ld_dynamic_link_flags="${wl}-export-dynamic" + fi diff --git a/xemacs-21.5.33-aarch64.patch b/xemacs-21.5.33-aarch64.patch new file mode 100644 index 0000000..37927b7 --- /dev/null +++ b/xemacs-21.5.33-aarch64.patch @@ -0,0 +1,1469 @@ +--- ./config.guess.orig 2013-01-04 09:57:13.000000000 -0700 ++++ ./config.guess 2013-04-08 16:21:47.264194605 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-02-03' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ timestamp='2009-02-03' + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -27,16 +25,16 @@ timestamp='2009-02-03' + # the same distribution terms that you use for the rest of that program. + + +-# Originally written by Per Bothner . +-# Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to and include a ChangeLog ++# entry. + # + # This script attempts to guess a canonical system name similar to + # config.sub. If it succeeds, it prints the system name on stdout, and + # exits with 0. Otherwise, it exits with 1. + # +-# The plan is that this can be called by configure scripts if you +-# don't specify an explicit build system type. ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD + + me=`echo "$0" | sed -e 's,.*/,,'` + +@@ -56,8 +54,9 @@ version="\ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ +- | grep __ELF__ >/dev/null ++ | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? +@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -324,12 +330,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" +@@ -388,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -474,8 +486,8 @@ EOF + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -488,7 +500,7 @@ EOF + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -545,7 +557,7 @@ EOF + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -588,52 +600,52 @@ EOF + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c + +- #define _HPUX_SOURCE +- #include +- #include ++ #define _HPUX_SOURCE ++ #include ++ #include + +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); + +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -653,7 +665,7 @@ EOF + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | +- grep __LP64__ >/dev/null ++ grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else +@@ -724,22 +736,22 @@ EOF + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -763,14 +775,14 @@ EOF + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -782,34 +794,39 @@ EOF + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; +- *:Interix*:[3456]*) +- case ${UNAME_MACHINE} in ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +- EM64T | authenticamd | genuineintel) ++ authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) +@@ -819,6 +836,9 @@ EOF + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we +@@ -848,6 +868,27 @@ EOF + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ +@@ -855,20 +896,40 @@ EOF + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -879,78 +940,34 @@ EOF + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- mips:Linux:*:*) +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #undef CPU +- #undef mips +- #undef mipsel +- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mipsel +- #else +- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips +- #else +- CPU= +- #endif +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" +- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } +- ;; +- mips64:Linux:*:*) ++ mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU +- #undef mips64 +- #undef mips64el ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) +- CPU=mips64el ++ CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) +- CPU=mips64 ++ CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif + EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^CPU/{ +- s: ::g +- p +- }'`" ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu +- exit ;; +- ppc:Linux:*:*) +- echo powerpc-unknown-linux-gnu +- exit ;; +- ppc64:Linux:*:*) +- echo powerpc64-unknown-linux-gnu +- exit ;; +- alpha:Linux:*:*) +- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in +- EV5) UNAME_MACHINE=alphaev5 ;; +- EV56) UNAME_MACHINE=alphaev56 ;; +- PCA56) UNAME_MACHINE=alphapca56 ;; +- PCA57) UNAME_MACHINE=alphapca56 ;; +- EV6) UNAME_MACHINE=alphaev6 ;; +- EV67) UNAME_MACHINE=alphaev67 ;; +- EV68*) UNAME_MACHINE=alphaev68 ;; +- esac +- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null +- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi +- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in +@@ -959,14 +976,17 @@ EOF + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; +- parisc64:Linux:*:* | hppa64:Linux:*:*) +- echo hppa64-unknown-linux-gnu ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -974,75 +994,18 @@ EOF + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; +- i*86:Linux:*:*) +- # The BFD linker knows what the default object file format is, so +- # first see if it will tell us. cd to the root directory to prevent +- # problems with other programs or directories called `ld' in the path. +- # Set LC_ALL=C to ensure ld outputs messages in English. +- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ +- | sed -ne '/supported targets:/!d +- s/[ ][ ]*/ /g +- s/.*supported targets: *// +- s/ .*// +- p'` +- case "$ld_supported_targets" in +- elf32-i386) +- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" +- ;; +- a.out-i386-linux) +- echo "${UNAME_MACHINE}-pc-linux-gnuaout" +- exit ;; +- "") +- # Either a pre-BFD a.out linker (linux-gnuoldld) or +- # one that does not give us useful --help. +- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" +- exit ;; +- esac +- # Determine whether the default compiler is a.out or elf +- eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c +- #include +- #ifdef __ELF__ +- # ifdef __GLIBC__ +- # if __GLIBC__ >= 2 +- LIBC=gnu +- # else +- LIBC=gnulibc1 +- # endif +- # else +- LIBC=gnulibc1 +- # endif +- #else +- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +- LIBC=gnu +- #else +- LIBC=gnuaout +- #endif +- #endif +- #ifdef __dietlibc__ +- LIBC=dietlibc +- #endif +-EOF +- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' +- /^LIBC/{ +- s: ::g +- p +- }'`" +- test x"${LIBC}" != x && { +- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" +- exit +- } +- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } +- ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both +@@ -1050,11 +1013,11 @@ EOF + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1071,7 +1034,7 @@ EOF + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; +- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) +@@ -1086,7 +1049,7 @@ EOF + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1114,10 +1077,13 @@ EOF + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i386. +- echo i386-pc-msdosdjgpp +- exit ;; ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1152,8 +1118,8 @@ EOF + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1176,7 +1142,7 @@ EOF + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; +- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) +@@ -1196,10 +1162,10 @@ EOF + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm +@@ -1225,11 +1191,11 @@ EOF + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1242,6 +1208,9 @@ EOF + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1269,6 +1238,16 @@ EOF + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} +@@ -1284,7 +1263,10 @@ EOF + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1329,13 +1311,13 @@ EOF + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1353,11 +1335,11 @@ EOF + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c < + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +--- ./config.sub.orig 2013-01-04 09:57:13.000000000 -0700 ++++ ./config.sub 2013-04-08 16:21:47.265194603 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-02-03' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ timestamp='2009-02-03' + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see . + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -32,13 +30,16 @@ timestamp='2009-02-03' + + + # Please send patches to . Submit a context +-# diff and a properly formatted ChangeLog entry. ++# diff and a properly formatted GNU ChangeLog entry. + # + # Configuration subroutine to validate and canonicalize a configuration type. + # Supply the specified configuration type as an argument. + # If it is invalid, we print an error message on stderr and exit with code 1. + # Otherwise, we print the canonical config type on stdout and succeed. + ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ + # This file is supposed to be the same for all GNU packages + # and recognize all the CPU types, system types and aliases + # that are meaningful with *any* GNU software. +@@ -72,8 +73,9 @@ Report bugs and patches to .@end ifinfo ++along with XEmacs. If not, see . ++@end ifinfo + + @c Combine indices. + @syncodeindex fn cp +--- ./man/xemacs-faq.texi.orig 2013-01-04 09:57:14.000000000 -0700 ++++ ./man/xemacs-faq.texi 2013-04-08 17:08:44.903272690 -0600 +@@ -8848,7 +8848,7 @@ keep the history of XEmacs development. + + + @node Q11.0.1, Q11.0.2, Bleeding Edge, Bleeding Edge +-@unnumberedsubsec Where is the most recent XEmacs development code? ++@unnumberedsec Where is the most recent XEmacs development code? + + The most recent XEmacs @emph{development} code is kept in a Mercurial + repository, hosted by the Debian project. The read-only URL, for +@@ -8871,7 +8871,7 @@ Yes, Virginia, that doubled slash is cor + @xref{Q11.2.1, What is Mercurial?}. + + @node Q11.0.2, Q11.0.3, Q11.0.1, Bleeding Edge +-@unnumberedsubsec Where is the most recent XEmacs stable code? ++@unnumberedsec Where is the most recent XEmacs stable code? + + The most recent XEmacs @emph{stable} code is kept in a Mercurial + repository, hosted by the Debian project. The read-only URL is +@@ -8887,7 +8887,7 @@ If you're @emph{not} Vin, you don't need + + + @node Q11.0.3, Q11.0.4, Q11.0.2, Bleeding Edge +-@unnumberedsubsec Where is the most recent XEmacs package code? ++@unnumberedsec Where is the most recent XEmacs package code? + + The most recent XEmacs @emph{packages} code is kept in a CVS + repository, hosted by the Debian project. The read-only @code{CVSROOT}, +@@ -8919,7 +8919,7 @@ on the website. + + + @node Q11.0.4, Q11.0.5, Q11.0.3, Bleeding Edge +-@unnumberedsubsec Why isn't @var{package} available? and what to do about it. ++@unnumberedsec Why isn't @var{package} available? and what to do about it. + + If a package isn't available from the Packages repository, probably + nobody has shown enough interest to add it yet. (Occasionally, there is +@@ -8937,7 +8937,7 @@ of the package @ref{(xemacs-devguide)XEm + + + @node Q11.0.5, Q11.1.1, Q11.0.4, Bleeding Edge +-@unnumberedsubsec How do I get commit access? ++@unnumberedsec How do I get commit access? + + To get commit access to XEmacs code, write to + @email{xemacs-review@@xemacs.org, the XEmacs Review Board} and request +@@ -8966,7 +8966,7 @@ submitted to @email{xemacs-patches@@xema + + + @node Q11.1.1, Q11.2.1, Q11.0.5, Bleeding Edge +-@unnumberedsubsec How do I keep cool using CVS? ++@unnumberedsec How do I keep cool using CVS? + + You don't. CVS is just basically and in detail @emph{un}-cool. + +@@ -8981,7 +8981,7 @@ Please update this FAQ with one or two o + + + @node Q11.2.1, Q11.2.2, Q11.1.1, Bleeding Edge +-@unnumberedsubsec What is Mercurial? ++@unnumberedsec What is Mercurial? + + Mercurial is a @dfn{distributed version control system}, or DVCS. This + means that versioning information can be easily exchanged between +@@ -9013,7 +9013,7 @@ the advantages. + + + @node Q11.2.2, Q11.2.3, Q11.2.1, Bleeding Edge +-@unnumberedsubsec Where do I get Mercurial? ++@unnumberedsec Where do I get Mercurial? + + Most OS distributions (including add-on distributions like + @uref{http://www.cygwin.com/, Cygwin} and +@@ -9024,7 +9024,7 @@ packages for most major platforms, from + + + @node Q11.2.3, Q11.2.4, Q11.2.2, Bleeding Edge +-@unnumberedsubsec Do I really have to waste space on history? ++@unnumberedsec Do I really have to waste space on history? + + Yes, you do. It's really not that much, though. In one of my current + workspaces, I see +@@ -9044,7 +9044,7 @@ all of the Mercurial-specific informatio + + + @node Q11.2.4, Q11.2.5, Q11.2.3, Bleeding Edge +-@unnumberedsubsec @code{hg diff} gives bizarre output. ++@unnumberedsec @code{hg diff} gives bizarre output. + + You may see an unreasonable diff (often large) that doesn't seem to + reflect your work. +@@ -9098,7 +9098,7 @@ and it doesn't show your work. Unfortun + result of diffing against the "previous" commit. + + @node Q11.2.5, Q11.2.6, Q11.2.4, Bleeding Edge +-@unnumberedsubsec How do I recover from a bad commit? (I already pushed.) ++@unnumberedsec How do I recover from a bad commit? (I already pushed.) + + Once upon a time, an XEmacs developer wrote: + +@@ -9270,7 +9270,7 @@ Mercurial (the revert command)! + + + @node Q11.2.6, Q11.2.7, Q11.2.5, Bleeding Edge +-@unnumberedsubsec How do I recover from a bad commit? (I haven't pushed yet.) ++@unnumberedsec How do I recover from a bad commit? (I haven't pushed yet.) + + If you hadn't yet pushed the commit you now regret, and realize it + before doing further commits, you can use @code{hg strip tip}. Then +@@ -9287,7 +9287,7 @@ When in doubt, use the safer method @ref + + + @node Q11.2.7, , Q11.2.6, Bleeding Edge +-@unnumberedsubsec Testing patches with Mercurial Queues. ++@unnumberedsec Testing patches with Mercurial Queues. + + When testing a patch proposed on xemacs-beta or xemacs-patches, + conflicts or new heads often appear later, when using @code{hg pull -u}. diff --git a/xemacs.spec b/xemacs.spec index b957b6e..f4b0d4d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.33 -Release: 4%{?snap:.%{snap}}%{?dist} +Release: 5%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -57,6 +57,10 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Applied upstream. Fix a crash if given a bad menu specification. Patch6: %{name}-21.5.33-menubar.patch +# Applied upstream. Enable aarch64 support. +Patch7: %{name}-21.5.33-aarch64.patch +# Experimental patch, to be sent upstream eventually. Adapt to texinfo 5.0. +Patch8: %{name}-21.5.33-info.patch BuildRequires: sed >= 3.95 BuildRequires: texinfo @@ -80,7 +84,7 @@ BuildRequires: xmkmf BuildRequires: libXau-devel BuildRequires: libXpm-devel BuildRequires: alsa-lib-devel -BuildRequires: db4-devel +BuildRequires: libdb-devel BuildRequires: gmp-devel %if %{with gtk} BuildRequires: gtk+-devel @@ -246,6 +250,8 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 +%patch8 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el @@ -431,6 +437,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} mv $RPM_BUILD_ROOT%{_mandir}/man1/etags{,.xemacs}.1 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ctags.1 +rm -f $RPM_BUILD_ROOT%{_infodir}/{cl,widget}.info* # these clash with other packages rm -f $RPM_BUILD_ROOT%{_infodir}/info* @@ -551,14 +558,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : %post info -for file in xemacs cl internals lispref new-users-guide ; do +for file in xemacs internals lispref new-users-guide ; do /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir done : %preun info if [ $1 -eq 0 ] ; then - for file in xemacs cl internals lispref new-users-guide ; do + for file in xemacs internals lispref new-users-guide ; do /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir done fi @@ -652,6 +659,12 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Apr 8 2013 Jerry James - 21.5.33-5 +- Add -texinfo patch to fix problems with texinfo 5 (bz 923365) +- Add -aarch64 patch (bz 926766) +- Build with libdb version 5 +- Emacs started shipping cl and widget info files, so we drop them + * Tue Feb 5 2013 Jerry James - 21.5.33-4 - Update -menubar patch so :visible keyword is accepted in menus (bz 890565) From 07afa0445fb25fb52e3d0f3721856b66d9f9c77e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 19 Jun 2013 09:10:52 -0600 Subject: [PATCH 105/160] Rebuild for libpng 1.6. --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index f4b0d4d..0e941c7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.33 -Release: 5%{?snap:.%{snap}}%{?dist} +Release: 6%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -659,6 +659,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Jun 19 2013 Jerry James - 21.5.33-6 +- Rebuild for libpng 1.6 + * Mon Apr 8 2013 Jerry James - 21.5.33-5 - Add -texinfo patch to fix problems with texinfo 5 (bz 923365) - Add -aarch64 patch (bz 926766) From deb349d6d4ce123e1fd3629e7099c5feb3145d92 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:50:02 -0500 Subject: [PATCH 106/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 0e941c7..a72e75d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -21,7 +21,7 @@ Name: xemacs Version: 21.5.33 -Release: 6%{?snap:.%{snap}}%{?dist} +Release: 7%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -659,6 +659,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 21.5.33-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jun 19 2013 Jerry James - 21.5.33-6 - Rebuild for libpng 1.6 From 72765798ba7d55348c980ff3ac4dc9e714756383 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 22 Aug 2013 08:55:34 -0600 Subject: [PATCH 107/160] New upstream version. Drop upstreamed -menubar, -aarch64, and -texinfo patches. Drop unnecessary sed BR. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.33-aarch64.patch | 1469 ---------------------------------- xemacs-21.5.33-info.patch | 537 ------------- xemacs-21.5.33-menubar.patch | 171 ---- xemacs.spec | 26 +- 6 files changed, 14 insertions(+), 2193 deletions(-) delete mode 100644 xemacs-21.5.33-aarch64.patch delete mode 100644 xemacs-21.5.33-info.patch delete mode 100644 xemacs-21.5.33-menubar.patch diff --git a/.gitignore b/.gitignore index ff47ec5..5cf4f49 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xemacs-21.5.33.tar.gz +/xemacs-21.5.34.tar.gz diff --git a/sources b/sources index 5d503a4..08e9a65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15cd5c52d4d5dfba078a389ee79d09f0 xemacs-21.5.33.tar.gz +e093150724b6e55b14bae21739cfe373 xemacs-21.5.34.tar.gz diff --git a/xemacs-21.5.33-aarch64.patch b/xemacs-21.5.33-aarch64.patch deleted file mode 100644 index 37927b7..0000000 --- a/xemacs-21.5.33-aarch64.patch +++ /dev/null @@ -1,1469 +0,0 @@ ---- ./config.guess.orig 2013-01-04 09:57:13.000000000 -0700 -+++ ./config.guess 2013-04-08 16:21:47.264194605 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2009-02-03' -+timestamp='2012-09-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,9 +17,7 @@ timestamp='2009-02-03' - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -27,16 +25,16 @@ timestamp='2009-02-03' - # the same distribution terms that you use for the rest of that program. - - --# Originally written by Per Bothner . --# Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# Originally written by Per Bothner. Please send patches (context -+# diff format) to and include a ChangeLog -+# entry. - # - # This script attempts to guess a canonical system name similar to - # config.sub. If it succeeds, it prints the system name on stdout, and - # exits with 0. Otherwise, it exits with 1. - # --# The plan is that this can be called by configure scripts if you --# don't specify an explicit build system type. -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD - - me=`echo "$0" | sed -e 's,.*/,,'` - -@@ -56,8 +54,9 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep __ELF__ >/dev/null -+ | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? -@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -201,6 +200,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -223,7 +226,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -269,7 +272,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -295,12 +301,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -324,12 +330,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; -+ s390x:SunOS:*:*) -+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; -+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) -+ echo i386-pc-auroraux${UNAME_RELEASE} -+ exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" -@@ -388,23 +400,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -474,8 +486,8 @@ EOF - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -488,7 +500,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -545,7 +557,7 @@ EOF - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -588,52 +600,52 @@ EOF - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c - -- #define _HPUX_SOURCE -- #include -- #include -+ #define _HPUX_SOURCE -+ #include -+ #include - -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); - -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -653,7 +665,7 @@ EOF - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -- grep __LP64__ >/dev/null -+ grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else -@@ -724,22 +736,22 @@ EOF - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -763,14 +775,14 @@ EOF - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} -@@ -782,34 +794,39 @@ EOF - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; -- *:Interix*:[3456]*) -- case ${UNAME_MACHINE} in -+ *:Interix*:*) -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; -- EM64T | authenticamd | genuineintel) -+ authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) -@@ -819,6 +836,9 @@ EOF - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; -+ 8664:Windows_NT:*) -+ echo x86_64-pc-mks -+ exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we -@@ -848,6 +868,27 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ alpha:Linux:*:*) -+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -+ EV5) UNAME_MACHINE=alphaev5 ;; -+ EV56) UNAME_MACHINE=alphaev56 ;; -+ PCA56) UNAME_MACHINE=alphapca56 ;; -+ PCA57) UNAME_MACHINE=alphapca56 ;; -+ EV6) UNAME_MACHINE=alphaev6 ;; -+ EV67) UNAME_MACHINE=alphaev67 ;; -+ EV68*) UNAME_MACHINE=alphaev68 ;; -+ esac -+ objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ -@@ -855,20 +896,40 @@ EOF - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ i*86:Linux:*:*) -+ LIBC=gnu -+ eval $set_cc_for_build -+ sed 's/^ //' << EOF >$dummy.c -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif -+EOF -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -879,78 +940,34 @@ EOF - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- mips:Linux:*:*) -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #undef CPU -- #undef mips -- #undef mipsel -- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mipsel -- #else -- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips -- #else -- CPU= -- #endif -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } -- ;; -- mips64:Linux:*:*) -+ mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU -- #undef mips64 -- #undef mips64el -+ #undef ${UNAME_MACHINE} -+ #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) -- CPU=mips64el -+ CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) -- CPU=mips64 -+ CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif - EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^CPU/{ -- s: ::g -- p -- }'`" -+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -- exit ;; -- ppc:Linux:*:*) -- echo powerpc-unknown-linux-gnu -- exit ;; -- ppc64:Linux:*:*) -- echo powerpc64-unknown-linux-gnu -- exit ;; -- alpha:Linux:*:*) -- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -- EV5) UNAME_MACHINE=alphaev5 ;; -- EV56) UNAME_MACHINE=alphaev56 ;; -- PCA56) UNAME_MACHINE=alphapca56 ;; -- PCA57) UNAME_MACHINE=alphapca56 ;; -- EV6) UNAME_MACHINE=alphaev6 ;; -- EV67) UNAME_MACHINE=alphaev67 ;; -- EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null -- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; -+ parisc64:Linux:*:* | hppa64:Linux:*:*) -+ echo hppa64-unknown-linux-gnu -+ exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -@@ -959,14 +976,17 @@ EOF - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; -- parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-unknown-linux-gnu -+ ppc64:Linux:*:*) -+ echo powerpc64-unknown-linux-gnu -+ exit ;; -+ ppc:Linux:*:*) -+ echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -974,75 +994,18 @@ EOF - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; -- i*86:Linux:*:*) -- # The BFD linker knows what the default object file format is, so -- # first see if it will tell us. cd to the root directory to prevent -- # problems with other programs or directories called `ld' in the path. -- # Set LC_ALL=C to ensure ld outputs messages in English. -- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ -- | sed -ne '/supported targets:/!d -- s/[ ][ ]*/ /g -- s/.*supported targets: *// -- s/ .*// -- p'` -- case "$ld_supported_targets" in -- elf32-i386) -- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" -- ;; -- a.out-i386-linux) -- echo "${UNAME_MACHINE}-pc-linux-gnuaout" -- exit ;; -- "") -- # Either a pre-BFD a.out linker (linux-gnuoldld) or -- # one that does not give us useful --help. -- echo "${UNAME_MACHINE}-pc-linux-gnuoldld" -- exit ;; -- esac -- # Determine whether the default compiler is a.out or elf -- eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -- #include -- #ifdef __ELF__ -- # ifdef __GLIBC__ -- # if __GLIBC__ >= 2 -- LIBC=gnu -- # else -- LIBC=gnulibc1 -- # endif -- # else -- LIBC=gnulibc1 -- # endif -- #else -- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) -- LIBC=gnu -- #else -- LIBC=gnuaout -- #endif -- #endif -- #ifdef __dietlibc__ -- LIBC=dietlibc -- #endif --EOF -- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' -- /^LIBC/{ -- s: ::g -- p -- }'`" -- test x"${LIBC}" != x && { -- echo "${UNAME_MACHINE}-pc-linux-${LIBC}" -- exit -- } -- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } -- ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both -@@ -1050,11 +1013,11 @@ EOF - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1071,7 +1034,7 @@ EOF - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; -- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) -+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) -@@ -1086,7 +1049,7 @@ EOF - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; -@@ -1114,10 +1077,13 @@ EOF - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i386. -- echo i386-pc-msdosdjgpp -- exit ;; -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. -+ # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that -+ # this is a cross-build. -+ echo i586-pc-msdosdjgpp -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1152,8 +1118,8 @@ EOF - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1176,7 +1142,7 @@ EOF - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; -- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) -+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) -@@ -1196,10 +1162,10 @@ EOF - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1225,11 +1191,11 @@ EOF - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-unknown-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1242,6 +1208,9 @@ EOF - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1269,6 +1238,16 @@ EOF - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in -+ i386) -+ eval $set_cc_for_build -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ grep IS_64BIT_ARCH >/dev/null -+ then -+ UNAME_PROCESSOR="x86_64" -+ fi -+ fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} -@@ -1284,7 +1263,10 @@ EOF - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1329,13 +1311,13 @@ EOF - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1353,11 +1335,11 @@ EOF - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - ---- ./config.sub.orig 2013-01-04 09:57:13.000000000 -0700 -+++ ./config.sub 2013-04-08 16:21:47.265194603 -0600 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2009-02-03' -+timestamp='2012-10-10' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,9 +21,7 @@ timestamp='2009-02-03' - # GNU General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -32,13 +30,16 @@ timestamp='2009-02-03' - - - # Please send patches to . Submit a context --# diff and a properly formatted ChangeLog entry. -+# diff and a properly formatted GNU ChangeLog entry. - # - # Configuration subroutine to validate and canonicalize a configuration type. - # Supply the specified configuration type as an argument. - # If it is invalid, we print an error message on stderr and exit with code 1. - # Otherwise, we print the canonical config type on stdout and succeed. - -+# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases - # that are meaningful with *any* GNU software. -@@ -72,8 +73,9 @@ Report bugs and patches to .@end ifinfo -+along with XEmacs. If not, see . -+@end ifinfo - - @c Combine indices. - @syncodeindex fn cp ---- ./man/xemacs-faq.texi.orig 2013-01-04 09:57:14.000000000 -0700 -+++ ./man/xemacs-faq.texi 2013-04-08 17:08:44.903272690 -0600 -@@ -8848,7 +8848,7 @@ keep the history of XEmacs development. - - - @node Q11.0.1, Q11.0.2, Bleeding Edge, Bleeding Edge --@unnumberedsubsec Where is the most recent XEmacs development code? -+@unnumberedsec Where is the most recent XEmacs development code? - - The most recent XEmacs @emph{development} code is kept in a Mercurial - repository, hosted by the Debian project. The read-only URL, for -@@ -8871,7 +8871,7 @@ Yes, Virginia, that doubled slash is cor - @xref{Q11.2.1, What is Mercurial?}. - - @node Q11.0.2, Q11.0.3, Q11.0.1, Bleeding Edge --@unnumberedsubsec Where is the most recent XEmacs stable code? -+@unnumberedsec Where is the most recent XEmacs stable code? - - The most recent XEmacs @emph{stable} code is kept in a Mercurial - repository, hosted by the Debian project. The read-only URL is -@@ -8887,7 +8887,7 @@ If you're @emph{not} Vin, you don't need - - - @node Q11.0.3, Q11.0.4, Q11.0.2, Bleeding Edge --@unnumberedsubsec Where is the most recent XEmacs package code? -+@unnumberedsec Where is the most recent XEmacs package code? - - The most recent XEmacs @emph{packages} code is kept in a CVS - repository, hosted by the Debian project. The read-only @code{CVSROOT}, -@@ -8919,7 +8919,7 @@ on the website. - - - @node Q11.0.4, Q11.0.5, Q11.0.3, Bleeding Edge --@unnumberedsubsec Why isn't @var{package} available? and what to do about it. -+@unnumberedsec Why isn't @var{package} available? and what to do about it. - - If a package isn't available from the Packages repository, probably - nobody has shown enough interest to add it yet. (Occasionally, there is -@@ -8937,7 +8937,7 @@ of the package @ref{(xemacs-devguide)XEm - - - @node Q11.0.5, Q11.1.1, Q11.0.4, Bleeding Edge --@unnumberedsubsec How do I get commit access? -+@unnumberedsec How do I get commit access? - - To get commit access to XEmacs code, write to - @email{xemacs-review@@xemacs.org, the XEmacs Review Board} and request -@@ -8966,7 +8966,7 @@ submitted to @email{xemacs-patches@@xema - - - @node Q11.1.1, Q11.2.1, Q11.0.5, Bleeding Edge --@unnumberedsubsec How do I keep cool using CVS? -+@unnumberedsec How do I keep cool using CVS? - - You don't. CVS is just basically and in detail @emph{un}-cool. - -@@ -8981,7 +8981,7 @@ Please update this FAQ with one or two o - - - @node Q11.2.1, Q11.2.2, Q11.1.1, Bleeding Edge --@unnumberedsubsec What is Mercurial? -+@unnumberedsec What is Mercurial? - - Mercurial is a @dfn{distributed version control system}, or DVCS. This - means that versioning information can be easily exchanged between -@@ -9013,7 +9013,7 @@ the advantages. - - - @node Q11.2.2, Q11.2.3, Q11.2.1, Bleeding Edge --@unnumberedsubsec Where do I get Mercurial? -+@unnumberedsec Where do I get Mercurial? - - Most OS distributions (including add-on distributions like - @uref{http://www.cygwin.com/, Cygwin} and -@@ -9024,7 +9024,7 @@ packages for most major platforms, from - - - @node Q11.2.3, Q11.2.4, Q11.2.2, Bleeding Edge --@unnumberedsubsec Do I really have to waste space on history? -+@unnumberedsec Do I really have to waste space on history? - - Yes, you do. It's really not that much, though. In one of my current - workspaces, I see -@@ -9044,7 +9044,7 @@ all of the Mercurial-specific informatio - - - @node Q11.2.4, Q11.2.5, Q11.2.3, Bleeding Edge --@unnumberedsubsec @code{hg diff} gives bizarre output. -+@unnumberedsec @code{hg diff} gives bizarre output. - - You may see an unreasonable diff (often large) that doesn't seem to - reflect your work. -@@ -9098,7 +9098,7 @@ and it doesn't show your work. Unfortun - result of diffing against the "previous" commit. - - @node Q11.2.5, Q11.2.6, Q11.2.4, Bleeding Edge --@unnumberedsubsec How do I recover from a bad commit? (I already pushed.) -+@unnumberedsec How do I recover from a bad commit? (I already pushed.) - - Once upon a time, an XEmacs developer wrote: - -@@ -9270,7 +9270,7 @@ Mercurial (the revert command)! - - - @node Q11.2.6, Q11.2.7, Q11.2.5, Bleeding Edge --@unnumberedsubsec How do I recover from a bad commit? (I haven't pushed yet.) -+@unnumberedsec How do I recover from a bad commit? (I haven't pushed yet.) - - If you hadn't yet pushed the commit you now regret, and realize it - before doing further commits, you can use @code{hg strip tip}. Then -@@ -9287,7 +9287,7 @@ When in doubt, use the safer method @ref - - - @node Q11.2.7, , Q11.2.6, Bleeding Edge --@unnumberedsubsec Testing patches with Mercurial Queues. -+@unnumberedsec Testing patches with Mercurial Queues. - - When testing a patch proposed on xemacs-beta or xemacs-patches, - conflicts or new heads often appear later, when using @code{hg pull -u}. diff --git a/xemacs-21.5.33-menubar.patch b/xemacs-21.5.33-menubar.patch deleted file mode 100644 index e9a5c6b..0000000 --- a/xemacs-21.5.33-menubar.patch +++ /dev/null @@ -1,171 +0,0 @@ ---- ./lisp/menubar.el.orig 2013-01-04 09:57:14.000000000 -0700 -+++ ./lisp/menubar.el 2013-02-05 09:59:42.868427364 -0700 -@@ -79,9 +79,9 @@ See `current-menubar' for a description - (setq menu (cdr menu))) - (let (menuitem item) - (while (keywordp (setq item (car menu))) -- (or (memq item '(:config :included :filter :accelerator :active)) -+ (or (memq item '(:config :included :visible :filter :accelerator :active)) - (signal 'error -- (list "menu keyword must be :config, :included, :accelerator, :active or :filter" -+ (list "menu keyword must be :config, :included, :visible, :accelerator, :active or :filter" - item))) - (if (or (not (cdr menu)) - (vectorp (nth 1 menu)) -@@ -135,7 +135,7 @@ See `current-menubar' for a description - (setq item (aref menuitem i)) - (cond ((not (memq item '(:active :suffix :keys :style - :full :included :selected -- :accelerator))) -+ :visible :accelerator))) - (signal 'error - (list (if (keywordp item) - "unknown menu item keyword" ---- ./lisp/glyphs.el.orig 2013-01-04 09:57:13.000000000 -0700 -+++ ./lisp/glyphs.el 2013-02-05 09:58:48.573508226 -0700 -@@ -266,7 +266,7 @@ The valid keywords are: - \[WIDGET-KEYWORDS] stands for the standard keywords accepted by widgets: - These are `:selected', `:active', `:suffix', `:keys', `:style', - `:filter', `:config', `:included', `:key-sequence', `:accelerator', --`:label', `:callback', `:initial-focus', and `:descriptor'. -+`:label', `:callback', `:initial-focus', `:descriptor', and ':visible'. - #### Document me. - - \[GUI-KEYWORDS] stands for keywords accepted by many widgets. ---- ./man/lispref/menus.texi.orig 2013-01-04 09:57:14.000000000 -0700 -+++ ./man/lispref/menus.texi 2013-02-05 10:00:53.460322321 -0700 -@@ -45,6 +45,7 @@ to five keyword-value pairs, as follows: - @item :included @var{form} - This can be used to control the visibility of a menu. The form is - evaluated and the menu will be omitted if the result is @code{nil}. -+The keyword @code{:visible} is an alias for @code{:included}. - - @item :config @var{symbol} - This is an efficient shorthand for @code{:included (memq @var{symbol} -@@ -224,7 +225,8 @@ evaluated and the menu item is only disp - non-@code{nil}. Note that this is different from @code{:active}: If - @code{:active} evaluates to @code{nil}, the item will be displayed - grayed out, while if @code{:included} evaluates to @code{nil}, the item --will be omitted entirely. -+will be omitted entirely.. The keyword @code{:visible} is an alias for -+@code{:included}. - - @item :config @var{symbol} - This is an efficient shorthand for @code{:included (memq @var{symbol} ---- ./man/lispref/glyphs.texi.orig 2013-01-04 09:57:14.000000000 -0700 -+++ ./man/lispref/glyphs.texi 2013-02-05 10:00:02.476398191 -0700 -@@ -299,6 +299,7 @@ It defaults to gui-element-face. - @itemx :filter - @itemx :config - @itemx :included -+@itemx :visible - @itemx :key-sequence - @itemx :accelerator - @itemx :label ---- ./src/menubar-x.c.orig 2013-01-04 09:57:15.000000000 -0700 -+++ ./src/menubar-x.c 2013-02-05 10:05:27.299914481 -0700 -@@ -172,7 +172,7 @@ menu_item_descriptor_to_widget_value_1 ( - sferror ("Keyword in menu lacks a value", cascade); - val = Fcar (desc); - desc = Fcdr (desc); -- if (EQ (key, Q_included)) -+ if (EQ (key, Q_included) || EQ (key, Q_visible)) - include_p = val, included_spec = 1; - else if (EQ (key, Q_config)) - config_tag = val; -@@ -516,6 +516,9 @@ pre_activate_callback (Widget widget, LW - } - } - -+/* Returns the converted menubar, or NULL if an error is encountered while -+ * converting the Lisp menu specification. -+ */ - static widget_value * - compute_menubar_data (struct frame *f, Lisp_Object menubar, int deep_p) - { -@@ -573,7 +576,8 @@ set_frame_menubar (struct frame *f, int - menubar_visible = !NILP (w->menubar_visible_p); - - data = compute_menubar_data (f, menubar, deep_p); -- assert (data && (data->next || data->contents)); -+ if (!data || (!data->next && !data->contents)) -+ return 0; - - if (!FRAME_X_MENUBAR_ID (f)) - FRAME_X_MENUBAR_ID (f) = new_lwlib_id (); -@@ -594,6 +598,8 @@ set_frame_menubar (struct frame *f, int - { - free_popup_widget_value_tree (data); - data = compute_menubar_data (f, menubar, 1); -+ if (!data || (!data->next && !data->contents)) -+ return 0; - } - - ---- ./src/gui.c.orig 2013-02-05 10:01:22.773278691 -0700 -+++ ./src/gui.c 2013-02-05 10:04:22.436011132 -0700 -@@ -144,7 +144,6 @@ gui_item_add_keyval_pair (Lisp_Object gu - } - FROB (suffix) - FROB (active) -- FROB (included) - FROB (config) - FROB (filter) - FROB (style) -@@ -154,6 +153,14 @@ gui_item_add_keyval_pair (Lisp_Object gu - FROB (callback_ex) - FROB (value) - #undef FROB -+ else if (EQ (key, Q_included) || EQ (key, Q_visible)) -+ { -+ if (!EQ (pgui_item->included, val)) -+ { -+ retval = 1; -+ pgui_item->included = val; -+ } -+ } - else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatibility */ - else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */ - else if (EQ (key, Q_accelerator)) ---- ./src/general-slots.h.orig 2013-01-04 09:57:15.000000000 -0700 -+++ ./src/general-slots.h 2013-02-05 10:01:18.900284456 -0700 -@@ -312,6 +312,7 @@ SYMBOL (Quser_default); - SYMBOL_KEYWORD (Q_value); - SYMBOL (Qvalue_assoc); - SYMBOL (Qvertical); -+SYMBOL_KEYWORD (Q_visible); - SYMBOL (Qwarning); - SYMBOL (Qwidget); - SYMBOL (Qwidth); ---- ./src/menubar-gtk.c.orig 2013-01-04 09:57:15.000000000 -0700 -+++ ./src/menubar-gtk.c 2013-02-05 10:05:03.315950221 -0700 -@@ -631,7 +631,7 @@ menu_convert (Lisp_Object desc, GtkWidge - cascade); - val = Fcar (desc); - desc = Fcdr (desc); -- if (EQ (key, Q_included)) -+ if (EQ (key, Q_included) || EQ(key, Q_visible)) - include_p = val, included_spec = 1; - else if (EQ (key, Q_config)) - config_tag = val; ---- ./src/menubar.c.orig 2013-01-04 09:57:15.000000000 -0700 -+++ ./src/menubar.c 2013-02-05 10:05:59.428866597 -0700 -@@ -495,7 +495,7 @@ the first character has been tagged as a - - Immediately following the name string of the menu, various optional - keyword-value pairs are permitted: currently, :filter, :active, :included, --and :config. (See below.) -+:visible, and :config. (See below.) - - If an element of a menu (or menubar) is a string, then that string will be - presented as unselectable text. -@@ -597,7 +597,8 @@ The possible keywords are: - - :included This can be used to control the visibility of a menu or - menu item. The form is evaluated and the menu or menu -- item is only displayed if the result is non-nil. -+ item is only displayed if the result is non-nil. The -+ keyword :visible is an alias for :included. - - :config This is an efficient shorthand for - :included (memq symbol menubar-configuration) diff --git a/xemacs.spec b/xemacs.spec index a72e75d..f358c76 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -17,13 +17,14 @@ %endif #global snap 20090311hg4626 -%global majver 21.5 Name: xemacs -Version: 21.5.33 -Release: 7%{?snap:.%{snap}}%{?dist} +Version: 21.5.34 +Release: 1%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs +%global majver %(cut -d. -f1-2 <<<%{version}) + Group: Applications/Editors License: GPLv3+ URL: http://www.xemacs.org/ @@ -55,14 +56,7 @@ Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch4: %{name}-21.5.28-courier-default.patch # Fedora-specific. Recognize the Fedora X server. Patch5: %{name}-21.5.29-x-server.patch -# Applied upstream. Fix a crash if given a bad menu specification. -Patch6: %{name}-21.5.33-menubar.patch -# Applied upstream. Enable aarch64 support. -Patch7: %{name}-21.5.33-aarch64.patch -# Experimental patch, to be sent upstream eventually. Adapt to texinfo 5.0. -Patch8: %{name}-21.5.33-info.patch -BuildRequires: sed >= 3.95 BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel @@ -249,11 +243,10 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch3 %patch4 %patch5 -%patch6 -%patch7 -%patch8 -sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el +sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new +touch -r lisp/setup-paths.el lisp/setup-paths.el.new +mv -f lisp/setup-paths.el.new lisp/setup-paths.el for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f @@ -659,6 +652,11 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Aug 22 2013 Jerry James - 21.5.34-1 +- New upstream version +- Drop upstreamed -menubar, -aarch64, and -texinfo patches +- Drop unnecessary sed BR + * Sun Aug 04 2013 Fedora Release Engineering - 21.5.33-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From fadd783af0bded5be056656d039c3b0062a02ad0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 2 Oct 2013 15:49:29 -0600 Subject: [PATCH 108/160] Don't package the texinfo info files; they clash with texinfo 5.2. --- xemacs.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index f358c76..5257704 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.34 -Release: 1%{?snap:.%{snap}}%{?dist} +Release: 2%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -434,6 +434,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/{cl,widget}.info* # these clash with other packages rm -f $RPM_BUILD_ROOT%{_infodir}/info* +rm -f $RPM_BUILD_ROOT%{_infodir}/texinfo* rm -f $RPM_BUILD_ROOT%{_infodir}/standards* rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -652,6 +653,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Oct 2 2013 Jerry James - 21.5.34-2 +- Don't package the texinfo info files; they clash with texinfo 5.2 + * Thu Aug 22 2013 Jerry James - 21.5.34-1 - New upstream version - Drop upstreamed -menubar, -aarch64, and -texinfo patches From 0b00e9ae3f465dec3d613b1379b00216c7fe7ec4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 25 Oct 2013 09:07:04 -0600 Subject: [PATCH 109/160] Update the -utf8-fonts patch to remove more references to iso8859 fonts. --- xemacs-21.5.26-utf8-fonts.patch | 35 ------------------ xemacs-21.5.34-utf8-fonts.patch | 64 +++++++++++++++++++++++++++++++++ xemacs.spec | 7 ++-- 3 files changed, 69 insertions(+), 37 deletions(-) delete mode 100644 xemacs-21.5.26-utf8-fonts.patch create mode 100644 xemacs-21.5.34-utf8-fonts.patch diff --git a/xemacs-21.5.26-utf8-fonts.patch b/xemacs-21.5.26-utf8-fonts.patch deleted file mode 100644 index ae0a2a8..0000000 --- a/xemacs-21.5.26-utf8-fonts.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- etc/Emacs.ad.orig 2011-04-29 07:31:05.000000000 -0600 -+++ etc/Emacs.ad 2011-05-03 13:45:02.269991498 -0600 -@@ -222,8 +222,12 @@ - ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ - ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 - ! --*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* -+*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+ -+XEmacs*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -+ * - *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ -@@ -235,7 +239,7 @@ - - ! Gui elements share this font - ! --Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* -+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* - - ! Font in the Motif dialog boxes. - ! (Motif uses `fontList' while most other things use `font' - if you don't -@@ -251,7 +255,7 @@ - ! Some people use 12-point anyway because you get more text, but - ! there's no purpose at all in doing this for dialog boxes. - --*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* -+*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-* - - ! Dialog box translations. - ! ======================= diff --git a/xemacs-21.5.34-utf8-fonts.patch b/xemacs-21.5.34-utf8-fonts.patch new file mode 100644 index 0000000..3f99b52 --- /dev/null +++ b/xemacs-21.5.34-utf8-fonts.patch @@ -0,0 +1,64 @@ +--- etc/Emacs.ad.orig 2013-08-21 11:43:43.000000000 -0600 ++++ etc/Emacs.ad 2013-10-24 20:00:00.000000000 -0600 +@@ -222,36 +222,40 @@ + ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ + ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 + ! +-*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +-*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +-*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ++*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* ++*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* ++ ++XEmacs*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \ ++ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ ++ * ++*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ + -*-*-*-*-*-*-*-120-*-iso10646-1, \ + -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ + -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 +-*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ ++*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ + -*-*-*-*-*-*-*-120-*-iso10646-1, \ + -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ + -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 + + ! Gui elements share this font + ! +-Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* ++Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* + + ! Font in the Motif dialog boxes. + ! (Motif uses `fontList' while most other things use `font' - if you don't + ! know why you probably don't want to.) + ! +-*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +-*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +-*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +-*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* ++*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* ++*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* ++*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* ++*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* + + ! Font in the Athena dialog boxes. + ! I think 14-point looks nicer than 12-point. + ! Some people use 12-point anyway because you get more text, but + ! there's no purpose at all in doing this for dialog boxes. + +-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* ++*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-* + + ! Dialog box translations. + ! ======================= +--- lwlib/xlwmenu.c.orig 2013-08-21 11:43:43.000000000 -0600 ++++ lwlib/xlwmenu.c 2013-10-24 20:00:00.000000000 -0600 +@@ -108,7 +108,7 @@ + /* We must use an iso8859-1 font here, or people without $LANG set lose. + It's fair to assume that those who do have $LANG set also have the + *fontList resource set, or at least know how to deal with this. */ +- XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"), ++ XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-1"), + #else + fontres (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font, + "XtDefaultFont"), diff --git a/xemacs.spec b/xemacs.spec index 5257704..e709e37 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.34 -Release: 2%{?snap:.%{snap}}%{?dist} +Release: 3%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -48,7 +48,7 @@ Patch0: %{name}-21.5.25-mk-nochk-features.patch # WNN still doesn't work. Patch1: %{name}-21.5.25-wnnfix-128362.patch # Fedora-specific. Don't force ISO-8859 fonts. -Patch2: %{name}-21.5.26-utf8-fonts.patch +Patch2: %{name}-21.5.34-utf8-fonts.patch # Experimental patch, to be sent upstream eventually. Don't use # -export-dynamic on IA64; leads to segfaults due to function pointer issues. Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch @@ -653,6 +653,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Oct 25 2013 Jerry James - 21.5.34-3 +- Update the -utf8-fonts patch to remove more references to iso8859 fonts + * Wed Oct 2 2013 Jerry James - 21.5.34-2 - Don't package the texinfo info files; they clash with texinfo 5.2 From b9b3c36776b02221a9a8d89dc5239f3be6e9ef6e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 12 Nov 2013 10:00:10 -0700 Subject: [PATCH 110/160] Add an AppData file. --- xemacs.appdata.xml | 22 ++++++++++++++++++++++ xemacs.spec | 11 ++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 xemacs.appdata.xml diff --git a/xemacs.appdata.xml b/xemacs.appdata.xml new file mode 100644 index 0000000..ca12e2e --- /dev/null +++ b/xemacs.appdata.xml @@ -0,0 +1,22 @@ + + + xemacs.desktop + CC0 + +

+ XEmacs is a highly customizable open source text editor and application + development system. +

+

XEmacs is protected under the GNU General Public License. It is related + to other versions of Emacs, in particular GNU Emacs. Its emphasis is on + modern graphical user interface support and an open software development + model, similar to Linux. +

+ + + http://www.xemacs.org/Images/gnus.png + http://www.xemacs.org/Images/custom.png + + http://www.xemacs.org/ + james@xemacs.org + diff --git a/xemacs.spec b/xemacs.spec index e709e37..8a76cbc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.34 -Release: 3%{?snap:.%{snap}}%{?dist} +Release: 4%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -39,6 +39,7 @@ Source3: dotxemacs-init.el Source4: default.el Source5: xemacs-sitestart.el Source6: gnuclient.desktop +Source7: %{name}.appdata.xml # Fedora-specific. Don't run the check-features Makefile target. It checks # that necessary packages are installed, but they aren't installed while @@ -445,6 +446,10 @@ desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE6} +# AppData file +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +install -pm 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/appdata + # site-start.el install -dm 755 \ $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d @@ -579,6 +584,7 @@ fi %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/canna_api.ell %endif %endif +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/gnuclient.desktop %{_datadir}/icons/hicolor/48x48/apps/xemacs.png @@ -653,6 +659,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Nov 12 2013 Jerry James - 21.5.34-4 +- Add an AppData file + * Fri Oct 25 2013 Jerry James - 21.5.34-3 - Update the -utf8-fonts patch to remove more references to iso8859 fonts From 9a9ae93a7321f138c3cc0b2f9cd72d0f0f92ba1c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 5 Feb 2014 11:27:16 -0700 Subject: [PATCH 111/160] Update location of rpm macro file for rpm >= 4.11. Disable XIM by default. It hasn't worked since the release of Fedora 19 due to a fixed size buffer inside libX11 that is too small (see _XimProtoCreateIC in modules/im/ximcp/imDefIc.c), and nobody has complained. --- xemacs.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index 8a76cbc..8b6b651 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -6,9 +6,9 @@ %bcond_with wnn %bcond_with xaw3d %bcond_with xfs +%bcond_with xim %bcond_without mule %bcond_without nox -%bcond_without xim %ifarch ia64 # no-expdyn-ia64 patch, https://bugzilla.redhat.com/show_bug.cgi?id=106744#c39 %bcond_with modules @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.34 -Release: 4%{?snap:.%{snap}}%{?dist} +Release: 5%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -467,7 +467,7 @@ install -Dpm 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png # macro file -install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs +install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.%{name} # Empty directories for external packages to use mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/etc @@ -624,7 +624,7 @@ fi %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc %endif -%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs +%{_rpmconfigdir}/macros.d/macros.%{name} %config(noreplace) %{_sysconfdir}/skel/.xemacs/ %{_mandir}/man1/etags.xemacs.1* %{_mandir}/man1/gnuserv.1* @@ -659,6 +659,12 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Feb 5 2014 Jerry James - 21.5.34-5 +- Disable XIM by default. It hasn't worked since the release of Fedora 19 due + to a fixed size buffer inside libX11 that is too small (see _XimProtoCreateIC + in modules/im/ximcp/imDefIc.c), and nobody has complained. +- Update location of rpm macro file for rpm >= 4.11 + * Tue Nov 12 2013 Jerry James - 21.5.34-4 - Add an AppData file From 8a07256b74dabbfc4af83b64f859e826c834d25c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 5 Jun 2014 09:35:30 -0600 Subject: [PATCH 112/160] Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159. Update snapshot creating script to use bitbucket and maximally compress. Don't need to exclude texinfo info files; upstream has dropped them. --- .gitignore | 1 + sources | 2 +- xemacs-21.5.25-mk-nochk-features.patch | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 2 +- xemacs-snapshot.sh | 4 ++-- xemacs.spec | 10 +++++++--- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 5cf4f49..36a65a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xemacs-21.5.34.tar.gz +/xemacs-20140605hgacf1c26e3019.tar.xz diff --git a/sources b/sources index 08e9a65..04c7317 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e093150724b6e55b14bae21739cfe373 xemacs-21.5.34.tar.gz +acbecd8dd6a032de44bcdb69b51d5708 xemacs-20140605hgacf1c26e3019.tar.xz diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch index 66a2d70..2a0ce92 100644 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ b/xemacs-21.5.25-mk-nochk-features.patch @@ -1,6 +1,6 @@ --- ./Makefile.in.in.orig 2012-08-02 12:38:27.000000000 -0600 +++ ./Makefile.in.in 2012-08-06 20:27:16.084145753 -0600 -@@ -393,7 +393,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS +@@ -394,7 +394,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 0755992..105ce6d 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -14,7 +14,7 @@ fi --- ./configure.orig 2012-08-02 12:39:01.000000000 -0600 +++ ./configure 2012-08-06 20:28:23.841705350 -0600 -@@ -14670,7 +14670,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +@@ -15007,7 +15007,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh index 7e13cd7..51e8eef 100755 --- a/xemacs-snapshot.sh +++ b/xemacs-snapshot.sh @@ -22,7 +22,7 @@ pwd=$(pwd) now=$(date +%Y%m%d) cd "$tmp" -hg clone http://hg.debian.org/hg/xemacs/xemacs-beta +hg clone https://bitbucket.org/xemacs/xemacs-beta cd xemacs-beta hg update -r "$rev" # Hack to avoid needing .hg/ around but still getting xemacs-extra-name right @@ -30,5 +30,5 @@ hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac rm -r .hg* cd .. tar cf "$pwd/$tarball" xemacs-beta -xz -f "$pwd/$tarball" +xz -9f "$pwd/$tarball" cd - >/dev/null diff --git a/xemacs.spec b/xemacs.spec index 8b6b651..3c223e1 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -16,11 +16,11 @@ %bcond_without modules %endif -#global snap 20090311hg4626 +%global snap 20140605hgacf1c26e3019 Name: xemacs Version: 21.5.34 -Release: 5%{?snap:.%{snap}}%{?dist} +Release: 6%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -435,7 +435,6 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/{cl,widget}.info* # these clash with other packages rm -f $RPM_BUILD_ROOT%{_infodir}/info* -rm -f $RPM_BUILD_ROOT%{_infodir}/texinfo* rm -f $RPM_BUILD_ROOT%{_infodir}/standards* rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -659,6 +658,11 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Jun 5 2014 Jerry James - 21.5.34-6.20140605hgacf1c26e3019 +- Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159 +- Update snapshot creating script to use bitbucket and maximally compress +- Don't need to exclude texinfo info files; upstream has dropped them + * Wed Feb 5 2014 Jerry James - 21.5.34-5 - Disable XIM by default. It hasn't worked since the release of Fedora 19 due to a fixed size buffer inside libX11 that is too small (see _XimProtoCreateIC From 91a528151b32421ff8ade822a541764cc122aeb8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:28:29 -0500 Subject: [PATCH 113/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 3c223e1..5f8405d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.34 -Release: 6%{?snap:.%{snap}}%{?dist} +Release: 7%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -658,6 +658,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 21.5.34-7.20140605hgacf1c26e3019 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Jun 5 2014 Jerry James - 21.5.34-6.20140605hgacf1c26e3019 - Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159 - Update snapshot creating script to use bitbucket and maximally compress From 7b022918c481000ff5cfa579a0ec30f42894687d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:34:21 +0000 Subject: [PATCH 114/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 5f8405d..059706d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.34 -Release: 7%{?snap:.%{snap}}%{?dist} +Release: 8%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -658,6 +658,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 21.5.34-8.20140605hgacf1c26e3019 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 21.5.34-7.20140605hgacf1c26e3019 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 354ce5dd825f34d9eec0d0e0197ea575fa6817ac Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Feb 2015 15:21:30 -0700 Subject: [PATCH 115/160] Add -c11 patch to fix build failure with gcc 5.0. Also: - Set compiling username to get reproducible builds. - Use license macro. --- xemacs-21.5.34-c11.patch | 33 +++++++++++++++++++++++++++++++++ xemacs.spec | 22 +++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 xemacs-21.5.34-c11.patch diff --git a/xemacs-21.5.34-c11.patch b/xemacs-21.5.34-c11.patch new file mode 100644 index 0000000..fef4dd5 --- /dev/null +++ b/xemacs-21.5.34-c11.patch @@ -0,0 +1,33 @@ +--- src/lisp.h.orig 2014-06-05 09:02:17.000000000 -0600 ++++ src/lisp.h 2015-02-09 12:30:00.000000000 -0700 +@@ -1154,6 +1154,9 @@ + + /* ------------------------ alignment definitions ------------------- */ + ++#if (defined (__STDC_VERSION__) && __STDC_VERSION__ < 201112L) || \ ++ (defined (__cplusplus) && __cplusplus < 201103L) || \ ++ (! defined (__STDC_VERSION__) && ! defined (__cplusplus)) + /* No type has a greater alignment requirement than max_align_t. + (except perhaps for types we don't use, like long double) */ + typedef union +@@ -1163,6 +1166,7 @@ + struct { void (*f)(void); } f; + struct { double d; } d; + } max_align_t; ++#endif + + /* ALIGNOF returns the required alignment of a type -- i.e. a value such + that data of this type must begin at a memory address which is a +@@ -1170,7 +1174,11 @@ + as the type itself. */ + + #ifndef ALIGNOF +-# if defined (__GNUC__) && (__GNUC__ >= 2) ++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L ++# define ALIGNOF(type) _Alignof(type) ++# elif defined (__cplusplus) && __cplusplus >= 201103L ++# define ALIGNOF(type) alignof(type) ++# elif defined (__GNUC__) && (__GNUC__ >= 2) + /* gcc has an extension that gives us exactly what we want. */ + # define ALIGNOF(type) __alignof__ (type) + # elif ! defined (__cplusplus) diff --git a/xemacs.spec b/xemacs.spec index 059706d..b813691 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -20,7 +20,7 @@ Name: xemacs Version: 21.5.34 -Release: 8%{?snap:.%{snap}}%{?dist} +Release: 9%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -57,6 +57,8 @@ Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch4: %{name}-21.5.28-courier-default.patch # Fedora-specific. Recognize the Fedora X server. Patch5: %{name}-21.5.29-x-server.patch +# To be sent upstsream: adapt to changes in C11 +Patch6: %{name}-21.5.34-c11.patch BuildRequires: texinfo BuildRequires: ncurses-devel @@ -244,6 +246,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch3 %patch4 %patch5 +%patch6 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -255,6 +258,13 @@ for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do mv -f $f.utf8 $f done +# Get reproducible builds by setting the compiling username +mkdir ~/.xemacs +echo >> ~/.xemacs/custom.el << EOF +(custom-set-variables + '(user-mail-address "mockbuild@fedoraproject.org")) +EOF + %build %if %{with gtk} @@ -609,7 +619,8 @@ fi %{_mandir}/man1/xemacs-xft.1* %files common -f base-files -%doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL +%doc INSTALL README PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL +%license COPYING %{_bindir}/etags.xemacs %{_bindir}/ootags %{_bindir}/xemacs-script @@ -635,7 +646,7 @@ fi %endif %files info -f info-files -%doc COPYING +%license COPYING %{_infodir}/*.info* %files devel @@ -658,6 +669,11 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Feb 9 2015 Jerry James - 21.5.34-9.20140605hgacf1c26e3019 +- Add -c11 patch to fix build failure with gcc 5.0 +- Set compiling username to get reproducible builds +- Use license macro + * Mon Aug 18 2014 Fedora Release Engineering - 21.5.34-8.20140605hgacf1c26e3019 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ac99c27d0e311f73ae0cba7e741218107586407a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 20 Apr 2015 17:14:33 -0600 Subject: [PATCH 116/160] Update to snapshot: fixes multiple bugs. Also: - Drop upstreamed -c11 patch. - Enable NSS support. --- .gitignore | 1 + sources | 2 +- xemacs-21.5.34-c11.patch | 33 --------------------------------- xemacs.appdata.xml | 5 ++++- xemacs.spec | 21 ++++++++++++++------- 5 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 xemacs-21.5.34-c11.patch diff --git a/.gitignore b/.gitignore index 36a65a5..6fffc09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xemacs-21.5.34.tar.gz /xemacs-20140605hgacf1c26e3019.tar.xz +/xemacs-20150420hg23178aa71f8b.tar.xz diff --git a/sources b/sources index 04c7317..aec377b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -acbecd8dd6a032de44bcdb69b51d5708 xemacs-20140605hgacf1c26e3019.tar.xz +dcb37b2e5ead9980e4a935c9a98b7058 xemacs-20150420hg23178aa71f8b.tar.xz diff --git a/xemacs-21.5.34-c11.patch b/xemacs-21.5.34-c11.patch deleted file mode 100644 index fef4dd5..0000000 --- a/xemacs-21.5.34-c11.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/lisp.h.orig 2014-06-05 09:02:17.000000000 -0600 -+++ src/lisp.h 2015-02-09 12:30:00.000000000 -0700 -@@ -1154,6 +1154,9 @@ - - /* ------------------------ alignment definitions ------------------- */ - -+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ < 201112L) || \ -+ (defined (__cplusplus) && __cplusplus < 201103L) || \ -+ (! defined (__STDC_VERSION__) && ! defined (__cplusplus)) - /* No type has a greater alignment requirement than max_align_t. - (except perhaps for types we don't use, like long double) */ - typedef union -@@ -1163,6 +1166,7 @@ - struct { void (*f)(void); } f; - struct { double d; } d; - } max_align_t; -+#endif - - /* ALIGNOF returns the required alignment of a type -- i.e. a value such - that data of this type must begin at a memory address which is a -@@ -1170,7 +1174,11 @@ - as the type itself. */ - - #ifndef ALIGNOF --# if defined (__GNUC__) && (__GNUC__ >= 2) -+# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L -+# define ALIGNOF(type) _Alignof(type) -+# elif defined (__cplusplus) && __cplusplus >= 201103L -+# define ALIGNOF(type) alignof(type) -+# elif defined (__GNUC__) && (__GNUC__ >= 2) - /* gcc has an extension that gives us exactly what we want. */ - # define ALIGNOF(type) __alignof__ (type) - # elif ! defined (__cplusplus) diff --git a/xemacs.appdata.xml b/xemacs.appdata.xml index ca12e2e..b623940 100644 --- a/xemacs.appdata.xml +++ b/xemacs.appdata.xml @@ -1,7 +1,10 @@ xemacs.desktop - CC0 + CC0 + GPL-3.0+ + XEmacs + Different version of Emacs

XEmacs is a highly customizable open source text editor and application diff --git a/xemacs.spec b/xemacs.spec index b813691..f7fd4a8 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,3 +1,6 @@ +# The garbage collector does not work with PIE +%undefine _hardened_build + # TODO: review desktop entry associations (does text/* work?) # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el # TODO: non-ASCII in buffer tabs @@ -16,11 +19,11 @@ %bcond_without modules %endif -%global snap 20140605hgacf1c26e3019 +%global snap 20150420hg23178aa71f8b Name: xemacs Version: 21.5.34 -Release: 9%{?snap:.%{snap}}%{?dist} +Release: 10%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -57,12 +60,11 @@ Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch4: %{name}-21.5.28-courier-default.patch # Fedora-specific. Recognize the Fedora X server. Patch5: %{name}-21.5.29-x-server.patch -# To be sent upstsream: adapt to changes in C11 -Patch6: %{name}-21.5.34-c11.patch BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel +BuildRequires: nss-devel BuildRequires: pam-devel BuildRequires: zlib-devel BuildRequires: libjpeg-devel @@ -238,7 +240,6 @@ add functionality to XEmacs. %prep %setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f -rm -f configure.in sed -i -e /tetris/d lisp/menubar-items.el %patch0 %patch1 @@ -246,13 +247,13 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch3 %patch4 %patch5 -%patch6 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new mv -f lisp/setup-paths.el.new lisp/setup-paths.el -for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do +for f in man/internals/internals.texi man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta +do iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f touch -r $f $f.utf8 mv -f $f.utf8 $f @@ -298,6 +299,7 @@ common_options=" --with-mail-locking=lockf --with-pop --without-hesiod + --with-tls=nss \ %ifarch alpha ia64 ppc64 --with-system-malloc %endif @@ -669,6 +671,11 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Mon Apr 20 2015 Jerry James - 21.5.34-10.20150420hg23178aa71f8b +- Update to snapshot: fixes multiple bugs +- Drop upstreamed -c11 patch +- Enable NSS support + * Mon Feb 9 2015 Jerry James - 21.5.34-9.20140605hgacf1c26e3019 - Add -c11 patch to fix build failure with gcc 5.0 - Set compiling username to get reproducible builds From 76cde9c660a2e6a04156e062aedc77a53cf9ba33 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:51:11 +0000 Subject: [PATCH 117/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index f7fd4a8..2ba5b23 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 10%{?snap:.%{snap}}%{?dist} +Release: 11%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -671,6 +671,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 21.5.34-11.20150420hg23178aa71f8b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Apr 20 2015 Jerry James - 21.5.34-10.20150420hg23178aa71f8b - Update to snapshot: fixes multiple bugs - Drop upstreamed -c11 patch From eac4eb5a41b5d5bdb4c5f7e9f3b198844cd4004c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 3 Oct 2015 11:29:04 -0600 Subject: [PATCH 118/160] Update to snapshot: fixes multiple bugs. Also add -alsaplay patch to fix playing sounds through ALSA. --- .gitignore | 1 + sources | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 2 +- xemacs-21.5.34-alsaplay.patch | 13 +++++++++++++ xemacs.spec | 11 +++++++++-- 5 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 xemacs-21.5.34-alsaplay.patch diff --git a/.gitignore b/.gitignore index 6fffc09..b5f4f31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xemacs-21.5.34.tar.gz /xemacs-20140605hgacf1c26e3019.tar.xz /xemacs-20150420hg23178aa71f8b.tar.xz +/xemacs-20150929hga76c9268bb72.tar.xz diff --git a/sources b/sources index aec377b..f1298ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dcb37b2e5ead9980e4a935c9a98b7058 xemacs-20150420hg23178aa71f8b.tar.xz +462a2f1a8308fb59ae12cae107798d05 xemacs-20150929hga76c9268bb72.tar.xz diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 105ce6d..a475ca6 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -14,7 +14,7 @@ fi --- ./configure.orig 2012-08-02 12:39:01.000000000 -0600 +++ ./configure 2012-08-06 20:28:23.841705350 -0600 -@@ -15007,7 +15007,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +@@ -15036,7 +15036,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.34-alsaplay.patch b/xemacs-21.5.34-alsaplay.patch new file mode 100644 index 0000000..eaa9b7c --- /dev/null +++ b/xemacs-21.5.34-alsaplay.patch @@ -0,0 +1,13 @@ +--- src/alsaplay.c.orig 2011-05-02 21:22:30.000000000 -0600 ++++ src/alsaplay.c 2015-10-03 10:33:52.961671169 -0600 +@@ -375,6 +375,10 @@ alsa_play_sound_data (const Binbyte *dat + if ((err = snd_pcm_writei (pcm_handle, data, length)) < 0) + goto error_mixer; + ++ /* Wait for it to finish */ ++ if ((err = snd_pcm_drain (pcm_handle)) < 0) ++ goto error_mixer; ++ + /* Put the volume back the way it used to be */ + reset_volume (&mix); + diff --git a/xemacs.spec b/xemacs.spec index 2ba5b23..b0c14d8 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20150420hg23178aa71f8b +%global snap 20150929hga76c9268bb72 Name: xemacs Version: 21.5.34 -Release: 11%{?snap:.%{snap}}%{?dist} +Release: 12%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -60,6 +60,8 @@ Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch Patch4: %{name}-21.5.28-courier-default.patch # Fedora-specific. Recognize the Fedora X server. Patch5: %{name}-21.5.29-x-server.patch +# Submitted upstream by Henry Thompson: fix playing sounds through ALSA +Patch6: %{name}-21.5.34-alsaplay.patch BuildRequires: texinfo BuildRequires: ncurses-devel @@ -247,6 +249,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch3 %patch4 %patch5 +%patch6 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -671,6 +674,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Oct 3 2015 Jerry James - 21.5.34-1220150929hga76c9268bb72 +- Update to snapshot: fixes multiple bugs +- Add -alsaplay patch to fix playing sounds through ALSA + * Fri Jun 19 2015 Fedora Release Engineering - 21.5.34-11.20150420hg23178aa71f8b - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From d715a06a136fccd74fae0ae67376e3f6109246a7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 30 Dec 2015 13:21:28 -0700 Subject: [PATCH 119/160] Use system malloc on 32-bit MIPS (bz 1294893). --- xemacs.appdata.xml | 19 +++++++++++++------ xemacs.spec | 9 ++++++--- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/xemacs.appdata.xml b/xemacs.appdata.xml index b623940..00c4be6 100644 --- a/xemacs.appdata.xml +++ b/xemacs.appdata.xml @@ -1,6 +1,6 @@ - - xemacs.desktop + + xemacs.desktop CC0 GPL-3.0+ XEmacs @@ -17,9 +17,16 @@

- http://www.xemacs.org/Images/gnus.png - http://www.xemacs.org/Images/custom.png + + http://www.xemacs.org/Images/gnus.png + Gnus in XEmacs + + + http://www.xemacs.org/Images/custom.png + Customize buffer + + james@xemacs.org http://www.xemacs.org/ - james@xemacs.org - + http://tracker.xemacs.org/XEmacs/its/ + diff --git a/xemacs.spec b/xemacs.spec index b0c14d8..464a358 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 12%{?snap:.%{snap}}%{?dist} +Release: 13%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -303,7 +303,7 @@ common_options=" --with-pop --without-hesiod --with-tls=nss \ -%ifarch alpha ia64 ppc64 +%ifarch alpha ia64 ppc64 mips mipsel --with-system-malloc %endif --with-pdump @@ -674,7 +674,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog -* Sat Oct 3 2015 Jerry James - 21.5.34-1220150929hga76c9268bb72 +* Wed Dec 30 2015 Michal Toman - 21.5.34-13.20150929hga76c9268bb72 +- Use system malloc on 32-bit MIPS (bz 1294893) + +* Sat Oct 3 2015 Jerry James - 21.5.34-12.20150929hga76c9268bb72 - Update to snapshot: fixes multiple bugs - Add -alsaplay patch to fix playing sounds through ALSA From f3f85a99c8929a6f463876ac2e6ae20286d120a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:22:23 +0000 Subject: [PATCH 120/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 464a358..39b2af7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 13%{?snap:.%{snap}}%{?dist} +Release: 14%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -674,6 +674,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 21.5.34-14.20150929hga76c9268bb72 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Dec 30 2015 Michal Toman - 21.5.34-13.20150929hga76c9268bb72 - Use system malloc on 32-bit MIPS (bz 1294893) From ef0d6ccc3948568a8e05dfb72d7f246ffb9eaf82 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 20 Feb 2016 17:29:55 -0700 Subject: [PATCH 121/160] Update to latest mercurial snapshot. --- .gitignore | 1 + sources | 2 +- xemacs.spec | 15 +++++---------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index b5f4f31..e02f520 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xemacs-20140605hgacf1c26e3019.tar.xz /xemacs-20150420hg23178aa71f8b.tar.xz /xemacs-20150929hga76c9268bb72.tar.xz +/xemacs-20160104hg4d03958b4080.tar.xz diff --git a/sources b/sources index f1298ef..aa4684a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -462a2f1a8308fb59ae12cae107798d05 xemacs-20150929hga76c9268bb72.tar.xz +19005a04860b394a2d836dcf1f6007f9 xemacs-20160104hg4d03958b4080.tar.xz diff --git a/xemacs.spec b/xemacs.spec index 39b2af7..d9f1708 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,16 +19,15 @@ %bcond_without modules %endif -%global snap 20150929hga76c9268bb72 +%global snap 20160104hg4d03958b4080 Name: xemacs Version: 21.5.34 -Release: 14%{?snap:.%{snap}}%{?dist} +Release: 15%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) -Group: Applications/Editors License: GPLv3+ URL: http://www.xemacs.org/ %if 0%{?snap:1} @@ -125,7 +124,6 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Byte-compiled lisp files and other common files for XEmacs -Group: Applications/Editors Requires: %{name}-filesystem = %{version}-%{release} Requires(post): chkconfig Requires(preun): chkconfig @@ -141,7 +139,6 @@ This package contains byte-compiled lisp and other common files for XEmacs. %package nox Summary: Different version of Emacs built without X Windows support -Group: Applications/Editors # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} @@ -161,7 +158,6 @@ This package contains XEmacs built without X Windows support. %package xft Summary: Different version of Emacs built with Xft/fontconfig support -Group: Applications/Editors Requires: %{name}-common = %{version}-%{release} Requires: xemacs-packages-base >= 20060510 Requires(post): chkconfig @@ -180,7 +176,6 @@ This package contains XEmacs built with Xft and fontconfig support. %package el Summary: Emacs lisp source files for XEmacs -Group: Development/Libraries Requires: %{name}-filesystem = %{version}-%{release} %description el @@ -195,7 +190,6 @@ interest when developing or debugging XEmacs itself. %package info Summary: XEmacs documentation in GNU texinfo format -Group: Documentation BuildArch: noarch Requires(post): info Requires(preun): info @@ -211,7 +205,6 @@ This package contains XEmacs documentation in GNU texinfo format. %package devel Summary: Development files for XEmacs -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig @@ -226,7 +219,6 @@ This package contains XEmacs development support files. %package filesystem Summary: XEmacs filesystem layout -Group: Applications/Editors BuildArch: noarch %description filesystem @@ -674,6 +666,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Feb 20 2016 Jerry James - 21.5.34-15.20160104hg4d03958b4080 +- Update to latest mercurial snapshot + * Fri Feb 05 2016 Fedora Release Engineering - 21.5.34-14.20150929hga76c9268bb72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From e1eb076aee79b17e31e4e6236323d461e7933a7d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 28 May 2016 15:09:29 -0600 Subject: [PATCH 122/160] Update to latest mercurial snapshot. Also, fix M-x shell under tcsh (bz 1222897, 1260785). --- .gitignore | 1 + sources | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 2 +- xemacs-21.5.34-setsid.patch | 28 ++++++++++++++++++++++ xemacs-21.5.34-tls.patch | 15 ++++++++++++ xemacs.spec | 15 ++++++++++-- 6 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 xemacs-21.5.34-setsid.patch create mode 100644 xemacs-21.5.34-tls.patch diff --git a/.gitignore b/.gitignore index e02f520..066754c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xemacs-20150420hg23178aa71f8b.tar.xz /xemacs-20150929hga76c9268bb72.tar.xz /xemacs-20160104hg4d03958b4080.tar.xz +/xemacs-20160507hgd5b51c618ef8.tar.xz diff --git a/sources b/sources index aa4684a..3fbc8bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19005a04860b394a2d836dcf1f6007f9 xemacs-20160104hg4d03958b4080.tar.xz +1b1ea71723e5bfe4badf7e87e38a0736 xemacs-20160507hgd5b51c618ef8.tar.xz diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index a475ca6..d553474 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -14,7 +14,7 @@ fi --- ./configure.orig 2012-08-02 12:39:01.000000000 -0600 +++ ./configure 2012-08-06 20:28:23.841705350 -0600 -@@ -15036,7 +15036,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +@@ -15045,7 +15045,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.34-setsid.patch b/xemacs-21.5.34-setsid.patch new file mode 100644 index 0000000..b6b0ab8 --- /dev/null +++ b/xemacs-21.5.34-setsid.patch @@ -0,0 +1,28 @@ +--- ./src/process-unix.c.orig 2016-05-28 13:52:40.000000000 -0600 ++++ ./src/process-unix.c 2016-05-28 14:50:54.288035364 -0600 +@@ -1122,10 +1122,8 @@ unix_create_process (Lisp_Process *p, + + /* Disconnect the current controlling terminal, pursuant to + making the pty be the controlling terminal of the process. +- Also put us in our own process group. +- Moved this call to later in the function, because on Cygwin, +- setsid() causes the pty setup to fail in some way. +- disconnect_controlling_terminal (); */ ++ Also put us in our own process group. */ ++ disconnect_controlling_terminal (); + + if (pty_flag) + { +@@ -1244,12 +1242,6 @@ unix_create_process (Lisp_Process *p, + child_setup_tty (xforkout); + } /* if (pty_flag) */ + +- /* Moved this here because of Cygwin. Vin Shelton 2015-03-24. */ +- /* Disconnect the current controlling terminal, pursuant to +- making the pty be the controlling terminal of the process. +- Also put us in our own process group. */ +- disconnect_controlling_terminal (); +- + EMACS_SIGNAL (SIGINT, SIG_DFL); + EMACS_SIGNAL (SIGQUIT, SIG_DFL); + diff --git a/xemacs-21.5.34-tls.patch b/xemacs-21.5.34-tls.patch new file mode 100644 index 0000000..5d8ab81 --- /dev/null +++ b/xemacs-21.5.34-tls.patch @@ -0,0 +1,15 @@ +--- ./src/tls.c.orig 2016-05-28 13:52:40.000000000 -0600 ++++ ./src/tls.c 2016-05-28 14:20:54.457085311 -0600 +@@ -370,12 +370,6 @@ init_tls (void) + /* Set options on the model socket */ + if (SSL_OptionSet (nss_model, SSL_SECURITY, PR_TRUE) != SECSuccess) + signal_error (Qtls_error, "NSS cannot enable model socket", NSS_ERRSTR); +- if (SSL_OptionSet (nss_model, SSL_ENABLE_SSL2, PR_FALSE) != SECSuccess) +- signal_error (Qtls_error, "NSS unable to disable SSLv2", NSS_ERRSTR); +- if (SSL_OptionSet (nss_model, SSL_V2_COMPATIBLE_HELLO, PR_FALSE) +- != SECSuccess) +- signal_error (Qtls_error, "NSS unable to disable SSLv2 handshake", +- NSS_ERRSTR); + if (SSL_OptionSet (nss_model, SSL_ENABLE_DEFLATE, PR_FALSE) != SECSuccess) + signal_error (Qtls_error, "NSS unable to disable deflate", NSS_ERRSTR); + if (SSL_OptionSet (nss_model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) diff --git a/xemacs.spec b/xemacs.spec index d9f1708..2d68efc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20160104hg4d03958b4080 +%global snap 20160507hgd5b51c618ef8 Name: xemacs Version: 21.5.34 -Release: 15%{?snap:.%{snap}}%{?dist} +Release: 16%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,7 +61,12 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch +# Don't try to set an option that has been removed from nss +Patch7: %{name}-21.5.34-tls.patch +# Undo a Cygwin fix that breaks M-x shell with tcsh on Linux +Patch8: %{name}-21.5.34-setsid.patch +BuildRequires: gcc BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel @@ -242,6 +247,8 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 +%patch8 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -666,6 +673,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat May 28 2016 Jerry James - 21.5.34-16.20160507hgd5b51c618ef8 +- Update to latest mercurial snapshot +- Fix M-x shell under tcsh (bz 1222897, 1260785) + * Sat Feb 20 2016 Jerry James - 21.5.34-15.20160104hg4d03958b4080 - Update to latest mercurial snapshot From 771e41e16d57c6c8465df0bb0c2c8fa4d0144ae0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 3 Jun 2016 14:41:30 -0600 Subject: [PATCH 123/160] Update to fix NSS breakage. Drop upstreamed -tls and -setsid patches. --- .gitignore | 1 + sources | 2 +- xemacs-21.5.34-setsid.patch | 28 ---------------------------- xemacs-21.5.34-tls.patch | 15 --------------- xemacs-snapshot.sh | 2 +- xemacs.spec | 14 ++++++-------- 6 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 xemacs-21.5.34-setsid.patch delete mode 100644 xemacs-21.5.34-tls.patch diff --git a/.gitignore b/.gitignore index 066754c..710fdb5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xemacs-20150929hga76c9268bb72.tar.xz /xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz +/xemacs-20160603hga561e02bb626.tar.xz diff --git a/sources b/sources index 3fbc8bc..8e81253 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b1ea71723e5bfe4badf7e87e38a0736 xemacs-20160507hgd5b51c618ef8.tar.xz +04a0b49ae238fb84b5ae928a8e216cf2 xemacs-20160603hga561e02bb626.tar.xz diff --git a/xemacs-21.5.34-setsid.patch b/xemacs-21.5.34-setsid.patch deleted file mode 100644 index b6b0ab8..0000000 --- a/xemacs-21.5.34-setsid.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ./src/process-unix.c.orig 2016-05-28 13:52:40.000000000 -0600 -+++ ./src/process-unix.c 2016-05-28 14:50:54.288035364 -0600 -@@ -1122,10 +1122,8 @@ unix_create_process (Lisp_Process *p, - - /* Disconnect the current controlling terminal, pursuant to - making the pty be the controlling terminal of the process. -- Also put us in our own process group. -- Moved this call to later in the function, because on Cygwin, -- setsid() causes the pty setup to fail in some way. -- disconnect_controlling_terminal (); */ -+ Also put us in our own process group. */ -+ disconnect_controlling_terminal (); - - if (pty_flag) - { -@@ -1244,12 +1242,6 @@ unix_create_process (Lisp_Process *p, - child_setup_tty (xforkout); - } /* if (pty_flag) */ - -- /* Moved this here because of Cygwin. Vin Shelton 2015-03-24. */ -- /* Disconnect the current controlling terminal, pursuant to -- making the pty be the controlling terminal of the process. -- Also put us in our own process group. */ -- disconnect_controlling_terminal (); -- - EMACS_SIGNAL (SIGINT, SIG_DFL); - EMACS_SIGNAL (SIGQUIT, SIG_DFL); - diff --git a/xemacs-21.5.34-tls.patch b/xemacs-21.5.34-tls.patch deleted file mode 100644 index 5d8ab81..0000000 --- a/xemacs-21.5.34-tls.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/tls.c.orig 2016-05-28 13:52:40.000000000 -0600 -+++ ./src/tls.c 2016-05-28 14:20:54.457085311 -0600 -@@ -370,12 +370,6 @@ init_tls (void) - /* Set options on the model socket */ - if (SSL_OptionSet (nss_model, SSL_SECURITY, PR_TRUE) != SECSuccess) - signal_error (Qtls_error, "NSS cannot enable model socket", NSS_ERRSTR); -- if (SSL_OptionSet (nss_model, SSL_ENABLE_SSL2, PR_FALSE) != SECSuccess) -- signal_error (Qtls_error, "NSS unable to disable SSLv2", NSS_ERRSTR); -- if (SSL_OptionSet (nss_model, SSL_V2_COMPATIBLE_HELLO, PR_FALSE) -- != SECSuccess) -- signal_error (Qtls_error, "NSS unable to disable SSLv2 handshake", -- NSS_ERRSTR); - if (SSL_OptionSet (nss_model, SSL_ENABLE_DEFLATE, PR_FALSE) != SECSuccess) - signal_error (Qtls_error, "NSS unable to disable deflate", NSS_ERRSTR); - if (SSL_OptionSet (nss_model, SSL_HANDSHAKE_AS_CLIENT, PR_TRUE) diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh index 51e8eef..fb235dc 100755 --- a/xemacs-snapshot.sh +++ b/xemacs-snapshot.sh @@ -22,7 +22,7 @@ pwd=$(pwd) now=$(date +%Y%m%d) cd "$tmp" -hg clone https://bitbucket.org/xemacs/xemacs-beta +hg clone https://bitbucket.org/xemacs/xemacs xemacs-beta cd xemacs-beta hg update -r "$rev" # Hack to avoid needing .hg/ around but still getting xemacs-extra-name right diff --git a/xemacs.spec b/xemacs.spec index 2d68efc..5e9be5f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20160507hgd5b51c618ef8 +%global snap 20160603hga561e02bb626 Name: xemacs Version: 21.5.34 -Release: 16%{?snap:.%{snap}}%{?dist} +Release: 17%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,10 +61,6 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Don't try to set an option that has been removed from nss -Patch7: %{name}-21.5.34-tls.patch -# Undo a Cygwin fix that breaks M-x shell with tcsh on Linux -Patch8: %{name}-21.5.34-setsid.patch BuildRequires: gcc BuildRequires: texinfo @@ -247,8 +243,6 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 -%patch7 -%patch8 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -673,6 +667,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Jun 3 2016 Jerry James - 21.5.34-17.20160603hga561e02bb626 +- Update to fix NSS breakage +- Drop upstreamed -tls and -setsid patches + * Sat May 28 2016 Jerry James - 21.5.34-16.20160507hgd5b51c618ef8 - Update to latest mercurial snapshot - Fix M-x shell under tcsh (bz 1222897, 1260785) From 155946898a150788745c77b3245fe09028339425 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 18 Oct 2016 14:46:22 -0600 Subject: [PATCH 124/160] Update to latest mercurial snapshot. --- .gitignore | 1 + sources | 2 +- xemacs.spec | 9 +++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 710fdb5..fff02d2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz +/xemacs-20161013hg39f002ba1b8c.tar.xz diff --git a/sources b/sources index 8e81253..7825b50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04a0b49ae238fb84b5ae928a8e216cf2 xemacs-20160603hga561e02bb626.tar.xz +d1b7476b56d730722726f2f1cf4c50dd xemacs-20161013hg39f002ba1b8c.tar.xz diff --git a/xemacs.spec b/xemacs.spec index 5e9be5f..ce66ae1 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20160603hga561e02bb626 +%global snap 20161013hg39f002ba1b8c Name: xemacs Version: 21.5.34 -Release: 17%{?snap:.%{snap}}%{?dist} +Release: 18%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -530,13 +530,11 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null [ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} if [ $1 -eq 0 ] ; then - update-desktop-database %{_datadir}/applications &>/dev/null touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null fi %posttrans -update-desktop-database %{_datadir}/applications &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post nox @@ -667,6 +665,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Oct 18 2016 Jerry James - 21.5.34-18.20161013hg39f002ba1b8c +- Update to latest mercurial snapshot + * Fri Jun 3 2016 Jerry James - 21.5.34-17.20160603hga561e02bb626 - Update to fix NSS breakage - Drop upstreamed -tls and -setsid patches From 350f5ce8b77a0bdf82cf8b461c9e9b7d5ade3d32 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 14 Jan 2017 17:07:56 -0700 Subject: [PATCH 125/160] Update to latest mercurial snapshot (bz 1408201). Also: - Use glibc malloc on all platforms. - Add -with-output-to-string patch. --- .gitignore | 5 +---- sources | 2 +- xemacs-21.5.34-with-output-to-string.patch | 20 ++++++++++++++++++++ xemacs.spec | 18 ++++++++++++------ 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 xemacs-21.5.34-with-output-to-string.patch diff --git a/.gitignore b/.gitignore index fff02d2..d9c9fa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,5 @@ -/xemacs-21.5.34.tar.gz -/xemacs-20140605hgacf1c26e3019.tar.xz -/xemacs-20150420hg23178aa71f8b.tar.xz -/xemacs-20150929hga76c9268bb72.tar.xz /xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz +/xemacs-20170114hgd0e8ec0fe015.tar.xz diff --git a/sources b/sources index 7825b50..4e122b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d1b7476b56d730722726f2f1cf4c50dd xemacs-20161013hg39f002ba1b8c.tar.xz +SHA512 (xemacs-20170114hgd0e8ec0fe015.tar.xz) = 7cf12dee82b714f61eefcef321b7c15cb47ed60debd629120b208689a0eb6f37f414905abf46a470070c4df716edae5d4c46a2c0fe1f249b147ad3b4f57787e8 diff --git a/xemacs-21.5.34-with-output-to-string.patch b/xemacs-21.5.34-with-output-to-string.patch new file mode 100644 index 0000000..9d39345 --- /dev/null +++ b/xemacs-21.5.34-with-output-to-string.patch @@ -0,0 +1,20 @@ +--- lisp/subr.el.orig 2017-01-14 14:43:49.000000000 -0700 ++++ lisp/subr.el 2017-01-14 16:35:55.082156030 -0700 +@@ -624,9 +624,14 @@ + + (defmacro with-output-to-string (&rest body) + "Execute BODY, return the text it sent to `standard-output', as a string." +- `(get-output-stream-string +- (let ((standard-output (make-string-output-stream))) +- (prog1 standard-output ,@body)))) ++ `(let ((standard-output ++ (get-buffer-create (generate-new-buffer-name " *string-output*")))) ++ (let ((standard-output standard-output)) ++ ,@body) ++ (with-current-buffer standard-output ++ (prog1 ++ (buffer-string) ++ (kill-buffer nil))))) + + (defmacro with-local-quit (&rest body) + "Execute BODY with `inhibit-quit' temporarily bound to nil." diff --git a/xemacs.spec b/xemacs.spec index ce66ae1..6529e38 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20161013hg39f002ba1b8c +%global snap 20170114hgd0e8ec0fe015 Name: xemacs Version: 21.5.34 -Release: 18%{?snap:.%{snap}}%{?dist} +Release: 19%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,6 +61,8 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch +# Revert recent buggy change to with-output-to-string +Patch7: %{name}-21.5.34-with-output-to-string.patch BuildRequires: gcc BuildRequires: texinfo @@ -100,7 +102,7 @@ BuildRequires: neXtaw-devel %endif # gtk BuildRequires: libXft-devel # Note: no xemacs-packages-extra dependency here, need main pkg to build it. -Requires: xemacs-packages-base >= 20060510 +Requires: xemacs-packages-base Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi @@ -243,6 +245,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -295,10 +298,8 @@ common_options=" --with-mail-locking=lockf --with-pop --without-hesiod - --with-tls=nss \ -%ifarch alpha ia64 ppc64 mips mipsel + --with-tls=nss --with-system-malloc -%endif --with-pdump %if ! %{with modules} --without-modules @@ -665,6 +666,11 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Jan 14 2017 Jerry James - 21.5.34-19.20170114hg29e551281d78 +- Update to latest mercurial snapshot (bz 1408201) +- Use glibc malloc on all platforms +- Add -with-output-to-string patch + * Tue Oct 18 2016 Jerry James - 21.5.34-18.20161013hg39f002ba1b8c - Update to latest mercurial snapshot From fc2f2f821f4b0c0a45708814ca9965afead4cf26 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 24 Jan 2017 20:35:05 -0700 Subject: [PATCH 126/160] Update to latest mercurial snapshot to really fix bz 1408201. Also, drop upstreamed -with-output-to-string patch. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.34-with-output-to-string.patch | 20 -------------------- xemacs.spec | 11 ++++++----- 4 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 xemacs-21.5.34-with-output-to-string.patch diff --git a/.gitignore b/.gitignore index d9c9fa6..df85b2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/xemacs-20160104hg4d03958b4080.tar.xz /xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz +/xemacs-20170124hgf412e9f093d4.tar.xz diff --git a/sources b/sources index 4e122b3..cec5cc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20170114hgd0e8ec0fe015.tar.xz) = 7cf12dee82b714f61eefcef321b7c15cb47ed60debd629120b208689a0eb6f37f414905abf46a470070c4df716edae5d4c46a2c0fe1f249b147ad3b4f57787e8 +SHA512 (xemacs-20170124hgf412e9f093d4.tar.xz) = 9ff78b9c830fd7deee95075098f80be2aacbec6ba690f3104c82be12648e98af4af8ca90694d8f6c0551ee96e9be44161e4ad08fc61d8959483cca6b4656ec22 diff --git a/xemacs-21.5.34-with-output-to-string.patch b/xemacs-21.5.34-with-output-to-string.patch deleted file mode 100644 index 9d39345..0000000 --- a/xemacs-21.5.34-with-output-to-string.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- lisp/subr.el.orig 2017-01-14 14:43:49.000000000 -0700 -+++ lisp/subr.el 2017-01-14 16:35:55.082156030 -0700 -@@ -624,9 +624,14 @@ - - (defmacro with-output-to-string (&rest body) - "Execute BODY, return the text it sent to `standard-output', as a string." -- `(get-output-stream-string -- (let ((standard-output (make-string-output-stream))) -- (prog1 standard-output ,@body)))) -+ `(let ((standard-output -+ (get-buffer-create (generate-new-buffer-name " *string-output*")))) -+ (let ((standard-output standard-output)) -+ ,@body) -+ (with-current-buffer standard-output -+ (prog1 -+ (buffer-string) -+ (kill-buffer nil))))) - - (defmacro with-local-quit (&rest body) - "Execute BODY with `inhibit-quit' temporarily bound to nil." diff --git a/xemacs.spec b/xemacs.spec index 6529e38..0b6d734 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20170114hgd0e8ec0fe015 +%global snap 20170124hgf412e9f093d4 Name: xemacs Version: 21.5.34 -Release: 19%{?snap:.%{snap}}%{?dist} +Release: 20%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,8 +61,6 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Revert recent buggy change to with-output-to-string -Patch7: %{name}-21.5.34-with-output-to-string.patch BuildRequires: gcc BuildRequires: texinfo @@ -245,7 +243,6 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 -%patch7 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -666,6 +663,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Jan 24 2017 Jerry James - 21.5.34-20.20170124hgf412e9f093d4 +- Update to latest mercurial snapshot to really fix bz 1408201 +- Drop upstreamed -with-output-to-string patch + * Sat Jan 14 2017 Jerry James - 21.5.34-19.20170114hg29e551281d78 - Update to latest mercurial snapshot (bz 1408201) - Use glibc malloc on all platforms From 6ddabfd1a29256a2e41b28fbb7ba023728af0d36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:44:45 +0000 Subject: [PATCH 127/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 0b6d734..b8b904d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 20%{?snap:.%{snap}}%{?dist} +Release: 21%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 21.5.34-21.20170124hgf412e9f093d4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Jan 24 2017 Jerry James - 21.5.34-20.20170124hgf412e9f093d4 - Update to latest mercurial snapshot to really fix bz 1408201 - Drop upstreamed -with-output-to-string patch From 06b7de7139616d81f8e93ffbb291d0e79f9e0575 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 22 Feb 2017 08:51:36 -0700 Subject: [PATCH 128/160] Rebuild for NSS 3.29.1. --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index b8b904d..faa6374 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 21%{?snap:.%{snap}}%{?dist} +Release: 22%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Feb 22 2017 Jerry James - 21.5.34-22.20170124hgf412e9f093d4 +- Rebuild for NSS 3.29.1 + * Sat Feb 11 2017 Fedora Release Engineering - 21.5.34-21.20170124hgf412e9f093d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f0339dbaf00c0e5d1ba26c52cc7f8384b4206523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:59:16 +0000 Subject: [PATCH 129/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index faa6374..e01c644 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 22%{?snap:.%{snap}}%{?dist} +Release: 23%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 21.5.34-23.20170124hgf412e9f093d4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Feb 22 2017 Jerry James - 21.5.34-22.20170124hgf412e9f093d4 - Rebuild for NSS 3.29.1 From e5271126d234ce77c0982d4a00ee39f150bab471 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:34:03 +0000 Subject: [PATCH 130/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index e01c644..a2b03a6 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 23%{?snap:.%{snap}}%{?dist} +Release: 24%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 21.5.34-24.20170124hgf412e9f093d4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 21.5.34-23.20170124hgf412e9f093d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 07647a254b6b04c14df87cd5a9aaf9644fcfe96a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 5 Aug 2017 13:29:30 -0600 Subject: [PATCH 131/160] Update to latest mercurial snapshot for miscellaneous bug fixes. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.25-mk-nochk-features.patch | 6 +++--- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 10 +++++----- xemacs-21.5.28-courier-default.patch | 6 +++--- xemacs.spec | 7 +++++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index df85b2f..87b1f5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/xemacs-20160507hgd5b51c618ef8.tar.xz /xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz /xemacs-20170124hgf412e9f093d4.tar.xz +/xemacs-20170628hg97140cfdeca7.tar.xz diff --git a/sources b/sources index cec5cc8..86d483b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20170124hgf412e9f093d4.tar.xz) = 9ff78b9c830fd7deee95075098f80be2aacbec6ba690f3104c82be12648e98af4af8ca90694d8f6c0551ee96e9be44161e4ad08fc61d8959483cca6b4656ec22 +SHA512 (xemacs-20170628hg97140cfdeca7.tar.xz) = 73a70c084611af0ac33fdb36cfa27a327ca22d2c69721be37b7ad5236bab54e9ece5dd93343ac7ddac696624fe0c35e39d36ad50b0d56d09efae90e1364c1196 diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch index 2a0ce92..79a5a1d 100644 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ b/xemacs-21.5.25-mk-nochk-features.patch @@ -1,6 +1,6 @@ ---- ./Makefile.in.in.orig 2012-08-02 12:38:27.000000000 -0600 -+++ ./Makefile.in.in 2012-08-06 20:27:16.084145753 -0600 -@@ -394,7 +394,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS +--- Makefile.in.in.orig 2017-04-18 09:36:15.000000000 -0600 ++++ Makefile.in.in 2017-04-18 09:38:44.769709731 -0600 +@@ -402,7 +402,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index d553474..b22a228 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,5 +1,5 @@ ---- ./aclocal.m4.orig 2012-08-02 12:38:27.000000000 -0600 -+++ ./aclocal.m4 2012-08-06 20:28:23.842705270 -0600 +--- aclocal.m4.orig 2017-04-18 09:36:15.000000000 -0600 ++++ aclocal.m4 2017-04-18 09:39:55.004373324 -0600 @@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; @@ -12,9 +12,9 @@ ;; esac fi ---- ./configure.orig 2012-08-02 12:39:01.000000000 -0600 -+++ ./configure 2012-08-06 20:28:23.841705350 -0600 -@@ -15045,7 +15045,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +--- configure.orig 2017-04-18 09:36:15.000000000 -0600 ++++ configure 2017-04-18 09:39:55.010373295 -0600 +@@ -15071,7 +15071,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index 4e9cff4..57c3dbb 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,6 +1,6 @@ ---- ./src/faces.c.orig 2012-08-02 12:38:29.000000000 -0600 -+++ ./src/faces.c 2012-08-06 20:29:33.659097709 -0600 -@@ -2484,7 +2484,7 @@ complex_vars_of_faces (void) +--- src/faces.c.orig 2017-04-18 09:36:15.000000000 -0600 ++++ src/faces.c 2017-04-18 09:40:13.685283847 -0600 +@@ -2503,7 +2503,7 @@ complex_vars_of_faces (void) Fcons (Fcons (list1 (device_symbol), diff --git a/xemacs.spec b/xemacs.spec index a2b03a6..8270ba7 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20170124hgf412e9f093d4 +%global snap 20170628hg97140cfdeca7 Name: xemacs Version: 21.5.34 -Release: 24%{?snap:.%{snap}}%{?dist} +Release: 25%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -663,6 +663,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Aug 5 2017 Jerry James - 21.5.34-25.20170628hg97140cfdeca7 +- Update to latest mercurial snapshot for miscellaneous bug fixes + * Thu Aug 03 2017 Fedora Release Engineering - 21.5.34-24.20170124hgf412e9f093d4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a451a963f606040c617feac46290f1bce6eda40a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 28 Nov 2017 20:29:51 -0700 Subject: [PATCH 132/160] Update to latest mercurial snapshot for miscellaneous bug fixes. Drop Canna support (bz 1517235). --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 10 ++++----- xemacs-21.5.34-format-overflow.patch | 11 ++++++++++ xemacs.spec | 25 +++++++++++----------- 5 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 xemacs-21.5.34-format-overflow.patch diff --git a/.gitignore b/.gitignore index 87b1f5c..abea978 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/xemacs-20160603hga561e02bb626.tar.xz /xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz /xemacs-20170124hgf412e9f093d4.tar.xz /xemacs-20170628hg97140cfdeca7.tar.xz +/xemacs-20171125hg700dd03e6a31.tar.xz diff --git a/sources b/sources index 86d483b..2096486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20170628hg97140cfdeca7.tar.xz) = 73a70c084611af0ac33fdb36cfa27a327ca22d2c69721be37b7ad5236bab54e9ece5dd93343ac7ddac696624fe0c35e39d36ad50b0d56d09efae90e1364c1196 +SHA512 (xemacs-20171125hg700dd03e6a31.tar.xz) = 4e5c73c4ad9027962fc6830eeca1bd5ad1ee111387a271a3fe5fbada762523397ffbacebee88b9d1dff281f9c18c3758d1378b695b0dc4832d7f71562b915a8f diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index b22a228..5b498ab 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,5 +1,5 @@ ---- aclocal.m4.orig 2017-04-18 09:36:15.000000000 -0600 -+++ aclocal.m4 2017-04-18 09:39:55.004373324 -0600 +--- aclocal.m4.orig 2017-11-26 14:00:22.000000000 -0700 ++++ aclocal.m4 2017-11-25 14:04:27.613768853 -0700 @@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; @@ -12,9 +12,9 @@ ;; esac fi ---- configure.orig 2017-04-18 09:36:15.000000000 -0600 -+++ configure 2017-04-18 09:39:55.010373295 -0600 -@@ -15071,7 +15071,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +--- configure.orig 2017-11-26 14:00:22.000000000 -0700 ++++ configure 2017-11-25 14:04:27.618768833 -0700 +@@ -15079,7 +15079,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.34-format-overflow.patch b/xemacs-21.5.34-format-overflow.patch new file mode 100644 index 0000000..55e8fbe --- /dev/null +++ b/xemacs-21.5.34-format-overflow.patch @@ -0,0 +1,11 @@ +--- src/process.c.orig 2017-11-25 14:00:22.000000000 -0700 ++++ src/process.c 2017-11-25 14:25:02.487156560 -0700 +@@ -522,7 +522,7 @@ make_process_internal (Lisp_Object name) + name1 = name; + for (i = 1; ; i++) + { +- Ascbyte suffix[10]; ++ Ascbyte suffix[12]; + Lisp_Object tem = Fget_process (name1); + if (NILP (tem)) + break; diff --git a/xemacs.spec b/xemacs.spec index 8270ba7..f8ac591 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20170628hg97140cfdeca7 +%global snap 20171125hg700dd03e6a31 Name: xemacs Version: 21.5.34 -Release: 25%{?snap:.%{snap}}%{?dist} +Release: 26%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -61,6 +61,8 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch +# Patch to be submitted upstream: fix overflow of a buffer via sprintf +Patch7: %{name}-21.5.34-format-overflow.patch BuildRequires: gcc BuildRequires: texinfo @@ -76,7 +78,6 @@ BuildRequires: libtiff-devel BuildRequires: giflib-devel BuildRequires: desktop-file-utils %if %{with mule} -BuildRequires: Canna-devel %if %{with wnn} BuildRequires: FreeWnn-devel %endif # wnn @@ -160,7 +161,7 @@ This package contains XEmacs built without X Windows support. %package xft Summary: Different version of Emacs built with Xft/fontconfig support Requires: %{name}-common = %{version}-%{release} -Requires: xemacs-packages-base >= 20060510 +Requires: xemacs-packages-base Requires(post): chkconfig Requires(post): coreutils Requires(postun): chkconfig @@ -234,7 +235,7 @@ add functionality to XEmacs. %prep %setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} -find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f +find . -type f -name "*.elc" -o -name "*.info*" -exec rm -f {} \+ sed -i -e /tetris/d lisp/menubar-items.el %patch0 %patch1 @@ -243,6 +244,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch4 %patch5 %patch6 +%patch7 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -286,7 +288,8 @@ common_options=" --with-system-packages=%{_datadir}/xemacs --without-msw %if %{with mule} - --with-mule + --with-unicode-internal + --without-canna %endif --with-clash-detection --with-database=berkdb @@ -313,7 +316,6 @@ common_options=" --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \ --with-sound=none \ --with-xim=no \ - --without-canna \ --without-wnn \ --without-x make EMACSDEBUGPATHS=yes # toplevel parallel make fails @@ -582,11 +584,6 @@ fi %ghost %{_bindir}/xemacs %{_bindir}/xemacs-%{xver} %{_libdir}/xemacs-%{xver}/doc/ -%if %{with modules} -%if %{with mule} -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/canna_api.ell -%endif -%endif %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/gnuclient.desktop @@ -663,6 +660,10 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Drop Canna support (bz 1517235) + * Sat Aug 5 2017 Jerry James - 21.5.34-25.20170628hg97140cfdeca7 - Update to latest mercurial snapshot for miscellaneous bug fixes From efb46bac1e99d4b7666bea2bec82d5e7b50707bd Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 28 Dec 2017 17:33:17 -0700 Subject: [PATCH 133/160] Update to latest mercurial snapshot for Unicode support. Also: - Add -gcpro patch to fix FTBFS. - Add -overflow patch to fix possible bad code generation. - Add -data-start patch to fix FTBFS on ppc64/ppc64le. --- .gitignore | 1 + sources | 2 +- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 10 ++--- xemacs-21.5.28-courier-default.patch | 12 ++--- xemacs-21.5.34-data-start.patch | 12 +++++ xemacs-21.5.34-format-overflow.patch | 2 +- xemacs-21.5.34-gcpro.patch | 52 ++++++++++++++++++++++ xemacs-21.5.34-overflow.patch | 20 +++++++++ xemacs.spec | 25 ++++++++--- 9 files changed, 118 insertions(+), 18 deletions(-) create mode 100644 xemacs-21.5.34-data-start.patch create mode 100644 xemacs-21.5.34-gcpro.patch create mode 100644 xemacs-21.5.34-overflow.patch diff --git a/.gitignore b/.gitignore index abea978..5aaa13e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xemacs-20170124hgf412e9f093d4.tar.xz /xemacs-20170628hg97140cfdeca7.tar.xz /xemacs-20171125hg700dd03e6a31.tar.xz +/xemacs-20171227hg27f66ce6ab71.tar.xz diff --git a/sources b/sources index 2096486..f9e904c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20171125hg700dd03e6a31.tar.xz) = 4e5c73c4ad9027962fc6830eeca1bd5ad1ee111387a271a3fe5fbada762523397ffbacebee88b9d1dff281f9c18c3758d1378b695b0dc4832d7f71562b915a8f +SHA512 (xemacs-20171227hg27f66ce6ab71.tar.xz) = 16c66f998f7db4e2ff335d4562c8bba6a9bfea77e7d7d191a9ec21131c35390e7ee2dfcc6894e9ccd2b05226d0629402b2a45e6cd516a4ec81bd88b1a37e5580 diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch index 5b498ab..9d0e902 100644 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ b/xemacs-21.5.27-no-expdyn-ia64-106744.patch @@ -1,5 +1,5 @@ ---- aclocal.m4.orig 2017-11-26 14:00:22.000000000 -0700 -+++ aclocal.m4 2017-11-25 14:04:27.613768853 -0700 +--- aclocal.m4.orig 2017-12-27 09:57:56.000000000 -0700 ++++ aclocal.m4 2017-12-27 09:59:53.773320170 -0700 @@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; @@ -12,9 +12,9 @@ ;; esac fi ---- configure.orig 2017-11-26 14:00:22.000000000 -0700 -+++ configure 2017-11-25 14:04:27.618768833 -0700 -@@ -15079,7 +15079,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib +--- configure.orig 2017-12-27 09:57:56.000000000 -0700 ++++ configure 2017-12-27 09:59:53.778320152 -0700 +@@ -15058,7 +15058,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib ;; *) diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch index 57c3dbb..696fb5d 100644 --- a/xemacs-21.5.28-courier-default.patch +++ b/xemacs-21.5.28-courier-default.patch @@ -1,11 +1,11 @@ ---- src/faces.c.orig 2017-04-18 09:36:15.000000000 -0600 -+++ src/faces.c 2017-04-18 09:40:13.685283847 -0600 -@@ -2503,7 +2503,7 @@ complex_vars_of_faces (void) +--- src/faces.c.orig 2017-12-27 10:00:10.468259293 -0700 ++++ src/faces.c 2017-12-27 10:01:24.744988448 -0700 +@@ -2524,7 +2524,7 @@ complex_vars_of_faces (void) Fcons (Fcons (list1 (device_symbol), -- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")), -+ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")), +- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-m-*-*-*")), ++ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-m-*-*-*")), inst_list); - + #endif /* HAVE_GTK */ #endif /* !HAVE_XFT */ diff --git a/xemacs-21.5.34-data-start.patch b/xemacs-21.5.34-data-start.patch new file mode 100644 index 0000000..a41dac2 --- /dev/null +++ b/xemacs-21.5.34-data-start.patch @@ -0,0 +1,12 @@ +--- src/sysdep.c.orig 2017-12-28 13:34:54.000000000 -0700 ++++ src/sysdep.c 2017-12-28 17:06:55.763497550 -0700 +@@ -1969,7 +1969,8 @@ start_of_data (void) + if (!initialized) + return static_heap_base; + #endif +- return ((char *) &environ); ++ extern char _end; ++ return &_end; + #else + extern int data_start; + return ((char *) &data_start); diff --git a/xemacs-21.5.34-format-overflow.patch b/xemacs-21.5.34-format-overflow.patch index 55e8fbe..116a453 100644 --- a/xemacs-21.5.34-format-overflow.patch +++ b/xemacs-21.5.34-format-overflow.patch @@ -5,7 +5,7 @@ for (i = 1; ; i++) { - Ascbyte suffix[10]; -+ Ascbyte suffix[12]; ++ Ascbyte suffix[16]; Lisp_Object tem = Fget_process (name1); if (NILP (tem)) break; diff --git a/xemacs-21.5.34-gcpro.patch b/xemacs-21.5.34-gcpro.patch new file mode 100644 index 0000000..24d3e3c --- /dev/null +++ b/xemacs-21.5.34-gcpro.patch @@ -0,0 +1,52 @@ +--- src/print.c.orig 2017-12-27 09:57:56.000000000 -0700 ++++ src/print.c 2017-12-27 11:27:07.382631140 -0700 +@@ -464,7 +464,8 @@ output_string (Lisp_Object function, con + if (print_unbuffered) + Lstream_flush (XLSTREAM (function)); + +- RETURN_UNGCPRO (result); ++ UNGCPRO; ++ return result; + } + else if (BUFFERP (function)) + { +@@ -476,7 +477,8 @@ output_string (Lisp_Object function, con + + buffer_insert_string (XBUFFER (function), nonreloc, reloc, offset, len); + +- RETURN_UNGCPRO (len); ++ UNGCPRO; ++ return len; + } + else if (MARKERP (function)) + { +@@ -490,7 +492,8 @@ output_string (Lisp_Object function, con + offset, len, -1, 0); + set_byte_marker_position (function, + byte_marker_position (function) + len); +- RETURN_UNGCPRO (len); /* We will have errored on failure. */ ++ UNGCPRO; ++ return len; /* We will have errored on failure. */ + } + else if (FRAMEP (function)) + { +@@ -507,7 +510,8 @@ output_string (Lisp_Object function, con + clear_echo_area_from_print (f, Qnil, 1); + echo_area_append (f, nonreloc, reloc, offset, len, Vprint_message_label); + +- RETURN_UNGCPRO (len); ++ UNGCPRO; ++ return len; + } + else if (EQ (function, Qt) || EQ (function, Qnil)) + { +@@ -557,7 +561,8 @@ output_string (Lisp_Object function, con + offset += itext_ichar_len (newnonreloc + offset); + } + +- RETURN_UNGCPRO (len); ++ UNGCPRO; ++ return len; + } + } + diff --git a/xemacs-21.5.34-overflow.patch b/xemacs-21.5.34-overflow.patch new file mode 100644 index 0000000..94f6663 --- /dev/null +++ b/xemacs-21.5.34-overflow.patch @@ -0,0 +1,20 @@ +--- src/alloca.c.orig 2017-12-28 13:34:54.000000000 -0700 ++++ src/alloca.c 2017-12-28 13:39:44.078644647 -0700 +@@ -177,15 +177,14 @@ xemacs_c_alloca (size_t size) + + { + #ifdef emacs +- size_t total_size = sizeof (header) + size; + register pointer new_; + +- if (total_size < size || ((Bytecount) (total_size) < 0)) ++ if (SIZE_MAX - size < sizeof(header)) + { + memory_full (); + } + +- new_ = xmalloc ((Bytecount) total_size); ++ new_ = xmalloc ((Bytecount) (size + sizeof(header))); + #else + register pointer new_ = malloc (sizeof (header) + size); + #endif diff --git a/xemacs.spec b/xemacs.spec index f8ac591..40f8f5e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ %bcond_without modules %endif -%global snap 20171125hg700dd03e6a31 +%global snap 20171227hg27f66ce6ab71 Name: xemacs Version: 21.5.34 @@ -61,8 +61,14 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Patch to be submitted upstream: fix overflow of a buffer via sprintf +# Submitted upstream 28 Dec 2017: fix overflow of a buffer via sprintf Patch7: %{name}-21.5.34-format-overflow.patch +# Submitted upstream 28 Dec 2017: fix some ungcpro expressions +Patch8: %{name}-21.5.34-gcpro.patch +# Submitted upstream 28 Dec 2017: do not rely on integer overflow wrapping +Patch9: %{name}-21.5.34-overflow.patch +# Submitted upstream 28 Dec 2017: better computation of data start address +Patch10: %{name}-21.5.34-data-start.patch BuildRequires: gcc BuildRequires: texinfo @@ -89,8 +95,8 @@ BuildRequires: alsa-lib-devel BuildRequires: libdb-devel BuildRequires: gmp-devel %if %{with gtk} -BuildRequires: gtk+-devel -BuildRequires: libglade-devel +BuildRequires: gtk2-devel +BuildRequires: libglade2-devel %else # gtk BuildRequires: xorg-x11-xbitmaps %if %{with xaw3d} @@ -245,6 +251,9 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch5 %patch6 %patch7 +%patch8 +%patch9 +%patch10 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -267,7 +276,7 @@ EOF %build %if %{with gtk} -CFLAGS="$CFLAGS $(pkg-config libglade --cflags) -fno-strict-aliasing" +CFLAGS="$CFLAGS $(pkg-config libglade-2.0 --cflags) -fno-strict-aliasing" %else CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %endif @@ -660,6 +669,12 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Dec 28 2017 Jerry James - 21.5.34-26.20171227hg27f66ce6ab71 +- Update to latest mercurial snapshot for Unicode support +- Add -gcpro patch to fix FTBFS +- Add -overflow patch to fix possible bad code generation +- Add -data-start patch to fix FTBFS on ppc64/ppc64le + * Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 - Update to latest mercurial snapshot for miscellaneous bug fixes - Drop Canna support (bz 1517235) From 932223be1f1b822a0ccdf73400620b3d9169f68d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 28 Dec 2017 22:29:32 -0700 Subject: [PATCH 134/160] Add -endian patch to fix FTBFS on ppc64/s390x. --- xemacs-21.5.34-endian.patch | 11 +++++++++++ xemacs.spec | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 xemacs-21.5.34-endian.patch diff --git a/xemacs-21.5.34-endian.patch b/xemacs-21.5.34-endian.patch new file mode 100644 index 0000000..729454a --- /dev/null +++ b/xemacs-21.5.34-endian.patch @@ -0,0 +1,11 @@ +--- src/config.h.in.orig 2017-12-28 13:34:54.000000000 -0700 ++++ src/config.h.in 2017-12-28 22:15:05.193233587 -0700 +@@ -312,7 +312,7 @@ things are arranged in config.h.in. In + #undef STDC_HEADERS + + #undef TIME_WITH_SYS_TIME +-/* #undef WORDS_BIGENDIAN */ ++#undef WORDS_BIGENDIAN + + #undef HAVE_LONG_FILE_NAMES + diff --git a/xemacs.spec b/xemacs.spec index 40f8f5e..077c2e1 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -69,6 +69,8 @@ Patch8: %{name}-21.5.34-gcpro.patch Patch9: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address Patch10: %{name}-21.5.34-data-start.patch +# Submitted upstream 28 Dec 2017: fix building on big endian architectures +Patch11: %{name}-21.5.34-endian.patch BuildRequires: gcc BuildRequires: texinfo @@ -254,6 +256,7 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch8 %patch9 %patch10 +%patch11 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -674,6 +677,7 @@ fi - Add -gcpro patch to fix FTBFS - Add -overflow patch to fix possible bad code generation - Add -data-start patch to fix FTBFS on ppc64/ppc64le +- Add -endian patch to fix FTBFS on ppc64/s390x * Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 - Update to latest mercurial snapshot for miscellaneous bug fixes From de837c3477505f1def94daee9169e6def6f847ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:28:39 +0000 Subject: [PATCH 135/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 077c2e1..714f599 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 26%{?snap:.%{snap}}%{?dist} +Release: 27%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -672,6 +672,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 21.5.34-27.20171227hg27f66ce6ab71 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Dec 28 2017 Jerry James - 21.5.34-26.20171227hg27f66ce6ab71 - Update to latest mercurial snapshot for Unicode support - Add -gcpro patch to fix FTBFS From 21dca458989e4bd5a634d05118dabd1db9b31a48 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 11 Feb 2018 22:29:52 +0100 Subject: [PATCH 136/160] Rebuild (giflib) --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 714f599..1362688 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 27%{?snap:.%{snap}}%{?dist} +Release: 28%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -672,6 +672,9 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Feb 11 2018 Sandro Mani - 21.5.34-28.20171227hg27f66ce6ab71 +- Rebuild (giflib) + * Fri Feb 09 2018 Fedora Release Engineering - 21.5.34-27.20171227hg27f66ce6ab71 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 339fe2fabe339c7d75829749ba4e43ea4ce9eb80 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 4 Mar 2018 15:10:08 -0700 Subject: [PATCH 137/160] Update to latest mercurial snapshot for miscellaneous bug fixes. Also: - Remove obsolete scriptlets. - Drop upstreamed -endian, -gcpro, and -format-overflow patches. - Install a scalable icon. --- .gitignore | 2 +- sources | 2 +- xemacs-21.5.34-endian.patch | 11 ------ xemacs-21.5.34-format-overflow.patch | 11 ------ xemacs-21.5.34-gcpro.patch | 52 --------------------------- xemacs.png | Bin 1363 -> 0 bytes xemacs.spec | 49 +++++++++---------------- 7 files changed, 18 insertions(+), 109 deletions(-) delete mode 100644 xemacs-21.5.34-endian.patch delete mode 100644 xemacs-21.5.34-format-overflow.patch delete mode 100644 xemacs-21.5.34-gcpro.patch delete mode 100644 xemacs.png diff --git a/.gitignore b/.gitignore index 5aaa13e..ad573eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ -/xemacs-20161013hg39f002ba1b8c.tar.xz /xemacs-20170114hgd0e8ec0fe015.tar.xz /xemacs-20170124hgf412e9f093d4.tar.xz /xemacs-20170628hg97140cfdeca7.tar.xz /xemacs-20171125hg700dd03e6a31.tar.xz /xemacs-20171227hg27f66ce6ab71.tar.xz +/xemacs-20171230hg92757c2b8239.tar.xz diff --git a/sources b/sources index f9e904c..0482249 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20171227hg27f66ce6ab71.tar.xz) = 16c66f998f7db4e2ff335d4562c8bba6a9bfea77e7d7d191a9ec21131c35390e7ee2dfcc6894e9ccd2b05226d0629402b2a45e6cd516a4ec81bd88b1a37e5580 +SHA512 (xemacs-20171230hg92757c2b8239.tar.xz) = 280f83e8b9ab184801351ccf8987034e81dabdef439ffabf87477e47e2685a8c3b277ba6d8d781e9e2dd8657a7f25b5485e1efc3ecaf9fbc69eb48f89be6dd5e diff --git a/xemacs-21.5.34-endian.patch b/xemacs-21.5.34-endian.patch deleted file mode 100644 index 729454a..0000000 --- a/xemacs-21.5.34-endian.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/config.h.in.orig 2017-12-28 13:34:54.000000000 -0700 -+++ src/config.h.in 2017-12-28 22:15:05.193233587 -0700 -@@ -312,7 +312,7 @@ things are arranged in config.h.in. In - #undef STDC_HEADERS - - #undef TIME_WITH_SYS_TIME --/* #undef WORDS_BIGENDIAN */ -+#undef WORDS_BIGENDIAN - - #undef HAVE_LONG_FILE_NAMES - diff --git a/xemacs-21.5.34-format-overflow.patch b/xemacs-21.5.34-format-overflow.patch deleted file mode 100644 index 116a453..0000000 --- a/xemacs-21.5.34-format-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/process.c.orig 2017-11-25 14:00:22.000000000 -0700 -+++ src/process.c 2017-11-25 14:25:02.487156560 -0700 -@@ -522,7 +522,7 @@ make_process_internal (Lisp_Object name) - name1 = name; - for (i = 1; ; i++) - { -- Ascbyte suffix[10]; -+ Ascbyte suffix[16]; - Lisp_Object tem = Fget_process (name1); - if (NILP (tem)) - break; diff --git a/xemacs-21.5.34-gcpro.patch b/xemacs-21.5.34-gcpro.patch deleted file mode 100644 index 24d3e3c..0000000 --- a/xemacs-21.5.34-gcpro.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- src/print.c.orig 2017-12-27 09:57:56.000000000 -0700 -+++ src/print.c 2017-12-27 11:27:07.382631140 -0700 -@@ -464,7 +464,8 @@ output_string (Lisp_Object function, con - if (print_unbuffered) - Lstream_flush (XLSTREAM (function)); - -- RETURN_UNGCPRO (result); -+ UNGCPRO; -+ return result; - } - else if (BUFFERP (function)) - { -@@ -476,7 +477,8 @@ output_string (Lisp_Object function, con - - buffer_insert_string (XBUFFER (function), nonreloc, reloc, offset, len); - -- RETURN_UNGCPRO (len); -+ UNGCPRO; -+ return len; - } - else if (MARKERP (function)) - { -@@ -490,7 +492,8 @@ output_string (Lisp_Object function, con - offset, len, -1, 0); - set_byte_marker_position (function, - byte_marker_position (function) + len); -- RETURN_UNGCPRO (len); /* We will have errored on failure. */ -+ UNGCPRO; -+ return len; /* We will have errored on failure. */ - } - else if (FRAMEP (function)) - { -@@ -507,7 +510,8 @@ output_string (Lisp_Object function, con - clear_echo_area_from_print (f, Qnil, 1); - echo_area_append (f, nonreloc, reloc, offset, len, Vprint_message_label); - -- RETURN_UNGCPRO (len); -+ UNGCPRO; -+ return len; - } - else if (EQ (function, Qt) || EQ (function, Qnil)) - { -@@ -557,7 +561,8 @@ output_string (Lisp_Object function, con - offset += itext_ichar_len (newnonreloc + offset); - } - -- RETURN_UNGCPRO (len); -+ UNGCPRO; -+ return len; - } - } - diff --git a/xemacs.png b/xemacs.png deleted file mode 100644 index 21be91beefb211546897aea4de77cae4d09c91f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1363 zcmchWv1`;|7{;I2JIYl%eAb56LF#u!7Y9p(Qo3mFJ8VF&P1+#cgd;DG>J{Q7wnL#? zk7mi{;&>t`bdcNp3)I2IP5cYoDn#Bdxg>Y>q=NXsm*w}p&-=bll7o%b-RY^zQvjx& zHRS=g$)_>_;MI+9?*LrcxVP2Bb~Q9&A=Wb%j9`)J!7RBq9pp#?rvb z)F2QkC@R3Wi2|7dc{OitXy7sMeP1p*YAKz{U~lrSn?w)7r(qa|PqJ~@BajSSA$||| zLVY=}U@uQs5Cvl^P6KYmQ$@2NS-LrxKT?iWyxJ7ZJ<9J7 z_DI1#?G~hLMbuV}71hwR48~TB?V&ZJjwHL4t%me>AW~NL!KHf)=?qpQe{($e2LYXU ap#uB^eR}b7@5AA(w`}D!Tk5s_aPJpqKhi7! diff --git a/xemacs.spec b/xemacs.spec index 1362688..aab4774 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20171227hg27f66ce6ab71 +%global snap 20171230hg92757c2b8239 Name: xemacs Version: 21.5.34 -Release: 28%{?snap:.%{snap}}%{?dist} +Release: 29%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -35,13 +35,12 @@ Source0: %{name}-%{snap}.tar.xz %else Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz %endif -Source1: %{name}.png +Source1: %{name}.appdata.xml Source2: xemacs.desktop Source3: dotxemacs-init.el Source4: default.el Source5: xemacs-sitestart.el Source6: gnuclient.desktop -Source7: %{name}.appdata.xml # Fedora-specific. Don't run the check-features Makefile target. It checks # that necessary packages are installed, but they aren't installed while @@ -61,16 +60,10 @@ Patch4: %{name}-21.5.28-courier-default.patch Patch5: %{name}-21.5.29-x-server.patch # Submitted upstream by Henry Thompson: fix playing sounds through ALSA Patch6: %{name}-21.5.34-alsaplay.patch -# Submitted upstream 28 Dec 2017: fix overflow of a buffer via sprintf -Patch7: %{name}-21.5.34-format-overflow.patch -# Submitted upstream 28 Dec 2017: fix some ungcpro expressions -Patch8: %{name}-21.5.34-gcpro.patch # Submitted upstream 28 Dec 2017: do not rely on integer overflow wrapping -Patch9: %{name}-21.5.34-overflow.patch +Patch7: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address -Patch10: %{name}-21.5.34-data-start.patch -# Submitted upstream 28 Dec 2017: fix building on big endian architectures -Patch11: %{name}-21.5.34-endian.patch +Patch8: %{name}-21.5.34-data-start.patch BuildRequires: gcc BuildRequires: texinfo @@ -97,8 +90,7 @@ BuildRequires: alsa-lib-devel BuildRequires: libdb-devel BuildRequires: gmp-devel %if %{with gtk} -BuildRequires: gtk2-devel -BuildRequires: libglade2-devel +BuildRequires: gtk3-devel %else # gtk BuildRequires: xorg-x11-xbitmaps %if %{with xaw3d} @@ -254,9 +246,6 @@ sed -i -e /tetris/d lisp/menubar-items.el %patch6 %patch7 %patch8 -%patch9 -%patch10 -%patch11 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -278,11 +267,7 @@ EOF %build -%if %{with gtk} -CFLAGS="$CFLAGS $(pkg-config libglade-2.0 --cflags) -fno-strict-aliasing" -%else CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%endif export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed" @@ -467,7 +452,7 @@ desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ # AppData file mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -install -pm 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/appdata +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata # site-start.el install -dm 755 \ @@ -482,8 +467,8 @@ install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el # icon -install -Dpm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png +install -Dpm 644 etc/xemacs-icon.svg \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/xemacs.png # macro file install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.%{name} @@ -536,18 +521,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %post %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ %{_bindir}/xemacs-%{xver} 80 -touch --no-create %{_datadir}/icons/hicolor &>/dev/null %postun [ -e %{_bindir}/xemacs-%{xver} ] || \ %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %post nox %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ @@ -599,7 +576,7 @@ fi %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/applications/gnuclient.desktop -%{_datadir}/icons/hicolor/48x48/apps/xemacs.png +%{_datadir}/icons/hicolor/scalable/apps/xemacs.png %{_mandir}/man1/gnuclient.1* %{_mandir}/man1/gnudoit.1* @@ -672,6 +649,12 @@ fi %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Mar 3 2018 Jerry James - 21.5.34-29.20171230hg92757c2b8239 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Remove obsolete scriptlets +- Drop upstreamed -endian, -gcpro, and -format-overflow patches +- Install a scalable icon + * Sun Feb 11 2018 Sandro Mani - 21.5.34-28.20171227hg27f66ce6ab71 - Rebuild (giflib) From 0e44989678eda4c8db517bf0f2795488c48a23a0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 7 Jul 2018 16:26:44 -0600 Subject: [PATCH 138/160] Remove info-related scriptlets. --- xemacs.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index aab4774..e87fa1d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -550,20 +550,6 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc [ $1 -ne 0 ] || \ %{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : -%post info -for file in xemacs internals lispref new-users-guide ; do - /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir -done -: - -%preun info -if [ $1 -eq 0 ] ; then - for file in xemacs internals lispref new-users-guide ; do - /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir - done -fi -: - %files %doc Installation From 4317a6357ec19f029d9f2af70a8f503bc0b3bd23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:11:35 +0000 Subject: [PATCH 139/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index e87fa1d..d55b359 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 29%{?snap:.%{snap}}%{?dist} +Release: 30%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 21.5.34-30.20171230hg92757c2b8239 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sat Mar 3 2018 Jerry James - 21.5.34-29.20171230hg92757c2b8239 - Update to latest mercurial snapshot for miscellaneous bug fixes - Remove obsolete scriptlets From ec5eeb720040d2154e40ea3ff0dbba296d69491e Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 15 Oct 2018 00:55:07 +0100 Subject: [PATCH 140/160] Update alternatives dep --- xemacs.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index d55b359..ad0d253 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 30%{?snap:.%{snap}}%{?dist} +Release: 31%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -106,9 +106,9 @@ Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc -Requires(post): chkconfig +Requires(post): /usr/sbin/alternatives Requires(post): coreutils -Requires(postun): chkconfig +Requires(postun): /usr/sbin/alternatives Requires(postun): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -127,8 +127,8 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Byte-compiled lisp files and other common files for XEmacs Requires: %{name}-filesystem = %{version}-%{release} -Requires(post): chkconfig -Requires(preun): chkconfig +Requires(post): /usr/sbin/alternatives +Requires(preun): /usr/sbin/alternatives %description common XEmacs is a highly customizable open source text editor and @@ -144,9 +144,9 @@ Summary: Different version of Emacs built without X Windows support # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} -Requires(post): chkconfig +Requires(post): /usr/sbin/alternatives Requires(post): coreutils -Requires(postun): chkconfig +Requires(postun): /usr/sbin/alternatives Provides: xemacs(bin) = %{version}-%{release} %description nox @@ -162,9 +162,9 @@ This package contains XEmacs built without X Windows support. Summary: Different version of Emacs built with Xft/fontconfig support Requires: %{name}-common = %{version}-%{release} Requires: xemacs-packages-base -Requires(post): chkconfig +Requires(post): /usr/sbin/alternatives Requires(post): coreutils -Requires(postun): chkconfig +Requires(postun): /usr/sbin/alternatives Provides: xemacs(bin) = %{version}-%{release} %description xft @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Oct 14 2018 Peter Robinson 21.5.34-31.20171230hg92757c2b8239 +- Update alternatives dep + * Sat Jul 14 2018 Fedora Release Engineering - 21.5.34-30.20171230hg92757c2b8239 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 8be405a05fa287a1225f57555596a55b49ce57d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:15:00 +0000 Subject: [PATCH 141/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index ad0d253..64e1488 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 31%{?snap:.%{snap}}%{?dist} +Release: 32%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Oct 14 2018 Peter Robinson 21.5.34-31.20171230hg92757c2b8239 - Update alternatives dep From 2fa224b10b7e9d9eea3a772ddcc4002ad226aae2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Mar 2019 20:14:15 -0600 Subject: [PATCH 142/160] Update to latest mercurial snapshot for miscellaneous bug fixes. Also: - Switch from NSS to OpenSSL - Build with openldap support - Enable test suite --- .gitignore | 7 +------ sources | 2 +- xemacs.spec | 40 ++++++++++++++++++++++++---------------- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index ad573eb..7f42168 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/xemacs-20170114hgd0e8ec0fe015.tar.xz -/xemacs-20170124hgf412e9f093d4.tar.xz -/xemacs-20170628hg97140cfdeca7.tar.xz -/xemacs-20171125hg700dd03e6a31.tar.xz -/xemacs-20171227hg27f66ce6ab71.tar.xz -/xemacs-20171230hg92757c2b8239.tar.xz +/xemacs-*.tar.xz diff --git a/sources b/sources index 0482249..55006c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20171230hg92757c2b8239.tar.xz) = 280f83e8b9ab184801351ccf8987034e81dabdef439ffabf87477e47e2685a8c3b277ba6d8d781e9e2dd8657a7f25b5485e1efc3ecaf9fbc69eb48f89be6dd5e +SHA512 (xemacs-20190321hge6bb9f0fcc42.tar.xz) = 27b01cd6d8ea075548339c59490e8615626b9befc67accb6d2f3a37741dfc0d7d91e1414d076009f5b1ce49bbbd1b030b5be089de6af16dc93c1b22a992fc613 diff --git a/xemacs.spec b/xemacs.spec index 64e1488..48357de 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20171230hg92757c2b8239 +%global snap 20190321hge6bb9f0fcc42 Name: xemacs Version: 21.5.34 -Release: 32%{?snap:.%{snap}}%{?dist} +Release: 33%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -69,7 +69,8 @@ BuildRequires: gcc BuildRequires: texinfo BuildRequires: ncurses-devel BuildRequires: gpm-devel -BuildRequires: nss-devel +BuildRequires: openldap-devel +BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: zlib-devel BuildRequires: libjpeg-devel @@ -285,18 +286,18 @@ common_options=" --with-system-packages=%{_datadir}/xemacs --without-msw %if %{with mule} + --with-mule --with-unicode-internal --without-canna %endif --with-clash-detection --with-database=berkdb - --without-ldap + --with-ldap --without-postgresql --with-mail-locking=lockf --with-pop --without-hesiod - --with-tls=nss - --with-system-malloc + --with-tls=openssl --with-pdump %if ! %{with modules} --without-modules @@ -488,19 +489,15 @@ chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/%{xbuild}/gzip-el.sh rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} -cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc +pushd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc rm -r InstallGuide tests XKeysymDB *.1 -cd - +popd # separate files -rm -f *.files base-files el-files info-files -echo "%%defattr(-,root,root,-)" > base-files -echo "%%defattr(-,root,root,-)" > el-files -echo "%%defattr(-,root,root,-)" > info-files - +rm -f *.files base-files el-files +touch base-files el-files find $RPM_BUILD_ROOT%{_datadir}/xemacs{-%{xver},/site-packages/lisp/*} \ \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ - \( -type d -name info -fprint info.files -prune \) -o \ \( -type d -not -name site-start.d -fprintf dir.files "%%%%dir %%p\n" \) -o \ \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ -fprint base-el-not-bytecomped.files \) \) @@ -513,10 +510,12 @@ sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config(noreplace) \1|' \ # combine the file lists cat base-*.files dir.files >> base-files cat el-*.files >> el-files -cat info.files >> info-files install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc +%check +%make_build check + %post %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ @@ -599,6 +598,7 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %{_libdir}/xemacs/ %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc +%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/eldap.ell %endif %{_rpmconfigdir}/macros.d/macros.%{name} %config(noreplace) %{_sysconfdir}/skel/.xemacs/ @@ -611,7 +611,7 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el %endif -%files info -f info-files +%files info %license COPYING %{_infodir}/*.info* @@ -635,6 +635,14 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hge6bb9f0fcc42 +- Enable test suite + +* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hge6bb9f0fcc42 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Switch from NSS to OpenSSL +- Build with openldap support + * Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b05cd20d3cd8bea41064543613f43acc886aede5 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Mar 2019 22:03:17 -0600 Subject: [PATCH 143/160] One more upstream update to fix 32-bit builds. --- sources | 2 +- xemacs.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 55006c8..78d5beb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20190321hge6bb9f0fcc42.tar.xz) = 27b01cd6d8ea075548339c59490e8615626b9befc67accb6d2f3a37741dfc0d7d91e1414d076009f5b1ce49bbbd1b030b5be089de6af16dc93c1b22a992fc613 +SHA512 (xemacs-20190321hg970cd945847e.tar.xz) = 65bb09bc51b72382e41322cc45de07e9375e13aff4eb9e4ac12946239f1ce6b885c803dedb017dc5d4faf67728f39f858464d53f97d8df0780401c95d7e0b0e5 diff --git a/xemacs.spec b/xemacs.spec index 48357de..b1eb87a 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ %bcond_without modules %endif -%global snap 20190321hge6bb9f0fcc42 +%global snap 20190321hg970cd945847e Name: xemacs Version: 21.5.34 @@ -635,10 +635,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog -* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hge6bb9f0fcc42 +* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hg970cd945847e - Enable test suite -* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hge6bb9f0fcc42 +* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hg970cd945847e - Update to latest mercurial snapshot for miscellaneous bug fixes - Switch from NSS to OpenSSL - Build with openldap support From 39d3e7e6bc3f41eff7f3a1316251cd69e8e78ee7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 23 Mar 2019 20:07:46 -0600 Subject: [PATCH 144/160] One more upstream update to fix the big endian build. Obsolete -el subpackage. Compress the Lisp source files. --- sources | 2 +- xemacs.spec | 68 +++++++++++++++++++++-------------------------------- 2 files changed, 28 insertions(+), 42 deletions(-) diff --git a/sources b/sources index 78d5beb..819edf6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20190321hg970cd945847e.tar.xz) = 65bb09bc51b72382e41322cc45de07e9375e13aff4eb9e4ac12946239f1ce6b885c803dedb017dc5d4faf67728f39f858464d53f97d8df0780401c95d7e0b0e5 +SHA512 (xemacs-20190323hgc0ed7ef9a5a1.tar.xz) = 57de142b3cbd829191180f0b8792f245c5978e3e83a23eec5dee402bd31acbf1b24f4f04c3173f7120dba5898b0ff53655b8403050bd69666cb93ee61deed636 diff --git a/xemacs.spec b/xemacs.spec index b1eb87a..1db0281 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,7 +19,7 @@ %bcond_without modules %endif -%global snap 20190321hg970cd945847e +%global snap 20190323hgc0ed7ef9a5a1 Name: xemacs Version: 21.5.34 @@ -126,11 +126,15 @@ and an open software development model, similar to Linux. This package contains XEmacs built for X Windows%{?with_mule: with MULE support}. %package common -Summary: Byte-compiled lisp files and other common files for XEmacs +Summary: Lisp files and other common files for XEmacs Requires: %{name}-filesystem = %{version}-%{release} Requires(post): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives +# This can be removed when F29 reaches EOL +Obsoletes: %{name}-el < 21.5.34-33 +Provides: %{name}-el = %{version}-%{release} + %description common XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -138,7 +142,7 @@ Public License and related to other versions of Emacs, in particular GNU Emacs. Its emphasis is on modern graphical user interface support and an open software development model, similar to Linux. -This package contains byte-compiled lisp and other common files for XEmacs. +This package contains lisp and other common files for XEmacs. %package nox Summary: Different version of Emacs built without X Windows support @@ -177,20 +181,6 @@ and an open software development model, similar to Linux. This package contains XEmacs built with Xft and fontconfig support. -%package el -Summary: Emacs lisp source files for XEmacs -Requires: %{name}-filesystem = %{version}-%{release} - -%description el -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains the lisp source files for XEmacs, mainly of -interest when developing or debugging XEmacs itself. - %package info Summary: XEmacs documentation in GNU texinfo format BuildArch: noarch @@ -410,6 +400,9 @@ EOF %install make install DESTDIR=$RPM_BUILD_ROOT +# Compress the .el files +find %{buildroot}%{_datadir}/xemacs-%{xver} -name \*.el -exec gzip --best {} \+ + %if %{with nox} # install nox files echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 @@ -493,23 +486,16 @@ pushd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc rm -r InstallGuide tests XKeysymDB *.1 popd -# separate files -rm -f *.files base-files el-files -touch base-files el-files -find $RPM_BUILD_ROOT%{_datadir}/xemacs{-%{xver},/site-packages/lisp/*} \ - \( -type f -not -name '*.el' -fprint base-non-el.files \) -o \ - \( -type d -not -name site-start.d -fprintf dir.files "%%%%dir %%p\n" \) -o \ - \( -name '*.el' \( -exec test -e '{}'c \; -fprint el-bytecomped.files -o \ - -fprint base-el-not-bytecomped.files \) \) -sed -i -e "s|$RPM_BUILD_ROOT||" *.files - -# make site-packages lisp files config files -sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config(noreplace) \1|' \ - base-el-not-bytecomped.files - -# combine the file lists -cat base-*.files dir.files >> base-files -cat el-*.files >> el-files +# Generate file list and make site-packages lisp files config files. +# (Note: The double-quote before "(noreplace)" is only to work around +# a bug in rpm-spec-mode). +find $RPM_BUILD_ROOT \ + \( -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver} -o \ + -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/\* -o \ + -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\* \) -a \ + \( \( -type d -not -name site-start.d -fprintf base-files "%%%%dir /%%P\n" \) -o \ + \( -type f -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\*.el.gz -not -exec test -e {}c \; -fprintf base-files "%%%%config""(noreplace) /%%P\n" \) -o \ + \( -type f -fprintf base-files "/%%P\n" \) \) install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc @@ -597,6 +583,7 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %if %{with modules} %{_libdir}/xemacs/ %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ +%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/eldap.ell %endif @@ -606,11 +593,6 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %{_mandir}/man1/gnuserv.1* %{_mandir}/man1/xemacs.1* -%files el -f el-files -%if %{with modules} -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el -%endif - %files info %license COPYING %{_infodir}/*.info* @@ -635,13 +617,17 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog -* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190321hg970cd945847e +* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190323hgc0ed7ef9a5a1 +- Obsolete -el subpackage +- Remove needless use of %%defattr +- Simplify generation of file list - Enable test suite -* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190321hg970cd945847e +* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190323hgc0ed7ef9a5a1 - Update to latest mercurial snapshot for miscellaneous bug fixes - Switch from NSS to OpenSSL - Build with openldap support +- Compress the Lisp source files * Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 482e4ef3139667fcff7565baad1e30c67ad25573 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:01:18 +0000 Subject: [PATCH 145/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 1db0281..f7206cf 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 33%{?snap:.%{snap}}%{?dist} +Release: 34%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -617,6 +617,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 21.5.34-34.20190323hgc0ed7ef9a5a1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190323hgc0ed7ef9a5a1 - Obsolete -el subpackage - Remove needless use of %%defattr From 5a36dcffe11585c87e07d9e4d6f063cc162a7d43 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 24 Jan 2020 22:23:45 -0700 Subject: [PATCH 146/160] Minor spec file cleanups. --- xemacs.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index f7206cf..af263dc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -131,10 +131,6 @@ Requires: %{name}-filesystem = %{version}-%{release} Requires(post): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives -# This can be removed when F29 reaches EOL -Obsoletes: %{name}-el < 21.5.34-33 -Provides: %{name}-el = %{version}-%{release} - %description common XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -226,7 +222,7 @@ add functionality to XEmacs. %prep %setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} -find . -type f -name "*.elc" -o -name "*.info*" -exec rm -f {} \+ +find . -type f -name "*.elc" -o -name "*.info*" -delete sed -i -e /tetris/d lisp/menubar-items.el %patch0 %patch1 From a475a09fb89904cc55315c24844ccc22de62018a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 28 Jan 2020 08:49:54 -0700 Subject: [PATCH 147/160] Replace libdb with gdbm. Use pkgconfig BRs. --- xemacs.spec | 76 ++++++++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index af263dc..bce5560 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -65,51 +65,51 @@ Patch7: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address Patch8: %{name}-21.5.34-data-start.patch -BuildRequires: gcc -BuildRequires: texinfo -BuildRequires: ncurses-devel -BuildRequires: gpm-devel -BuildRequires: openldap-devel -BuildRequires: openssl-devel -BuildRequires: pam-devel -BuildRequires: zlib-devel -BuildRequires: libjpeg-devel BuildRequires: compface-devel -BuildRequires: libpng-devel -BuildRequires: libtiff-devel -BuildRequires: giflib-devel BuildRequires: desktop-file-utils %if %{with mule} %if %{with wnn} BuildRequires: FreeWnn-devel -%endif # wnn -%endif # mule -BuildRequires: xmkmf -BuildRequires: libXau-devel -BuildRequires: libXpm-devel -BuildRequires: alsa-lib-devel -BuildRequires: libdb-devel +%endif +%endif +BuildRequires: gcc +BuildRequires: gdbm-devel +BuildRequires: giflib-devel BuildRequires: gmp-devel +BuildRequires: gpm-devel +BuildRequires: openldap-devel +BuildRequires: pam-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(ncurses) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(xau) +BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zlib) +BuildRequires: texinfo +BuildRequires: xmkmf %if %{with gtk} -BuildRequires: gtk3-devel -%else # gtk +BuildRequires: pkgconfig(gtk+-3.0) +%else BuildRequires: xorg-x11-xbitmaps %if %{with xaw3d} -BuildRequires: Xaw3d-devel -%else # xaw3d +BuildRequires: pkgconfig(xaw3d) +%else BuildRequires: neXtaw-devel -%endif # xaw3d -%endif # gtk -BuildRequires: libXft-devel +%endif +%endif # Note: no xemacs-packages-extra dependency here, need main pkg to build it. Requires: xemacs-packages-base Requires: %{name}-common = %{version}-%{release} Requires: xorg-x11-fonts-ISO8859-1-75dpi Requires: xorg-x11-fonts-ISO8859-1-100dpi Requires: xorg-x11-fonts-misc -Requires(post): /usr/sbin/alternatives +Requires(post): alternatives Requires(post): coreutils -Requires(postun): /usr/sbin/alternatives +Requires(postun): alternatives Requires(postun): coreutils Provides: xemacs(bin) = %{version}-%{release} @@ -128,8 +128,8 @@ This package contains XEmacs built for X Windows%{?with_mule: with MULE support} %package common Summary: Lisp files and other common files for XEmacs Requires: %{name}-filesystem = %{version}-%{release} -Requires(post): /usr/sbin/alternatives -Requires(preun): /usr/sbin/alternatives +Requires(post): alternatives +Requires(preun): alternatives %description common XEmacs is a highly customizable open source text editor and @@ -145,9 +145,9 @@ Summary: Different version of Emacs built without X Windows support # Note: no xemacs-packages* dependencies here, we need -nox to build the # base package set. Requires: %{name}-common = %{version}-%{release} -Requires(post): /usr/sbin/alternatives +Requires(post): alternatives Requires(post): coreutils -Requires(postun): /usr/sbin/alternatives +Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} %description nox @@ -163,9 +163,9 @@ This package contains XEmacs built without X Windows support. Summary: Different version of Emacs built with Xft/fontconfig support Requires: %{name}-common = %{version}-%{release} Requires: xemacs-packages-base -Requires(post): /usr/sbin/alternatives +Requires(post): alternatives Requires(post): coreutils -Requires(postun): /usr/sbin/alternatives +Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} %description xft @@ -307,7 +307,7 @@ mv lib-src/DOC{,-nox} mv src/xemacs{,-nox-%{xver}} mv lib-src/config.values{,-nox} mv Installation{,-nox} -%endif # nox +%endif # build with Xft %configure $common_options \ @@ -409,7 +409,7 @@ install -pm 644 lib-src/DOC-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC install -pm 644 lib-src/config.values-nox \ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values -%endif # nox +%endif # install xft files echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1 @@ -613,6 +613,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Jan 28 2020 Jerry James - 21.5.34-3420190323hgc0ed7ef9a5a1 +- Replace libdb with gdbm +- Use pkgconfig BRs + * Sat Jul 27 2019 Fedora Release Engineering - 21.5.34-34.20190323hgc0ed7ef9a5a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 6b4e167749a7328e430c388b15ebecbcae544b74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:16:14 +0000 Subject: [PATCH 148/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index bce5560..5610c1f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 34%{?snap:.%{snap}}%{?dist} +Release: 35%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -613,6 +613,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 21.5.34-35.20190323hgc0ed7ef9a5a1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Jan 28 2020 Jerry James - 21.5.34-3420190323hgc0ed7ef9a5a1 - Replace libdb with gdbm - Use pkgconfig BRs From 621bba2cd1d7d2114bec274feb7fe416a621765a Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 21 Jul 2020 19:41:14 -0600 Subject: [PATCH 149/160] Explicitly ask configure for gdbm. --- xemacs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 5610c1f..a08b71f 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -277,7 +277,7 @@ common_options=" --without-canna %endif --with-clash-detection - --with-database=berkdb + --with-database=gdbm --with-ldap --without-postgresql --with-mail-locking=lockf From 20b6445349530fb191bed3220438a71480ec3fd1 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 14:54:38 +0000 Subject: [PATCH 150/160] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- xemacs.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xemacs.spec b/xemacs.spec index a08b71f..d510451 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 35%{?snap:.%{snap}}%{?dist} +Release: 36%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -394,7 +394,7 @@ cat > macros.xemacs << EOF EOF %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # Compress the .el files find %{buildroot}%{_datadir}/xemacs-%{xver} -name \*.el -exec gzip --best {} \+ @@ -613,6 +613,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Jul 14 2020 Tom Stellard - 21.5.34-36.20190323hgc0ed7ef9a5a1 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Fri Jan 31 2020 Fedora Release Engineering - 21.5.34-35.20190323hgc0ed7ef9a5a1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e70c0a7c88ccf6a01a68d5ed6db536b7b3f39d15 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 22 Jul 2020 16:32:12 -0600 Subject: [PATCH 151/160] Update to latest mercurial snapshot for miscellaneous bug fixes. - Add -strsignal patch to fix build with latest glibc. --- sources | 2 +- xemacs-21.5.34-strsignal.patch | 85 ++++++++++++++++++++++++++++++++++ xemacs.spec | 21 ++++----- 3 files changed, 95 insertions(+), 13 deletions(-) create mode 100644 xemacs-21.5.34-strsignal.patch diff --git a/sources b/sources index 819edf6..b5901cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xemacs-20190323hgc0ed7ef9a5a1.tar.xz) = 57de142b3cbd829191180f0b8792f245c5978e3e83a23eec5dee402bd31acbf1b24f4f04c3173f7120dba5898b0ff53655b8403050bd69666cb93ee61deed636 +SHA512 (xemacs-20200331hge2ac728aa576.tar.xz) = cfeb5bdef2cb864550674200a3fb95bb71923b248394bca10e1b0e21c3fb79343201ab458219d1a12c46d753194a8ab95ca1b43f7b13e4451a5e0d2886e688e6 diff --git a/xemacs-21.5.34-strsignal.patch b/xemacs-21.5.34-strsignal.patch new file mode 100644 index 0000000..02fa97b --- /dev/null +++ b/xemacs-21.5.34-strsignal.patch @@ -0,0 +1,85 @@ +--- configure.orig 2020-07-22 15:06:06.967107535 -0600 ++++ configure 2020-07-22 15:09:53.877056156 -0600 +@@ -18093,7 +18093,7 @@ done + esac + + +-for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen ++for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen + do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` + ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +--- configure.ac.orig 2020-07-21 21:57:12.000000000 -0600 ++++ configure.ac 2020-07-22 15:09:48.023057483 -0600 +@@ -4563,7 +4563,7 @@ dnl ------------------------------------ + dnl Check for POSIX functions. + dnl ---------------------------------------------------------------- + +-AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) ++AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) + + dnl getaddrinfo() is borked under hpux11 + if test "$ac_cv_func_getaddrinfo" != "no" ; then +--- src/config.h.in.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/config.h.in 2020-07-22 15:08:47.781071118 -0600 +@@ -417,6 +417,7 @@ things are arranged in config.h.in. In + #undef HAVE_SNPRINTF + #undef HAVE_STRERROR + #undef HAVE_STRLWR ++#undef HAVE_STRSIGNAL + #undef HAVE_STRUPR + #undef HAVE_SYMLINK + #undef HAVE_TZSET +--- src/process.c.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/process.c 2020-07-22 15:24:09.884978441 -0600 +@@ -1646,7 +1646,11 @@ const char * + signal_name (int signum) + { + if (signum >= 0 && signum < NSIG) ++#ifdef HAVE_STRSIGNAL ++ return strsignal (signum); ++#else + return (const char *) sys_siglist[signum]; ++#endif + + return (const char *) GETTEXT ("unknown signal"); + } +--- src/s/linux.h.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/s/linux.h 2020-07-22 15:11:55.884028996 -0600 +@@ -36,10 +36,6 @@ Boston, MA 02111-1307, USA. */ + + /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */ + +-/* This is needed for sysdep.c */ +- +-#define HAVE_SYS_SIGLIST +- + /* #define POSIX -- not used in XEmacs */ + + /* Deleted TERM stuff -- probably hugely obsolete */ +--- src/sysdep.c.orig 2020-07-22 15:06:29.217102499 -0600 ++++ src/sysdep.c 2020-07-22 15:30:51.614011813 -0600 +@@ -3521,7 +3521,7 @@ get_random (void) + /* Strings corresponding to defined signals */ + /************************************************************************/ + +-#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) ++#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) + + #if defined(WIN32_NATIVE) || defined(CYGWIN) + const char *sys_siglist[] = +--- src/syssignal.h.orig 2020-07-21 21:57:12.000000000 -0600 ++++ src/syssignal.h 2020-07-22 15:22:23.900976554 -0600 +@@ -263,10 +263,8 @@ signal_handler_t qxe_reliable_signal (in + # endif + #endif + +-/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, +- configure incorrectly fails to find it, so s/linux.h defines +- HAVE_SYS_SIGLIST. */ +-#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) ++/* Systems that have sys_siglist but do not declare it. */ ++#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) + extern const char *sys_siglist[]; + #endif + diff --git a/xemacs.spec b/xemacs.spec index d510451..21b7996 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -19,11 +19,11 @@ %bcond_without modules %endif -%global snap 20190323hgc0ed7ef9a5a1 +%global snap 20200331hge2ac728aa576 Name: xemacs Version: 21.5.34 -Release: 36%{?snap:.%{snap}}%{?dist} +Release: 37%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -64,6 +64,8 @@ Patch6: %{name}-21.5.34-alsaplay.patch Patch7: %{name}-21.5.34-overflow.patch # Submitted upstream 28 Dec 2017: better computation of data start address Patch8: %{name}-21.5.34-data-start.patch +# Submitted upstream 22 Jul 2020: Use strsignal() in preference to sys_siglist +Patch9: %{name}-21.5.34-strsignal.patch BuildRequires: compface-devel BuildRequires: desktop-file-utils @@ -221,18 +223,9 @@ This package contains directories that are required by other packages that add functionality to XEmacs. %prep -%setup -q -n %{name}-%{?snap:beta}%{!?snap:%{version}} +%autosetup -p0 -n %{name}-%{?snap:beta}%{!?snap:%{version}} find . -type f -name "*.elc" -o -name "*.info*" -delete sed -i -e /tetris/d lisp/menubar-items.el -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new touch -r lisp/setup-paths.el lisp/setup-paths.el.new @@ -613,6 +606,10 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Jul 22 2020 Jerry James - 21.5.34-37.20200331hge2ac728aa576 +- Update to latest mercurial snapshot for miscellaneous bug fixes +- Add -strsignal patch to fix build with latest glibc + * Tue Jul 14 2020 Tom Stellard - 21.5.34-36.20190323hgc0ed7ef9a5a1 - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 7db6db0fd375365066afdc424cdc3fb149308e75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:35:09 +0000 Subject: [PATCH 152/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 21b7996..b06825d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 37%{?snap:.%{snap}}%{?dist} +Release: 38%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -606,6 +606,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 21.5.34-38.20200331hge2ac728aa576 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 22 2020 Jerry James - 21.5.34-37.20200331hge2ac728aa576 - Update to latest mercurial snapshot for miscellaneous bug fixes - Add -strsignal patch to fix build with latest glibc From f60634b59139c0ce32d7babbdc88eb9eeda64475 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2020 21:33:37 -0700 Subject: [PATCH 153/160] Explicitly BR make. --- xemacs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xemacs.spec b/xemacs.spec index b06825d..3c5b5dc 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -79,6 +79,7 @@ BuildRequires: gdbm-devel BuildRequires: giflib-devel BuildRequires: gmp-devel BuildRequires: gpm-devel +BuildRequires: make BuildRequires: openldap-devel BuildRequires: pam-devel BuildRequires: pkgconfig(alsa) From 9201297f41b6d91402a067ecf1e65122e6483c1c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 21 Jan 2021 21:27:47 -0700 Subject: [PATCH 154/160] Mark as deprecated (bz 1916926). --- xemacs.spec | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/xemacs.spec b/xemacs.spec index 3c5b5dc..74d02d3 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -116,6 +116,10 @@ Requires(postun): alternatives Requires(postun): coreutils Provides: xemacs(bin) = %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') %global xbuild %(echo %{_build} | sed -e 's/^\\([^-]*-[^-]*-[^-]*\\).*/\\1/') @@ -134,6 +138,10 @@ Requires: %{name}-filesystem = %{version}-%{release} Requires(post): alternatives Requires(preun): alternatives +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description common XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -153,6 +161,10 @@ Requires(post): coreutils Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description nox XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -171,6 +183,10 @@ Requires(post): coreutils Requires(postun): alternatives Provides: xemacs(bin) = %{version}-%{release} +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description xft XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -186,6 +202,10 @@ BuildArch: noarch Requires(post): info Requires(preun): info +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description info XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -200,6 +220,10 @@ Summary: Development files for XEmacs Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description devel XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -213,6 +237,10 @@ This package contains XEmacs development support files. Summary: XEmacs filesystem layout BuildArch: noarch +# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs +# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 +Provides: deprecated() + %description filesystem XEmacs is a highly customizable open source text editor and application development system. It is protected under the GNU General @@ -607,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Thu Jan 21 2021 Jerry James - 21.5.34-38.20200331hge2ac728aa576 +- Mark as deprecated (bz 1916926) + * Wed Jul 29 2020 Fedora Release Engineering - 21.5.34-38.20200331hge2ac728aa576 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 86b2e621c35b286b77d513cf03132a4f2078d893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:55:09 +0000 Subject: [PATCH 155/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 74d02d3..d3576f6 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 38%{?snap:.%{snap}}%{?dist} +Release: 39%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 21.5.34-39.20200331hge2ac728aa576 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 21 2021 Jerry James - 21.5.34-38.20200331hge2ac728aa576 - Mark as deprecated (bz 1916926) From ca3ac70be7482a40d2a10b3a569ba67c2efd5680 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:26:04 +0000 Subject: [PATCH 156/160] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index d3576f6..729043e 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 39%{?snap:.%{snap}}%{?dist} +Release: 40%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -635,6 +635,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 21.5.34-40.20200331hge2ac728aa576 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 21.5.34-39.20200331hge2ac728aa576 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 8dd60e636a1bca0243a42cf559d6fe28a474965b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Aug 2021 09:43:44 -0600 Subject: [PATCH 157/160] Add -xlinker patch to fix link failure. --- xemacs-21.5.34-xlinker.patch | 94 ++++++++++++++++++++++++++++++++++++ xemacs.spec | 11 +++-- 2 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 xemacs-21.5.34-xlinker.patch diff --git a/xemacs-21.5.34-xlinker.patch b/xemacs-21.5.34-xlinker.patch new file mode 100644 index 0000000..0b361f4 --- /dev/null +++ b/xemacs-21.5.34-xlinker.patch @@ -0,0 +1,94 @@ +--- configure.ac.orig 2021-08-04 09:10:32.405958685 -0600 ++++ configure.ac 2021-08-04 09:27:43.671827551 -0600 +@@ -186,7 +186,7 @@ if test "$GCC" = "yes"; then + case [$]1 in + -L | -l | -u ) [$1]="$[$1] [$]1 [$]2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) [$1]="$[$1] [$]1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) [$1]="$[$1] -Xlinker [$]1" ;; + esac + shift +--- configure.orig 2021-08-04 09:10:32.515958873 -0600 ++++ configure 2021-08-04 09:29:53.325030055 -0600 +@@ -9768,7 +9768,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_system="$ld_switch_system $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_system="$ld_switch_system $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_system="$ld_switch_system -Xlinker $1" ;; + esac + shift +@@ -9781,7 +9781,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_machine="$ld_switch_machine $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_machine="$ld_switch_machine $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_machine="$ld_switch_machine -Xlinker $1" ;; + esac + shift +@@ -9794,7 +9794,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_site="$ld_switch_site $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_site="$ld_switch_site $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_site="$ld_switch_site -Xlinker $1" ;; + esac + shift +@@ -9807,7 +9807,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) LDFLAGS="$LDFLAGS $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) LDFLAGS="$LDFLAGS $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) LDFLAGS="$LDFLAGS -Xlinker $1" ;; + esac + shift +@@ -9820,7 +9820,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_call_shared="$ld_call_shared $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_call_shared="$ld_call_shared $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_call_shared="$ld_call_shared -Xlinker $1" ;; + esac + shift +@@ -10104,7 +10104,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) xe_check_libs="$xe_check_libs $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) xe_check_libs="$xe_check_libs $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) xe_check_libs="$xe_check_libs -Xlinker $1" ;; + esac + shift +@@ -10188,7 +10188,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; + esac + shift +@@ -13457,7 +13457,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; + esac + shift +@@ -18065,7 +18065,7 @@ if test "$GCC" = "yes"; then + case $1 in + -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; + -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; +- -Xlinker* ) ;; ++ -Xlinker* | -specs* ) ;; + * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; + esac + shift diff --git a/xemacs.spec b/xemacs.spec index 729043e..2dbe26b 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 40%{?snap:.%{snap}}%{?dist} +Release: 41%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -66,6 +66,8 @@ Patch7: %{name}-21.5.34-overflow.patch Patch8: %{name}-21.5.34-data-start.patch # Submitted upstream 22 Jul 2020: Use strsignal() in preference to sys_siglist Patch9: %{name}-21.5.34-strsignal.patch +# Do not protect -specs=* with -Xlinker +Patch10: %{name}-21.5.34-xlinker.patch BuildRequires: compface-devel BuildRequires: desktop-file-utils @@ -276,10 +278,10 @@ EOF %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +CFLAGS="%{build_cflags} -fno-strict-aliasing" export CFLAGS export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule -export LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed" +export LDFLAGS="%{build_ldflags}" # The --with-*dir args can probably go away in the future if/when upstream # configure learns to honor standard autofoo dirs better. @@ -635,6 +637,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Wed Aug 4 2021 Jerry James - 21.5.34-41.20200331hge2ac728aa576 +- Add -xlinker patch to fix link failure + * Fri Jul 23 2021 Fedora Release Engineering - 21.5.34-40.20200331hge2ac728aa576 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f29cd9af4c1dbfa9701a7034d935caac859e5fca Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:17:57 +0200 Subject: [PATCH 158/160] Rebuilt with OpenSSL 3.0.0 --- xemacs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xemacs.spec b/xemacs.spec index 2dbe26b..32c9c3d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -23,7 +23,7 @@ Name: xemacs Version: 21.5.34 -Release: 41%{?snap:.%{snap}}%{?dist} +Release: 42%{?snap:.%{snap}}%{?dist} Summary: Different version of Emacs %global majver %(cut -d. -f1-2 <<<%{version}) @@ -637,6 +637,9 @@ install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc %dir %{_datadir}/xemacs/site-packages/pkginfo %changelog +* Tue Sep 14 2021 Sahana Prasad - 21.5.34-42.20200331hge2ac728aa576 +- Rebuilt with OpenSSL 3.0.0 + * Wed Aug 4 2021 Jerry James - 21.5.34-41.20200331hge2ac728aa576 - Add -xlinker patch to fix link failure From 9cb7ea0e93314bea87b174961f3f67e455fc736e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 17 Jan 2022 09:54:47 -0700 Subject: [PATCH 159/160] Unmaintained upstream --- .gitignore | 1 - dead.package | 1 + default.el | 28 - dotxemacs-init.el | 4 - gnuclient.desktop | 11 - sources | 1 - xemacs-21.5.25-mk-nochk-features.patch | 11 - xemacs-21.5.25-wnnfix-128362.patch | 61 -- xemacs-21.5.27-no-expdyn-ia64-106744.patch | 28 - xemacs-21.5.28-courier-default.patch | 11 - xemacs-21.5.29-x-server.patch | 11 - xemacs-21.5.34-alsaplay.patch | 13 - xemacs-21.5.34-data-start.patch | 12 - xemacs-21.5.34-overflow.patch | 20 - xemacs-21.5.34-strsignal.patch | 85 -- xemacs-21.5.34-utf8-fonts.patch | 64 -- xemacs-21.5.34-xlinker.patch | 94 -- xemacs-sitestart.el | 156 --- xemacs-snapshot.sh | 34 - xemacs.appdata.xml | 32 - xemacs.desktop | 34 - xemacs.spec | 1078 -------------------- 22 files changed, 1 insertion(+), 1789 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 default.el delete mode 100644 dotxemacs-init.el delete mode 100644 gnuclient.desktop delete mode 100644 sources delete mode 100644 xemacs-21.5.25-mk-nochk-features.patch delete mode 100644 xemacs-21.5.25-wnnfix-128362.patch delete mode 100644 xemacs-21.5.27-no-expdyn-ia64-106744.patch delete mode 100644 xemacs-21.5.28-courier-default.patch delete mode 100644 xemacs-21.5.29-x-server.patch delete mode 100644 xemacs-21.5.34-alsaplay.patch delete mode 100644 xemacs-21.5.34-data-start.patch delete mode 100644 xemacs-21.5.34-overflow.patch delete mode 100644 xemacs-21.5.34-strsignal.patch delete mode 100644 xemacs-21.5.34-utf8-fonts.patch delete mode 100644 xemacs-21.5.34-xlinker.patch delete mode 100644 xemacs-sitestart.el delete mode 100755 xemacs-snapshot.sh delete mode 100644 xemacs.appdata.xml delete mode 100644 xemacs.desktop delete mode 100644 xemacs.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7f42168..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/xemacs-*.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..151f4be --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Unmaintained upstream diff --git a/default.el b/default.el deleted file mode 100644 index 8d4478e..0000000 --- a/default.el +++ /dev/null @@ -1,28 +0,0 @@ -;;; default.el - loaded at startup after "~/.xemacs/init.el" by default -;;; -;;; Setting `inhibit-default-init' to non-nil in "~/.xemacs/init.el" -;;; prevents loading of this file. The "-q" option to xemacs -;;; prevents "~/.xemacs/init.el" *and* this file from being loaded -;;; at startup. - -;; enable wheel mouse support by default -(when window-system - (mwheel-install)) - -;; make gnus save articles be mbox format not rmail format -(defvar gnus-default-article-saver 'gnus-summary-save-in-file) - -;; use terminfo by default -(defvar system-uses-terminfo t) - -;; turn on syntax highlighting by default if lazy-lock is available -(when (fboundp 'turn-on-lazy-lock) - (require 'font-lock) - ;; use lazy-lock by default if lazy-shot is not enabled - (remove-hook 'font-lock-mode-hook 'turn-on-lazy-lock) - (add-hook 'font-lock-mode-hook - (function - (lambda () - (unless (and (boundp 'lazy-shot-mode) lazy-shot-mode) - (turn-on-lazy-lock)))) - t)) diff --git a/dotxemacs-init.el b/dotxemacs-init.el deleted file mode 100644 index 6697754..0000000 --- a/dotxemacs-init.el +++ /dev/null @@ -1,4 +0,0 @@ -;;; ~/.xemacs/init.el - -;;; uncomment this line to disable loading of "default.el" at startup -;(setq inhibit-default-init t) diff --git a/gnuclient.desktop b/gnuclient.desktop deleted file mode 100644 index c06d946..0000000 --- a/gnuclient.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Gnuclient -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=gnuclient %f -Icon=xemacs -Type=Application -Terminal=false -Categories=Application;Utility;TextEditor; -StartupWMClass=XEmacs diff --git a/sources b/sources deleted file mode 100644 index b5901cd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (xemacs-20200331hge2ac728aa576.tar.xz) = cfeb5bdef2cb864550674200a3fb95bb71923b248394bca10e1b0e21c3fb79343201ab458219d1a12c46d753194a8ab95ca1b43f7b13e4451a5e0d2886e688e6 diff --git a/xemacs-21.5.25-mk-nochk-features.patch b/xemacs-21.5.25-mk-nochk-features.patch deleted file mode 100644 index 79a5a1d..0000000 --- a/xemacs-21.5.25-mk-nochk-features.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.in.orig 2017-04-18 09:36:15.000000000 -0600 -+++ Makefile.in.in 2017-04-18 09:38:44.769709731 -0600 -@@ -402,7 +402,7 @@ etc/PROBLEMS: $(srcdir)/PROBLEMS - - install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep - --install: all check-features install-arch-dep install-arch-indep -+install: all install-arch-dep install-arch-indep - - install-arch-dep: mkdir - for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \ diff --git a/xemacs-21.5.25-wnnfix-128362.patch b/xemacs-21.5.25-wnnfix-128362.patch deleted file mode 100644 index 0b64249..0000000 --- a/xemacs-21.5.25-wnnfix-128362.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- src/mule-wnnfns.c.orig 2011-04-29 07:31:16.000000000 -0600 -+++ src/mule-wnnfns.c 2011-05-03 14:00:02.625969757 -0600 -@@ -316,7 +316,7 @@ - Lisp_Object Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji; - Lisp_Object Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko; - Lisp_Object Vwnn_server_type; --Lisp_Object Vcwnn_zhuyin; -+//Lisp_Object Vcwnn_zhuyin; - Lisp_Object Vwnnenv_sticky; - Lisp_Object Vwnn_uniq_level; - Lisp_Object Qchinese_sisheng; -@@ -1914,9 +1914,11 @@ - DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /* - *jserver, cserver .. - */ ); -- DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /* -+#if 0 -+ DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /* - *pinyin or zhuyin - */ ); -+#endif - DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /* - *If non-nil, make environment sticky - */ ); -@@ -1925,7 +1927,7 @@ - */ ); - - Vwnn_server_type = Qjserver; -- Vcwnn_zhuyin = Qnil; -+ //Vcwnn_zhuyin = Qnil; - Vwnnenv_sticky = Qnil; - - DEFSYMBOL (Qchinese_sisheng); -@@ -1952,10 +1954,14 @@ - case 0x80: - if (EQ(Vwnn_server_type, Qcserver)) - { -+#if 0 - len = cwnn_yincod_pzy (pzy, wc, - NILP (Vcwnn_zhuyin) - ? CWNN_PINYIN - : CWNN_ZHUYIN); -+#else -+ len = 0; -+#endif - for (i = 0; i < len; i++) - { - if (pzy[i] & 0x80) -@@ -2055,8 +2061,12 @@ - else *pin = *w; - w++; pin++; - } -+#if 0 - len = cwnn_pzy_yincod (ybuf, pbuf, - NILP (Vcwnn_zhuyin) ? CWNN_PINYIN : CWNN_ZHUYIN); -+#else -+ return; -+#endif - if (len <= 0) - return; - diff --git a/xemacs-21.5.27-no-expdyn-ia64-106744.patch b/xemacs-21.5.27-no-expdyn-ia64-106744.patch deleted file mode 100644 index 9d0e902..0000000 --- a/xemacs-21.5.27-no-expdyn-ia64-106744.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- aclocal.m4.orig 2017-12-27 09:57:56.000000000 -0700 -+++ aclocal.m4 2017-12-27 09:59:53.773320170 -0700 -@@ -533,7 +533,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib - ;; - - *) -- ld_dynamic_link_flags="${wl}-export-dynamic" -+ # avoid -export-dynamic on ia64 -+ if test "$xehost_cpu" != "ia64"; then -+ ld_dynamic_link_flags="${wl}-export-dynamic" -+ fi - ;; - esac - fi ---- configure.orig 2017-12-27 09:57:56.000000000 -0700 -+++ configure 2017-12-27 09:59:53.778320152 -0700 -@@ -15058,7 +15058,10 @@ if test "$xe_gnu_ld" = yes -a "$ld_shlib - ;; - - *) -- ld_dynamic_link_flags="${wl}-export-dynamic" -+ # avoid -export-dynamic on ia64 -+ if test "$xehost_cpu" != "ia64"; then -+ ld_dynamic_link_flags="${wl}-export-dynamic" -+ fi - ;; - esac - fi diff --git a/xemacs-21.5.28-courier-default.patch b/xemacs-21.5.28-courier-default.patch deleted file mode 100644 index 696fb5d..0000000 --- a/xemacs-21.5.28-courier-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/faces.c.orig 2017-12-27 10:00:10.468259293 -0700 -+++ src/faces.c 2017-12-27 10:01:24.744988448 -0700 -@@ -2524,7 +2524,7 @@ complex_vars_of_faces (void) - Fcons - (Fcons - (list1 (device_symbol), -- build_ascstring ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-m-*-*-*")), -+ build_ascstring ("-*-courier-medium-r-*-*-*-120-*-*-m-*-*-*")), - inst_list); - #endif /* HAVE_GTK */ - #endif /* !HAVE_XFT */ diff --git a/xemacs-21.5.29-x-server.patch b/xemacs-21.5.29-x-server.patch deleted file mode 100644 index f72b399..0000000 --- a/xemacs-21.5.29-x-server.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./lisp/x-init.el.orig 2012-08-02 12:38:28.000000000 -0600 -+++ ./lisp/x-init.el 2012-08-06 20:31:09.330411828 -0600 -@@ -154,7 +154,7 @@ it was previously unaware of, the predic - (string-equal "X Consortium" vendor)) - ;; Ok, we think this could be a Sun keyboard. Run the Sun code. - (x-win-init-sun device)) -- ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor) -+ ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation\|Fedora Project" vendor) - ;; Those XFree86 people do some weird keysym stuff, too. - (x-win-init-xfree86 device))))) - diff --git a/xemacs-21.5.34-alsaplay.patch b/xemacs-21.5.34-alsaplay.patch deleted file mode 100644 index eaa9b7c..0000000 --- a/xemacs-21.5.34-alsaplay.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- src/alsaplay.c.orig 2011-05-02 21:22:30.000000000 -0600 -+++ src/alsaplay.c 2015-10-03 10:33:52.961671169 -0600 -@@ -375,6 +375,10 @@ alsa_play_sound_data (const Binbyte *dat - if ((err = snd_pcm_writei (pcm_handle, data, length)) < 0) - goto error_mixer; - -+ /* Wait for it to finish */ -+ if ((err = snd_pcm_drain (pcm_handle)) < 0) -+ goto error_mixer; -+ - /* Put the volume back the way it used to be */ - reset_volume (&mix); - diff --git a/xemacs-21.5.34-data-start.patch b/xemacs-21.5.34-data-start.patch deleted file mode 100644 index a41dac2..0000000 --- a/xemacs-21.5.34-data-start.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/sysdep.c.orig 2017-12-28 13:34:54.000000000 -0700 -+++ src/sysdep.c 2017-12-28 17:06:55.763497550 -0700 -@@ -1969,7 +1969,8 @@ start_of_data (void) - if (!initialized) - return static_heap_base; - #endif -- return ((char *) &environ); -+ extern char _end; -+ return &_end; - #else - extern int data_start; - return ((char *) &data_start); diff --git a/xemacs-21.5.34-overflow.patch b/xemacs-21.5.34-overflow.patch deleted file mode 100644 index 94f6663..0000000 --- a/xemacs-21.5.34-overflow.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/alloca.c.orig 2017-12-28 13:34:54.000000000 -0700 -+++ src/alloca.c 2017-12-28 13:39:44.078644647 -0700 -@@ -177,15 +177,14 @@ xemacs_c_alloca (size_t size) - - { - #ifdef emacs -- size_t total_size = sizeof (header) + size; - register pointer new_; - -- if (total_size < size || ((Bytecount) (total_size) < 0)) -+ if (SIZE_MAX - size < sizeof(header)) - { - memory_full (); - } - -- new_ = xmalloc ((Bytecount) total_size); -+ new_ = xmalloc ((Bytecount) (size + sizeof(header))); - #else - register pointer new_ = malloc (sizeof (header) + size); - #endif diff --git a/xemacs-21.5.34-strsignal.patch b/xemacs-21.5.34-strsignal.patch deleted file mode 100644 index 02fa97b..0000000 --- a/xemacs-21.5.34-strsignal.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- configure.orig 2020-07-22 15:06:06.967107535 -0600 -+++ configure 2020-07-22 15:09:53.877056156 -0600 -@@ -18093,7 +18093,7 @@ done - esac - - --for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen -+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ---- configure.ac.orig 2020-07-21 21:57:12.000000000 -0600 -+++ configure.ac 2020-07-22 15:09:48.023057483 -0600 -@@ -4563,7 +4563,7 @@ dnl ------------------------------------ - dnl Check for POSIX functions. - dnl ---------------------------------------------------------------- - --AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) -+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) - - dnl getaddrinfo() is borked under hpux11 - if test "$ac_cv_func_getaddrinfo" != "no" ; then ---- src/config.h.in.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/config.h.in 2020-07-22 15:08:47.781071118 -0600 -@@ -417,6 +417,7 @@ things are arranged in config.h.in. In - #undef HAVE_SNPRINTF - #undef HAVE_STRERROR - #undef HAVE_STRLWR -+#undef HAVE_STRSIGNAL - #undef HAVE_STRUPR - #undef HAVE_SYMLINK - #undef HAVE_TZSET ---- src/process.c.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/process.c 2020-07-22 15:24:09.884978441 -0600 -@@ -1646,7 +1646,11 @@ const char * - signal_name (int signum) - { - if (signum >= 0 && signum < NSIG) -+#ifdef HAVE_STRSIGNAL -+ return strsignal (signum); -+#else - return (const char *) sys_siglist[signum]; -+#endif - - return (const char *) GETTEXT ("unknown signal"); - } ---- src/s/linux.h.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/s/linux.h 2020-07-22 15:11:55.884028996 -0600 -@@ -36,10 +36,6 @@ Boston, MA 02111-1307, USA. */ - - /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */ - --/* This is needed for sysdep.c */ -- --#define HAVE_SYS_SIGLIST -- - /* #define POSIX -- not used in XEmacs */ - - /* Deleted TERM stuff -- probably hugely obsolete */ ---- src/sysdep.c.orig 2020-07-22 15:06:29.217102499 -0600 -+++ src/sysdep.c 2020-07-22 15:30:51.614011813 -0600 -@@ -3521,7 +3521,7 @@ get_random (void) - /* Strings corresponding to defined signals */ - /************************************************************************/ - --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - - #if defined(WIN32_NATIVE) || defined(CYGWIN) - const char *sys_siglist[] = ---- src/syssignal.h.orig 2020-07-21 21:57:12.000000000 -0600 -+++ src/syssignal.h 2020-07-22 15:22:23.900976554 -0600 -@@ -263,10 +263,8 @@ signal_handler_t qxe_reliable_signal (in - # endif - #endif - --/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, -- configure incorrectly fails to find it, so s/linux.h defines -- HAVE_SYS_SIGLIST. */ --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+/* Systems that have sys_siglist but do not declare it. */ -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - extern const char *sys_siglist[]; - #endif - diff --git a/xemacs-21.5.34-utf8-fonts.patch b/xemacs-21.5.34-utf8-fonts.patch deleted file mode 100644 index 3f99b52..0000000 --- a/xemacs-21.5.34-utf8-fonts.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- etc/Emacs.ad.orig 2013-08-21 11:43:43.000000000 -0600 -+++ etc/Emacs.ad 2013-10-24 20:00:00.000000000 -0600 -@@ -222,36 +222,40 @@ - ! *menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ - ! -*-*-*-*-*-*-*-120-*-jisx0208.1983-0 - ! --*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -+*menubar*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+*popup*Font: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+ -+XEmacs*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \ -+ -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ -+ * -+*menubar*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 --*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \ -+*popup*FontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*, \ - -*-*-*-*-*-*-*-120-*-iso10646-1, \ - -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \ - -*-*-*-*-*-*-*-120-*-jisx0201.1976-0 - - ! Gui elements share this font - ! --Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-* -+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-* - - ! Font in the Motif dialog boxes. - ! (Motif uses `fontList' while most other things use `font' - if you don't - ! know why you probably don't want to.) - ! --*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* --*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* --*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* --*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* -+*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-* -+*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* -+*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* -+*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-*-* - - ! Font in the Athena dialog boxes. - ! I think 14-point looks nicer than 12-point. - ! Some people use 12-point anyway because you get more text, but - ! there's no purpose at all in doing this for dialog boxes. - --*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* -+*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-* - - ! Dialog box translations. - ! ======================= ---- lwlib/xlwmenu.c.orig 2013-08-21 11:43:43.000000000 -0600 -+++ lwlib/xlwmenu.c 2013-10-24 20:00:00.000000000 -0600 -@@ -108,7 +108,7 @@ - /* We must use an iso8859-1 font here, or people without $LANG set lose. - It's fair to assume that those who do have $LANG set also have the - *fontList resource set, or at least know how to deal with this. */ -- XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"), -+ XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-1"), - #else - fontres (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font, - "XtDefaultFont"), diff --git a/xemacs-21.5.34-xlinker.patch b/xemacs-21.5.34-xlinker.patch deleted file mode 100644 index 0b361f4..0000000 --- a/xemacs-21.5.34-xlinker.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- configure.ac.orig 2021-08-04 09:10:32.405958685 -0600 -+++ configure.ac 2021-08-04 09:27:43.671827551 -0600 -@@ -186,7 +186,7 @@ if test "$GCC" = "yes"; then - case [$]1 in - -L | -l | -u ) [$1]="$[$1] [$]1 [$]2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) [$1]="$[$1] [$]1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) [$1]="$[$1] -Xlinker [$]1" ;; - esac - shift ---- configure.orig 2021-08-04 09:10:32.515958873 -0600 -+++ configure 2021-08-04 09:29:53.325030055 -0600 -@@ -9768,7 +9768,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_system="$ld_switch_system $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_system="$ld_switch_system $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_system="$ld_switch_system -Xlinker $1" ;; - esac - shift -@@ -9781,7 +9781,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_machine="$ld_switch_machine $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_machine="$ld_switch_machine $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_machine="$ld_switch_machine -Xlinker $1" ;; - esac - shift -@@ -9794,7 +9794,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_site="$ld_switch_site $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_site="$ld_switch_site $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_site="$ld_switch_site -Xlinker $1" ;; - esac - shift -@@ -9807,7 +9807,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) LDFLAGS="$LDFLAGS $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) LDFLAGS="$LDFLAGS $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) LDFLAGS="$LDFLAGS -Xlinker $1" ;; - esac - shift -@@ -9820,7 +9820,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_call_shared="$ld_call_shared $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_call_shared="$ld_call_shared $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_call_shared="$ld_call_shared -Xlinker $1" ;; - esac - shift -@@ -10104,7 +10104,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) xe_check_libs="$xe_check_libs $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) xe_check_libs="$xe_check_libs $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) xe_check_libs="$xe_check_libs -Xlinker $1" ;; - esac - shift -@@ -10188,7 +10188,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; - esac - shift -@@ -13457,7 +13457,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; - esac - shift -@@ -18065,7 +18065,7 @@ if test "$GCC" = "yes"; then - case $1 in - -L | -l | -u ) ld_switch_run="$ld_switch_run $1 $2"; shift ;; - -L* | -l* | -u* | -Wl* | -pg ) ld_switch_run="$ld_switch_run $1" ;; -- -Xlinker* ) ;; -+ -Xlinker* | -specs* ) ;; - * ) ld_switch_run="$ld_switch_run -Xlinker $1" ;; - esac - shift diff --git a/xemacs-sitestart.el b/xemacs-sitestart.el deleted file mode 100644 index 4fa0353..0000000 --- a/xemacs-sitestart.el +++ /dev/null @@ -1,156 +0,0 @@ -;;; site-start.el - loaded at startup before "~/.xemacs/init.el" -;;; -;;; The "-no-site-file" option to xemacs prevents this file from being loaded. - -;;; psgml catalog list -(setq sgml-catalog-files - (if (getenv "SGML_CATALOG_FILES") - (split-path (getenv "SGML_CATALOG_FILES")) - (list "CATALOG" "catalog" - "/etc/sgml/catalog" - "/etc/xml/catalog" - (locate-data-file "CATALOG")))) - -;; default to non-kerberos ftp -(setq efs-ftp-program-name "/usr/bin/ftp") - -;; default to unified diffs -(setq-default diff-switches "-u") - -;; decrease lazy-lock default threshold -(setq-default lazy-lock-minimum-size (* 2 1024)) - -;; load .el files in "site-start.d/" -(let ((files (directory-files - "/usr/share/xemacs/site-packages/lisp/site-start.d" t "\\.el$"))) - (mapc 'load-file files)) - -;; fix default courier italics -;; for courier, oblique usually produces better results than italic -(setq try-oblique-before-italic-fonts t) -(when window-system - (make-face-italic 'italic) - (make-face-italic 'bold-italic)) - -;; Set up language environment and coding systems -(when (featurep 'mule) - (let* ((locale (getenv "LANG")) - (lang-region (and locale - (substring locale 0 (min 5 (length locale))))) - (lang (and lang-region - (substring lang-region 0 (min 2 (length lang-region)))))) - (cond ((equal lang "af") - (set-language-environment "Afrikaans")) - ((equal lang "sq") - (set-language-environment "Albanian")) - ((equal lang "ca") - (set-language-environment "Catalan")) - ((or (equal lang-region "zh_TW") (equal lang-region "zh_HK")) - (set-language-environment "Chinese-BIG5")) - ((or (equal lang-region "zh_CN") (equal lang-region "zh_SG")) - (set-language-environment "Chinese-GB")) - ((equal lang "hr") - (set-language-environment "Croatian")) - ((equal lang "ru") - (set-language-environment "Cyrillic-KOI8")) - ((equal lang "cs") - (set-language-environment "Czech")) - ((equal lang "da") - (set-language-environment "Danish")) - ((equal lang "nl") - (set-language-environment "Dutch")) - ((equal lang "et") - (set-language-environment "Estonian")) - ((equal lang "fi") - (set-language-environment "Finnish")) - ((equal lang "fr") - (set-language-environment "French")) - ((equal lang "gl") - (set-language-environment "Galician")) - ((equal lang "de") - (set-language-environment "German")) - ((equal lang "el") - (set-language-environment "Greek")) - ((equal lang "kl") - (set-language-environment "Greenlandic")) - ((or (equal lang "he") (equal lang "iw")) - (set-language-environment "Hebrew")) - ((equal lang "hu") - (set-language-environment "Hungarian")) - ((equal lang "ga") - (set-language-environment "Irish")) - ((equal lang "it") - (set-language-environment "Italian")) - ((equal lang "ja") - (set-language-environment "Japanese")) - ((equal lang "ko") - (set-language-environment "Korean")) - ((equal lang "lt") - (set-language-environment "Lithuanian")) - ((equal lang "mt") - (set-language-environment "Maltese")) - ((or (equal lang "nb") (equal lang "nn") (equal lang "no")) - (set-language-environment "Norwegian")) - ((equal lang "pl") - (set-language-environment "Polish")) - ((equal lang "pt") - (set-language-environment "Portuguese")) - ((equal lang "ro") - (set-language-environment "Romanian")) - ((equal lang "sk") - (set-language-environment "Slovak")) - ((equal lang "sl") - (set-language-environment "Slovenian")) - ((equal lang "es") - (set-language-environment "Spanish")) - ((equal lang "sv") - (set-language-environment "Swedish")) - ((equal lang "th") - (set-language-environment "Thai-XTIS")) - ((equal lang "tr") - (set-language-environment "Turkish")) - ((equal lang "vi") - (set-language-environment "Vietnamese")) - (t - (set-language-environment "English"))) - - ;; set-language-environment changes the locale; restore it. - (setenv "LANG" locale) - (set-current-locale (or locale "C")) - - (let* ((tmp (shell-command-to-string "locale charmap")) - (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp))) - (tmp (intern (downcase tmp)))) - (when (find-coding-system tmp) - (let ((cat (or (coding-system-category tmp) tmp))) - (set-coding-priority-list (list cat)) - (set-coding-category-system cat tmp)) - (set-default-output-coding-systems tmp) - (set-keyboard-coding-system tmp) - (set-terminal-coding-system tmp) - (setq file-name-coding-system tmp) - (setq process-coding-system-alist (cons (cons ".*" tmp) '())) - (define-coding-system-alias 'native tmp))) - - ;; Register available Input Methods. - (load "leim-list" t) - (when (member lang '("ja" "ko" "zh")) - ;; ispell doesn't support CJK - (setq-default ispell-local-dictionary "english")))) - -;; Set input mode -;(let ((value (current-input-mode))) -; (set-input-mode (nth 0 value) -; (nth 1 value) -; (terminal-coding-system) -; ;; This quit value is optional -; (nth 3 value))) - -;; try to preserve user/group when saving files -(setq-default backup-by-copying-when-mismatch t) - -;; when saving a buffer always end it with a newline -(setq-default require-final-newline t) - -;; the graphical progress bar is buggy - disable it by default (#188973) -(setq-default progress-feedback-use-echo-area t) diff --git a/xemacs-snapshot.sh b/xemacs-snapshot.sh deleted file mode 100755 index fb235dc..0000000 --- a/xemacs-snapshot.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -set -e - -if [ -z "$1" -o $# -ne 1 ]; then - echo "Usage: $0 " - exit 2 -fi - -rev="$1" -tmp=$(mktemp -d) -tarball="xemacs-$(date +%Y%m%d)hg$rev.tar" - -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} - -unset CDPATH -pwd=$(pwd) -now=$(date +%Y%m%d) - -cd "$tmp" -hg clone https://bitbucket.org/xemacs/xemacs xemacs-beta -cd xemacs-beta -hg update -r "$rev" -# Hack to avoid needing .hg/ around but still getting xemacs-extra-name right -hg identify | cut -d " " -f 1 >> version.sh.in # see configure.ac -rm -r .hg* -cd .. -tar cf "$pwd/$tarball" xemacs-beta -xz -9f "$pwd/$tarball" -cd - >/dev/null diff --git a/xemacs.appdata.xml b/xemacs.appdata.xml deleted file mode 100644 index 00c4be6..0000000 --- a/xemacs.appdata.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - xemacs.desktop - CC0 - GPL-3.0+ - XEmacs - Different version of Emacs - -

- XEmacs is a highly customizable open source text editor and application - development system. -

-

XEmacs is protected under the GNU General Public License. It is related - to other versions of Emacs, in particular GNU Emacs. Its emphasis is on - modern graphical user interface support and an open software development - model, similar to Linux. -

- - - - http://www.xemacs.org/Images/gnus.png - Gnus in XEmacs - - - http://www.xemacs.org/Images/custom.png - Customize buffer - - - james@xemacs.org - http://www.xemacs.org/ - http://tracker.xemacs.org/XEmacs/its/ - diff --git a/xemacs.desktop b/xemacs.desktop deleted file mode 100644 index 817c6d9..0000000 --- a/xemacs.desktop +++ /dev/null @@ -1,34 +0,0 @@ -[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 -Comment[zh_TW]=編輯文字 -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=Application;Utility;TextEditor; -StartupWMClass=XEmacs diff --git a/xemacs.spec b/xemacs.spec deleted file mode 100644 index 32c9c3d..0000000 --- a/xemacs.spec +++ /dev/null @@ -1,1078 +0,0 @@ -# The garbage collector does not work with PIE -%undefine _hardened_build - -# TODO: review desktop entry associations (does text/* work?) -# TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el -# TODO: non-ASCII in buffer tabs - -%bcond_with gtk -%bcond_with wnn -%bcond_with xaw3d -%bcond_with xfs -%bcond_with xim -%bcond_without mule -%bcond_without nox -%ifarch ia64 -# no-expdyn-ia64 patch, https://bugzilla.redhat.com/show_bug.cgi?id=106744#c39 -%bcond_with modules -%else -%bcond_without modules -%endif - -%global snap 20200331hge2ac728aa576 - -Name: xemacs -Version: 21.5.34 -Release: 42%{?snap:.%{snap}}%{?dist} -Summary: Different version of Emacs - -%global majver %(cut -d. -f1-2 <<<%{version}) - -License: GPLv3+ -URL: http://www.xemacs.org/ -%if 0%{?snap:1} -Source0: %{name}-%{snap}.tar.xz -%else -Source0: http://ftp.xemacs.org/xemacs-%{majver}/xemacs-%{version}.tar.gz -%endif -Source1: %{name}.appdata.xml -Source2: xemacs.desktop -Source3: dotxemacs-init.el -Source4: default.el -Source5: xemacs-sitestart.el -Source6: gnuclient.desktop - -# Fedora-specific. Don't run the check-features Makefile target. It checks -# that necessary packages are installed, but they aren't installed while -# building an RPM. -Patch0: %{name}-21.5.25-mk-nochk-features.patch -# Experimental patch. Fix WNN support. This patch is no longer sufficient. -# WNN still doesn't work. -Patch1: %{name}-21.5.25-wnnfix-128362.patch -# Fedora-specific. Don't force ISO-8859 fonts. -Patch2: %{name}-21.5.34-utf8-fonts.patch -# Experimental patch, to be sent upstream eventually. Don't use -# -export-dynamic on IA64; leads to segfaults due to function pointer issues. -Patch3: %{name}-21.5.27-no-expdyn-ia64-106744.patch -# Fedora-specific. Default to courier instead of lucidatypewriter. -Patch4: %{name}-21.5.28-courier-default.patch -# Fedora-specific. Recognize the Fedora X server. -Patch5: %{name}-21.5.29-x-server.patch -# Submitted upstream by Henry Thompson: fix playing sounds through ALSA -Patch6: %{name}-21.5.34-alsaplay.patch -# Submitted upstream 28 Dec 2017: do not rely on integer overflow wrapping -Patch7: %{name}-21.5.34-overflow.patch -# Submitted upstream 28 Dec 2017: better computation of data start address -Patch8: %{name}-21.5.34-data-start.patch -# Submitted upstream 22 Jul 2020: Use strsignal() in preference to sys_siglist -Patch9: %{name}-21.5.34-strsignal.patch -# Do not protect -specs=* with -Xlinker -Patch10: %{name}-21.5.34-xlinker.patch - -BuildRequires: compface-devel -BuildRequires: desktop-file-utils -%if %{with mule} -%if %{with wnn} -BuildRequires: FreeWnn-devel -%endif -%endif -BuildRequires: gcc -BuildRequires: gdbm-devel -BuildRequires: giflib-devel -BuildRequires: gmp-devel -BuildRequires: gpm-devel -BuildRequires: make -BuildRequires: openldap-devel -BuildRequires: pam-devel -BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(ncurses) -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(xau) -BuildRequires: pkgconfig(xft) -BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(zlib) -BuildRequires: texinfo -BuildRequires: xmkmf -%if %{with gtk} -BuildRequires: pkgconfig(gtk+-3.0) -%else -BuildRequires: xorg-x11-xbitmaps -%if %{with xaw3d} -BuildRequires: pkgconfig(xaw3d) -%else -BuildRequires: neXtaw-devel -%endif -%endif -# Note: no xemacs-packages-extra dependency here, need main pkg to build it. -Requires: xemacs-packages-base -Requires: %{name}-common = %{version}-%{release} -Requires: xorg-x11-fonts-ISO8859-1-75dpi -Requires: xorg-x11-fonts-ISO8859-1-100dpi -Requires: xorg-x11-fonts-misc -Requires(post): alternatives -Requires(post): coreutils -Requires(postun): alternatives -Requires(postun): coreutils -Provides: xemacs(bin) = %{version}-%{release} - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%global xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/') -%global xbuild %(echo %{_build} | sed -e 's/^\\([^-]*-[^-]*-[^-]*\\).*/\\1/') - -%description -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs built for X Windows%{?with_mule: with MULE support}. - -%package common -Summary: Lisp files and other common files for XEmacs -Requires: %{name}-filesystem = %{version}-%{release} -Requires(post): alternatives -Requires(preun): alternatives - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description common -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains lisp and other common files for XEmacs. - -%package nox -Summary: Different version of Emacs built without X Windows support -# Note: no xemacs-packages* dependencies here, we need -nox to build the -# base package set. -Requires: %{name}-common = %{version}-%{release} -Requires(post): alternatives -Requires(post): coreutils -Requires(postun): alternatives -Provides: xemacs(bin) = %{version}-%{release} - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description nox -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs built without X Windows support. - -%package xft -Summary: Different version of Emacs built with Xft/fontconfig support -Requires: %{name}-common = %{version}-%{release} -Requires: xemacs-packages-base -Requires(post): alternatives -Requires(post): coreutils -Requires(postun): alternatives -Provides: xemacs(bin) = %{version}-%{release} - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description xft -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs built with Xft and fontconfig support. - -%package info -Summary: XEmacs documentation in GNU texinfo format -BuildArch: noarch -Requires(post): info -Requires(preun): info - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description info -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs documentation in GNU texinfo format. - -%package devel -Summary: Development files for XEmacs -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description devel -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains XEmacs development support files. - -%package filesystem -Summary: XEmacs filesystem layout -BuildArch: noarch - -# https://fedoraproject.org/wiki/Changes/Deprecate_xemacs -# https://bugzilla.redhat.com/show_bug.cgi?id=1916926 -Provides: deprecated() - -%description filesystem -XEmacs is a highly customizable open source text editor and -application development system. It is protected under the GNU General -Public License and related to other versions of Emacs, in particular -GNU Emacs. Its emphasis is on modern graphical user interface support -and an open software development model, similar to Linux. - -This package contains directories that are required by other packages that -add functionality to XEmacs. - -%prep -%autosetup -p0 -n %{name}-%{?snap:beta}%{!?snap:%{version}} -find . -type f -name "*.elc" -o -name "*.info*" -delete -sed -i -e /tetris/d lisp/menubar-items.el - -sed -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el > lisp/setup-paths.el.new -touch -r lisp/setup-paths.el lisp/setup-paths.el.new -mv -f lisp/setup-paths.el.new lisp/setup-paths.el - -for f in man/internals/internals.texi man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta -do - iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f - touch -r $f $f.utf8 - mv -f $f.utf8 $f -done - -# Get reproducible builds by setting the compiling username -mkdir ~/.xemacs -echo >> ~/.xemacs/custom.el << EOF -(custom-set-variables - '(user-mail-address "mockbuild@fedoraproject.org")) -EOF - - -%build -CFLAGS="%{build_cflags} -fno-strict-aliasing" -export CFLAGS -export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule -export LDFLAGS="%{build_ldflags}" - -# The --with-*dir args can probably go away in the future if/when upstream -# configure learns to honor standard autofoo dirs better. -common_options=" - --mandir=%{_mandir}/man1 - --with-archlibdir=%{_libdir}/xemacs-%{xver}/%{xbuild} -%if %{with modules} - --with-moduledir=%{_libdir}/xemacs-%{xver}/%{xbuild}/modules -%endif - --with-lispdir=%{_datadir}/xemacs-%{xver}/lisp - --with-etcdir=%{_datadir}/xemacs-%{xver}/etc - --with-system-packages=%{_datadir}/xemacs - --without-msw -%if %{with mule} - --with-mule - --with-unicode-internal - --without-canna -%endif - --with-clash-detection - --with-database=gdbm - --with-ldap - --without-postgresql - --with-mail-locking=lockf - --with-pop - --without-hesiod - --with-tls=openssl - --with-pdump -%if ! %{with modules} - --without-modules -%endif - --with-debug - --with-error-checking=none - --enable-bignum=gmp - --with-union-type -" - -%if %{with nox} -# build without X -%configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \ - --with-sound=none \ - --with-xim=no \ - --without-wnn \ - --without-x -make EMACSDEBUGPATHS=yes # toplevel parallel make fails -mv lib-src/DOC{,-nox} -mv src/xemacs{,-nox-%{xver}} -mv lib-src/config.values{,-nox} -mv Installation{,-nox} -%endif - -# build with Xft -%configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc-xft \ - --with-sound=nonative,alsa \ - --with-xft=all \ -%if %{with gtk} - --with-gtk \ - --with-gnome \ -%else - --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ - --with-menubars=lucid \ - --with-widgets=athena \ - --with-dialogs=athena \ - --with-scrollbars=lucid \ - --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ -%endif -%if ! %{with wnn} - --without-wnn -%endif -make EMACSDEBUGPATHS=yes # toplevel parallel make fails -mv lib-src/DOC{,-xft} -mv src/xemacs{,-xft-%{xver}} -mv lib-src/config.values{,-xft} -mv Installation{,-xft} - -# build with X -%configure $common_options \ - --with-docdir=%{_libdir}/xemacs-%{xver}/doc \ - --with-sound=nonative,alsa \ -%if %{with xft} - --with-xft=all \ -%else -%if %{with xfs} - --with-xfs \ -%endif -%endif -%if %{with gtk} - --with-gtk \ - --with-gnome \ -%else - --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \ - --with-menubars=lucid \ - --with-widgets=athena \ - --with-dialogs=athena \ - --with-scrollbars=lucid \ - --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \ -%endif -%if ! %{with wnn} - --without-wnn -%endif - -make EMACSDEBUGPATHS=yes # toplevel parallel make fails - -cat << \EOF > xemacs.pc -prefix=%{_prefix} -%if %{with modules} -includedir=%{_libdir}/xemacs-%{xver}/%{xbuild}/include -sitemoduledir=%{_libdir}/xemacs/site-modules -%endif -sitestartdir=%{_datadir}/xemacs/site-packages/lisp/site-start.d -sitepkglispdir=%{_datadir}/xemacs/site-packages/lisp - -Name: xemacs -Description: Different version of Emacs -Version: %{version} -%if %{with modules} -Cflags: -I${includedir} -%endif -EOF - -cat > macros.xemacs << EOF -%%_xemacs_version %{majver} -%%_xemacs_ev %{?epoch:%{epoch}:}%{version} -%%_xemacs_evr %{?epoch:%{epoch}:}%{version}-%{release} -%%_xemacs_sitepkgdir %{_datadir}/xemacs/site-packages -%%_xemacs_sitelispdir %{_datadir}/xemacs/site-packages/lisp -%%_xemacs_sitestartdir %{_datadir}/xemacs/site-packages/lisp/site-start.d -%%_xemacs_bytecompile /usr/bin/xemacs -q -no-site-file -batch -eval '(push "." load-path)' -f batch-byte-compile -%if %{with modules} -%%_xemacs_includedir %{_libdir}/xemacs-%{xver}/%{xbuild}/include -%%_xemacs_sitemoduledir %{_libdir}/xemacs/site-modules -%endif -EOF - -%install -%make_install - -# Compress the .el files -find %{buildroot}%{_datadir}/xemacs-%{xver} -name \*.el -exec gzip --best {} \+ - -%if %{with nox} -# install nox files -echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1 -install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir} -ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox -install -pm 644 lib-src/DOC-nox \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC -install -pm 644 lib-src/config.values-nox \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values -%endif - -# install xft files -echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1 -install -pm 755 src/xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir} -ln -s xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-xft -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft -install -pm 644 lib-src/DOC-xft \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/DOC -install -pm 644 lib-src/config.values-xft \ - $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/config.values - -# these clash with GNU Emacs -mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs} -rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m} -mv $RPM_BUILD_ROOT%{_mandir}/man1/etags{,.xemacs}.1 -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ctags.1 -rm -f $RPM_BUILD_ROOT%{_infodir}/{cl,widget}.info* - -# these clash with other packages -rm -f $RPM_BUILD_ROOT%{_infodir}/info* -rm -f $RPM_BUILD_ROOT%{_infodir}/standards* -rm -f $RPM_BUILD_ROOT%{_infodir}/termcap* -rm -f $RPM_BUILD_ROOT%{_infodir}/dir - -desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE2} - -desktop-file-install --mode=644 --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE6} - -# AppData file -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata - -# site-start.el -install -dm 755 \ - $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d -install -pm 644 %{SOURCE5} \ - $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.el - -# default.el -install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp - -# default user init file -install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el - -# icon -install -Dpm 644 etc/xemacs-icon.svg \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/xemacs.png - -# macro file -install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.%{name} - -# Empty directories for external packages to use -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/etc -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/info -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lib-src -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/man -mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/pkginfo - -# make sure nothing is 0400 -chmod -R a+rX $RPM_BUILD_ROOT%{_prefix} -chmod a+x $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}%{_sysconfdir}/xemacs-fe.sh - -# clean up unneeded stuff (TODO: there's probably much more) -find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs -r rm -rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/%{xbuild}/gzip-el.sh -rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1} -pushd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc -rm -r InstallGuide tests XKeysymDB *.1 -popd - -# Generate file list and make site-packages lisp files config files. -# (Note: The double-quote before "(noreplace)" is only to work around -# a bug in rpm-spec-mode). -find $RPM_BUILD_ROOT \ - \( -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver} -o \ - -path $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/\* -o \ - -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\* \) -a \ - \( \( -type d -not -name site-start.d -fprintf base-files "%%%%dir /%%P\n" \) -o \ - \( -type f -path $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/\*.el.gz -not -exec test -e {}c \; -fprintf base-files "%%%%config""(noreplace) /%%P\n" \) -o \ - \( -type f -fprintf base-files "/%%P\n" \) \) - -install -Dpm 644 xemacs.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xemacs.pc - -%check -%make_build check - - -%post -%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ - %{_bindir}/xemacs-%{xver} 80 - -%postun -[ -e %{_bindir}/xemacs-%{xver} ] || \ -%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} - -%post nox -%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ - %{_bindir}/xemacs-nox-%{xver} 40 || : - -%postun nox -[ -e %{_bindir}/xemacs-nox-%{xver} ] || \ -%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || : - -%post xft -%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \ - %{_bindir}/xemacs-xft-%{xver} 40 || : - -%postun xft -[ -e %{_bindir}/xemacs-xft-%{xver} ] || \ -%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-xft-%{xver} || : - -%post common -%{_sbindir}/alternatives --install %{_bindir}/etags etags \ - %{_bindir}/etags.xemacs 40 || : - -%preun common -[ $1 -ne 0 ] || \ -%{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || : - - -%files -%doc Installation -# gnuclient needs X libs, so not in -common -%{_bindir}/gnuclient -%{_bindir}/gnudoit -%ghost %{_bindir}/xemacs -%{_bindir}/xemacs-%{xver} -%{_libdir}/xemacs-%{xver}/doc/ -%{_datadir}/appdata/%{name}.appdata.xml -%{_datadir}/applications/%{name}.desktop -%{_datadir}/applications/gnuclient.desktop -%{_datadir}/icons/hicolor/scalable/apps/xemacs.png -%{_mandir}/man1/gnuclient.1* -%{_mandir}/man1/gnudoit.1* - -%if %{with nox} -%files nox -%doc Installation-nox -%ghost %{_bindir}/xemacs -%{_bindir}/xemacs-nox -%{_bindir}/xemacs-nox-%{xver} -%{_libdir}/xemacs-%{xver}/doc-nox/ -%{_mandir}/man1/xemacs-nox.1* -%endif - -%files xft -%doc Installation-xft -%ghost %{_bindir}/xemacs -%{_bindir}/xemacs-xft -%{_bindir}/xemacs-xft-%{xver} -%{_libdir}/xemacs-%{xver}/doc-xft/ -%{_mandir}/man1/xemacs-xft.1* - -%files common -f base-files -%doc INSTALL README PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL -%license COPYING -%{_bindir}/etags.xemacs -%{_bindir}/ootags -%{_bindir}/xemacs-script -%dir %{_libdir}/xemacs-%{xver}/ -%dir %{_libdir}/xemacs-%{xver}/%{xbuild}/ -%{_libdir}/xemacs-%{xver}/%{xbuild}/[acdfghprsvwy]* -%{_libdir}/xemacs-%{xver}/%{xbuild}/m[am]* -%{_libdir}/xemacs-%{xver}/%{xbuild}/movemail -%if %{with modules} -%{_libdir}/xemacs/ -%dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/ -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.el -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc -%{_libdir}/xemacs-%{xver}/%{xbuild}/modules/eldap.ell -%endif -%{_rpmconfigdir}/macros.d/macros.%{name} -%config(noreplace) %{_sysconfdir}/skel/.xemacs/ -%{_mandir}/man1/etags.xemacs.1* -%{_mandir}/man1/gnuserv.1* -%{_mandir}/man1/xemacs.1* - -%files info -%license COPYING -%{_infodir}/*.info* - -%files devel -%if %{with modules} -%{_bindir}/ellcc -%{_libdir}/xemacs-%{xver}/%{xbuild}/include/ -%endif -%{_libdir}/pkgconfig/xemacs.pc - -%files filesystem -%dir %{_datadir}/xemacs -%dir %{_datadir}/xemacs/site-lisp -%dir %{_datadir}/xemacs/site-packages -%dir %{_datadir}/xemacs/site-packages/etc -%dir %{_datadir}/xemacs/site-packages/info -%dir %{_datadir}/xemacs/site-packages/lib-src -%dir %{_datadir}/xemacs/site-packages/lisp -%dir %{_datadir}/xemacs/site-packages/lisp/site-start.d -%dir %{_datadir}/xemacs/site-packages/man -%dir %{_datadir}/xemacs/site-packages/pkginfo - -%changelog -* Tue Sep 14 2021 Sahana Prasad - 21.5.34-42.20200331hge2ac728aa576 -- Rebuilt with OpenSSL 3.0.0 - -* Wed Aug 4 2021 Jerry James - 21.5.34-41.20200331hge2ac728aa576 -- Add -xlinker patch to fix link failure - -* Fri Jul 23 2021 Fedora Release Engineering - 21.5.34-40.20200331hge2ac728aa576 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 21.5.34-39.20200331hge2ac728aa576 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 21 2021 Jerry James - 21.5.34-38.20200331hge2ac728aa576 -- Mark as deprecated (bz 1916926) - -* Wed Jul 29 2020 Fedora Release Engineering - 21.5.34-38.20200331hge2ac728aa576 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 22 2020 Jerry James - 21.5.34-37.20200331hge2ac728aa576 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Add -strsignal patch to fix build with latest glibc - -* Tue Jul 14 2020 Tom Stellard - 21.5.34-36.20190323hgc0ed7ef9a5a1 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Fri Jan 31 2020 Fedora Release Engineering - 21.5.34-35.20190323hgc0ed7ef9a5a1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Jan 28 2020 Jerry James - 21.5.34-3420190323hgc0ed7ef9a5a1 -- Replace libdb with gdbm -- Use pkgconfig BRs - -* Sat Jul 27 2019 Fedora Release Engineering - 21.5.34-34.20190323hgc0ed7ef9a5a1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Mar 21 2019 Tim Landscheidt - 21.5.34-33.20190323hgc0ed7ef9a5a1 -- Obsolete -el subpackage -- Remove needless use of %%defattr -- Simplify generation of file list -- Enable test suite - -* Thu Mar 21 2019 Jerry James - 21.5.34-33.20190323hgc0ed7ef9a5a1 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Switch from NSS to OpenSSL -- Build with openldap support -- Compress the Lisp source files - -* Sun Feb 03 2019 Fedora Release Engineering - 21.5.34-32.20171230hg92757c2b8239 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Oct 14 2018 Peter Robinson 21.5.34-31.20171230hg92757c2b8239 -- Update alternatives dep - -* Sat Jul 14 2018 Fedora Release Engineering - 21.5.34-30.20171230hg92757c2b8239 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Mar 3 2018 Jerry James - 21.5.34-29.20171230hg92757c2b8239 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Remove obsolete scriptlets -- Drop upstreamed -endian, -gcpro, and -format-overflow patches -- Install a scalable icon - -* Sun Feb 11 2018 Sandro Mani - 21.5.34-28.20171227hg27f66ce6ab71 -- Rebuild (giflib) - -* Fri Feb 09 2018 Fedora Release Engineering - 21.5.34-27.20171227hg27f66ce6ab71 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Dec 28 2017 Jerry James - 21.5.34-26.20171227hg27f66ce6ab71 -- Update to latest mercurial snapshot for Unicode support -- Add -gcpro patch to fix FTBFS -- Add -overflow patch to fix possible bad code generation -- Add -data-start patch to fix FTBFS on ppc64/ppc64le -- Add -endian patch to fix FTBFS on ppc64/s390x - -* Tue Nov 28 2017 Jerry James - 21.5.34-26.20171125hg700dd03e6a31 -- Update to latest mercurial snapshot for miscellaneous bug fixes -- Drop Canna support (bz 1517235) - -* Sat Aug 5 2017 Jerry James - 21.5.34-25.20170628hg97140cfdeca7 -- Update to latest mercurial snapshot for miscellaneous bug fixes - -* Thu Aug 03 2017 Fedora Release Engineering - 21.5.34-24.20170124hgf412e9f093d4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 21.5.34-23.20170124hgf412e9f093d4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Feb 22 2017 Jerry James - 21.5.34-22.20170124hgf412e9f093d4 -- Rebuild for NSS 3.29.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 21.5.34-21.20170124hgf412e9f093d4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jan 24 2017 Jerry James - 21.5.34-20.20170124hgf412e9f093d4 -- Update to latest mercurial snapshot to really fix bz 1408201 -- Drop upstreamed -with-output-to-string patch - -* Sat Jan 14 2017 Jerry James - 21.5.34-19.20170114hg29e551281d78 -- Update to latest mercurial snapshot (bz 1408201) -- Use glibc malloc on all platforms -- Add -with-output-to-string patch - -* Tue Oct 18 2016 Jerry James - 21.5.34-18.20161013hg39f002ba1b8c -- Update to latest mercurial snapshot - -* Fri Jun 3 2016 Jerry James - 21.5.34-17.20160603hga561e02bb626 -- Update to fix NSS breakage -- Drop upstreamed -tls and -setsid patches - -* Sat May 28 2016 Jerry James - 21.5.34-16.20160507hgd5b51c618ef8 -- Update to latest mercurial snapshot -- Fix M-x shell under tcsh (bz 1222897, 1260785) - -* Sat Feb 20 2016 Jerry James - 21.5.34-15.20160104hg4d03958b4080 -- Update to latest mercurial snapshot - -* Fri Feb 05 2016 Fedora Release Engineering - 21.5.34-14.20150929hga76c9268bb72 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Dec 30 2015 Michal Toman - 21.5.34-13.20150929hga76c9268bb72 -- Use system malloc on 32-bit MIPS (bz 1294893) - -* Sat Oct 3 2015 Jerry James - 21.5.34-12.20150929hga76c9268bb72 -- Update to snapshot: fixes multiple bugs -- Add -alsaplay patch to fix playing sounds through ALSA - -* Fri Jun 19 2015 Fedora Release Engineering - 21.5.34-11.20150420hg23178aa71f8b -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 20 2015 Jerry James - 21.5.34-10.20150420hg23178aa71f8b -- Update to snapshot: fixes multiple bugs -- Drop upstreamed -c11 patch -- Enable NSS support - -* Mon Feb 9 2015 Jerry James - 21.5.34-9.20140605hgacf1c26e3019 -- Add -c11 patch to fix build failure with gcc 5.0 -- Set compiling username to get reproducible builds -- Use license macro - -* Mon Aug 18 2014 Fedora Release Engineering - 21.5.34-8.20140605hgacf1c26e3019 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 21.5.34-7.20140605hgacf1c26e3019 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 5 2014 Jerry James - 21.5.34-6.20140605hgacf1c26e3019 -- Update to snapshot: fixes bz 1095405 and allows diagnosis of bz 1078159 -- Update snapshot creating script to use bitbucket and maximally compress -- Don't need to exclude texinfo info files; upstream has dropped them - -* Wed Feb 5 2014 Jerry James - 21.5.34-5 -- Disable XIM by default. It hasn't worked since the release of Fedora 19 due - to a fixed size buffer inside libX11 that is too small (see _XimProtoCreateIC - in modules/im/ximcp/imDefIc.c), and nobody has complained. -- Update location of rpm macro file for rpm >= 4.11 - -* Tue Nov 12 2013 Jerry James - 21.5.34-4 -- Add an AppData file - -* Fri Oct 25 2013 Jerry James - 21.5.34-3 -- Update the -utf8-fonts patch to remove more references to iso8859 fonts - -* Wed Oct 2 2013 Jerry James - 21.5.34-2 -- Don't package the texinfo info files; they clash with texinfo 5.2 - -* Thu Aug 22 2013 Jerry James - 21.5.34-1 -- New upstream version -- Drop upstreamed -menubar, -aarch64, and -texinfo patches -- Drop unnecessary sed BR - -* Sun Aug 04 2013 Fedora Release Engineering - 21.5.33-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 19 2013 Jerry James - 21.5.33-6 -- Rebuild for libpng 1.6 - -* Mon Apr 8 2013 Jerry James - 21.5.33-5 -- Add -texinfo patch to fix problems with texinfo 5 (bz 923365) -- Add -aarch64 patch (bz 926766) -- Build with libdb version 5 -- Emacs started shipping cl and widget info files, so we drop them - -* Tue Feb 5 2013 Jerry James - 21.5.33-4 -- Update -menubar patch so :visible keyword is accepted in menus (bz 890565) - -* Mon Jan 21 2013 Jerry James - 21.5.33-3 -- Add -menubar patch to fix bz 890565 - -* Mon Jan 21 2013 Adam Tkac - 21.5.33-2 -- rebuild due to "jpeg8-ABI" feature drop - -* Mon Jan 7 2013 Jerry James - 21.5.33-1 -- New upstream version -- Drop upstreamed view-mode patch - -* Fri Dec 21 2012 Adam Tkac - 21.5.32-2 -- rebuild against new libjpeg - -* Mon Aug 6 2012 Jerry James - 21.5.32-1 -- New upstream version -- Drop upstreamed patches -- Running autoconf no longer necessary -- Drop conditionals for ancient versions of Fedora -- Package X versions of lib-src binaries to get gnuclient linked with -lXau - -* Sun Jul 22 2012 Fedora Release Engineering - 21.5.31-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 7 2012 Jerry James - 21.5.31-4 -- Rebuild for GCC 4.7 -- Minor spec file cleanups - -* Mon Nov 7 2011 Jerry James - 21.5.31-3 -- Rebuild with new libpng - -* Wed Oct 26 2011 Marcela Mašláňová - 21.5.31-2.2 -- rebuild with new gmp without compat lib - -* Wed Oct 12 2011 Peter Schiffer - 21.5.31-2.1 -- rebuild with new gmp - -* Fri Aug 5 2011 Jerry James - 21.5.31-2 -- Build --with-union-type to avoid a make-int bug in lisp-disunion.h -- Add view-mode patch (bz 709399) -- Add get-other-frame patch from upstream -- Add lib-src patch to eliminate unnecessary linkage - -* Tue May 3 2011 Jerry James - 21.5.31-1 -- Update to 21.5.31 -- License is now GPLv3+ -- Drop upstreamed patches: x-paths, image-overflow, no-xft, png, tty-font, - etags-memmove, arabic, dired, infodir -- Rebase and renumber remaining patches -- Drop workaround for ancient alternatives bug - -* Tue Mar 1 2011 Jerry James - 21.5.29-18 -- Make -filesystem subpackage be noarch. - -* Tue Mar 1 2011 Jerry James - 21.5.29-17 -- Add filesystem subpackage (bz 672093). -- Add gnuclient desktop file. -- Fix CFLAGS so -fno-strict-aliasing actually gets used. -- Add . to the default load-path in _xemacs_bytecompile. -- Update Requires for pre/post(un) scripts. - -* Mon Feb 07 2011 Fedora Release Engineering - 21.5.29-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Dec 1 2010 Jerry James - 21.5.29-15 -- Don't create /var/lock/xemacs; it is not used (bz 656723). -- Drop the BuildRoot tag. -- Ship COPYING with the -info subpackage. - -* Wed Nov 10 2010 Jerry James - 21.5.29-14 -- Create and own subdirectories of site-packages - -* Tue Jul 6 2010 Jerry James - 21.5.29-13 -- Add db4 support (bz 581614). -- Add -xft subpackage (bz 356961). -- Recognize Fedora's X server. - -* Tue Mar 2 2010 Jerry James - 21.5.29-12 -- Remove the bitmap-fonts dependency. - -* Thu Jan 7 2010 Jerry James - 21.5.29-11 -- New upstream patch for bz 547840. -- Add dired patch for large files (bz 550145). -- Replace "lzma" with "xz" for snapshots. - -* Mon Dec 21 2009 Jerry James - 21.5.29-10 -- Don't crash with a Persian keyboard layout (bz 547840) - -* Tue Dec 8 2009 Jerry James - 21.5.29-9 -- Add patch to use memmove in etags (bz 545399). - -* Mon Nov 9 2009 Jerry James - 21.5.29-8 -- Move macros.xemacs to the -common subpackage (bz 533611). -- Updated TTY font patch from upstream. - -* Tue Nov 3 2009 Jerry James - 21.5.29-7 -- Make the desktop file consistent with Emacs (bz 532296). - -* Wed Oct 28 2009 Jerry James - 21.5.29-6 -- Bring back the courier font patch; that was a red herring. -- Really, seriously fix bz 512623 with a TTY font patch. -- Fix the version number in macros.xemacs. -- Build with bignum support. -- Turn off OSS support. - -* Wed Sep 23 2009 Jerry James - 21.5.29-5 -- Final fix for bz 512623, which is actually two bugs, because ... -- ... the courier font patch breaks TTY font detection. Removed that patch - and Require bitmap-fonts to supply the original font name. -- Add macros.xemacs (bz 480546) -- Add png patch to fix a problem with reading PNG files - -* Wed Aug 26 2009 Jerry James - 21.5.29-4 -- Use upstream's attempt at fixing #512623 instead of mine, which didn't work. - -* Mon Aug 24 2009 Jerry James - 21.5.29-3 -- Fix image overflow bug (CVE-2009-2688). -- Fix calling xft-font-create-object in non-Xft builds (#512623). -- Rebase patches to eliminate fuzz/offsets. - -* Mon Jul 27 2009 Fedora Release Engineering - 21.5.29-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed May 20 2009 Ville Skyttä - 21.5.29-1 -- Update to 21.5.29; gtk-gcc4, finder-lisp-dir, 3d-athena, autoconf262, - doc-encodings, revert-modified, and xemacs-base-autoloads patches applied - upstream. - -* Thu Mar 12 2009 Ville Skyttä - 21.5.28-13 -- Add possibility to build upstream hg snapshots. -- Add dependency on xorg-x11-fonts-misc (#478370, Carl Brune). -- Include Installation{,-nox} in docs. - -* Sun Mar 8 2009 Ville Skyttä - 21.5.28-12 -- Make XFontSet support optional at build time and disable it by default - to work around #478370. - -* Thu Feb 26 2009 Ville Skyttä - 21.5.28-11 -- Apply upstream autoload changes to be able to build recent XEmacs packages. -- Make support for XIM optional at build time, still enabled by default. -- Drop support for building without stack protector compiler flags. -- Make -info subpackage noarch when built for Fedora >= 10. -- Improve icon cache and desktop database refresh scriptlets. -- Use %%global instead of %%define. - -* Thu Feb 26 2009 Fedora Release Engineering - 21.5.28-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jul 20 2008 Ville Skyttä - 21.5.28-9 -- Rebuild. - -* Sun Jul 6 2008 Ville Skyttä - 21.5.28-8 -- Apply upstream fix for detection of 3D Athena widget sets. - -* Sun Jul 6 2008 Ville Skyttä - 21.5.28-7 -- Fix build with autoconf >= 2.62 (#449626). - -* Tue Feb 19 2008 Fedora Release Engineering - 21.5.28-6 -- Autorebuild for GCC 4.3 - -* Fri Aug 17 2007 Ville Skyttä - 21.5.28-5 -- Turn on syntax highlighting by default only if lazy-lock is available. -- Requires(post): coreutils in main package and -nox. -- Scriptlet cleanups. -- License: GPLv2+ - -* Sat Jun 30 2007 Ville Skyttä - 21.5.28-4 -- Turn on syntax highlighting with lazy-lock by default. -- Drop Application and X-Fedora categories and Encoding from desktop entry. -- Move diff-switches default from skeleton init.el to site-start.el. - -* Sun Jun 24 2007 Ville Skyttä - 21.5.28-3 -- Apply upstream fix for #245017. - -* Wed Jun 6 2007 Ville Skyttä - 21.5.28-2 -- Set more dirs explicitly until upstream configure honors them better. -- Borrow DESTDIR install patch from openSUSE. -- Add pkgconfig file to -devel. - -* Mon May 21 2007 Ville Skyttä - 21.5.28-1 -- 21.5.28, module path fix applied upstream. -- Patch to retain courier as the default font. -- Fix some corrupt characters in docs. - -* Fri May 18 2007 Ville Skyttä - 21.5.27-9 -- Require one of the actual editor variants in -common. -- Require -common in -el, drop duplicate dir ownerships. - -* Wed Jan 24 2007 Ville Skyttä - 21.5.27-8 -- Fix canna_api.ell install/load paths (#222559). -- Fix site-start.el locale setup when the LANG env var is unset. - -* Thu Jan 4 2007 Ville Skyttä - 21.5.27-7 -- Don't run autoconf during build. - -* Wed Jan 3 2007 Ville Skyttä - 21.5.27-6 -- Fix site-start.el coding system setup in non-UTF8 locales (#213582). -- Fix "--without modules" build. - -* Mon Oct 2 2006 Ville Skyttä - 21.5.27-5 -- Rebuild. - -* Wed Sep 20 2006 Ville Skyttä - 21.5.27-4 -- Disable graphical progress bar by default (#188973). -- Make Wnn support optional at build time, disabled by default. - -* Sun Sep 10 2006 Ville Skyttä - 21.5.27-3 -- Adjust to split xemacs-packages-{base,extra}. -- Provide xemacs(bin) in main package and -nox. - -* Sat Sep 2 2006 Ville Skyttä - 21.5.27-2 -- Fix build when previous revision of the same XEmacs version is installed. -- BuildRequire compface-devel instead of compface. -- Turn error checking off. -- Specfile cleanups. - -* Tue May 16 2006 Ville Skyttä - 21.5.27-1 -- 21.5.27, maximize patch included upstream. -- Drop no longer needed find-paths patch. -- Fix alternatives setup. - -* Sun May 7 2006 Ville Skyttä - 21.5.26-5 -- Apply upstream fix for window maximization problems (#111225). - -* Sun Apr 23 2006 Ville Skyttä - 21.5.26-4 -- Bring StartupWMClass in desktop entry up to date. -- Fix non-MULE build. - -* Sat Apr 15 2006 Ville Skyttä - 21.5.26-3 -- Don't expect to find ellcc if building without modules (#188929). -- New --with/--without rpmbuild flags: - - xft: enable/disable Xft support, default disabled. - - nox: enable/disable building the non-X version, default enabled - - modules: enable/disable module support, default arch-dependent. -- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE). -- Move gnuserv to -common, gnudoit to base package, drop gnuattach. -- Split ellcc and headers to -devel subpackage. -- Drop unneeded libXaw-devel build dependency. -- Move -nox "man page" to -nox subpackage. -- Fix GTK build and glade detection for it. -- Avoid -common dependency on ALSA. - -* Thu Apr 6 2006 Ville Skyttä - 21.5.26-2 -- Borrow Mike Fabian's site-start.el work from the SuSE package. - -* Tue Apr 4 2006 Ville Skyttä - 21.5.26-1 -- 21.5.26 (WIP). -- Make %%{_bindir}/xemacs an alternative (main/nox). -- Convert some info docs to UTF-8. - -* Fri Mar 31 2006 Ville Skyttä - 21.5.25-1 -- 21.5.25 (WIP). -- Trim pre-21.5 %%changelog entries. From e30d09c952db39821d10c4a20c74745807560dd6 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 31 Jan 2022 18:05:17 -0800 Subject: [PATCH 160/160] epel8-playground decommissioned : https://pagure.io/epel/issue/136 --- .cvsignore | 0 Makefile | 21 --------------------- dead.package | 1 + sources | 0 4 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 2b27083..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xemacs -# $Id$ -NAME := xemacs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..a72aec0 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +epel8-playground decommissioned : https://pagure.io/epel/issue/136 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000