diff --git a/40_fix_dash_list_for_different_styles.patch b/40_fix_dash_list_for_different_styles.patch new file mode 100644 index 0000000..7c5aaa9 --- /dev/null +++ b/40_fix_dash_list_for_different_styles.patch @@ -0,0 +1,34 @@ +--- xfig.3.2.5c/w_drawprim.c 2012-10-17 00:14:09.000000000 +0200 ++++ xfig.3.2.5c/w_drawprim.c 2013-11-29 02:45:36.950448714 +0100 +@@ -1292,14 +1292,23 @@ void set_fill_gc(int fill_style, int op, + } + + +-static unsigned char dash_list[16][2] = {{255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}, +- {255, 255}, {255, 255}}; ++static unsigned char dash_list[16][8] = { ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}, ++ {255, 255, 255, 255, 255, 255, 255, 255}}; + + static int join_styles[3] = { JoinMiter, JoinRound, JoinBevel }; + static int cap_styles[3] = { CapButt, CapRound, CapProjecting }; diff --git a/xfig.spec b/xfig.spec index 5275d82..e492de1 100644 --- a/xfig.spec +++ b/xfig.spec @@ -3,7 +3,7 @@ Summary: An X Window System tool for drawing basic vector graphics Name: xfig Version: 3.2.5 -Release: 37.b%{?dist} +Release: 38.b%{?dist} License: MIT Group: Applications/Multimedia URL: http://www.xfig.org/ @@ -27,6 +27,7 @@ Patch11: 35_CVE-2010-4262.patch Patch12: 36_libpng15.patch Patch13: 37_fix-eps-reading.patch Patch14: 38_formatstring.patch +Patch15: 40_fix_dash_list_for_different_styles.patch BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -106,6 +107,7 @@ Files common to both the plain Xaw and the Xaw3d version of xfig. %patch12 -p1 %patch13 -p1 %patch14 -p1 +%patch15 -p1 iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES rm Doc/html/images/sav1a0.tmp @@ -188,6 +190,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Jan 03 2014 Michal Srb - 3.2.5-38.b +- Fix crash when creating lines with linestyle 3 +- Resolves: rhbz#1023744 (Thanks to Maurizio Paolini and David Kaufmann) + * Sun Aug 04 2013 Fedora Release Engineering - 3.2.5-37.b - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild