aboutsummaryrefslogtreecommitdiff
path: root/development/xemacs/patches
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-04 19:53:01 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit7067111589bd57a44ba1eaba8cbc2d7e95811d2a (patch)
treeb0eaa0b0316dcb0d6498c2254d1e2c762d6d0b71 /development/xemacs/patches
parent20f9f3bb1e450874bcafa99269863bd471032543 (diff)
development/xemacs: Updated for version 21.5.34.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/xemacs/patches')
-rw-r--r--development/xemacs/patches/check-features.patch11
-rw-r--r--development/xemacs/patches/dump-paths.patch27
-rw-r--r--development/xemacs/patches/lib64.patch49
-rw-r--r--development/xemacs/patches/mod-shift.patch30
4 files changed, 20 insertions, 97 deletions
diff --git a/development/xemacs/patches/check-features.patch b/development/xemacs/patches/check-features.patch
deleted file mode 100644
index 7da578a4b435..000000000000
--- a/development/xemacs/patches/check-features.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xemacs-21.4.15/Makefile.in.in.orig 2004-07-09 19:00:27.000000000 -0400
-+++ xemacs-21.4.15/Makefile.in.in 2004-07-09 19:00:46.000000000 -0400
-@@ -403,7 +403,7 @@
- ## all. --cet
-
- check-features: all
-- ${blddir}/src/${PROGNAME} -batch -l check-features.el
-+ ${blddir}/src/${PROGNAME} -batch -l ${blddir}/lisp/check-features.el
-
- install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
-
diff --git a/development/xemacs/patches/dump-paths.patch b/development/xemacs/patches/dump-paths.patch
deleted file mode 100644
index d5278013d805..000000000000
--- a/development/xemacs/patches/dump-paths.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Subject: Re: Compiling XEmacs when same version is already installed
-From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-Date: 31 Jul 2001 20:23:42 +0200
-http://list-archive.xemacs.org/xemacs/200108/msg00001.html
-
---- xemacs-21.4.4/lisp/dump-paths.el.orig Tue Jul 31 19:47:56 2001
-+++ xemacs-21.4.4/lisp/dump-paths.el Tue Jul 31 19:56:14 2001
-@@ -58,10 +58,18 @@
- late-packages late-package-load-path)
- 'external-debugging-output)))
-
-- (setq lisp-directory (paths-find-lisp-directory roots))
-+ (let ((build-root (expand-file-name ".." invocation-directory)))
-+ (setq lisp-directory (expand-file-name "lisp" build-root))
-+ (setq module-directory (expand-file-name "modules" build-root)))
-+
- (if debug-paths
- (princ (format "lisp-directory:\n%S\n" lisp-directory)
- 'external-debugging-output))
-+
-+ (if debug-paths
-+ (princ (format "module-directory:\n%S\n" module-directory)
-+ 'external-debugging-output))
-+
- (if (featurep 'mule)
- (progn
- (setq mule-lisp-directory
diff --git a/development/xemacs/patches/lib64.patch b/development/xemacs/patches/lib64.patch
index 41f985bd43ce..4a1ff07097bc 100644
--- a/development/xemacs/patches/lib64.patch
+++ b/development/xemacs/patches/lib64.patch
@@ -1,29 +1,20 @@
---- xemacs-21.4.22/lisp/find-paths.el.orig 2011-08-05 13:42:44.545564371 -0400
-+++ xemacs-21.4.22/lisp/find-paths.el 2011-08-05 13:43:10.205459415 -0400
-@@ -103,7 +103,7 @@
- (or
- ;; installed
- (paths-file-readable-directory-p (paths-construct-path (list directory
-- "lib"
-+ "lib64"
- emacs-program-name)))
- ;; in-place or windows-nt
- (and
-@@ -216,7 +216,7 @@
- (paths-find-emacs-directory roots
- (file-name-as-directory
- (paths-construct-path (list
-- "lib"
-+ "lib64"
- emacs-program-name)))
- base
- envvar default
-@@ -230,7 +230,7 @@
- (paths-find-emacs-directory roots
- (file-name-as-directory
- (paths-construct-path
-- (list "lib"
-+ (list "lib64"
- (construct-emacs-version-name))))
- base
- envvar default
+--- xemacs-21.5.34/lisp/find-paths.el.old 2016-01-04 18:49:46.227528964 +0700
++++ xemacs-21.5.34/lisp/find-paths.el 2016-01-04 18:50:32.334978047 +0700
+@@ -226,7 +226,7 @@
+ roots
+ (file-name-as-directory
+ (paths-construct-path (list
+- (if arch-dependent-p "lib" "share")
++ (if arch-dependent-p "lib64" "share")
+ emacs-program-name)))
+ bases
+ envvar default))
+@@ -276,7 +276,7 @@
+ roots
+ (file-name-as-directory
+ (paths-construct-path
+- (list (if arch-dependent-p "lib" "share")
++ (list (if arch-dependent-p "lib64" "share")
+ (construct-emacs-version-name))))
+ bases
+ envvar default))
diff --git a/development/xemacs/patches/mod-shift.patch b/development/xemacs/patches/mod-shift.patch
deleted file mode 100644
index 9ca292a7efa5..000000000000
--- a/development/xemacs/patches/mod-shift.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- xemacs-21.4.15/src/event-Xt.c.orig 2004-07-09 11:02:02.000000000 -0400
-+++ xemacs-21.4.15/src/event-Xt.c 2004-07-09 11:02:23.000000000 -0400
-@@ -1253,7 +1253,26 @@
- KeySym bot = XLookupKeysym (ev, Mode_switch_p ? 2 : 0);
- KeySym top = XLookupKeysym (ev, Mode_switch_p ? 3 : 1);
- if (top && bot && top != bot)
-- modifiers &= ~XEMACS_MOD_SHIFT;
-+ // SAM
-+ switch(top) {
-+ case 0x1008fe01:
-+ case 0x1008fe02:
-+ case 0x1008fe03:
-+ case 0x1008fe04:
-+ case 0x1008fe05:
-+ case 0x1008fe06:
-+ case 0x1008fe07:
-+ case 0x1008fe08:
-+ case 0x1008fe09:
-+ case 0x1008fe0a:
-+ case 0x1008fe0b:
-+ case 0x1008fe0c:
-+ break;
-+ default:
-+ modifiers &= ~XEMACS_MOD_SHIFT;
-+ break;
-+ }
-+ //SAM
- }
- emacs_event->event_type = key_press_event;
- emacs_event->timestamp = ev->time;