Backport from testing

koffice/PKGBUILD

@@ -22,7 +22,7 @@ pkgname=('koffice-common'
         'koffice-doc')
 
 pkgver=2.3.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -32,16 +32,21 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' 'lcms' 'lcms2' \
   'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'libwpg' 'openexr' \
   'kdegraphics-common' 'sqlite3' 'libpqxx' 'create-resources' 'freetds' 'docbook-xsl') # 'opengtl'
 groups=('koffice')
-source=("ftp://ftp.kde.org/pub/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099')
+source=("ftp://ftp.kde.org/pub/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+	"kde4-koffice-libwpg02.patch")
+sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
+	    '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612')
+
 options=('docs' '!splithdr' 'splitdbg' 'log')
 	
 build() {
-	cd ${srcdir}
+	cd "${srcdir}/${pkgbase}-${pkgver}"
 
-        #patch -Np1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
+        patch -Np1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
 
-	mkdir -p build
+	cd "${srcdir}"
+
+	mkdir build
 	cd build
 	cmake ../${pkgbase}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \