From 5fa72cc42a1b9910e0999b1d80684420f00b95e6f15a565a99c893bc417a136d Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 26 Apr 2008 09:41:29 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfig?expand=0&rev=7 --- xfig.3.2.5-pspdftex.dif | 59 +++++++++++++++++++++++++++++++++++++++++ xfig.changes | 5 ++++ xfig.spec | 6 ++++- 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 xfig.3.2.5-pspdftex.dif diff --git a/xfig.3.2.5-pspdftex.dif b/xfig.3.2.5-pspdftex.dif new file mode 100644 index 0000000..b711fc4 --- /dev/null +++ b/xfig.3.2.5-pspdftex.dif @@ -0,0 +1,59 @@ +--- u_print.c ++++ u_print.c 2008-04-25 18:15:33.810809242 +0200 +@@ -351,8 +351,10 @@ int print_to_file(char *file, char *lang + strcat(prcmd, tmpcmd); + } else if (!strcmp(lang,"pspdftex")) { + /* first generate postscript then PDF. */ +- sprintf(tmpcmd, "-n %s", outfile); ++ sprintf(tmpcmd, "-b %d -n %s", border, outfile); + strcat(prcmd, tmpcmd); ++ if (appres.correct_font_size) ++ strcat(prcmd," -F "); + + if (backgrnd[0]) { + strcat(prcmd," -g \\"); /* must escape the #rrggbb color spec */ +@@ -366,13 +368,13 @@ int print_to_file(char *file, char *lang + strcat(prcmd,tmp_name); + + /* make it suitable for pstex. */ +- strsub(prcmd,"pspdftex","pstex",tmpcmd,0); ++ strsub(prcmd,"eps","pstex",tmpcmd,0); + strcat(tmpcmd,".eps"); +- (void) exec_prcmd(tmpcmd, "EXPORT of PostScript part"); ++ (void) exec_prcmd(tmpcmd, "EXPORT of EPS part"); + + /* make it suitable for pdftex. */ +- strsub(prcmd,"eps","pdf",tmpcmd,0); +- strsub(tmpcmd,"pspdftex","pdftex",prcmd,0); ++ strsub(prcmd,"pstex","pdftex",tmpcmd,0); ++ strsub(tmpcmd,"eps","pdftex",prcmd,0); + strcat(prcmd,".pdf"); + (void) exec_prcmd(prcmd, "EXPORT of PDF part"); + +@@ -380,12 +382,13 @@ int print_to_file(char *file, char *lang + #ifdef I18N + /* set the numeric locale to C so we get decimal points for numbers */ + setlocale(LC_NUMERIC, "C"); +- sprintf(prcmd, "fig2dev %s -L %s -p %s -m %f %s %s", +- appres.international ? appres.fig2dev_localize_option : "", ++ sprintf(prcmd, "%s %s -L %s -E %d -p %s -m %f -b %d %s %s", ++ fig2dev_cmd, appres.international ? appres.fig2dev_localize_option : "", + #else +- sprintf(prcmd, "fig2dev -L %s -p %s -m %f %s %s", ++ sprintf(prcmd, "%s -L %s -E %d -p %s -m %f -b %d %s %s", ++ fig2dev_cmd, + #endif /* I18N */ +- "pstex_t", tmp_name, mag/100.0, tmp_fig_file, outfile); ++ "pstex_t", appres.encoding, tmp_name, mag/100.0, border, tmp_fig_file, outfile); + #ifdef I18N + /* reset to original locale */ + setlocale(LC_NUMERIC, ""); +@@ -727,7 +730,7 @@ void build_layer_list(char *layers) + { + char list[PATH_MAX], notlist[PATH_MAX], num[10]; + int layer, len, notlen; +- int firstyes, lastyes, firstno, lastno; ++ int firstyes, lastyes = 0, firstno, lastno = 0; + + layers[0] = '\0'; + diff --git a/xfig.changes b/xfig.changes index 39b7416..e2ca4bc 100644 --- a/xfig.changes +++ b/xfig.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 25 18:17:48 CEST 2008 - werner@suse.de + +- Make PS/PDF/LaTeX work similar to PS/LaTeX and PDF/LaTeX (bnc#383669) + ------------------------------------------------------------------- Tue Dec 18 14:22:49 UTC 2007 - werner@suse.de diff --git a/xfig.spec b/xfig.spec index e372b5c..03aefc8 100644 --- a/xfig.spec +++ b/xfig.spec @@ -19,7 +19,7 @@ Provides: xfig.3.2.3d Requires: transfig netpbm ghostscript-fonts-std AutoReqProv: on Version: 3.2.5 -Release: 72 +Release: 85 Summary: Facility for Interactive Generation of Figures under the X Window System Url: http://www.xfig.org/ Source: xfig.%{version}.tar.bz2 @@ -35,6 +35,7 @@ Patch4: xfig-%{version}-mkstemp.dif Patch5: xfig.3.2.4-null.dif Patch6: xfig.%{version}-locale.dif Patch7: xfig.%{version}-fixes.dif +Patch8: xfig.%{version}-pspdftex.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -80,6 +81,7 @@ find -type f | xargs -r chmod a-x,go-w %patch5 -p0 -b .null %patch6 -p0 -b .locale %patch7 -p0 -b .fixes +%patch8 -p0 -b .pspdftex cp $RPM_SOURCE_DIR/font-test.fig . xmkmf -a -D_DATA='%{_data}' -DStandardDefines='' @@ -135,6 +137,8 @@ find %{buildroot}/%{_docdir}/%{name} -name '*.orig' | xargs -r rm -f %doc %{_mandir}/man1/xfig.1x.gz %changelog +* Fri Apr 25 2008 werner@suse.de +- Make PS/PDF/LaTeX work similar to PS/LaTeX and PDF/LaTeX (bnc#383669) * Tue Dec 18 2007 werner@suse.de - Close comment in patch xfig.3.2.5-fixes.dif (bug #349439) * Fri Nov 23 2007 werner@suse.de