From 4a8c27c3bf2916baff63fcab7079860ccdd0a1cd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 17 Dec 2017 14:33:05 +0000
Subject: [PATCH] extra/calligra to 3.0.1-9
---
extra/calligra/PKGBUILD | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 1a617a16a..73e70e945 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -11,14 +11,14 @@
pkgname=calligra
pkgdesc="A set of applications for productivity and creative usage"
pkgver=3.0.1
-pkgrel=8
-arch=('i686' 'x86_64')
+pkgrel=9
+arch=(x86_64)
url='https://www.calligra-suite.org/'
-license=('FDL1.2' 'GPL2' 'LGPL')
-depends=('kcmutils' 'knotifyconfig' 'kross' 'kactivities' 'kdiagram' 'kreport' 'libspnav'
- 'gsl' 'openexr' 'kcontacts' 'kcalcore' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy' 'khtml')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin' 'boost' 'openjpeg'
- 'libwpg' 'okular' 'eigen' 'marble-common' 'pstoedit' 'libvisio' 'libetonyek' 'libwps')
+license=(FDL1.2 GPL2 LGPL)
+depends=(kcmutils knotifyconfig kross kactivities kdiagram kreport libspnav kdelibs4support
+ gsl openexr kcontacts kcalcore qca-qt5 poppler-qt5 libodfgen qt5-webkit cauchy khtml)
+makedepends=(extra-cmake-modules kdoctools python kdesignerplugin boost openjpeg akonadi-contacts
+ libwpg okular eigen marble-common pstoedit libvisio libetonyek libwps)
optdepends=('libwpg: Corel WordPerfect Graphics image importer'
'libwps: Microsoft Works file word processor format import'
'libvisio: Microsoft Visio import filter'
@@ -26,20 +26,22 @@ optdepends=('libwpg: Corel WordPerfect Graphics image importer'
'pstoedit: EPS to SVG filter'
'poppler: PDF to SVG filter'
'openjpeg: PDF to SVG filer')
-conflicts=('calligra-devtools' 'calligra-extras' 'calligra-filters' 'calligra-karbon' 'karbon' 'calligra-libs' 'calligra-plan'
- 'calligra-plugins' 'calligra-sheets' 'calligra-stage' 'calligra-words' 'calligra-l10n' 'calligra-meta'
- 'calligra-flow' 'calligra-braindump' 'calligra-gemini' 'calligra-handbook')
-replaces=('calligra-devtools' 'calligra-extras' 'calligra-filters' 'calligra-karbon' 'karbon' 'calligra-libs' 'calligra-plan'
- 'calligra-plugins' 'calligra-sheets' 'calligra-stage' 'calligra-words' 'calligra-l10n' 'calligra-meta')
+conflicts=(calligra-devtools calligra-extras calligra-filters calligra-karbon karbon calligra-libs calligra-plan
+ calligra-plugins calligra-sheets calligra-stage calligra-words calligra-l10n calligra-meta
+ calligra-flow calligra-braindump calligra-gemini calligra-handbook)
+replaces=(calligra-devtools calligra-extras calligra-filters calligra-karbon karbon calligra-libs calligra-plan
+ calligra-plugins calligra-sheets calligra-stage calligra-words calligra-l10n calligra-meta)
for _lang in bs ca ca@valencia cs da de el en_gb es et fi fr gl hu it ja kk nb nl \
pl pt pt_br ru sk sv uk zh_cn zh_tw; do
conflicts+=(calligra-l10n-$_lang)
replaces+=(calligra-l10n-$_lang)
done
source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
+ calligra-kcalcore-17.12.patch::"https://cgit.kde.org/calligra.git/patch/?id=9a02a545"
'calligra-2.9.11-gcc6_arm.patch')
sha256sums=('452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2'
'SKIP'
+ '83b8eff3e5fa50decf826b22912d0f77ae855c230c470ad4c260870a888cdce0'
'33d803c49abefc37f51f824543e889f9e369e86df9ce64d980e0a7dbca2ea27d')
validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <foundation@krita.org>
42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders@get2net.dk>
@@ -47,17 +49,17 @@ validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt <found
prepare() {
mkdir -p build
- # Fix build on ARM
cd $pkgbase-$pkgver
+ patch -p1 -i ../calligra-kcalcore-17.12.patch # Fix build with kcalcore 17.12
patch -p1 -i ../calligra-2.9.11-gcc6_arm.patch
}
build() {
cd build
- cmake ../${pkgbase}-${pkgver} \
+ cmake ../$pkgbase-$pkgver \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DKDE_INSTALL_LIBDIR=lib \
+ -DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_TESTING=OFF
make
}