From c8f7fc65d17176cc8d468dff4d1a1be20b6e17cb Mon Sep 17 00:00:00 2001 From: Marc Maurer Date: Mon, 4 Apr 2005 11:40:22 +0000 Subject: [PATCH] Update AbiWord to 2.2.6 --- abiword-2.2.1-desktop.patch | 28 ----------------- abiword-2.2.5-gcc4.patch | 41 ------------------------ abiword-2.2.5-pt64.patch | 26 --------------- abiword-2.2.5-virtdestr.patch | 59 ----------------------------------- abiword-2.2.5-wvread.patch | 21 ------------- abiword-2.2.6-desktop.patch | 11 +++++++ abiword.spec | 18 +++++------ 7 files changed, 18 insertions(+), 186 deletions(-) delete mode 100644 abiword-2.2.1-desktop.patch delete mode 100644 abiword-2.2.5-gcc4.patch delete mode 100644 abiword-2.2.5-pt64.patch delete mode 100644 abiword-2.2.5-virtdestr.patch delete mode 100644 abiword-2.2.5-wvread.patch create mode 100644 abiword-2.2.6-desktop.patch diff --git a/abiword-2.2.1-desktop.patch b/abiword-2.2.1-desktop.patch deleted file mode 100644 index e9184a3..0000000 --- a/abiword-2.2.1-desktop.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- abiword-2.2.1/abi/abiword.desktop.desktop 2004-12-06 08:55:02.366730824 +0000 -+++ abiword-2.2.1/abi/abiword.desktop 2004-12-06 08:57:31.004206527 +0000 -@@ -6,11 +6,17 @@ - Categories=Application;Office;WordProcessor;X-Red-Hat-Base; - StartupNotify=true - Encoding=UTF-8 --X-Desktop-File-Install-Version=0.4 --MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain; --Name=AbiWord Word Processor --Name[de]=AbiWord Textverarbeitung --Name[nb]=AbiWord Tekstbehandling --Name[nn]=AbiWord Tekstbehandling --Name[no]=AbiWord Tekstbehandler --Name[pt]=AbiWord Processador de Texto -+X-Desktop-File-Install-Version=0.9 -+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite; -+Name=Word Processor -+Comment=AbiWord Word Processor -+Name[de]=Textverarbeitung -+Comment[de]=AbiWord Textverarbeitung -+Name[nb]=Tekstbehandling -+Comment[nb]=AbiWord Tekstbehandling -+Name[nn]=Tekstbehandling -+Comment[nn]=AbiWord Tekstbehandling -+Name[no]=Tekstbehandler -+Comment[no]=AbiWord Tekstbehandler -+Name[pt]=Processador de Texto -+Comment[pt]=AbiWord Processador de Texto diff --git a/abiword-2.2.5-gcc4.patch b/abiword-2.2.5-gcc4.patch deleted file mode 100644 index 360aa24..0000000 --- a/abiword-2.2.5-gcc4.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ru abiword-2.2.5.orig/wv/wvConfig.c abiword-2.2.5/wv/wvConfig.c ---- abiword-2.2.5.orig/wv/wvConfig.c 2005-03-04 08:48:33.804025324 +0000 -+++ abiword-2.2.5/wv/wvConfig.c 2005-03-04 08:50:44.807202081 +0000 -@@ -2130,7 +2130,7 @@ - } - - static void --startElement (void *userData, const XML_Char *name, const XML_Char **atts) -+wvstartElement (void *userData, const XML_Char *name, const XML_Char **atts) - { - unsigned int nAtts = 0; - const XML_Char **p; -@@ -3094,7 +3094,7 @@ - } - - static void --endElement (void *userData, const XML_Char *name) -+wvendElement (void *userData, const XML_Char *name) - { - state_data *mydata = (state_data *) userData; - unsigned int token_type; -@@ -3470,8 +3470,8 @@ - memset(&hdl, 0, sizeof(hdl)); - - hdl.getEntity = _getEntity; -- hdl.startElement = startElement; -- hdl.endElement = endElement; -+ hdl.startElement = wvstartElement; -+ hdl.endElement = wvendElement; - hdl.characters = charData; - - if (myhandle->fp) -@@ -3514,7 +3514,7 @@ - size_t len; - - XML_SetUserData (parser, myhandle); -- XML_SetElementHandler (parser, startElement, endElement); -+ XML_SetElementHandler (parser, wvstartElement, wvendElement); - XML_SetCharacterDataHandler (parser, charData); - - if (myhandle->fp == NULL) diff --git a/abiword-2.2.5-pt64.patch b/abiword-2.2.5-pt64.patch deleted file mode 100644 index 8120fa0..0000000 --- a/abiword-2.2.5-pt64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -r -u abiword-2.2.5.orig/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp abiword-2.2.5/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp ---- abiword-2.2.5.orig/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp 2004-04-03 19:48:28.000000000 +0200 -+++ abiword-2.2.5/abi/src/text/ptbl/xp/pp_TableAttrProp.cpp 2005-03-15 21:33:41.519703662 +0100 -@@ -53,10 +53,9 @@ - static UT_sint32 compareAPBinary(const void * vX1, const void * vX2) - { - // --// vX1 is actually the key value (a UT_uint32 checkSum) cast into a --// void * pointer so this cast is correct even on a 64 bit machine -+// vX1 is actually a pointer to a UT_uint32 key value (a checkSum) - // -- UT_uint32 u1 = ((UT_uint32) (vX1)); -+ UT_uint32 u1 = *((UT_uint32*) (vX1)); - PP_AttrProp *x2 = *(PP_AttrProp **)(vX2); - UT_uint32 u2 = x2->getCheckSum(); - -@@ -176,7 +175,8 @@ - // VC6 complains about not being able to convert from - // 'const class UT_Vector *' to 'class UT_Vector &' - // so I put in the cast to shut it up -- k = ((UT_Vector &)m_vecTableSorted).binarysearch(reinterpret_cast(pMatch->getCheckSum()), compareAPBinary); -+ UT_uint32 checksum = pMatch->getCheckSum(); -+ k = ((UT_Vector &)m_vecTableSorted).binarysearch(reinterpret_cast(&checksum), compareAPBinary); - UT_uint32 cksum = pMatch->getCheckSum(); - - if (k == -1) diff --git a/abiword-2.2.5-virtdestr.patch b/abiword-2.2.5-virtdestr.patch deleted file mode 100644 index 00be42f..0000000 --- a/abiword-2.2.5-virtdestr.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff -u -r abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Graphics.h abiword-2.2.5/abi/src/af/gr/xp/gr_Graphics.h ---- abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Graphics.h 2005-01-01 01:16:58.000000000 +0100 -+++ abiword-2.2.5/abi/src/af/gr/xp/gr_Graphics.h 2005-03-15 21:05:32.020613488 +0100 -@@ -247,6 +247,8 @@ - class GR_AllocInfo - { - public: -+ virtual ~GR_AllocInfo() {} -+ - virtual GR_GraphicsId getType() const {UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); return GRID_UNKNOWN;} - virtual bool isPrinterGraphics()const {UT_ASSERT_HARMLESS(UT_NOT_IMPLEMENTED); return false;} - }; -diff -u -r abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Image.h abiword-2.2.5/abi/src/af/gr/xp/gr_Image.h ---- abiword-2.2.5.orig/abi/src/af/gr/xp/gr_Image.h 2004-03-18 17:00:48.000000000 +0100 -+++ abiword-2.2.5/abi/src/af/gr/xp/gr_Image.h 2005-03-15 21:05:32.040610718 +0100 -@@ -79,6 +79,8 @@ - class ABI_EXPORT GR_ImageFactory - { - public: -+ virtual ~GR_ImageFactory() {} -+ - virtual GR_Image* createNewImage(const char* pszName, GR_Image::GRType iType = GR_Image::GRT_Raster) = 0; - }; - -diff -u -r abiword-2.2.5.orig/abi/src/af/util/xp/ut_TextIterator.h abiword-2.2.5/abi/src/af/util/xp/ut_TextIterator.h ---- abiword-2.2.5.orig/abi/src/af/util/xp/ut_TextIterator.h 2004-03-10 23:03:21.000000000 +0100 -+++ abiword-2.2.5/abi/src/af/util/xp/ut_TextIterator.h 2005-03-15 21:05:32.063607531 +0100 -@@ -104,6 +104,7 @@ - class ABI_EXPORT UT_TextIterator - { - public: -+ virtual ~UT_TextIterator() {} - - ///////////////////////////////////////////////////////////////////////// - // data accessor; retrieves character at present position -diff -u -r abiword-2.2.5.orig/abi/src/af/xap/xp/xap_AppImpl.h abiword-2.2.5/abi/src/af/xap/xp/xap_AppImpl.h ---- abiword-2.2.5.orig/abi/src/af/xap/xp/xap_AppImpl.h 2004-02-06 12:13:47.000000000 +0100 -+++ abiword-2.2.5/abi/src/af/xap/xp/xap_AppImpl.h 2005-03-15 21:05:32.084604622 +0100 -@@ -27,6 +27,8 @@ - class XAP_AppImpl - { - public: -+ virtual ~XAP_AppImpl() {} -+ - static XAP_AppImpl* static_constructor(void); /* must be implemented by the ap_AppImpl */ - - /* XAP_App can call impl methods. */ -diff -u -r abiword-2.2.5.orig/abi/src/af/xap/xp/xav_Listener.h abiword-2.2.5/abi/src/af/xap/xp/xav_Listener.h ---- abiword-2.2.5.orig/abi/src/af/xap/xp/xav_Listener.h 2004-10-05 12:25:42.000000000 +0200 -+++ abiword-2.2.5/abi/src/af/xap/xp/xav_Listener.h 2005-03-15 21:05:32.104601851 +0100 -@@ -94,6 +94,8 @@ - class AV_Listener - { - public: -+ virtual ~AV_Listener() {} -+ - virtual bool notify(AV_View * pView, const AV_ChangeMask mask) = 0; - virtual AV_ListenerType getType(void) = 0; - }; diff --git a/abiword-2.2.5-wvread.patch b/abiword-2.2.5-wvread.patch deleted file mode 100644 index 395eada..0000000 --- a/abiword-2.2.5-wvread.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u abiword-2.2.5.orig/wv/libole2/ms-ole.c abiword-2.2.5/wv/libole2/ms-ole.c ---- abiword-2.2.5.orig/wv/libole2/ms-ole.c 2004-10-23 02:59:51.000000000 +0200 -+++ abiword-2.2.5/wv/libole2/ms-ole.c 2005-03-14 23:36:08.130603903 +0100 -@@ -482,7 +482,7 @@ - - offset = (b+1)*BB_BLOCK_SIZE; - f->syswrap->lseek (f->file_des, offset, SEEK_SET, f->syswrap->closure); -- f->syswrap->read (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure); -+ (f->syswrap->read) (f->file_des, attr->data, BB_BLOCK_SIZE, f->syswrap->closure); - attr->usage = 1; - attr->dirty = forwrite; - -@@ -1791,7 +1791,7 @@ - f->mem = g_new (guint8, BB_BLOCK_SIZE); - - if (!f->mem || -- f->syswrap->read (file, f->mem, BB_BLOCK_SIZE, -+ (f->syswrap->read) (file, f->mem, BB_BLOCK_SIZE, - f->syswrap->closure) == -1) { - g_warning ("Error reading header\n"); - f->syswrap->close (file, f->syswrap->closure) ; diff --git a/abiword-2.2.6-desktop.patch b/abiword-2.2.6-desktop.patch new file mode 100644 index 0000000..8ffb7cb --- /dev/null +++ b/abiword-2.2.6-desktop.patch @@ -0,0 +1,11 @@ +--- abiword-2.2.6.orig/abi/abiword.desktop 2005-04-03 17:14:30.000000000 +0200 ++++ abiword-2.2.6/abi/abiword.desktop 2005-04-04 02:09:01.000000000 +0200 +@@ -7,7 +7,7 @@ + StartupNotify=true + Encoding=UTF-8 + X-Desktop-File-Install-Version=0.9 +-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html; ++MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite; + Name=Word Processor + Comment=AbiWord Word Processor + Name[de]=Textverarbeitung diff --git a/abiword.spec b/abiword.spec index 4f5d78a..6dc0020 100644 --- a/abiword.spec +++ b/abiword.spec @@ -2,8 +2,8 @@ Summary: The AbiWord word processor Name: abiword -Version: 2.2.5 -Release: 3 +Version: 2.2.6 +Release: 1 Epoch: 1 Group: Applications/Editors License: GPL @@ -39,11 +39,7 @@ BuildRequires: libgnomeui-devel URL: http://www.abisource.com/ Patch0: abiword-2.0.9-windowshelppaths.patch -Patch1: abiword-2.2.1-desktop.patch -Patch2: abiword-2.2.5-gcc4.patch -Patch3: abiword-2.2.5-wvread.patch -Patch4: abiword-2.2.5-virtdestr.patch -Patch5: abiword-2.2.5-pt64.patch +Patch1: abiword-2.2.6-desktop.patch %description AbiWord is a cross-platform Open Source word processor. The goal is to make @@ -53,10 +49,6 @@ AbiWord full-featured, and remain lean. %setup -q %patch0 -p1 -b .windowshelppaths %patch1 -p1 -b .desktop -%patch2 -p1 -b .gcc4 -%patch3 -p1 -b .wvread -%patch4 -p1 -b .virtdestr -%patch5 -p1 -b .pt64 %build cd abi @@ -135,6 +127,10 @@ update-desktop-database %{_datadir}/applications %{_datadir}/icons/*png %changelog +* Sun Apr 3 2005 Marc Maurer - 1:2.2.6-1 +- Drop the gcc4, wvread, virtdestr and pt64 patches +- Update the desktop patch + * Fri Mar 15 2005 Marc Maurer - 1:2.2.5-3 - Fix 64bit build - Add virtual destructors to classes with virtual functions