[pkgsrc/trunk]: pkgsrc/editors/abiword Fix a problem with fontconfig 2.4.x; r...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f511845b2dc7
branches:  trunk
changeset: 519553:f511845b2dc7
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Oct 05 10:49:23 2006 +0000

description:
Fix a problem with fontconfig 2.4.x; revision bump

diffstat:

 editors/abiword/Makefile         |   4 ++--
 editors/abiword/distinfo         |   3 ++-
 editors/abiword/patches/patch-ae |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs (49 lines):

diff -r 0bfe7ceacacb -r f511845b2dc7 editors/abiword/Makefile
--- a/editors/abiword/Makefile  Thu Oct 05 10:05:41 2006 +0000
+++ b/editors/abiword/Makefile  Thu Oct 05 10:49:23 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2006/09/16 12:20:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.104 2006/10/05 10:49:23 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Open Source cross-platform word processor
 
diff -r 0bfe7ceacacb -r f511845b2dc7 editors/abiword/distinfo
--- a/editors/abiword/distinfo  Thu Oct 05 10:05:41 2006 +0000
+++ b/editors/abiword/distinfo  Thu Oct 05 10:49:23 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2006/07/10 21:40:49 adam Exp $
+$NetBSD: distinfo,v 1.54 2006/10/05 10:49:23 adam Exp $
 
 SHA1 (abiword-2.4.5.tar.bz2) = bca02a8beb490246f785518fc82c6c557a77a88d
 RMD160 (abiword-2.4.5.tar.bz2) = f0de27f97135f8fff9b4400b05d74a27eee348cd
@@ -7,5 +7,6 @@
 SHA1 (patch-ab) = 94191b278b6c5d0a37231efde9dc11097d6c1590
 SHA1 (patch-ac) = 8fe244939c96a322a4db61463b8f66af0fc61e35
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
+SHA1 (patch-ae) = a9d395f4128765737095655e94e586eb3a9c7b1f
 SHA1 (patch-af) = d3fe1c03fe80648afb729b3dbc4721c413220a0d
 SHA1 (patch-ag) = a4d4569e2bb67110aa160f2f596c32bbd5bac9c4
diff -r 0bfe7ceacacb -r f511845b2dc7 editors/abiword/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-ae  Thu Oct 05 10:49:23 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.19 2006/10/05 10:49:24 adam Exp $
+
+--- 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)