From 07eb808c52ee80ad5e3650955984b4ae3b87b9a0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 2 Oct 2015 18:08:11 +0000 Subject: [PATCH] extra/calligra to 2.9.7-2 --- extra/calligra/PKGBUILD | 44 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 35 deletions(-) diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 8bcce72aa..6c69a6b35 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -25,13 +25,13 @@ pkgname=('calligra-braindump' 'calligra-stage' 'calligra-words') pkgver=2.9.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen' 'libmarble4' +makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' - 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' 'libodfgen' + 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libkdcraw' 'libodfgen' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio' 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' groups=('calligra') @@ -42,7 +42,7 @@ md5sums=('d99288b1492cf9ae6a6f602b513b93e7' '266289d4f69f24941d3e94d526a350f2') prepare() { - mkdir build + mkdir -p build # Fix build against libwps 0.4 cd $pkgbase-$pkgver @@ -77,8 +77,6 @@ package_calligra-filters() { 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter' 'libetonyek: Apple Keynote import filter') - conflicts=('koffice-filters') - replaces=('koffice-filters') install=calligra-filters.install cd build/filters @@ -87,13 +85,9 @@ package_calligra-filters() { package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'kactivities' 'libkactivities4') - conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'calligra-interfaces' - 'calligra-pics' 'calligra-servicetypes') - replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics' - 'koffice-servicetypes' 'calligra-interfaces' - 'calligra-pics' 'calligra-servicetypes') + depends=('kdepimlibs4' 'libkactivities4') + conflicts=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') + replaces=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') for d in interfaces libs pics servicetypes; do cd "${srcdir}"/build/${d} @@ -105,8 +99,6 @@ package_calligra-plugins() { pkgdesc="Plugins for the Calligra office suite" depends=('calligra-libs' 'calligra-filters' 'libspnav') optdepends=('libmarble4: map shape for Calligra') - conflicts=('koffice-plugins' 'koffice-kchart') - replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula') install=calligra-plugins.install cd build/plugins @@ -121,8 +113,6 @@ package_calligra-karbon() { depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') optdepends=('calligra-filters: import/export filters' 'calligra-extras: extra calligra tools') - conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') - replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') install=calligra-karbon.install cd build/karbon @@ -139,8 +129,6 @@ package_calligra-kexi() { 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin' 'libmarble4: map form widget' 'calligra-plugins: extra calligra plugins') - conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') - replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') install=calligra-kexi.install cd build/kexi @@ -152,8 +140,6 @@ package_calligra-kexi() { package_calligra-plan() { pkgdesc="Calligra Project Management Component" depends=('calligra-words') - conflicts=('koffice-kplato' 'calligra-kplato') - replaces=('koffice-kplato' 'calligra-kplato') install=calligra-plan.install cd build/plan @@ -166,8 +152,6 @@ package_calligra-plan() { package_calligra-stage() { pkgdesc="Write presentation documents" depends=('calligra-plugins' 'kdebase-runtime') - conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') - replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') install=calligra-stage.install cd build/stage @@ -180,8 +164,6 @@ package_calligra-krita() { pkgdesc="Edit and paint images" depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw' 'fftw' 'glew' 'curl' 'gsl') - conflicts=('koffice-krita' 'calligra-krita-doc') - replaces=('koffice-krita' 'calligra-krita-doc') install=calligra-krita.install cd build/krita @@ -194,8 +176,6 @@ package_calligra-sheets() { optdepends=('calligra-filters: import/export filters' 'calligra-plugins: extra calligra plugins' 'calligra-extras: extra calligra tools') - conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') - replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') install=calligra-sheets.install cd build/sheets @@ -208,8 +188,6 @@ package_calligra-words() { pkgdesc="Word Processor" depends=('kdebase-runtime' 'calligra-plugins') optdepends=('calligra-extras: extra calligra tools') - conflicts=('koffice-kword') - replaces=('koffice-kword') install=calligra-words.install cd build/words @@ -218,8 +196,6 @@ package_calligra-words() { package_calligra-handbook() { pkgdesc="Documentation for Calligra" - conflicts=('koffice-handbook') - replaces=('koffice-handbook') options=('docs') cd build/doc/calligra @@ -239,8 +215,6 @@ package_calligra-flow() { pkgdesc="Flowchart & Diagram Editing" depends=('calligra-words') optdepends=('calligra-karbon: to export the charts in various formats') - conflicts=('calligra-flow-doc') - replaces=('calligra-flow-doc') install=calligra-flow.install cd build/flow @@ -251,8 +225,8 @@ package_calligra-extras() { pkgdesc="Calligra suite extras" depends=('calligra-libs') optdepends=('kdegraphics-okular') - conflicts=('calligra-tools' 'koffice-templates' 'calligra-templats') - replaces=('calligra-tools' 'koffice-templates' 'calligra-templats') + conflicts=('calligra-tools') + replaces=('calligra-tools') install=calligra-extras.install cd build/extras