[pkgsrc/trunk]: pkgsrc/editors/abiword Fixed six little things that prevented...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/52b66c209e5e
branches:  trunk
changeset: 535340:52b66c209e5e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Nov 14 15:41:40 2007 +0000

description:
Fixed six little things that prevented sunpro from building the package.
Now it fails in the linker stage with an undefined reference to
UT_XML::processingInstruction(const char *, const char *).

diffstat:

 editors/abiword/distinfo         |   8 +++++++-
 editors/abiword/patches/patch-sa |  22 ++++++++++++++++++++++
 editors/abiword/patches/patch-sb |  13 +++++++++++++
 editors/abiword/patches/patch-sc |  13 +++++++++++++
 editors/abiword/patches/patch-sd |  13 +++++++++++++
 editors/abiword/patches/patch-se |  13 +++++++++++++
 editors/abiword/patches/patch-sf |  13 +++++++++++++
 7 files changed, 94 insertions(+), 1 deletions(-)

diffs (130 lines):

diff -r 5cddef3e09c8 -r 52b66c209e5e editors/abiword/distinfo
--- a/editors/abiword/distinfo  Wed Nov 14 13:15:36 2007 +0000
+++ b/editors/abiword/distinfo  Wed Nov 14 15:41:40 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2006/11/09 15:25:32 adam Exp $
+$NetBSD: distinfo,v 1.56 2007/11/14 15:41:40 rillig Exp $
 
 SHA1 (abiword-2.4.6.tar.bz2) = 3011d221d09336f09f4bb0732add3405961a8623
 RMD160 (abiword-2.4.6.tar.bz2) = ca56800d811b3aca0af6b2fb6cd70cbea29ab792
@@ -9,3 +9,9 @@
 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5
 SHA1 (patch-af) = d3fe1c03fe80648afb729b3dbc4721c413220a0d
 SHA1 (patch-ag) = a4d4569e2bb67110aa160f2f596c32bbd5bac9c4
