From 6cf13198eba4d928db069b9416b6e267382e8cc9289626040e002b8a6af4dfd5 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 4 Jul 2014 12:52:20 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/graphics/xfig?expand=0&rev=45 --- xfig.3.2.5b-mediaboxrealnb.dif | 2 +- xfig.3.2.5b-pspdftex.dif | 19 +++++-------------- xfig.3.2.5c-patches.tar.bz2 | 4 ++-- xfig.changes | 12 ++++++++++++ 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/xfig.3.2.5b-mediaboxrealnb.dif b/xfig.3.2.5b-mediaboxrealnb.dif index b00840a..8417842 100644 --- a/xfig.3.2.5b-mediaboxrealnb.dif +++ b/xfig.3.2.5b-mediaboxrealnb.dif @@ -12,7 +12,7 @@ - c = strchr(buf, '[') + 1; - if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) { -+ c = strchr(buf, '['); ++ c = strchr(s, '['); + if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) { llx = lly = 0; urx = paper_sizes[0].width * 72 / PIX_PER_INCH; diff --git a/xfig.3.2.5b-pspdftex.dif b/xfig.3.2.5b-pspdftex.dif index e952a51..21956ce 100644 --- a/xfig.3.2.5b-pspdftex.dif +++ b/xfig.3.2.5b-pspdftex.dif @@ -12,25 +12,16 @@ if (backgrnd[0]) { strcat(prcmd," -g \\"); /* must escape the #rrggbb color spec */ -@@ -369,13 +371,13 @@ int print_to_file(char *file, char *lang - strcat(prcmd,tmp_name); - +@@ -370,7 +373,7 @@ int print_to_file(char *file, char *lang /* make it suitable for pstex. */ -- strsub(prcmd,"pspdftex","pstex",tmpcmd,0); -+ strsub(prcmd,"eps","pstex",tmpcmd,0); + strsub(prcmd,"pspdftex","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,"ps","pdf",tmpcmd,0); -- strsub(tmpcmd,"pspdftex","pdftex",prcmd,0); -+ strsub(prcmd,"pstex","pdf",tmpcmd,0); -+ strsub(tmpcmd,"eps","pdftex",prcmd,0); - strcat(prcmd,".pdf"); - (void) exec_prcmd(prcmd, "EXPORT of PDF part"); - -@@ -383,10 +385,11 @@ int print_to_file(char *file, char *lang + strsub(prcmd,"ps","pdf",tmpcmd,0); +@@ -382,10 +385,11 @@ 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"); @@ -45,7 +36,7 @@ #endif /* I18N */ "pstex_t", tmp_name, mag/100.0, layers, tmp_fig_file, outfile); #ifdef I18N -@@ -743,7 +746,7 @@ void build_layer_list(char *layers) +@@ -742,7 +746,7 @@ void build_layer_list(char *layers) { char list[PATH_MAX], notlist[PATH_MAX], num[10]; int layer, len, notlen; diff --git a/xfig.3.2.5c-patches.tar.bz2 b/xfig.3.2.5c-patches.tar.bz2 index 0188e5d..f79f365 100644 --- a/xfig.3.2.5c-patches.tar.bz2 +++ b/xfig.3.2.5c-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e64d588120ed0a861ffd2662c9fc10c0843e2a851202f14b39c17b2c32e9dc3 -size 1566 +oid sha256:8137bd17c19e2d3e5fe1f0366152f0468e1cd92523b0d9fa1d447c2591effb57 +size 3121 diff --git a/xfig.changes b/xfig.changes index 11682e9..8dd72da 100644 --- a/xfig.changes +++ b/xfig.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 4 12:48:32 UTC 2014 - werner@suse.de + +- Fix patches + xfig.3.2.5b-mediaboxrealnb.dif + xfig.3.2.5b-pspdftex.dif (bnc#882692) +- Add patch set from Debian xfig package as well + 31_spelling.patch + 39_man_hyphen.patch + 40_XAW3D1_5E_notlocal.patch + 41_mkstemp.patch (CVE-2009-1962) + ------------------------------------------------------------------- Tue Feb 11 10:26:27 UTC 2014 - werner@suse.de