retitle 687913 unblock: abiword/2.9.2+svn20120603-7
--
Updating according to new version uploaded to unstable (full diff from
previous version is attached):
abiword (2.9.2+svn20120603-7) unstable; urgency=low
* new backported patches:
+ r31854_bug-13397-RTF-import-fix-missing-text.patch
to fix missing numbers in beginning of lines on RTF/DOC import
(Closes: #688552).
+ r31855_gtk3-bug-13405.patch
+ r31877_start-layout-only-after-document-is-fully-loaded.patch
- removed unused (duplicate) patch file.
This version fixing serious bug when abiword dropping numbers from beginning
of lines on document open.
Thank you.
Regards,
Dmitry.
diff --git a/debian/changelog b/debian/changelog
index 3834422..fb2ce87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
+abiword (2.9.2+svn20120603-7) unstable; urgency=low
+
+ * new backported patches:
+ + r31854_bug-13397-RTF-import-fix-missing-text.patch
+ to fix missing numbers in beginning of lines on RTF/DOC import
+ (Closes: #688552).
+ + r31855_gtk3-bug-13405.patch
+ + r31877_start-layout-only-after-document-is-fully-loaded.patch
+ - removed unused (duplicate) patch file.
+
+ -- Dmitry Smirnov <onlyjob@member.fsf.org> Mon, 24 Sep 2012 11:10:44 +1000
+
abiword (2.9.2+svn20120603-6) unstable; urgency=low
* debian/watch to find all available versions with fallback to latest-dev.
* new patch to fix collab backend if built --with-gtk2 and to fix FTBFS
diff --git a/debian/patches/r31847_fix-program-hanging-during-paste-unformatted.patch b/debian/patches/r31847_fix-program-hanging-during-paste-unformatted.patch
index 64c3c57..a35b71f 100644
--- a/debian/patches/r31847_fix-program-hanging-during-paste-unformatted.patch
+++ b/debian/patches/r31847_fix-program-hanging-during-paste-unformatted.patch
@@ -3,15 +3,8 @@ Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Forwarded: not-needed
Description: backported patch
Bug 13401: fix program hanging during paste unformatted
-git-svn-id: http://svn.abisource.com/abiword/trunk@31847 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
----
- src/text/ptbl/xp/pd_Document.cpp | 17 +++++++++++++----
- src/text/ptbl/xp/pd_Document.h | 3 ++-
- src/wp/impexp/xp/ie_imp.cpp | 5 +++--
- 3 files changed, 18 insertions(+), 7 deletions(-)
-
--- a/src/text/ptbl/xp/pd_Document.cpp
+++ b/src/text/ptbl/xp/pd_Document.cpp
@@ -1327,10 +1327,9 @@
* If pAttrProp is set to NULL, the text will be set to exactly
diff --git a/debian/patches/r31854_bug-13397-RTF-import-fix-missing-text.patch b/debian/patches/r31854_bug-13397-RTF-import-fix-missing-text.patch
new file mode 100644
index 0000000..6148460
--- /dev/null
+++ b/debian/patches/r31854_bug-13397-RTF-import-fix-missing-text.patch
@@ -0,0 +1,43 @@
+Last-Update: 2012-09-24
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Origin: r31854
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=688552
+Bug-Abiword: http://bugzilla.abisource.com/show_bug.cgi?id=13397
+Description: backported patch to fix missing text on RTF/DOC import
+ fixes RTF importer: Use PopRTFState on a closing
+ backet if PushRTFState was called on the corresponding
+ opening bracket.
+
+--- a/src/wp/impexp/xp/ie_imp_RTF.cpp
++++ b/src/wp/impexp/xp/ie_imp_RTF.cpp
+@@ -2638,6 +2638,13 @@
+ UT_DEBUGMSG(("FlushStoredChars()\n"));
+ }
+ }
++
++ /* m_stateStack.getDepth() == 0 if the functions PushRTFState and PopRTFState
++ have been called the same number of times. Each call to PushRTFState on an
++ opening bracket ("{") should be followed by a call to PopRTFState on the
++ corresponding closing bracket ("}").*/
++ UT_ASSERT(m_stateStack.getDepth() == 0);
++
+ // UT_DEBUGMSG(("dumping document\n"));
+ // getDoc()->__dump(stderr);
+ return ok ? UT_OK : UT_ERROR;
+@@ -8905,6 +8912,7 @@
+ PD_DocumentRDFMutationHandle m = rdf->createMutation();
+ /*UT_Error e = */loadRDFXML( m, rdfxml );
+ m->commit();
++ PopRTFState();
+ UT_DEBUGMSG(("rdf triples after read of rdf tag size:%ld\n", (long)rdf->size() ));
+ return true;
+ }
+@@ -12525,6 +12533,7 @@
+ break;
+ }
+ } while ((tokenType != RTF_TOKEN_CLOSE_BRACE) || (nested >= 0));
++ PopRTFState();
+ return true;
+ }
+
diff --git a/debian/patches/r31855_gtk3-bug-13405.patch b/debian/patches/r31855_gtk3-bug-13405.patch
new file mode 100644
index 0000000..c488194
--- /dev/null
+++ b/debian/patches/r31855_gtk3-bug-13405.patch
@@ -0,0 +1,18 @@
+Last-Update: 2012-09-24
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Origin: r31855
+Bug-Abiword: http://bugzilla.abisource.com/show_bug.cgi?id=13405
+Description: backported patch to fix GTK3 bug
+
+--- a/src/wp/ap/gtk/abiwidget.cpp
++++ b/src/wp/ap/gtk/abiwidget.cpp
+@@ -2022,7 +2022,7 @@
+ gtk_widget_set_can_focus(GTK_WIDGET(abi), true);
+ gtk_widget_set_receives_default(GTK_WIDGET(abi), true);
+ gtk_widget_set_can_default(GTK_WIDGET(abi), true);
+- gtk_widget_set_has_window(GTK_WIDGET(abi), false);
++ gtk_widget_set_has_window(GTK_WIDGET(abi), true);
+ }
+
+ static void
diff --git a/debian/patches/r31861-fix-fake-collab-backend.patch b/debian/patches/r31861-fix-fake-collab-backend.patch
deleted file mode 100644
index 9a1a2f5..0000000
--- a/debian/patches/r31861-fix-fake-collab-backend.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Last-Update: 2012-09-08
-Author: Dmitry Smirnov <onlyjob@member.fsf.org>
-Forwarded: not-needed
-Description: backported patch (r31861) to fix FTBFS with --enable-collab-backend-fake
-
---- a/plugins/collab/backends/fake/xp/FakeAccountHandler.cpp
-+++ b/plugins/collab/backends/fake/xp/FakeAccountHandler.cpp
-@@ -295,7 +295,7 @@
- {
- UT_DEBUGMSG(("Starting a locally controlled collaboration session: %s\n", sSessionId.utf8_str()));
- // FIXME: we need to set the proper collab id and master descriptor
-- m_pSession = pManager->startSession(m_pDoc, sSessionId, NULL, "fake://master");
-+ m_pSession = pManager->startSession(m_pDoc, sSessionId, this, true, NULL, "fake://master");
- }
- else
- {
-@@ -320,8 +320,7 @@
- }
-
- addBuddy(pCollaborator);
-- XAP_Frame* pFrame = XAP_App::getApp()->newFrame(); // FIXME: this is a memory leak
-- m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, pFrame);
-+ m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, this, true);
- pManager->joinSession(m_pSession, pCollaborator);
- }
-
---- a/plugins/collab/backends/fake/xp/FakeAccountHandler.h
-+++ b/plugins/collab/backends/fake/xp/FakeAccountHandler.h
-@@ -64,6 +64,8 @@
- { return false; }
- virtual void forceDisconnectBuddy(BuddyPtr pBuddy);
- virtual bool recognizeBuddyIdentifier(const std::string& identifier);
-+ virtual bool hasPersistentAccessControl()
-+ { return true; }
-
- // session management
- virtual bool allowsSessionTakeover()
---- a/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp
-+++ b/plugins/collab/core/session/xp/AbiCollabSessionManager.cpp
-@@ -94,6 +94,9 @@
- #ifdef ABICOLLAB_HANDLER_SIPSIMPLE
- #include <backends/sipsimple/unix/SIPSimpleUnixAccountHandler.h>
- #endif
-+#ifdef ABICOLLAB_HANDLER_FAKE
-+#include <backends/fake/xp/FakeAccountHandler.h>
-+#endif
-
- // event includes
- #include <account/xp/Event.h>
-@@ -287,6 +290,10 @@
- #ifdef ABICOLLAB_HANDLER_SIPSIMPLE
- m_regAccountHandlers[SIPSimpleAccountHandler::getStaticStorageType()] = SIPSimpleAccountHandlerConstructor;
- #endif
-+#ifdef ABICOLLAB_HANDLER_FAKE
-+ AccountHandler *pFakeHandler = new FakeAccountHandler("FakeAbiCollabBackend", NULL);
-+ addAccount(pFakeHandler);
-+#endif
- return true;
- }
-
diff --git a/debian/patches/r31877_start-layout-only-after-document-is-fully-loaded.patch b/debian/patches/r31877_start-layout-only-after-document-is-fully-loaded.patch
new file mode 100644
index 0000000..87d67a9
--- /dev/null
+++ b/debian/patches/r31877_start-layout-only-after-document-is-fully-loaded.patch
@@ -0,0 +1,18 @@
+Last-Update: 2012-09-24
+Author: Dmitry Smirnov <onlyjob@member.fsf.org>
+Forwarded: not-needed
+Origin: r31877
+Description: backported patch
+ Start layout only after document is fully loaded
+
+--- a/src/text/fmt/xp/fl_DocLayout.cpp
++++ b/src/text/fmt/xp/fl_DocLayout.cpp
+@@ -2932,7 +2932,7 @@
+ fl_SectionLayout* pSL = m_pFirstSection;
+ while (pSL)
+ {
+- if(!isLayoutFilling() || (pSL->getType() == FL_SECTION_DOC))
++ if(!isLayoutFilling())
+ {
+ pSL->updateLayout(false);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 3f7cfb2..7dd82aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,9 +22,12 @@ r31768_correct-horizontal-scroll-limit.patch
r31842_fix-crash-13401.patch
r31843_prevent-crash.patch
r31844_fix-gtk3-presentation.patch
r31847_fix-program-hanging-during-paste-unformatted.patch
+r31854_bug-13397-RTF-import-fix-missing-text.patch
+r31855_gtk3-bug-13405.patch
r31861_fix-FTBFS-with-fake-collab-backend.patch
+r31877_start-layout-only-after-document-is-fully-loaded.patch
r31901_fix-crash-on-open-doc-with-table-in-header.patch
r31909_fix-doc-corruption.patch
r31910_fix-memory-leak-in-ABW-exporter.patch
r31914_fix-clip-art-window.patch
Attachment:
signature.asc
Description: This is a digitally signed message part.