Re: Abiword crashes on amd64

[Kouichirou Hiratsuka <hira%po6.nsk.ne.jp@localhost>]

Hello,

[It's not about pkgsrc infrastructure.  Move to pkgsrc-users.]

At Thu, 5 Oct 2006 07:52:16 +0200,
Adam wrote:
> 
> > and it's getting worse... in the previous branch it came through the
> > build process, but now not even that.
> >
> > A fragment from the build (on amd64):
> >
> > menuview.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > menuweb.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > menuwindow.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > rulers.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > toolbarextra.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > toolbarformatting.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > toolbarstandard.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > workspace.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> > index.abw
> > [1]   Abort trap (core dumped) ${ABI_DOC_PROG} ...
> 
> There's a problem with fontconfig 2.4.x and, I guess, it happens on  
> any platform. :/
> 

It's fixed in CVS of abiword.

  http://www.abiword.org/mailinglists/abiword-dev/2006/Sep/0052.html

The following patch works fine for me.  If it's OK, please commit.

best regards.
--
 Kouichirou Hiratsuka
   hira%po6.nsk.ne.jp@localhost

diff -ruN abiword.orig/Makefile abiword/Makefile
--- abiword.orig/Makefile       2006-10-05 18:21:04.000000000 +0900
+++ abiword/Makefile    2006-10-05 18:23:07.000000000 +0900
@@ -2,7 +2,7 @@
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Open Source cross-platform word processor
 
diff -ruN abiword.orig/distinfo abiword/distinfo
--- abiword.orig/distinfo       2006-10-05 18:21:04.000000000 +0900
+++ abiword/distinfo    2006-10-05 18:21:25.000000000 +0900
@@ -9,3 +9,4 @@
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
 SHA1 (patch-af) = d3fe1c03fe80648afb729b3dbc4721c413220a0d
 SHA1 (patch-ag) = a4d4569e2bb67110aa160f2f596c32bbd5bac9c4
+SHA1 (patch-am) = a9d395f4128765737095655e94e586eb3a9c7b1f
diff -ruN abiword.orig/patches/patch-am abiword/patches/patch-am
--- abiword.orig/patches/patch-am       1970-01-01 09:00:00.000000000 +0900
+++ abiword/patches/patch-am    2006-10-05 18:21:11.000000000 +0900
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/af/xap/unix/xap_UnixApp.cpp.orig       2006-10-05 11:18:55.000000000 
+0900
++++ src/af/xap/unix/xap_UnixApp.cpp    2006-10-05 11:19:58.000000000 +0900
+@@ -134,10 +134,6 @@
+       DELETEP(m_pUnixToolbarIcons);
+       
+       delete m_fontManager;
+-
+-#if FC_MINOR > 2
+-      FcFini();
+-#endif
+ }
+ 
+ bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * 
szKeyBindingsDefaultValue)