From 600d5378dadf22b8517d52ac19500594bce4b66d Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Sun, 13 Nov 2011 23:14:59 +0000
Subject: Sun Nov 13 23:14:59 UTC 2011

---
 extra/koffice/PKGBUILD      | 17 +++++++++--------
 extra/koffice/qt48fix.patch | 10 ++++++++++
 2 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 extra/koffice/qt48fix.patch

(limited to 'extra/koffice')

diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index 2425f5077..f0be52a61 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $
+# $Id: PKGBUILD 142654 2011-11-12 17:18:33Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -37,25 +37,26 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=9
+pkgrel=11
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
              'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons')
+             'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf')
 groups=('koffice')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'kde4-koffice-libwpg02.patch' 'gcc46.patch')
+        'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch')
 sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
             '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
-            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739')
-
+            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739'
+            'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa')
 build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
 	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
 	patch -p1 -i "${srcdir}"/gcc46.patch
+    patch -p1 -i "${srcdir}"/qt48fix.patch
 
 	cd "${srcdir}"
 	mkdir build
@@ -71,8 +72,8 @@ build() {
 
 package_koffice-filters(){
 	pkgdesc="Filters for the KDE office suite"
-	depends=('shared-mime-info')
-	optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
+	depends=('shared-mime-info' 'libgsf')
+	optdepends=('libwpd: WordPerfect document importer'
                    'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
                    'libkdcraw: support for raw images' 'poppler: support for pdf' 
 		   'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
diff --git a/extra/koffice/qt48fix.patch b/extra/koffice/qt48fix.patch
new file mode 100644
index 000000000..de72926d5
--- /dev/null
+++ b/extra/koffice/qt48fix.patch
@@ -0,0 +1,10 @@
+--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-02-17 13:10:38.000000000 +0100
++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
+@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
+ 	<< "visible="<<ba.isVisible()
+ 	<< "brush="<<ba.brush()
+ 	<< "pixmapmode="<<ba.pixmapMode()
+-	<< "pixmap="<<ba.pixmap()
+ 	<< ")";
+     return dbg;
+ }
-- 
cgit v1.2.3-54-g00ecf