diff options
| author | J.M. Maurer <uwog@uwog.net> | 2008-04-24 21:26:09 (GMT) |
|---|---|---|
| committer | J.M. Maurer <uwog@uwog.net> | 2008-04-24 21:26:09 (GMT) |
| commit | f580822960d586d154d20817bbfc5cdca4889600 (patch) | |
| tree | b2fe839382ca6acfa16e230c133087230d22f7bf /config/modulesets/patches | |
| parent | 4c627121d20d5b201a649d4be176e348a049d4c8 (diff) | |
Update to abiword 2.6.2 and pyabiword 0.6.1
Diffstat (limited to 'config/modulesets/patches')
| -rw-r--r-- | config/modulesets/patches/libabiword-docreplace-r22844.patch | 23 | ||||
| -rw-r--r-- | config/modulesets/patches/libabiword-plugins-odt-mimetype-fix-r22396.diff | 37 |
2 files changed, 0 insertions, 60 deletions
diff --git a/config/modulesets/patches/libabiword-docreplace-r22844.patch b/config/modulesets/patches/libabiword-docreplace-r22844.patch deleted file mode 100644 index d20e775..0000000 --- a/config/modulesets/patches/libabiword-docreplace-r22844.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u -r libabiword-2.6.0.svn20071127.orig/src/wp/ap/unix/abiwidget.cpp libabiword-2.6.0.svn20071127/src/wp/ap/unix/abiwidget.cpp ---- libabiword-2.6.0.svn20071127.orig/src/wp/ap/unix/abiwidget.cpp 2007-11-24 20:19:03.000000000 +0100 -+++ libabiword-2.6.0.svn20071127/src/wp/ap/unix/abiwidget.cpp 2008-03-22 21:42:22.000000000 +0100 -@@ -890,6 +890,19 @@ - { - case APF_ReplaceDocument: - UT_DEBUGMSG(("Replace document signalled\n")); -+ // -+ // Not sure what got broken for us to need this. -+ // Views should be deleted before their documents -+ // Nonetheless this fixes bug 11421 crash in sugar -+ // when changing document with a shared session. -+ // -+ // -+ if (m_pWidget->priv->m_pFrame->getCurrentView()) -+ { -+ FV_View * pView = static_cast<FV_View *>(m_pWidget->priv->m_pFrame->getCurrentView()); -+ m_pWidget->priv->m_pDoc = pView->getDocument(); -+ } -+ - break; - case APF_ReplaceView: - UT_DEBUGMSG(("Replace view signalled\n")); diff --git a/config/modulesets/patches/libabiword-plugins-odt-mimetype-fix-r22396.diff b/config/modulesets/patches/libabiword-plugins-odt-mimetype-fix-r22396.diff deleted file mode 100644 index ddf678b..0000000 --- a/config/modulesets/patches/libabiword-plugins-odt-mimetype-fix-r22396.diff +++ /dev/null @@ -1,37 +0,0 @@ -diff -u -r libabiword-plugins-2.6.0.svn20071113.orig/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.cpp libabiword-plugins-2.6.0.svn20071113/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.cpp ---- libabiword-plugins-2.6.0.svn20071113.orig/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.cpp 2007-01-17 15:48:05.000000000 +0100 -+++ libabiword-plugins-2.6.0.svn20071113/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.cpp 2008-01-06 16:29:44.000000000 +0100 -@@ -57,9 +57,21 @@ - } - - -+/** -+ * Recognize this MIMEType -+ */ -+UT_Confidence_t IE_Exp_OpenDocument_Sniffer::supportsMIME(const char * szMIME) -+{ -+ if (g_ascii_strcasecmp(szMIME, "application/vnd.oasis.opendocument.text") == 0) -+ { -+ return UT_CONFIDENCE_PERFECT; -+ } -+ return UT_CONFIDENCE_ZILCH; -+} -+ - - /** -- * Construct an importer for us -+ * Construct an exporter for us - */ - UT_Error IE_Exp_OpenDocument_Sniffer::constructExporter(PD_Document * pDocument, - IE_Exp ** ppie) -diff -u -r libabiword-plugins-2.6.0.svn20071113.orig/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h libabiword-plugins-2.6.0.svn20071113/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h ---- libabiword-plugins-2.6.0.svn20071113.orig/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h 2005-11-25 18:27:16.000000000 +0100 -+++ libabiword-plugins-2.6.0.svn20071113/wp/impexp/OpenDocument/exp/xp/ie_exp_OpenDocument_Sniffer.h 2008-01-06 16:29:44.000000000 +0100 -@@ -39,6 +39,7 @@ - - virtual bool recognizeSuffix(const char * szSuffix) ; - -+ virtual UT_Confidence_t supportsMIME(const char * szMIME); - virtual UT_Error constructExporter(PD_Document * pDocument, - IE_Exp ** ppie) ; - |