Date: Thursday, April 26, 2012 @ 02:40:41 Author: andrea Revision: 157223
upgpkg: calligra 2.4.1-1 Upstream release Modified: calligra/trunk/PKGBUILD Deleted: calligra/trunk/do-not-build-hancomword.patch calligra/trunk/fix-docx-support.patch -------------------------------+ PKGBUILD | 16 ++++------------ do-not-build-hancomword.patch | 11 ----------- fix-docx-support.patch | 18 ------------------ 3 files changed, 4 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-26 04:27:55 UTC (rev 157222) +++ PKGBUILD 2012-04-26 06:40:41 UTC (rev 157223) @@ -22,8 +22,8 @@ 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.4.0 -pkgrel=3 +pkgver=2.4.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -33,18 +33,10 @@ 'libwpd' 'libwpg' 'pstoedit' 'glew' 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'do-not-build-hancomword.patch' - 'fix-docx-support.patch') -md5sums=('a45b9141c6bb750569e8f6554197dd50' - 'cc1a5fba43426003909751035d093362' - 'b694e3af26a31c36488d869f9331090c') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('a4da7e1181e1539850a4fcae466d7d75') 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 cd build Deleted: do-not-build-hancomword.patch =================================================================== --- do-not-build-hancomword.patch 2012-04-26 04:27:55 UTC (rev 157222) +++ do-not-build-hancomword.patch 2012-04-26 06:40:41 UTC (rev 157223) @@ -1,11 +0,0 @@ ---- a/filters/words/CMakeLists.txt -+++ b/filters/words/CMakeLists.txt -@@ -75,7 +75,6 @@ IF( NOT TINY ) - add_subdirectory( docbook ) - # add_subdirectory( html ) - add_subdirectory( kword1.3 ) -- add_subdirectory( hancomword ) - add_subdirectory( oowriter ) - add_subdirectory( palmdoc ) - add_subdirectory( wml ) - Deleted: fix-docx-support.patch =================================================================== --- fix-docx-support.patch 2012-04-26 04:27:55 UTC (rev 157222) +++ fix-docx-support.patch 2012-04-26 06:40:41 UTC (rev 157223) @@ -1,18 +0,0 @@ ---- 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 -