From 86ca80d60a716b61a3117212a0b090771a4bb51ef3b2f49055d895783f6c41dc Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 11 Aug 2010 16:59:24 +0000 Subject: [PATCH 1/4] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs-auctex?expand=0&rev=8 --- auctex-11.85-preview.dif | 44 ++++++++++++++++++++++------------------ emacs-auctex.changes | 5 +++++ 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/auctex-11.85-preview.dif b/auctex-11.85-preview.dif index 261d46b..16fbe27 100644 --- a/auctex-11.85-preview.dif +++ b/auctex-11.85-preview.dif @@ -1,44 +1,48 @@ --- preview/preview.el -+++ preview/preview.el 2010-07-21 13:48:25.830924999 +0200 -@@ -233,7 +233,7 @@ method, like when PDFTeX was used." - (symbol :tag "Emacs image-type") - (repeat :inline t :tag "Ghostscript options" string)))) - --(defcustom preview-image-type 'png -+(defcustom preview-image-type 'dvipng - "*Image type to be used in images." - :group 'preview-gs - :type (append '(choice) -@@ -682,29 +682,31 @@ Gets the usual PROCESS and STRING parame ++++ preview/preview.el 2010-08-11 16:57:59.429024953 +0000 +@@ -682,29 +682,43 @@ Gets the usual PROCESS and STRING parame (setq preview-gs-sequence (list 1))) (setcdr preview-gs-sequence 1) (let* ((process-connection-type nil) - (outfile (format "-dOutputFile=%s" - (preview-ps-quote-filename -+ (inputdir (format "-I%s/" (car TeX-active-tempdir))) ++ (file (if (consp (car preview-ps-file)) ++ (if (consp (caar preview-ps-file)) ++ (car (last (caar preview-ps-file))) ++ (caar preview-ps-file)) ++ (car preview-ps-file))) + (outfile (format "-sOutputFile=%s" (format "%s/pr%d-%%d.%s" (car TeX-active-tempdir) (car preview-gs-sequence) - preview-gs-image-type)))) + preview-gs-image-type))) ++ (command-line ++ (append ++ ; First replace SAFER by DELAYSAFER, we then allow reading ++ ; the preview file and after this switch over to SAFER mode ++ ; by using the .locksafe operator ++ (list "-dDELAYSAFER") ++ (remove "-dSAFER" preview-gs-command-line) ++ (list "-c" ++ (format "<> setuserparams .locksafe" ++ (preview-ps-quote-filename file t))))) (process (apply #'start-process "Preview-Ghostscript" (current-buffer) preview-gs-command outfile -+ inputdir - preview-gs-command-line))) +- preview-gs-command-line))) ++ command-line))) (goto-char (point-max)) (insert-before-markers "Running `Preview-Ghostscript' with ``" (mapconcat #'shell-quote-argument (append (list preview-gs-command -- outfile) -+ outfile -+ inputdir) - preview-gs-command-line) + outfile) +- preview-gs-command-line) ++ command-line) " ") "''\n") (setq preview-gs-answer "") - (process-kill-without-query process) @@ -46,7 +50,7 @@ (set-process-sentinel process #'preview-gs-sentinel) (set-process-filter process #'preview-gs-filter) (process-send-string process preview-gs-init-string) -@@ -1075,7 +1077,7 @@ NONREL is not NIL." +@@ -1075,7 +1089,7 @@ NONREL is not NIL." (setq preview-gs-init-string (concat preview-gs-init-string (format "[%s(r)file]aload exch %s .runandhide aload pop " @@ -55,7 +59,7 @@ (preview-gs-dsc-cvx 0 preview-gs-dsc)))))) (defun preview-gs-urgentize (ov buff) -@@ -1163,7 +1165,7 @@ Try \\[ps-shell] and \\[ps-execute-buffe +@@ -1163,7 +1177,7 @@ Try \\[ps-shell] and \\[ps-execute-buffe "Make an eps error flag in overlay OV for ERR string." (let* ((filenames (overlay-get ov 'filenames)) (file (car (nth 0 filenames))) diff --git a/emacs-auctex.changes b/emacs-auctex.changes index 1cfa6e3..f2d3700 100644 --- a/emacs-auctex.changes +++ b/emacs-auctex.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 11 18:58:43 CEST 2010 - werner@suse.de + +- Make fix for bnc#623719 more flexible + ------------------------------------------------------------------- Sun Jul 25 07:20:32 UTC 2010 - aj@suse.de From da5ec3e606c028004eb2dc0cb3a2b516b5bcb930c2f98cfc14c1386cb23967a5 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 12 Aug 2010 09:31:33 +0000 Subject: [PATCH 2/4] . OBS-URL: https://build.opensuse.org/package/show/editors/emacs-auctex?expand=0&rev=9 --- auctex-11.85-preview.dif | 72 ++++++++-------------------------------- 1 file changed, 13 insertions(+), 59 deletions(-) diff --git a/auctex-11.85-preview.dif b/auctex-11.85-preview.dif index 16fbe27..5c494b7 100644 --- a/auctex-11.85-preview.dif +++ b/auctex-11.85-preview.dif @@ -1,48 +1,7 @@ --- preview/preview.el -+++ preview/preview.el 2010-08-11 16:57:59.429024953 +0000 -@@ -682,29 +682,43 @@ Gets the usual PROCESS and STRING parame - (setq preview-gs-sequence (list 1))) - (setcdr preview-gs-sequence 1) - (let* ((process-connection-type nil) -- (outfile (format "-dOutputFile=%s" -- (preview-ps-quote-filename -+ (file (if (consp (car preview-ps-file)) -+ (if (consp (caar preview-ps-file)) -+ (car (last (caar preview-ps-file))) -+ (caar preview-ps-file)) -+ (car preview-ps-file))) -+ (outfile (format "-sOutputFile=%s" - (format "%s/pr%d-%%d.%s" - (car TeX-active-tempdir) - (car preview-gs-sequence) -- preview-gs-image-type)))) -+ preview-gs-image-type))) -+ (command-line -+ (append -+ ; First replace SAFER by DELAYSAFER, we then allow reading -+ ; the preview file and after this switch over to SAFER mode -+ ; by using the .locksafe operator -+ (list "-dDELAYSAFER") -+ (remove "-dSAFER" preview-gs-command-line) -+ (list "-c" -+ (format "<> setuserparams .locksafe" -+ (preview-ps-quote-filename file t))))) - (process - (apply #'start-process - "Preview-Ghostscript" - (current-buffer) - preview-gs-command - outfile -- preview-gs-command-line))) -+ command-line))) - (goto-char (point-max)) - (insert-before-markers "Running `Preview-Ghostscript' with ``" - (mapconcat #'shell-quote-argument - (append - (list preview-gs-command - outfile) -- preview-gs-command-line) -+ command-line) ++++ preview/preview.el 2010-08-12 09:13:54.697159903 +0000 +@@ -704,7 +704,7 @@ Gets the usual PROCESS and STRING parame + preview-gs-command-line) " ") "''\n") (setq preview-gs-answer "") - (process-kill-without-query process) @@ -50,21 +9,16 @@ (set-process-sentinel process #'preview-gs-sentinel) (set-process-filter process #'preview-gs-filter) (process-send-string process preview-gs-init-string) -@@ -1075,7 +1089,7 @@ NONREL is not NIL." +@@ -1072,6 +1072,12 @@ NONREL is not NIL." + (caar preview-ps-file)) + (car preview-ps-file)))) + (setq preview-gs-dsc (preview-dsc-parse file)) ++ (setq preview-gs-command-line ++ (append (list "-dDELAYSAFER") ++ (remove "-dSAFER" preview-gs-command-line) ++ (list "-c" ++ (format "<> setuserparams .locksafe" ++ (preview-ps-quote-filename file))))) (setq preview-gs-init-string (concat preview-gs-init-string (format "[%s(r)file]aload exch %s .runandhide aload pop " -- (preview-ps-quote-filename file) -+ (preview-ps-quote-filename file t) - (preview-gs-dsc-cvx 0 preview-gs-dsc)))))) - - (defun preview-gs-urgentize (ov buff) -@@ -1163,7 +1177,7 @@ Try \\[ps-shell] and \\[ps-execute-buffe - "Make an eps error flag in overlay OV for ERR string." - (let* ((filenames (overlay-get ov 'filenames)) - (file (car (nth 0 filenames))) -- (outfile (format "-dOutputFile=%s" -+ (outfile (format "-sOutputFile=%s" - (preview-ps-quote-filename - (car (nth 1 filenames))))) - (ps-open From 38c1bca6fd234df53cff0e0f59c134242fd6d249bae9ac146fa4bc2a208b46f0 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 13 Aug 2010 00:43:57 +0000 Subject: [PATCH 3/4] Accepting request 45455 from editors checked in (request 45455) OBS-URL: https://build.opensuse.org/request/show/45455 OBS-URL: https://build.opensuse.org/package/show/editors/emacs-auctex?expand=0&rev=10 --- auctex-11.85-preview.dif | 66 ++++++++++++++++++++++++++++++++-------- emacs-auctex.changes | 5 --- 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/auctex-11.85-preview.dif b/auctex-11.85-preview.dif index 5c494b7..261d46b 100644 --- a/auctex-11.85-preview.dif +++ b/auctex-11.85-preview.dif @@ -1,6 +1,43 @@ --- preview/preview.el -+++ preview/preview.el 2010-08-12 09:13:54.697159903 +0000 -@@ -704,7 +704,7 @@ Gets the usual PROCESS and STRING parame ++++ preview/preview.el 2010-07-21 13:48:25.830924999 +0200 +@@ -233,7 +233,7 @@ method, like when PDFTeX was used." + (symbol :tag "Emacs image-type") + (repeat :inline t :tag "Ghostscript options" string)))) + +-(defcustom preview-image-type 'png ++(defcustom preview-image-type 'dvipng + "*Image type to be used in images." + :group 'preview-gs + :type (append '(choice) +@@ -682,29 +682,31 @@ Gets the usual PROCESS and STRING parame + (setq preview-gs-sequence (list 1))) + (setcdr preview-gs-sequence 1) + (let* ((process-connection-type nil) +- (outfile (format "-dOutputFile=%s" +- (preview-ps-quote-filename ++ (inputdir (format "-I%s/" (car TeX-active-tempdir))) ++ (outfile (format "-sOutputFile=%s" + (format "%s/pr%d-%%d.%s" + (car TeX-active-tempdir) + (car preview-gs-sequence) +- preview-gs-image-type)))) ++ preview-gs-image-type))) + (process + (apply #'start-process + "Preview-Ghostscript" + (current-buffer) + preview-gs-command + outfile ++ inputdir + preview-gs-command-line))) + (goto-char (point-max)) + (insert-before-markers "Running `Preview-Ghostscript' with ``" + (mapconcat #'shell-quote-argument + (append + (list preview-gs-command +- outfile) ++ outfile ++ inputdir) preview-gs-command-line) " ") "''\n") (setq preview-gs-answer "") @@ -9,16 +46,21 @@ (set-process-sentinel process #'preview-gs-sentinel) (set-process-filter process #'preview-gs-filter) (process-send-string process preview-gs-init-string) -@@ -1072,6 +1072,12 @@ NONREL is not NIL." - (caar preview-ps-file)) - (car preview-ps-file)))) - (setq preview-gs-dsc (preview-dsc-parse file)) -+ (setq preview-gs-command-line -+ (append (list "-dDELAYSAFER") -+ (remove "-dSAFER" preview-gs-command-line) -+ (list "-c" -+ (format "<> setuserparams .locksafe" -+ (preview-ps-quote-filename file))))) +@@ -1075,7 +1077,7 @@ NONREL is not NIL." (setq preview-gs-init-string (concat preview-gs-init-string (format "[%s(r)file]aload exch %s .runandhide aload pop " +- (preview-ps-quote-filename file) ++ (preview-ps-quote-filename file t) + (preview-gs-dsc-cvx 0 preview-gs-dsc)))))) + + (defun preview-gs-urgentize (ov buff) +@@ -1163,7 +1165,7 @@ Try \\[ps-shell] and \\[ps-execute-buffe + "Make an eps error flag in overlay OV for ERR string." + (let* ((filenames (overlay-get ov 'filenames)) + (file (car (nth 0 filenames))) +- (outfile (format "-dOutputFile=%s" ++ (outfile (format "-sOutputFile=%s" + (preview-ps-quote-filename + (car (nth 1 filenames))))) + (ps-open diff --git a/emacs-auctex.changes b/emacs-auctex.changes index f2d3700..1cfa6e3 100644 --- a/emacs-auctex.changes +++ b/emacs-auctex.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 11 18:58:43 CEST 2010 - werner@suse.de - -- Make fix for bnc#623719 more flexible - ------------------------------------------------------------------- Sun Jul 25 07:20:32 UTC 2010 - aj@suse.de From b3cfd4c6c69e8e659c45688da5c1f65dc980a5ccc4165c4875f15ad255564d9f Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 13 Aug 2010 00:43:58 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/emacs-auctex revision 16.0 OBS-URL: https://build.opensuse.org/package/show/editors/emacs-auctex?expand=0&rev=893ee836282826fac08255b251b2da1a --- auctex-11.85-preview.dif | 66 ++++++++-------------------------------- emacs-auctex.changes | 5 +++ emacs-auctex.spec | 2 +- 3 files changed, 18 insertions(+), 55 deletions(-) diff --git a/auctex-11.85-preview.dif b/auctex-11.85-preview.dif index 261d46b..5c494b7 100644 --- a/auctex-11.85-preview.dif +++ b/auctex-11.85-preview.dif @@ -1,43 +1,6 @@ --- preview/preview.el -+++ preview/preview.el 2010-07-21 13:48:25.830924999 +0200 -@@ -233,7 +233,7 @@ method, like when PDFTeX was used." - (symbol :tag "Emacs image-type") - (repeat :inline t :tag "Ghostscript options" string)))) - --(defcustom preview-image-type 'png -+(defcustom preview-image-type 'dvipng - "*Image type to be used in images." - :group 'preview-gs - :type (append '(choice) -@@ -682,29 +682,31 @@ Gets the usual PROCESS and STRING parame - (setq preview-gs-sequence (list 1))) - (setcdr preview-gs-sequence 1) - (let* ((process-connection-type nil) -- (outfile (format "-dOutputFile=%s" -- (preview-ps-quote-filename -+ (inputdir (format "-I%s/" (car TeX-active-tempdir))) -+ (outfile (format "-sOutputFile=%s" - (format "%s/pr%d-%%d.%s" - (car TeX-active-tempdir) - (car preview-gs-sequence) -- preview-gs-image-type)))) -+ preview-gs-image-type))) - (process - (apply #'start-process - "Preview-Ghostscript" - (current-buffer) - preview-gs-command - outfile -+ inputdir - preview-gs-command-line))) - (goto-char (point-max)) - (insert-before-markers "Running `Preview-Ghostscript' with ``" - (mapconcat #'shell-quote-argument - (append - (list preview-gs-command -- outfile) -+ outfile -+ inputdir) ++++ preview/preview.el 2010-08-12 09:13:54.697159903 +0000 +@@ -704,7 +704,7 @@ Gets the usual PROCESS and STRING parame preview-gs-command-line) " ") "''\n") (setq preview-gs-answer "") @@ -46,21 +9,16 @@ (set-process-sentinel process #'preview-gs-sentinel) (set-process-filter process #'preview-gs-filter) (process-send-string process preview-gs-init-string) -@@ -1075,7 +1077,7 @@ NONREL is not NIL." +@@ -1072,6 +1072,12 @@ NONREL is not NIL." + (caar preview-ps-file)) + (car preview-ps-file)))) + (setq preview-gs-dsc (preview-dsc-parse file)) ++ (setq preview-gs-command-line ++ (append (list "-dDELAYSAFER") ++ (remove "-dSAFER" preview-gs-command-line) ++ (list "-c" ++ (format "<> setuserparams .locksafe" ++ (preview-ps-quote-filename file))))) (setq preview-gs-init-string (concat preview-gs-init-string (format "[%s(r)file]aload exch %s .runandhide aload pop " -- (preview-ps-quote-filename file) -+ (preview-ps-quote-filename file t) - (preview-gs-dsc-cvx 0 preview-gs-dsc)))))) - - (defun preview-gs-urgentize (ov buff) -@@ -1163,7 +1165,7 @@ Try \\[ps-shell] and \\[ps-execute-buffe - "Make an eps error flag in overlay OV for ERR string." - (let* ((filenames (overlay-get ov 'filenames)) - (file (car (nth 0 filenames))) -- (outfile (format "-dOutputFile=%s" -+ (outfile (format "-sOutputFile=%s" - (preview-ps-quote-filename - (car (nth 1 filenames))))) - (ps-open diff --git a/emacs-auctex.changes b/emacs-auctex.changes index 1cfa6e3..f2d3700 100644 --- a/emacs-auctex.changes +++ b/emacs-auctex.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 11 18:58:43 CEST 2010 - werner@suse.de + +- Make fix for bnc#623719 more flexible + ------------------------------------------------------------------- Sun Jul 25 07:20:32 UTC 2010 - aj@suse.de diff --git a/emacs-auctex.spec b/emacs-auctex.spec index f671d3a..a95fc08 100644 --- a/emacs-auctex.spec +++ b/emacs-auctex.spec @@ -27,7 +27,7 @@ Provides: auc-tex auctex ge_auc Requires: emacs texlive-tools texlive-latex AutoReqProv: on Version: 11.86 -Release: 2 +Release: 3 Summary: AUC TeX: An Emacs Extension Source: ftp://ftp.gnu.org/pub/gnu/auctex/auctex-%{version}.tar.bz2 Url: http://www.gnu.org/software/auctex