[arch-commits] Commit in xfig/trunk (2 files)

[Eric Bélanger]

    Date: Friday, January 24, 2014 @ 04:47:09
  Author: eric
Revision: 204603

upgpkg: xfig 3.2.5c-2

Fix seg fault (close FS#38633)

Added:
  xfig/trunk/xfig-fix_dash_list_for_different_styles.patch
Modified:
  xfig/trunk/PKGBUILD

-----------------------------------------------+
 PKGBUILD                                      |   17 +++++++-----
 xfig-fix_dash_list_for_different_styles.patch |   34 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-24 03:30:13 UTC (rev 204602)
+++ PKGBUILD	2014-01-24 03:47:09 UTC (rev 204603)
@@ -3,7 +3,7 @@
 
 pkgname=xfig
 pkgver=3.2.5c
-pkgrel=1
+pkgrel=2
 pkgdesc="An interactive drawing tool"
 arch=('i686' 'x86_64')
 url="http://www.xfig.org/userman/"
@@ -13,21 +13,24 @@
 optdepends=('transfig: to use the frontend to convert fig files')
 options=('!makeflags' '!emptydirs')
 install=xfig.install
-source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \
-	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \
-        xfig-3.2.5-urwfonts.patch \
+source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz
+	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch
+        xfig-3.2.5-urwfonts.patch xfig-fix_dash_list_for_different_styles.patch
         LICENSE)
 sha1sums=('47d31dd9ad46819732ab74db340e11489db2c646'
           '926ad99c7221baa4aa9e9737722958860b2700fc'
           '45e7fb80193825b088d798089aeade2e1729c9ac'
           'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
+          '6aa98ab4497c30d18b4d0599f9d943bf78991246'
           '31edf4cfab708820ea3f114d095dfef5aa88e5aa')
 
 prepare() {
   cd ${pkgname}.${pkgver}
-  patch -p1 < ../xfig-3.2.4-redhat.patch
-  patch -p1 < ../xfig-3.2.5-color-resources.patch
-  patch -p1 < ../xfig-3.2.5-urwfonts.patch
+  patch -p1 -i "${srcdir}/xfig-3.2.4-redhat.patch"
+  patch -p1 -i "${srcdir}/xfig-3.2.5-color-resources.patch"
+  patch -p1 -i "${srcdir}/xfig-3.2.5-urwfonts.patch"
+  patch -p1 -i "${srcdir}/xfig-fix_dash_list_for_different_styles.patch"
+
   sed -i -e 's|X11R6/||' -e 's|image/x-xfig|image/fig;image/x-xfig|' xfig.desktop
   echo -e "Categories=Application;Graphics;\nIcon=xfig" >> xfig.desktop
   sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile

Added: xfig-fix_dash_list_for_different_styles.patch
===================================================================
--- xfig-fix_dash_list_for_different_styles.patch	                        (rev 0)
+++ xfig-fix_dash_list_for_different_styles.patch	2014-01-24 03:47:09 UTC (rev 204603)
@@ -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 };