[pkgsrc/pkgsrc-2006Q3]: pkgsrc/editors/abiword Pullup ticket 1846 - requested...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ae75bafd03d
branches:  pkgsrc-2006Q3
changeset: 519114:8ae75bafd03d
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Oct 07 03:21:26 2006 +0000

description:
Pullup ticket 1846 - requested by hira
runtime fix for abiword

Revisions pulled up:
- pkgsrc/editors/abiword/Makefile                       1.104
- pkgsrc/editors/abiword/distinfo                       1.54
- pkgsrc/editors/abiword/patches/patch-ae               1.19

   Module Name:         pkgsrc
   Committed By:        adam
   Date:                Thu Oct  5 10:49:24 UTC 2006

   Modified Files:
        pkgsrc/editors/abiword: Makefile distinfo
   Added Files:
        pkgsrc/editors/abiword/patches: patch-ae

   Log Message:
   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 7a629bf07d1e -r 8ae75bafd03d editors/abiword/Makefile
--- a/editors/abiword/Makefile  Sat Oct 07 02:59:15 2006 +0000
+++ b/editors/abiword/Makefile  Sat Oct 07 03:21:26 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.103 2006/09/16 12:20:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.103.2.1 2006/10/07 03:21:26 salo Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 COMMENT=       Open Source cross-platform word processor
 
diff -r 7a629bf07d1e -r 8ae75bafd03d editors/abiword/distinfo
--- a/editors/abiword/distinfo  Sat Oct 07 02:59:15 2006 +0000
+++ b/editors/abiword/distinfo  Sat Oct 07 03:21:26 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2006/07/10 21:40:49 adam Exp $
+$NetBSD: distinfo,v 1.53.2.1 2006/10/07 03:21:26 salo 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 7a629bf07d1e -r 8ae75bafd03d editors/abiword/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-ae  Sat Oct 07 03:21:26 2006 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.18.2.1 2006/10/07 03:21:27 salo 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)