[arch-commits] Commit in calligra/trunk (PKGBUILD fix-docx-support.patch)

[Andrea Scarpino]

    Date: Friday, April 20, 2012 @ 15:16:28
  Author: andrea
Revision: 156551

Fix docx support (FS#29483)

Added:
  calligra/trunk/fix-docx-support.patch
Modified:
  calligra/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    9 ++++++---
 fix-docx-support.patch |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-20 19:15:51 UTC (rev 156550)
+++ PKGBUILD	2012-04-20 19:16:28 UTC (rev 156551)
@@ -23,7 +23,7 @@
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.4.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -34,13 +34,16 @@
              'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'do-not-build-hancomword.patch')
+        'do-not-build-hancomword.patch'
+        'fix-docx-support.patch')
 md5sums=('a45b9141c6bb750569e8f6554197dd50'
-         'cc1a5fba43426003909751035d093362')
+         'cc1a5fba43426003909751035d093362'
+         'b694e3af26a31c36488d869f9331090c')
 
 build() {
   cd "${srcdir}"/${pkgbase}-${pkgver}
   patch -p1 -i "${srcdir}"/do-not-build-hancomword.patch
+  patch -p1 -i "${srcdir}"/fix-docx-support.patch
 
   cd "${srcdir}"
   mkdir build

Added: fix-docx-support.patch
===================================================================
--- fix-docx-support.patch	                        (rev 0)
+++ fix-docx-support.patch	2012-04-20 19:16:28 UTC (rev 156551)
@@ -0,0 +1,18 @@
+--- a/libs/odf/KoXmlWriter.h
++++ b/libs/odf/KoXmlWriter.h
+@@ -252,6 +252,14 @@ private:
+         Tag(const char* t = 0, bool ind = true)
+                 : tagName(t), hasChildren(false), lastChildIsText(false),
+                 openingTagClosed(false), indentInside(ind) {}
++        Tag(const Tag &original)
++        {
++            tagName = original.tagName;
++            hasChildren = original.hasChildren;
++            lastChildIsText = original.lastChildIsText;
++            openingTagClosed = original.openingTagClosed;
++            indentInside = original.indentInside;
++        }
+         const char* tagName;
+         bool hasChildren : 1; ///< element or text children
+         bool lastChildIsText : 1; ///< last child is a text node
+