| 1 |
ulm 12/01/01 19:16:30 |
| 2 |
|
| 3 |
Added: 50org-mode-gentoo-7.8.02.el |
| 4 |
org-mode-7.8.02-odt-styles.patch |
| 5 |
Log: |
| 6 |
Install OpenDocument style files. Fixes bug 396269. |
| 7 |
|
| 8 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/org-mode/files/50org-mode-gentoo-7.8.02.el?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 50org-mode-gentoo-7.8.02.el |
| 17 |
=================================================================== |
| 18 |
(add-to-list 'load-path "@SITELISP@") |
| 19 |
(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode)) |
| 20 |
(require 'org-install) |
| 21 |
(setq org-odt-styles-dir "@SITEETC@/styles") |
| 22 |
|
| 23 |
|
| 24 |
|
| 25 |
1.1 app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch |
| 26 |
|
| 27 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch?rev=1.1&view=markup |
| 28 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emacs/org-mode/files/org-mode-7.8.02-odt-styles.patch?rev=1.1&content-type=text/plain |
| 29 |
|
| 30 |
Index: org-mode-7.8.02-odt-styles.patch |
| 31 |
=================================================================== |
| 32 |
https://bugs.gentoo.org/396269 |
| 33 |
Install OpenDocument style files. |
| 34 |
|
| 35 |
Makefile patch from upstream git repo, |
| 36 |
commit e514982ae126c058b965dd00393b4e68e5f8522d by Dave Marquardt. |
| 37 |
|
| 38 |
--- org-7.8.02-orig/Makefile |
| 39 |
+++ org-7.8.02/Makefile |
| 40 |
@@ -19,6 +19,12 @@ |
| 41 |
# Where local lisp files go. |
| 42 |
lispdir = $(prefix)/share/emacs/site-lisp |
| 43 |
|
| 44 |
+# Where etc files go |
| 45 |
+etcdir = $(lispdir)/../etc |
| 46 |
+ |
| 47 |
+# Where style files go |
| 48 |
+stylesdir = $(etcdir)/styles |
| 49 |
+ |
| 50 |
# Where info files go. |
| 51 |
infodir = $(prefix)/share/info |
| 52 |
|
| 53 |
@@ -175,6 +181,7 @@ |
| 54 |
CARDFILES = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf |
| 55 |
TEXIFILES = doc/org.texi |
| 56 |
INFOFILES = doc/org |
| 57 |
+STYLESFILES = etc/styles/OrgOdtContentTemplate.xml etc/styles/OrgOdtStyles.xml |
| 58 |
|
| 59 |
# Package Manager (ELPA) |
| 60 |
PKG_TAG = $(shell date +%Y%m%d) |
| 61 |
@@ -211,7 +218,7 @@ |
| 62 |
|
| 63 |
compile: $(ELCFILES0) $(ELCBFILES) |
| 64 |
|
| 65 |
-install: install-lisp |
| 66 |
+install: install-lisp install-etc |
| 67 |
|
| 68 |
doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgguide.pdf doc/orgcard.txt |
| 69 |
|
| 70 |
@@ -231,6 +238,10 @@ |
| 71 |
$(CP) $(INFOFILES) $(infodir) |
| 72 |
$(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES) |
| 73 |
|
| 74 |
+install-etc: $(STYLESFILES) |
| 75 |
+ if [ ! -d $(stylesdir) ]; then $(MKDIR) $(stylesdir); else true; fi ; |
| 76 |
+ $(CP) $(STYLESFILES) $(stylesdir) |
| 77 |
+ |
| 78 |
autoloads: lisp/org-install.el |
| 79 |
|
| 80 |
lisp/org-install.el: $(LISPFILES0) Makefile |
| 81 |
--- org-7.8.02-orig/lisp/org-odt.el |
| 82 |
+++ org-7.8.02/lisp/org-odt.el |
| 83 |
@@ -76,7 +76,7 @@ |
| 84 |
"Regular expressions for special string conversion.") |
| 85 |
|
| 86 |
(defconst org-odt-lib-dir (file-name-directory load-file-name)) |
| 87 |
-(defconst org-odt-styles-dir |
| 88 |
+(defvar org-odt-styles-dir |
| 89 |
(let* ((styles-dir1 (expand-file-name "../etc/styles/" org-odt-lib-dir)) |
| 90 |
(styles-dir2 (expand-file-name "./etc/styles/" org-odt-lib-dir)) |
| 91 |
(styles-dir |
Archives