diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-07-14 21:14:04 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-07-14 21:14:04 +0000 |
| commit | aaea47784f73bf87c5db0bee86a8d195b0c75afe (patch) | |
| tree | e4fa613ddd8a744b8408af1871a60fcf2863ff81 /app-emacs | |
| parent | Stable for x86, wrt bug #418321 (diff) | |
| download | gentoo-2-aaea47784f73bf87c5db0bee86a8d195b0c75afe.tar.gz gentoo-2-aaea47784f73bf87c5db0bee86a8d195b0c75afe.tar.bz2 gentoo-2-aaea47784f73bf87c5db0bee86a8d195b0c75afe.zip | |
Don't rely on image-load-path always being defined, bug 426646.
(Portage version: 2.1.11.7/cvs/Linux x86_64)
Diffstat (limited to 'app-emacs')
| -rw-r--r-- | app-emacs/proofgeneral/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch | 14 | ||||
| -rw-r--r-- | app-emacs/proofgeneral/proofgeneral-4.1.ebuild | 5 |
3 files changed, 22 insertions, 3 deletions
diff --git a/app-emacs/proofgeneral/ChangeLog b/app-emacs/proofgeneral/ChangeLog index 9bece0081469..051a20aa6baf 100644 --- a/app-emacs/proofgeneral/ChangeLog +++ b/app-emacs/proofgeneral/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emacs/proofgeneral # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.36 2012/03/08 11:31:41 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/ChangeLog,v 1.37 2012/07/14 21:14:04 ulm Exp $ + + 14 Jul 2012; Ulrich Müller <ulm@gentoo.org> proofgeneral-4.1.ebuild, + +files/proofgeneral-4.1-image-load-path.patch: + Don't rely on image-load-path always being defined, bug 426646. 08 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> proofgeneral-4.1.ebuild: x86 stable wrt bug #404605 diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch b/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch new file mode 100644 index 000000000000..238c022de08c --- /dev/null +++ b/app-emacs/proofgeneral/files/proofgeneral-4.1-image-load-path.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/426646 + +--- ProofGeneral-orig/generic/proof-toolbar.el ++++ ProofGeneral/generic/proof-toolbar.el +@@ -103,7 +103,8 @@ + (when (proof-toolbar-available-p) + (unless proof-toolbar-map + (setq proof-toolbar-map (make-sparse-keymap)) +- (add-to-list 'image-load-path proof-images-directory) ; rude? ++ (if (boundp 'image-load-path) ++ (add-to-list 'image-load-path proof-images-directory)) ; rude? + (mapc 'proof-toolbar-make-icon (proof-ass toolbar-entries)) + (proof-toolbar-make-toolbar-items proof-toolbar-map + (proof-ass toolbar-entries))) diff --git a/app-emacs/proofgeneral/proofgeneral-4.1.ebuild b/app-emacs/proofgeneral/proofgeneral-4.1.ebuild index 312a524bf2f6..a49b6752dcd4 100644 --- a/app-emacs/proofgeneral/proofgeneral-4.1.ebuild +++ b/app-emacs/proofgeneral/proofgeneral-4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.1.ebuild,v 1.4 2012/03/08 11:31:41 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/proofgeneral/proofgeneral-4.1.ebuild,v 1.5 2012/07/14 21:14:04 ulm Exp $ EAPI=4 NEED_EMACS=23 @@ -21,7 +21,8 @@ DEPEND=">=app-emacs/mmm-mode-0.4.8-r2" RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_PN}-${PV}" -ELISP_PATCHES="${P}-emacs-24.patch" +ELISP_PATCHES="${P}-emacs-24.patch + ${P}-image-load-path.patch" SITEFILE="50${PN}-gentoo.el" src_prepare() { |