diff options
| author | hauke <hauke@pkgsrc.org> | 2015-11-11 15:02:33 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2015-11-11 15:02:33 +0000 |
| commit | 24a24d24a5827e70a8506715087bb922bc0b93e8 (patch) | |
| tree | d27083e297203b0eabb7c80631699f6d9e8a7549 | |
| parent | 170f46da01b54eba30c2c1f6187aeb43ef0a1924 (diff) | |
| download | pkgsrc-24a24d24a5827e70a8506715087bb922bc0b93e8.tar.gz | |
Unbreak xemacs-nox11 by fixing guided-tour, which is in autostart.
| -rw-r--r-- | editors/xemacs-packages/Makefile | 4 | ||||
| -rw-r--r-- | editors/xemacs-packages/distinfo | 3 | ||||
| -rw-r--r-- | editors/xemacs-packages/patches/patch-lisp_guided-tour_guided-tour.el | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile index bdfbfd0b4fd..bad366ad72d 100644 --- a/editors/xemacs-packages/Makefile +++ b/editors/xemacs-packages/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.64 2015/09/30 10:11:45 hauke Exp $ +# $NetBSD: Makefile,v 1.65 2015/11/11 15:02:33 hauke Exp $ DISTNAME= xemacs-packages PKGNAME= xemacs-packages-1.17 -#PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_XEMACS:=packages/} diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo index 3fac0c53a29..b9d35c111a1 100644 --- a/editors/xemacs-packages/distinfo +++ b/editors/xemacs-packages/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2015/11/03 03:32:23 agc Exp $ +$NetBSD: distinfo,v 1.22 2015/11/11 15:02:33 hauke Exp $ SHA1 (xemacs-packages/Sun-1.16-pkg.tar.gz) = a23d5ff683e28ec1d8ae24f6e5a163005bc6615d RMD160 (xemacs-packages/Sun-1.16-pkg.tar.gz) = 4fc6848fcc0d5dd542c2b79260969898aaefcf06 @@ -512,5 +512,6 @@ SHA1 (xemacs-packages/zenirc-1.16-pkg.tar.gz) = 1b4569d41ac0429611a4e7b3fa8c7aab RMD160 (xemacs-packages/zenirc-1.16-pkg.tar.gz) = 8eca17ee3dce43632b1a3a8887856727b4f7b48c SHA512 (xemacs-packages/zenirc-1.16-pkg.tar.gz) = 2fd93791a94682bd26a2133a9a10b13587aa5a5d0b9a559c9589153f3132810c86d5fd7c6b607f2b777f22edf3aa4eab61d47ca161e0c2bf8b4a6f43ced2a07c Size (xemacs-packages/zenirc-1.16-pkg.tar.gz) = 277377 bytes +SHA1 (patch-lisp_guided-tour_guided-tour.el) = 28556cc7fbb9a18ba88d6e2cf23f3b517461f580 SHA1 (patch-lisp_vc_vc-git.el) = 5b55c88501fca6e6680875e7bbd21e76dc06ea1b SHA1 (patch-lisp_vc_vc.el) = ec13ecf02b41dca5bb80afc63ee4fb9f0b283a45 diff --git a/editors/xemacs-packages/patches/patch-lisp_guided-tour_guided-tour.el b/editors/xemacs-packages/patches/patch-lisp_guided-tour_guided-tour.el new file mode 100644 index 00000000000..268bd3bc677 --- /dev/null +++ b/editors/xemacs-packages/patches/patch-lisp_guided-tour_guided-tour.el @@ -0,0 +1,20 @@ +$NetBSD: patch-lisp_guided-tour_guided-tour.el,v 1.1 2015/11/11 15:02:33 hauke Exp $ + +xemacs-nox11 does not sport a menu, but just returning nil will blow +up later - we need to at least return an empty tuple. + +--- lisp/guided-tour/guided-tour.el.orig 2008-03-25 07:43:42.000000000 +0000 ++++ lisp/guided-tour/guided-tour.el +@@ -79,8 +79,10 @@ removing any existing instances of the s + + ;; #### this probably should move to help.el or menubar-items.el + (defun guided-tour-find-menubar-help-menu (&optional menubar) +- "Return the Help submenu for MENUBAR if present, else nil." +- (assoc "%_Help" (or menubar default-menubar))) ++ "Return the Help submenu for MENUBAR if present, else an empty menu." ++ (if (boundp 'default-menubar) ++ (assoc "%_Help" (or menubar default-menubar)) ++ '(nil nil))) + + (defun guided-tour-about-xemacs-index (menu) + "Return the (zero-based) index of the About XEmacs item in MENU. |