diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /extra/koffice | |
parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'extra/koffice')
-rw-r--r-- | extra/koffice/PKGBUILD | 19 | ||||
-rw-r--r-- | extra/koffice/qt48fix.patch | 10 |
2 files changed, 20 insertions, 9 deletions
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index 56a5e6907..01d3dad85 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,29 +37,30 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=9 +pkgrel=11 arch=('i686' 'x86_64' 'mips64el') 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') [ "$CARCH" = "mips64el" ] && \ makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'libkdcraw' 'oxygen-icons') + 'libwpg' '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 @@ -75,8 +76,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; + } |