+SHA1 (patch-sa) = 97508591d7592f0a70260beddaa5f8acbdb6c154
+SHA1 (patch-sb) = f18bd370f10cfd59d81f949bf7b2d57334109abc
+SHA1 (patch-sc) = 13082820d8826f8418758a5f2c9f7fe78fe2f9e9
+SHA1 (patch-sd) = b371b780d35cf63b9809cad83cd5d50895a19510
+SHA1 (patch-se) = 0b1245d182cffc424b85909373107f1c29393b20
+SHA1 (patch-sf) = 8116fa7c1597a92993c373014b24350b3fa25e4f
diff -r 5cddef3e09c8 -r 52b66c209e5e editors/abiword/patches/patch-sa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-sa  Wed Nov 14 15:41:40 2007 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-sa,v 1.1 2007/11/14 15:41:41 rillig Exp $
+
+--- src/af/util/xp/ut_misc.cpp.orig    2005-06-20 20:59:13.000000000 +0200
++++ src/af/util/xp/ut_misc.cpp 2007-11-14 14:24:39.136875000 +0100
+@@ -1128,7 +1128,7 @@ const XML_Char ** UT_splitPropsToArray(X
+               }
+ 
+               char * semi = NULL;
+-              const char * p = pProps;
++              char * p = pProps;
+               while(semi = strchr(p, ';'))
+               {
+                       *semi = 0;
+@@ -1142,7 +1142,7 @@ const XML_Char ** UT_splitPropsToArray(X
+               const XML_Char ** pPropsArray = new const XML_Char *[2 * iPropCount + 1];
+               UT_return_val_if_fail( pPropsArray, NULL );
+       
+-              const char * pStart = pProps;
++              char * pStart = pProps;
+ 
+               // we want to include the 0-terminator
+               for(i = 0; i <= iLen; i++)
diff -r 5cddef3e09c8 -r 52b66c209e5e editors/abiword/patches/patch-sb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-sb  Wed Nov 14 15:41:40 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-sb,v 1.1 2007/11/14 15:41:41 rillig Exp $
+
+--- src/af/util/xp/ut_png.cpp.orig     2005-01-07 20:44:09.000000000 +0100
++++ src/af/util/xp/ut_png.cpp  2007-11-14 14:26:59.534916000 +0100
+@@ -84,7 +84,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
+       myBB.pBB = pBB;
+       myBB.iCurPos = 0;
+       
+-      png_set_read_fn(png_ptr, static_cast<void *>(&myBB), static_cast<png_rw_ptr>(_png_read));
++      png_set_read_fn(png_ptr, static_cast<void *>(&myBB), _png_read);
+ 
+       /* The call to png_read_info() gives us all of the information from the
+        * PNG file before the first IDAT (image data chunk).  REQUIRED
diff -r 5cddef3e09c8 -r 52b66c209e5e editors/abiword/patches/patch-sc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-sc  Wed Nov 14 15:41:40 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-sc,v 1.1 2007/11/14 15:41:41 rillig Exp $
+
+--- src/af/xap/unix/xap_UnixFont.cpp.orig      2005-10-10 01:28:07.000000000 +0200
++++ src/af/xap/unix/xap_UnixFont.cpp   2007-11-14 14:31:07.730470000 +0100
+@@ -151,7 +151,7 @@ bool XAP_UnixFontHandle::doesGlyphExist(
+ 
+ static float fixedToFloat(signed long in)
+ {
+-  float res = static_cast<float>(in*64);
++      return float(in * 64);
+ }
+ //
+ // UT_Rect of glyph in Logical units.
diff -r 5cddef3e09c8 -r 52b66c209e5e editors/abiword/patches/patch-sd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-sd  Wed Nov 14 15:41:40 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-sd,v 1.1 2007/11/14 15:41:41 rillig Exp $
+
+--- src/af/xap/unix/xap_UnixFrameImpl.cpp.orig 2006-06-16 21:20:13.000000000 +0200
++++ src/af/xap/unix/xap_UnixFrameImpl.cpp      2007-11-14 14:41:10.141208000 +0100
+@@ -739,7 +739,7 @@ gint XAP_UnixFrameImpl::_fe::configure_e
+ 
+               if(!pUnixFrameImpl->m_bDoZoomUpdate && (pUnixFrameImpl->m_iZoomUpdateID == 0))
+               {
+-                      pUnixFrameImpl->m_iZoomUpdateID = g_idle_add(static_cast<GSourceFunc>(do_ZoomUpdate), static_cast<gpointer>(pUnixFrameImpl));
++                      pUnixFrameImpl->m_iZoomUpdateID = g_idle_add(do_ZoomUpdate, static_cast<gpointer>(pUnixFrameImpl));
+               }
+       }
+       return 1;
diff -r 5cddef3e09c8 -r 52b66c209e5e editors/abiword/patches/patch-se
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-se  Wed Nov 14 15:41:40 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-se,v 1.1 2007/11/14 15:41:42 rillig Exp $
+
+--- src/wp/ap/unix/abiwidget.cpp.orig  2005-01-26 20:52:07.000000000 +0100
++++ src/wp/ap/unix/abiwidget.cpp       2007-11-14 14:56:13.329692000 +0100
+@@ -589,7 +589,7 @@ static void s_abi_widget_map_cb(GObject 
+ //
+ // Can't load until this event has finished propagating
+ //
+-        g_idle_add(static_cast<GSourceFunc>(s_abi_widget_load_file),static_cast<gpointer>(abi));
++        g_idle_add(s_abi_widget_load_file,static_cast<gpointer>(abi));
+   }
+ }
+ 
diff -r 5cddef3e09c8 -r 52b66c209e5e editors/abiword/patches/patch-sf
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/editors/abiword/patches/patch-sf  Wed Nov 14 15:41:40 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-sf,v 1.1 2007/11/14 15:41:42 rillig Exp $
+
+--- src/wp/impexp/unix/ie_impGraphic_GdkPixbuf.cpp.orig        2006-06-16 21:30:27.000000000 +0200
++++ src/wp/impexp/unix/ie_impGraphic_GdkPixbuf.cpp     2007-11-14 14:58:13.819843000 +0100
+@@ -396,7 +396,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
+       m_pPngBB = new UT_ByteBuf;  /* Byte Buffer for Converted Data */
+       
+       /* Setting up the Data Writing Function */
+-      png_set_write_fn(m_pPNG, static_cast<void *>(m_pPngBB), static_cast<png_rw_ptr>(_write_png), NULL);
++      png_set_write_fn(m_pPNG, static_cast<void *>(m_pPngBB), _write_png, NULL);
+       
+       return UT_OK;
+ }