[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, December 2, 2020 @ 08:44:37 Author: felixonmars Revision: 402745 upgpkg: calligra 3.2.1-7: poppler 20.12.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-12-02 08:22:33 UTC (rev 402744) +++ PKGBUILD2020-12-02 08:44:37 UTC (rev 402745) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.1 -pkgrel=6 +pkgrel=7 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, October 15, 2020 @ 17:07:39 Author: arojas Revision: 398404 libgit 1.1 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-10-15 16:56:49 UTC (rev 398403) +++ PKGBUILD2020-10-15 17:07:39 UTC (rev 398404) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.1 -pkgrel=5 +pkgrel=6 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, October 15, 2020 @ 07:53:14 Author: arojas Revision: 398370 Revert unintended change Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-10-15 07:52:22 UTC (rev 398369) +++ PKGBUILD2020-10-15 07:53:14 UTC (rev 398370) @@ -37,8 +37,7 @@ build() { cd build cmake ../$pkgbase-$pkgver \ --DBUILD_TESTING=OFF \ --DFILEMANAGER_THUMBNAIL=OFF +-DBUILD_TESTING=OFF make }
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, October 15, 2020 @ 07:52:11 Author: arojas Revision: 398368 Kill utterly broken thumbnailers Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-10-15 06:01:11 UTC (rev 398367) +++ PKGBUILD2020-10-15 07:52:11 UTC (rev 398368) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.1 -pkgrel=4 +pkgrel=5 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL) @@ -37,7 +37,8 @@ build() { cd build cmake ../$pkgbase-$pkgver \ --DBUILD_TESTING=OFF +-DBUILD_TESTING=OFF \ +-DFILEMANAGER_THUMBNAIL=OFF make } @@ -44,4 +45,7 @@ package() { cd build make DESTDIR="$pkgdir" install + +# Remove utterly broken thumbnailers + rm "$pkgdir"/usr/lib/qt/plugins/calligra*thumbnail.so }
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, October 4, 2020 @ 21:01:37 Author: felixonmars Revision: 397260 upgpkg: calligra 3.2.1-4: poppler 20.10.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-10-04 20:52:10 UTC (rev 397259) +++ PKGBUILD2020-10-04 21:01:37 UTC (rev 397260) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.1 -pkgrel=3 +pkgrel=4 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, August 23, 2020 @ 17:02:04 Author: foutrelis Revision: 394608 upgpkg: calligra 3.2.1-3: poppler 20.08.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-08-23 16:24:16 UTC (rev 394607) +++ PKGBUILD2020-08-23 17:02:04 UTC (rev 394608) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.1 -pkgrel=2 +pkgrel=3 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, July 3, 2020 @ 10:09:08 Author: felixonmars Revision: 390776 upgpkg: calligra 3.2.1-2: poppler 0.90.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-07-03 09:40:36 UTC (rev 390775) +++ PKGBUILD2020-07-03 10:09:08 UTC (rev 390776) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.1 -pkgrel=1 +pkgrel=2 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, May 14, 2020 @ 20:15:07 Author: arojas Revision: 383455 Update to 3.2.1 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-05-14 20:07:28 UTC (rev 383454) +++ PKGBUILD2020-05-14 20:15:07 UTC (rev 383455) @@ -5,8 +5,8 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" -pkgver=3.2.0 -pkgrel=4 +pkgver=3.2.1 +pkgrel=1 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL) @@ -25,7 +25,7 @@ 'qt5-quickcontrols: for Calligra Gemini' 'qt5-webengine: for Calligra Gemini') source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('7e556228665d79e67c062fd1173d6676f0b0d7ceefdd6e1b0bcf9a781ea70951' +sha256sums=('b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147' 'SKIP') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, May 12, 2020 @ 06:53:16 Author: arojas Revision: 383265 openexr 2.5.1 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-12 06:39:37 UTC (rev 383264) +++ PKGBUILD2020-05-12 06:53:16 UTC (rev 383265) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.0 -pkgrel=3 +pkgrel=4 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, May 9, 2020 @ 13:30:55 Author: arojas Revision: 382939 openexr 2.5 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-05-09 12:57:54 UTC (rev 382938) +++ PKGBUILD2020-05-09 13:30:55 UTC (rev 382939) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.0 -pkgrel=2 +pkgrel=3 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL) @@ -13,7 +13,7 @@ depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support gsl openexr kcontacts qca poppler-qt5 libodfgen khtml cauchy) makedepends=(extra-cmake-modules kdoctools kdesignerplugin kinit libwpg okular eigen marble-common - boost pstoedit libvisio libetonyek libwps vc libgit2 kcalcore akonadi) + boost pstoedit libvisio libetonyek libwps vc libgit2 kcalendarcore akonadi) optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter'
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, May 1, 2020 @ 11:04:46 Author: felixonmars Revision: 382018 poppler 0.88.0 / cfitsio 3.48 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-01 10:44:43 UTC (rev 382017) +++ PKGBUILD2020-05-01 11:04:46 UTC (rev 382018) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.2.0 -pkgrel=1 +pkgrel=2 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, April 24, 2020 @ 09:29:14 Author: andyrtr Revision: 381470 upgpkg: calligra 3.1.0-32: drop unneeded dependency on openjpeg - FS#66331 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-24 09:00:22 UTC (rev 381469) +++ PKGBUILD2020-04-24 09:29:14 UTC (rev 381470) @@ -6,13 +6,13 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=31 +pkgrel=32 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL) depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support gsl openexr kcontacts qca-qt5 poppler-qt5 libodfgen qt5-webkit cauchy khtml) -makedepends=(extra-cmake-modules kdoctools kdesignerplugin boost openjpeg akonadi-contacts +makedepends=(extra-cmake-modules kdoctools kdesignerplugin boost akonadi-contacts libwpg okular eigen marble-common pstoedit libvisio libetonyek libwps vc libgit2 kinit) optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' @@ -20,7 +20,6 @@ 'libetonyek: Apple Keynote import filter' 'pstoedit: EPS to SVG filter' 'poppler: PDF to SVG filter' -'openjpeg: PDF to SVG filer' 'libgit2: Calligra Gemini git plugin' 'kirigami2: for Calligra Gemini' 'qt5-quickcontrols: for Calligra Gemini'
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, April 1, 2020 @ 21:37:32 Author: arojas Revision: 379070 libgit 1.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-04-01 21:29:16 UTC (rev 379069) +++ PKGBUILD2020-04-01 21:37:32 UTC (rev 379070) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=30 +pkgrel=31 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, March 30, 2020 @ 11:17:50 Author: felixonmars Revision: 378717 poppler 0.87.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-30 10:57:12 UTC (rev 378716) +++ PKGBUILD2020-03-30 11:17:50 UTC (rev 378717) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=29 +pkgrel=30 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, March 2, 2020 @ 09:17:32 Author: foutrelis Revision: 376489 poppler 0.86.1 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-02 09:13:37 UTC (rev 376488) +++ PKGBUILD2020-03-02 09:17:32 UTC (rev 376489) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=28 +pkgrel=29 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, March 1, 2020 @ 09:06:21 Author: felixonmars Revision: 376439 poppler 0.86.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-01 09:01:30 UTC (rev 376438) +++ PKGBUILD2020-03-01 09:06:21 UTC (rev 376439) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=27 +pkgrel=28 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, February 19, 2020 @ 18:09:31 Author: arojas Revision: 375889 libgit2 0.99 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-02-19 18:07:40 UTC (rev 375888) +++ PKGBUILD2020-02-19 18:09:31 UTC (rev 375889) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=26 +pkgrel=27 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, January 30, 2020 @ 16:58:03 Author: felixonmars Revision: 374353 poppler 0.85.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-01-30 16:55:15 UTC (rev 374352) +++ PKGBUILD2020-01-30 16:58:03 UTC (rev 374353) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=25 +pkgrel=26 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, January 7, 2020 @ 21:06:42 Author: felixonmars Revision: 372779 poppler 0.84.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-01-07 21:02:04 UTC (rev 372778) +++ PKGBUILD2020-01-07 21:06:42 UTC (rev 372779) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=24 +pkgrel=25 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.83.patch)
Date: Tuesday, January 7, 2020 @ 20:01:26 Author: arojas Revision: 372768 Fix build with poppler 0.83 Added: calligra/trunk/calligra-poppler-0.83.patch Modified: calligra/trunk/PKGBUILD -+ PKGBUILD| 10 -- calligra-poppler-0.83.patch | 69 ++ 2 files changed, 76 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-01-07 19:34:56 UTC (rev 372767) +++ PKGBUILD2020-01-07 20:01:26 UTC (rev 372768) @@ -13,7 +13,7 @@ depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support gsl openexr kcontacts qca-qt5 poppler-qt5 libodfgen qt5-webkit cauchy khtml) makedepends=(extra-cmake-modules kdoctools kdesignerplugin boost openjpeg akonadi-contacts - libwpg okular eigen marble-common pstoedit libvisio libetonyek libwps vc libgit2) + libwpg okular eigen marble-common pstoedit libvisio libetonyek libwps vc libgit2 kinit) optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter' @@ -42,7 +42,8 @@ calligra-poppler-0.71.patch calligra-poppler-0.72.patch calligra-poppler-0.73.patch -calligra-poppler-0.82.patch) +calligra-poppler-0.82.patch +calligra-poppler-0.83.patch) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' @@ -51,7 +52,8 @@ '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87' '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece' 'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8' -'a2f02dccd8f7748b187dba805220ded95c41bbddc084091794691164184d1b82') +'a2f02dccd8f7748b187dba805220ded95c41bbddc084091794691164184d1b82' +'3877210cc58c11472909c62bdc1678a05deb30051f0180c47893e51bae9182d1') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -73,6 +75,8 @@ patch -p1 -i ../calligra-poppler-0.73.patch # Fix build with poppler 0.82 patch -p1 -i ../calligra-poppler-0.82.patch +# Fix build with poppler 0.83 + patch -p1 -i ../calligra-poppler-0.83.patch } build() { Added: calligra-poppler-0.83.patch === --- calligra-poppler-0.83.patch (rev 0) +++ calligra-poppler-0.83.patch 2020-01-07 20:01:26 UTC (rev 372768) @@ -0,0 +1,69 @@ +Source: Timo Gurr +Upstream: Reported, https://bugs.kde.org/show_bug.cgi?id=414795 +Reason: Fix build with poppler 0.83.0 + +diff -Naur calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp +--- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp2019-12-04 12:41:13.0 +0100 calligra-3.1.0.new/filters/karbon/pdf/PdfImport.cpp2019-12-04 12:39:03.0 +0100 +@@ -60,19 +60,17 @@ + } + + // read config file +-globalParams = new GlobalParams(); ++globalParams.reset(new GlobalParams()); + if (! globalParams) + return KoFilter::NotImplemented; + + GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data()); + PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0); + if (! pdfDoc) { +-delete globalParams; + return KoFilter::StupidError; + } + + if (! pdfDoc->isOk()) { +-delete globalParams; + delete pdfDoc; + return KoFilter::StupidError; + } +@@ -99,7 +97,6 @@ + + delete dev; + delete pdfDoc; +-delete globalParams; + globalParams = 0; + + return KoFilter::OK; +diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp +--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:41:14.0 +0100 calligra-3.1.0.new/filters/karbon/pdf/SvgOutputDev.cpp 2019-12-04 12:35:30.0 +0100 +@@ -172,7 +172,7 @@ + *d->body << "/>" << endl; + } + +-QString SvgOutputDev::convertPath(GfxPath *path) ++QString SvgOutputDev::convertPath(const GfxPath *path) + { + if (! path) + return QString(); +@@ -180,7 +180,7 @@ + QString output; + + for (int i = 0; i < path->getNumSubpaths(); ++i) { +-GfxSubpath * subpath = path->getSubpath(i); ++const GfxSubpath * subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) { + output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); + int j = 1; +diff -Naur calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h calligra-3.1.0.new
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, November 12, 2019 @ 13:36:08 Author: foutrelis Revision: 367945 icu 65.1 / poppler 0.82.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-12 13:33:33 UTC (rev 367944) +++ PKGBUILD2019-11-12 13:36:08 UTC (rev 367945) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=23 +pkgrel=24 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.82.patch)
Date: Tuesday, November 12, 2019 @ 13:09:57 Author: foutrelis Revision: 367882 Use minimal patch for poppler 0.82 Modified: calligra/trunk/PKGBUILD calligra/trunk/calligra-poppler-0.82.patch -+ PKGBUILD|2 +- calligra-poppler-0.82.patch | 31 --- 2 files changed, 5 insertions(+), 28 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-12 12:54:17 UTC (rev 367881) +++ PKGBUILD2019-11-12 13:09:57 UTC (rev 367882) @@ -51,7 +51,7 @@ '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87' '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece' 'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8' -'3d59c6dec806113b9659cdd7f64230d87d081366a8a53ed9edd3a1afc13dd940') +'a2f02dccd8f7748b187dba805220ded95c41bbddc084091794691164184d1b82') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen Modified: calligra-poppler-0.82.patch === --- calligra-poppler-0.82.patch 2019-11-12 12:54:17 UTC (rev 367881) +++ calligra-poppler-0.82.patch 2019-11-12 13:09:57 UTC (rev 367882) @@ -1,10 +1,7 @@ -Patch stolen from Mageia Cauldron but had to be modified quite a bit. - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index ffdbf01..70bc9f8 100644 a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) +diff -upr calligra-3.1.0.orig/filters/karbon/pdf/SvgOutputDev.cpp calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp +--- calligra-3.1.0.orig/filters/karbon/pdf/SvgOutputDev.cpp2019-11-12 14:55:33.418358543 +0200 calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-11-12 14:59:26.843199351 +0200 +@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * const char * p = s->c_str(); int len = s->getLength(); CharCode code; @@ -13,23 +10,3 @@ int uLen; double dx, dy, originX, originY; while (len > 0) { -@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - - void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, -- bool /*interpolate*/, int *maskColors, bool inlineImg) -+ bool /*interpolate*/, const int *maskColors, bool inlineImg) - { - drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); - } a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -63,7 +63,7 @@ public: -int *maskColors, bool inlineImg); - virtual void drawImage(GfxState *state, Object *ref, Stream *str, -int width, int height, GfxImageColorMap *colorMap, -- bool interpolate, int *maskColors, bool inlineImg); -+ bool interpolate, const int *maskColors, bool inlineImg); - - // styles - virtual void updateAll(GfxState *state);
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.82.patch)
Date: Tuesday, November 12, 2019 @ 09:46:27 Author: arojas Revision: 367860 Fix build with poppler 0.82 Added: calligra/trunk/calligra-poppler-0.82.patch Modified: calligra/trunk/PKGBUILD -+ PKGBUILD|8 ++-- calligra-poppler-0.82.patch | 35 +++ 2 files changed, 41 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-12 09:22:18 UTC (rev 367859) +++ PKGBUILD2019-11-12 09:46:27 UTC (rev 367860) @@ -41,7 +41,8 @@ calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"; calligra-poppler-0.71.patch calligra-poppler-0.72.patch -calligra-poppler-0.73.patch) +calligra-poppler-0.73.patch +calligra-poppler-0.82.patch) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' @@ -49,7 +50,8 @@ '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80' '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87' '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece' -'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8') +'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8' +'3d59c6dec806113b9659cdd7f64230d87d081366a8a53ed9edd3a1afc13dd940') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -69,6 +71,8 @@ patch -p1 -i ../calligra-poppler-0.72.patch # Fix build with poppler 0.73 patch -p1 -i ../calligra-poppler-0.73.patch +# Fix build with poppler 0.82 + patch -p1 -i ../calligra-poppler-0.82.patch } build() { Added: calligra-poppler-0.82.patch === --- calligra-poppler-0.82.patch (rev 0) +++ calligra-poppler-0.82.patch 2019-11-12 09:46:27 UTC (rev 367860) @@ -0,0 +1,35 @@ +Patch stolen from Mageia Cauldron but had to be modified quite a bit. + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index ffdbf01..70bc9f8 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + const char * p = s->c_str(); + int len = s->getLength(); + CharCode code; +-Unicode *u = nullptr; ++const Unicode *u = nullptr; + int uLen; + double dx, dy, originX, originY; + while (len > 0) { +@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + + void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- bool /*interpolate*/, int *maskColors, bool inlineImg) ++ bool /*interpolate*/, const int *maskColors, bool inlineImg) + { + drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); + } +--- a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +@@ -63,7 +63,7 @@ public: +int *maskColors, bool inlineImg); + virtual void drawImage(GfxState *state, Object *ref, Stream *str, +int width, int height, GfxImageColorMap *colorMap, +- bool interpolate, int *maskColors, bool inlineImg); ++ bool interpolate, const int *maskColors, bool inlineImg); + + // styles + virtual void updateAll(GfxState *state);
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, October 19, 2019 @ 08:14:29 Author: arojas Revision: 365195 openexr 2.4 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-10-19 08:06:34 UTC (rev 365194) +++ PKGBUILD2019-10-19 08:14:29 UTC (rev 365195) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=22 +pkgrel=23 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, August 24, 2019 @ 22:31:20 Author: foutrelis Revision: 361127 gsl 2.6 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-08-24 22:28:44 UTC (rev 361126) +++ PKGBUILD2019-08-24 22:31:20 UTC (rev 361127) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=21 +pkgrel=22 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, August 23, 2019 @ 09:37:33 Author: foutrelis Revision: 360592 poppler 0.80 rebuild (against stable) Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-08-23 09:14:42 UTC (rev 360591) +++ PKGBUILD2019-08-23 09:37:33 UTC (rev 360592) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=20 +pkgrel=21 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, August 23, 2019 @ 09:02:38 Author: felixonmars Revision: 360583 poppler 0.80 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-08-23 08:44:15 UTC (rev 360582) +++ PKGBUILD2019-08-23 09:02:38 UTC (rev 360583) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=19 +pkgrel=20 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-qt5.13.patch)
Date: Friday, August 23, 2019 @ 08:21:52 Author: foutrelis Revision: 360578 Fix build with Qt 5.13 Added: calligra/trunk/calligra-qt5.13.patch Modified: calligra/trunk/PKGBUILD ---+ PKGBUILD |4 calligra-qt5.13.patch | 21 + 2 files changed, 25 insertions(+) Modified: PKGBUILD === --- PKGBUILD2019-08-23 07:59:54 UTC (rev 360577) +++ PKGBUILD2019-08-23 08:21:52 UTC (rev 360578) @@ -37,6 +37,7 @@ done source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} calligra-qt5.11.patch +calligra-qt5.13.patch calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"; calligra-poppler-0.71.patch calligra-poppler-0.72.patch @@ -44,6 +45,7 @@ sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' +'d32a9cda1343f224f5a0cfa2b8122c5571a0dbb09c9948414d6770d9c3814f4d' '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80' '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87' '87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece' @@ -57,6 +59,8 @@ cd $pkgname-$pkgver # Fix build with Qt 5.11 patch -p1 -i ../calligra-qt5.11.patch +# Fix build with Qt 5.13 + patch -p1 -i ../calligra-qt5.13.patch # Fix build with poppler 0.69 patch -p1 -i ../calligra-poppler-0.69.patch # Fix build with poppler 0.71 Added: calligra-qt5.13.patch === --- calligra-qt5.13.patch (rev 0) +++ calligra-qt5.13.patch 2019-08-23 08:21:52 UTC (rev 360578) @@ -0,0 +1,21 @@ +From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 23 Jul 2019 13:02:34 +0200 +Subject: [PATCH] Fix compilation with Qt 5.13 (missing include) + +--- + sheets/plugins/calendar/CalendarToolWidget.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp +index b10b23022a2..0c5eeb68cf3 100644 +--- a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + namespace Calligra + {
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, June 30, 2019 @ 10:48:31 Author: foutrelis Revision: 357102 poppler 0.78 / nettle 3.5 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-06-30 10:39:11 UTC (rev 357101) +++ PKGBUILD2019-06-30 10:48:31 UTC (rev 357102) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=18 +pkgrel=19 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, June 8, 2019 @ 23:40:55 Author: arojas Revision: 355411 libgit2 0.28 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-06-08 23:12:46 UTC (rev 355410) +++ PKGBUILD2019-06-08 23:40:55 UTC (rev 355411) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=17 +pkgrel=18 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, April 23, 2019 @ 21:16:40 Author: foutrelis Revision: 352028 poppler 0.76.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-04-23 21:13:28 UTC (rev 352027) +++ PKGBUILD2019-04-23 21:16:40 UTC (rev 352028) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=16 +pkgrel=17 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, March 21, 2019 @ 21:21:28 Author: foutrelis Revision: 348841 poppler 0.75.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-03-21 21:08:23 UTC (rev 348840) +++ PKGBUILD2019-03-21 21:21:28 UTC (rev 348841) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=15 +pkgrel=16 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, February 8, 2019 @ 22:42:54 Author: foutrelis Revision: 345679 poppler 0.74.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-02-08 22:27:23 UTC (rev 345678) +++ PKGBUILD2019-02-08 22:42:54 UTC (rev 345679) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=14 +pkgrel=15 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, January 19, 2019 @ 11:56:35 Author: foutrelis Revision: 344476 poppler 0.73.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-01-19 11:44:30 UTC (rev 344475) +++ PKGBUILD2019-01-19 11:56:35 UTC (rev 344476) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=13 +pkgrel=14 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.73.patch)
Date: Saturday, January 19, 2019 @ 11:33:46 Author: foutrelis Revision: 344471 Fix build with poppler 0.73 Added: calligra/trunk/calligra-poppler-0.73.patch Modified: calligra/trunk/PKGBUILD -+ PKGBUILD|8 ++-- calligra-poppler-0.73.patch | 32 2 files changed, 38 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-19 11:29:16 UTC (rev 344470) +++ PKGBUILD2019-01-19 11:33:46 UTC (rev 344471) @@ -39,13 +39,15 @@ calligra-qt5.11.patch calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"; calligra-poppler-0.71.patch -calligra-poppler-0.72.patch) +calligra-poppler-0.72.patch +calligra-poppler-0.73.patch) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80' '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87' -'87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece') +'87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece' +'ef95f49f69c9f2a5b530e416003f2d6d106bb3c85e8458ae27494c64c8b474a8') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -61,6 +63,8 @@ patch -p1 -i ../calligra-poppler-0.71.patch # Fix build with poppler 0.72 patch -p1 -i ../calligra-poppler-0.72.patch +# Fix build with poppler 0.73 + patch -p1 -i ../calligra-poppler-0.73.patch } build() { Added: calligra-poppler-0.73.patch === --- calligra-poppler-0.73.patch (rev 0) +++ calligra-poppler-0.73.patch 2019-01-19 11:33:46 UTC (rev 344471) @@ -0,0 +1,32 @@ +From a1ddd91e6c354e8f0dda40f8a522053c3fa19c39 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Tue, 15 Jan 2019 22:24:08 +0100 +Subject: [PATCH] Guchar -> unsigned char + +It was just a typdef and it's now gone +--- + filters/karbon/pdf/SvgOutputDev.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 80f01a5f76f..1a5aa30bc40 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -496,7 +496,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + if (maskColors) { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +-Guchar * pix = imgStr->getLine(); ++unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + + for (int x = 0; x < width; x++) { +@@ -515,7 +515,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + } else { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +-Guchar * pix = imgStr->getLine(); ++unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + } +
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, December 13, 2018 @ 21:14:22 Author: felixonmars Revision: 342094 poppler 0.72.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-12-13 20:59:02 UTC (rev 342093) +++ PKGBUILD2018-12-13 21:14:22 UTC (rev 342094) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=12 +pkgrel=13 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.72.patch)
Date: Thursday, December 13, 2018 @ 20:53:54 Author: arojas Revision: 342091 Fix patch Modified: calligra/trunk/PKGBUILD calligra/trunk/calligra-poppler-0.72.patch -+ PKGBUILD|2 +- calligra-poppler-0.72.patch | 11 --- 2 files changed, 5 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-12-13 20:23:33 UTC (rev 342090) +++ PKGBUILD2018-12-13 20:53:54 UTC (rev 342091) @@ -45,7 +45,7 @@ '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80' '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87' -'e172b1dcb21f17fcd69ee1d1d6600b1cf4ecdb9a8be297bc3e3703330ff28f6f') +'87a09710b9e7e825a46344ddec08eb98b3454d6d067b0177d284733b2342cece') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen Modified: calligra-poppler-0.72.patch === --- calligra-poppler-0.72.patch 2018-12-13 20:23:33 UTC (rev 342090) +++ calligra-poppler-0.72.patch 2018-12-13 20:53:54 UTC (rev 342091) @@ -1,19 +1,16 @@ diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 4a1fad6bbcf..958be4d2fd8 100644 +index 80f01a5f76f..ea69228dbc1 100644 --- a/filters/karbon/pdf/SvgOutputDev.cpp +++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -407,9 +407,9 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) +@@ -407,7 +407,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + QString str; - #ifdef HAVE_POPPLER_PRE_0_64 --char * p = s->getCString(); -+char * p = s->c_str(); - #else -const char * p = s->getCString(); +const char * p = s->c_str(); - #endif int len = s->getLength(); CharCode code; + Unicode *u = nullptr; @@ -459,11 +459,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) *d->body << " y=\"" << y << "px\"";
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.72.patch)
Date: Thursday, December 13, 2018 @ 17:14:29 Author: arojas Revision: 342083 Fix build with poppler 0.72 Added: calligra/trunk/calligra-poppler-0.72.patch Modified: calligra/trunk/PKGBUILD -+ PKGBUILD|8 ++-- calligra-poppler-0.72.patch | 32 2 files changed, 38 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-12-13 16:41:36 UTC (rev 342082) +++ PKGBUILD2018-12-13 17:14:29 UTC (rev 342083) @@ -38,12 +38,14 @@ source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} calligra-qt5.11.patch calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"; -calligra-poppler-0.71.patch) +calligra-poppler-0.71.patch +calligra-poppler-0.72.patch) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' '127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80' -'052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87') +'052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87' +'e172b1dcb21f17fcd69ee1d1d6600b1cf4ecdb9a8be297bc3e3703330ff28f6f') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -57,6 +59,8 @@ patch -p1 -i ../calligra-poppler-0.69.patch # Fix build with poppler 0.71 patch -p1 -i ../calligra-poppler-0.71.patch +# Fix build with poppler 0.72 + patch -p1 -i ../calligra-poppler-0.72.patch } build() { Added: calligra-poppler-0.72.patch === --- calligra-poppler-0.72.patch (rev 0) +++ calligra-poppler-0.72.patch 2018-12-13 17:14:29 UTC (rev 342083) @@ -0,0 +1,32 @@ +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 4a1fad6bbcf..958be4d2fd8 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -407,9 +407,9 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + QString str; + + #ifdef HAVE_POPPLER_PRE_0_64 +-char * p = s->getCString(); ++char * p = s->c_str(); + #else +-const char * p = s->getCString(); ++const char * p = s->c_str(); + #endif + int len = s->getLength(); + CharCode code; +@@ -459,11 +459,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + *d->body << " y=\"" << y << "px\""; + + if (font && font->getFamily()) { +-*d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; +-//debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); ++*d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; ++//debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); + } else if (font && font->getName()) { +-*d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; +-//debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); ++*d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; ++//debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); + } + *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; +
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, December 13, 2018 @ 16:41:36 Author: arojas Revision: 342082 Fix checksums Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-12-13 16:37:48 UTC (rev 342081) +++ PKGBUILD2018-12-13 16:41:36 UTC (rev 342082) @@ -42,7 +42,7 @@ sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' -'b6b3dc44606aa4243cd0da23819f3bad9953d0542b87d3b4e04113f431f2598c' +'127cc5e0946fbf741279306b4e9d592f5f901a7fab09039fcfc6c7e60193fa80' '052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, November 1, 2018 @ 12:55:07 Author: felixonmars Revision: 337685 poppler 0.71.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-11-01 12:48:00 UTC (rev 337684) +++ PKGBUILD2018-11-01 12:55:07 UTC (rev 337685) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=11 +pkgrel=12 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.71.patch)
Date: Thursday, November 1, 2018 @ 12:48:00 Author: arojas Revision: 337684 Fix patch again Modified: calligra/trunk/PKGBUILD calligra/trunk/calligra-poppler-0.71.patch -+ PKGBUILD|2 +- calligra-poppler-0.71.patch | 34 +- 2 files changed, 34 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-11-01 12:40:02 UTC (rev 337683) +++ PKGBUILD2018-11-01 12:48:00 UTC (rev 337684) @@ -43,7 +43,7 @@ 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' 'b6b3dc44606aa4243cd0da23819f3bad9953d0542b87d3b4e04113f431f2598c' -'27e9a721a8f132cd582a638418093ff532d35423c34625414b82fc97f670a4b1') +'052adc4ea812d7667812ff7867e703327dbe7c1ecad86094fd6772dc09782d87') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen Modified: calligra-poppler-0.71.patch === --- calligra-poppler-0.71.patch 2018-11-01 12:40:02 UTC (rev 337683) +++ calligra-poppler-0.71.patch 2018-11-01 12:48:00 UTC (rev 337684) @@ -96,4 +96,36 @@ { drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); } - +diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +index 2a4490848bf..cdb1d4e43b1 100644 +--- a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +@@ -44,11 +44,11 @@ public: + explicit SvgOutputDev(const QString &fileName); + virtual ~SvgOutputDev(); + +-GBool isOk(); ++bool isOk(); + +-virtual GBool upsideDown(); +-virtual GBool useDrawChar(); +-virtual GBool interpretType3Chars(); ++virtual bool upsideDown(); ++virtual bool useDrawChar(); ++virtual bool interpretType3Chars(); + virtual void startPage(int pageNum, GfxState *state, XRef *xref); + virtual void endPage(); + +@@ -63,10 +63,10 @@ public: + // images + virtual void drawImage(GfxState *state, Object *ref, Stream *str, +int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool inlineImg); ++ int *maskColors, bool inlineImg); + virtual void drawImage(GfxState *state, Object *ref, Stream *str, +int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg); ++ bool interpolate, int *maskColors, bool inlineImg); + + // styles + virtual void updateAll(GfxState *state);
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.71.patch)
Date: Thursday, November 1, 2018 @ 12:40:02 Author: arojas Revision: 337683 More poppler fixes Added: calligra/trunk/calligra-poppler-0.71.patch Modified: calligra/trunk/PKGBUILD -+ PKGBUILD|7 -- calligra-poppler-0.71.patch | 99 ++ 2 files changed, 101 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-11-01 12:20:33 UTC (rev 337682) +++ PKGBUILD2018-11-01 12:40:02 UTC (rev 337683) @@ -38,14 +38,12 @@ source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} calligra-qt5.11.patch calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"; - calligra-poppler-override.patch::"https://cgit.kde.org/calligra.git/patch/?id=2993cf64"; - calligra-poppler-0.71.patch::"https://cgit.kde.org/calligra.git/patch/?id=ab9cb332";) +calligra-poppler-0.71.patch) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' 'b6b3dc44606aa4243cd0da23819f3bad9953d0542b87d3b4e04113f431f2598c' -'08bfd9b8b1e77f0ea319d66f9692c34227872c772215e8c6c6663051e77b7f9b' -'ab13e12778cb7a4e30f1953fdaf964e2d2e7a135832cda2553838ff8690b4004') +'27e9a721a8f132cd582a638418093ff532d35423c34625414b82fc97f670a4b1') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -57,7 +55,6 @@ patch -p1 -i ../calligra-qt5.11.patch # Fix build with poppler 0.69 patch -p1 -i ../calligra-poppler-0.69.patch - patch -p1 -i ../calligra-poppler-override.patch # Fix build with poppler 0.71 patch -p1 -i ../calligra-poppler-0.71.patch } Added: calligra-poppler-0.71.patch === --- calligra-poppler-0.71.patch (rev 0) +++ calligra-poppler-0.71.patch 2018-11-01 12:40:02 UTC (rev 337683) @@ -0,0 +1,99 @@ +diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +index 48b08dfa32d..e910dae0756 100644 +--- a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); + if (dev->isOk()) { + int rotate = 0; +-GBool useMediaBox = gTrue; +-GBool crop = gFalse; +-GBool printing = gFalse; ++bool useMediaBox = true; ++bool crop = false; ++bool printing = false; + pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); + dev->dumpContent(); + } +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 5692824bc45..43205170991 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -39,7 +39,7 @@ class SvgOutputDev::Private + { + public: + Private(const QString &fname) +-: svgFile(fname), defs(0), body(0), state(gTrue) ++: svgFile(fname), defs(0), body(0), state(true) + , brush(Qt::SolidPattern) {} + + ~Private() { +@@ -52,7 +52,7 @@ public: + QString defsData; + QTextStream * defs; + QTextStream * body; +-GBool state; ++bool state; + QSizeF pageSize; + QPen pen; + QBrush brush; +@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) + : d(new Private(fileName)) + { + if (! d->svgFile.open(QIODevice::WriteOnly)) { +-d->state = gFalse; ++d->state = false; + return; + } + +@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev() + delete d; + } + +-GBool SvgOutputDev::isOk() ++bool SvgOutputDev::isOk() + { + return d->state; + } + +-GBool SvgOutputDev::upsideDown() ++bool SvgOutputDev::upsideDown() + { +-return gTrue; ++return true; + } + +-GBool SvgOutputDev::useDrawChar() ++bool SvgOutputDev::useDrawChar() + { +-return gFalse; ++return false; + } + +-GBool SvgOutputDev::interpretType3Chars() ++bool SvgOutputDev::interpretType3Chars() + { +-return gFalse; ++return false; + } + + void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) +@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + + void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool /*inlineImg*/) ++ int *maskColors, bool /*inlineImg*/) + { + ImageStream * imgStr = ne
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, November 1, 2018 @ 12:20:33 Author: arojas Revision: 337682 More poppler fixes Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |5 - 1 file changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-11-01 12:15:50 UTC (rev 337681) +++ PKGBUILD2018-11-01 12:20:33 UTC (rev 337682) @@ -38,11 +38,13 @@ source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} calligra-qt5.11.patch calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"; + calligra-poppler-override.patch::"https://cgit.kde.org/calligra.git/patch/?id=2993cf64"; calligra-poppler-0.71.patch::"https://cgit.kde.org/calligra.git/patch/?id=ab9cb332";) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' -'7a29c220b3871569cb16390261951481341b7e5923ed5c95aa4188286b2ba56d' +'b6b3dc44606aa4243cd0da23819f3bad9953d0542b87d3b4e04113f431f2598c' +'08bfd9b8b1e77f0ea319d66f9692c34227872c772215e8c6c6663051e77b7f9b' 'ab13e12778cb7a4e30f1953fdaf964e2d2e7a135832cda2553838ff8690b4004') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -55,6 +57,7 @@ patch -p1 -i ../calligra-qt5.11.patch # Fix build with poppler 0.69 patch -p1 -i ../calligra-poppler-0.69.patch + patch -p1 -i ../calligra-poppler-override.patch # Fix build with poppler 0.71 patch -p1 -i ../calligra-poppler-0.71.patch }
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.69.patch)
Date: Thursday, November 1, 2018 @ 12:08:54 Author: arojas Revision: 337679 Fix build with poppler 0.71 Modified: calligra/trunk/PKGBUILD Deleted: calligra/trunk/calligra-poppler-0.69.patch -+ PKGBUILD| 11 +- calligra-poppler-0.69.patch | 67 -- 2 files changed, 8 insertions(+), 70 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-11-01 12:05:39 UTC (rev 337678) +++ PKGBUILD2018-11-01 12:08:54 UTC (rev 337679) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=10 +pkgrel=11 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL) @@ -36,11 +36,14 @@ replaces+=(calligra-l10n-$_lang) done source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} -calligra-qt5.11.patch calligra-poppler-0.69.patch) +calligra-qt5.11.patch + calligra-poppler-0.69.patch::"https://cgit.kde.org/calligra.git/patch/?id=a6157182"; + calligra-poppler-0.71.patch::"https://cgit.kde.org/calligra.git/patch/?id=ab9cb332";) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' -'7a29c220b3871569cb16390261951481341b7e5923ed5c95aa4188286b2ba56d') +'7a29c220b3871569cb16390261951481341b7e5923ed5c95aa4188286b2ba56d' +'ab13e12778cb7a4e30f1953fdaf964e2d2e7a135832cda2553838ff8690b4004') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -52,6 +55,8 @@ patch -p1 -i ../calligra-qt5.11.patch # Fix build with poppler 0.69 patch -p1 -i ../calligra-poppler-0.69.patch +# Fix build with poppler 0.71 + patch -p1 -i ../calligra-poppler-0.71.patch } build() { Deleted: calligra-poppler-0.69.patch === --- calligra-poppler-0.69.patch 2018-11-01 12:05:39 UTC (rev 337678) +++ calligra-poppler-0.69.patch 2018-11-01 12:08:54 UTC (rev 337679) @@ -1,67 +0,0 @@ -diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp -index c3e96b0cd28..48b08dfa32d 100644 a/filters/karbon/pdf/PdfImport.cpp -+++ b/filters/karbon/pdf/PdfImport.cpp -@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt - delete globalParams; - globalParams = 0; - --// check for memory leaks --Object::memCheck(stderr); -- - return KoFilter::OK; - } - -diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp -index 931917ae15d..7901317ebd0 100644 a/filters/karbon/pdf/SvgOutputDev.cpp -+++ b/filters/karbon/pdf/SvgOutputDev.cpp -@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) -.arg(matrix.dx()) .arg(matrix.dy()); - } - --QString SvgOutputDev::convertMatrix(double * matrix) -+QString SvgOutputDev::convertMatrix(const double * matrix) - { - return QString("matrix(%1 %2 %3 %4 %5 %6)") -.arg(matrix[0]).arg(matrix[1]) -@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - - QString str; - --char * p = s->getCString(); -+const char * p = s->getCString(); - int len = s->getLength(); - CharCode code; - Unicode *u = nullptr; -@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) - double x = state->getCurX(); - double y = state->getCurY(); - --double * ctm = state->getCTM(); -+const double * ctm = state->getCTM(); - QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - - QMatrix mirror; -@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, - return; - } - --double * ctm = state->getCTM(); -+const double * ctm = state->getCTM(); - QMatrix m; - m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); - -diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h -index 85fe55dfff6..2a4490848bf 100644 a/filters/karbon/pdf/SvgOutputDev.h -+++ b/filters/karbon/pdf/SvgOutputDev.h -@@ -84,7 +84,7 @@ public: - private: - QString convertPath(GfxPath *path); - QString convertMatrix(const QMatrix &matrix); --QString convertMatrix(double * matrix); -+QString convertMatrix(const double * matrix); - QString printFill(); - QString printStroke(); -
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, October 23, 2018 @ 15:04:47 Author: felixonmars Revision: 337187 icu 63.1 / poppler 0.70.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-10-23 14:45:43 UTC (rev 337186) +++ PKGBUILD2018-10-23 15:04:47 UTC (rev 337187) @@ -6,7 +6,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=9 +pkgrel=10 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-poppler-0.69.patch)
Date: Tuesday, October 23, 2018 @ 14:45:43 Author: arojas Revision: 337186 Fix build with poppler 0.69 Added: calligra/trunk/calligra-poppler-0.69.patch Modified: calligra/trunk/PKGBUILD -+ PKGBUILD|7 +++- calligra-poppler-0.69.patch | 67 ++ 2 files changed, 72 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-10-23 14:43:36 UTC (rev 337185) +++ PKGBUILD2018-10-23 14:45:43 UTC (rev 337186) @@ -36,10 +36,11 @@ replaces+=(calligra-l10n-$_lang) done source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} -calligra-qt5.11.patch) +calligra-qt5.11.patch calligra-poppler-0.69.patch) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' 'SKIP' -'40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a') +'40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a' +'7a29c220b3871569cb16390261951481341b7e5923ed5c95aa4188286b2ba56d') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen @@ -49,6 +50,8 @@ cd $pkgname-$pkgver # Fix build with Qt 5.11 patch -p1 -i ../calligra-qt5.11.patch +# Fix build with poppler 0.69 + patch -p1 -i ../calligra-poppler-0.69.patch } build() { Added: calligra-poppler-0.69.patch === --- calligra-poppler-0.69.patch (rev 0) +++ calligra-poppler-0.69.patch 2018-10-23 14:45:43 UTC (rev 337186) @@ -0,0 +1,67 @@ +diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +index c3e96b0cd28..48b08dfa32d 100644 +--- a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + delete globalParams; + globalParams = 0; + +-// check for memory leaks +-Object::memCheck(stderr); +- + return KoFilter::OK; + } + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 931917ae15d..7901317ebd0 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) +.arg(matrix.dx()) .arg(matrix.dy()); + } + +-QString SvgOutputDev::convertMatrix(double * matrix) ++QString SvgOutputDev::convertMatrix(const double * matrix) + { + return QString("matrix(%1 %2 %3 %4 %5 %6)") +.arg(matrix[0]).arg(matrix[1]) +@@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + + QString str; + +-char * p = s->getCString(); ++const char * p = s->getCString(); + int len = s->getLength(); + CharCode code; + Unicode *u = nullptr; +@@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + double x = state->getCurX(); + double y = state->getCurY(); + +-double * ctm = state->getCTM(); ++const double * ctm = state->getCTM(); + QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + + QMatrix mirror; +@@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + return; + } + +-double * ctm = state->getCTM(); ++const double * ctm = state->getCTM(); + QMatrix m; + m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); + +diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +index 85fe55dfff6..2a4490848bf 100644 +--- a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +@@ -84,7 +84,7 @@ public: + private: + QString convertPath(GfxPath *path); + QString convertMatrix(const QMatrix &matrix); +-QString convertMatrix(double * matrix); ++QString convertMatrix(const double * matrix); + QString printFill(); + QString printStroke(); +
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, August 19, 2018 @ 09:36:12 Author: arojas Revision: 332635 ilmbase/openexr 2.3 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-08-19 09:19:32 UTC (rev 332634) +++ PKGBUILD2018-08-19 09:36:12 UTC (rev 332635) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=8 +pkgrel=9 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, August 6, 2018 @ 22:31:23 Author: foutrelis Revision: 331059 icu 62.1 / poppler 0.67.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-08-06 22:26:57 UTC (rev 331058) +++ PKGBUILD2018-08-06 22:31:23 UTC (rev 331059) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=7 +pkgrel=8 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD calligra-qt5.11.patch)
Date: Wednesday, June 27, 2018 @ 15:04:57 Author: arojas Revision: 327701 Fix build with Qt 5.11 (FS#59160) Added: calligra/trunk/calligra-qt5.11.patch Modified: calligra/trunk/PKGBUILD ---+ PKGBUILD | 10 ++- calligra-qt5.11.patch | 135 2 files changed, 143 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-06-27 14:45:44 UTC (rev 327700) +++ PKGBUILD2018-06-27 15:04:57 UTC (rev 327701) @@ -36,14 +36,20 @@ conflicts+=(calligra-l10n-$_lang) replaces+=(calligra-l10n-$_lang) done -source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} +calligra-qt5.11.patch) sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' -'SKIP') +'SKIP' +'40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen prepare() { mkdir -p build + + cd $pkgname-$pkgver +# Fix build with Qt 5.11 + patch -p1 -i ../calligra-qt5.11.patch } build() { Added: calligra-qt5.11.patch === --- calligra-qt5.11.patch (rev 0) +++ calligra-qt5.11.patch 2018-06-27 15:04:57 UTC (rev 327701) @@ -0,0 +1,135 @@ +From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Tue, 3 Apr 2018 00:31:19 +0200 +Subject: Fix compilation with Qt 5.11 (missing include) + +--- + stage/part/KPrPresentationTool.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +index ae743da..3007f91 100644 +--- a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include + #include +--- +From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 18 Mar 2018 11:56:57 +0100 +Subject: Fix build with Qt 5.11 (missing headers) + +Reviewers: #calligra:_3.0, anthonyfieroni, danders + +Reviewed By: #calligra:_3.0, anthonyfieroni, danders + +Subscribers: anthonyfieroni, danders + +Tags: #calligra:_3.0 + +Differential Revision: https://phabricator.kde.org/D11454 +--- + libs/widgets/KoCsvImportDialog.cpp | 1 + + libs/widgets/KoPageLayoutWidget.cpp| 2 ++ + plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + + plugins/formulashape/FormulaToolWidget.cpp | 1 + + sheets/dialogs/LayoutDialog.cpp| 1 + + words/part/dialogs/KWAnchoringProperties.cpp | 1 + + words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ + 15 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp +index 0ffdcf6..cdca006 100644 +--- a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp +@@ -21,6 +21,7 @@ + #include "KoCsvImportDialog.h" + + // Qt ++#include + #include + #include + +diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +index f91555c..a3816f9 100644 +--- a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp +@@ -23,6 +23,8 @@ + + #include + ++#include ++ + class Q_DECL_HIDDEN KoPageLayoutWidget::Private + { + public: +diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp +index c0d5136..d2a772e 100644 +--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp +@@ -24,6 +24,7 @@ + + // Qt + #include ++#include + + // Calligra + #include +diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +index ed10919..8f52177 100644 +--- a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + + FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) +diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +index a0a9832..7d7db53 100644 +--- a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp +@@ -36,6 +36,7 @@ + #include + + #include ++#include + #include + #include + #include +diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp +index d64208c..bfddb3a 100644 +--- a/words/part/dialogs/KWAnchoringProperties
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, May 27, 2018 @ 22:26:40 Author: arojas Revision: 325053 Add missing optdepends for Calligra Gemini (FS#58749) Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-05-27 21:16:13 UTC (rev 325052) +++ PKGBUILD2018-05-27 22:26:40 UTC (rev 325053) @@ -23,7 +23,9 @@ 'poppler: PDF to SVG filter' 'openjpeg: PDF to SVG filer' 'libgit2: Calligra Gemini git plugin' -'kirigami2: for Calligra Gemini') +'kirigami2: for Calligra Gemini' +'qt5-quickcontrols: for Calligra Gemini' +'qt5-webengine: for Calligra Gemini') conflicts=(calligra-devtools calligra-extras calligra-filters calligra-karbon karbon calligra-libs calligra-plugins calligra-sheets calligra-stage calligra-words calligra-l10n calligra-meta calligra-flow calligra-braindump calligra-gemini calligra-handbook)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, April 21, 2018 @ 18:21:01 Author: arojas Revision: 322766 poppler 0.64 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-21 14:27:19 UTC (rev 322765) +++ PKGBUILD2018-04-21 18:21:01 UTC (rev 322766) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=6 +pkgrel=7 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, April 19, 2018 @ 13:43:57 Author: arojas Revision: 322437 okular 18.04 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-19 13:16:29 UTC (rev 322436) +++ PKGBUILD2018-04-19 13:43:57 UTC (rev 322437) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=5 +pkgrel=6 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, April 4, 2018 @ 18:20:14 Author: arojas Revision: 320947 libgit2 0.27 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-04 17:54:53 UTC (rev 320946) +++ PKGBUILD2018-04-04 18:20:14 UTC (rev 320947) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=4 +pkgrel=5 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, March 20, 2018 @ 10:55:44 Author: arojas Revision: 319687 poppler 0.63 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-20 10:25:07 UTC (rev 319686) +++ PKGBUILD2018-03-20 10:55:44 UTC (rev 319687) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=3 +pkgrel=4 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL) @@ -47,7 +47,6 @@ build() { cd build cmake ../$pkgbase-$pkgver \ --DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, March 7, 2018 @ 13:15:13 Author: arojas Revision: 317978 Drop unused dependency Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-07 13:11:41 UTC (rev 317977) +++ PKGBUILD2018-03-07 13:15:13 UTC (rev 317978) @@ -7,11 +7,11 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=2 +pkgrel=3 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL) -depends=(kcmutils knotifyconfig kross kactivities kdiagram kreport libspnav kdelibs4support +depends=(kcmutils knotifyconfig kross kactivities kdiagram libspnav kdelibs4support gsl openexr kcontacts 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 vc libgit2)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, February 26, 2018 @ 08:21:00 Author: arojas Revision: 317544 ilmbase/openexr 2.2.1 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-02-26 07:39:20 UTC (rev 317543) +++ PKGBUILD2018-02-26 08:21:00 UTC (rev 317544) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.1.0 -pkgrel=1 +pkgrel=2 arch=(x86_64) url='https://www.calligra-suite.org/' license=(FDL1.2 GPL2 LGPL)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, January 27, 2018 @ 12:25:57 Author: arojas Revision: 315498 Add kirigami optdepend Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-01-27 12:18:08 UTC (rev 315497) +++ PKGBUILD2018-01-27 12:25:57 UTC (rev 315498) @@ -22,7 +22,8 @@ 'pstoedit: EPS to SVG filter' 'poppler: PDF to SVG filter' 'openjpeg: PDF to SVG filer' -'libgit2: Calligra Gemini git plugin') +'libgit2: Calligra Gemini git plugin' +'kirigami2: for Calligra Gemini') conflicts=(calligra-devtools calligra-extras calligra-filters calligra-karbon karbon calligra-libs calligra-plugins calligra-sheets calligra-stage calligra-words calligra-l10n calligra-meta calligra-flow calligra-braindump calligra-gemini calligra-handbook)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, January 27, 2018 @ 11:43:47 Author: arojas Revision: 315494 Update to 3.1.0 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 26 +++--- 1 file changed, 11 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-27 11:37:30 UTC (rev 315493) +++ PKGBUILD2018-01-27 11:43:47 UTC (rev 315494) @@ -6,15 +6,15 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" -pkgver=3.0.1 -pkgrel=9 +pkgver=3.1.0 +pkgrel=1 arch=(x86_64) url='https://www.calligra-suite.org/' 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) + gsl openexr kcontacts 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 vc) + libwpg okular eigen marble-common pstoedit libvisio libetonyek libwps vc libgit2) optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter' @@ -21,11 +21,12 @@ 'libetonyek: Apple Keynote import filter' '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 +'openjpeg: PDF to SVG filer' +'libgit2: Calligra Gemini git plugin') +conflicts=(calligra-devtools calligra-extras calligra-filters calligra-karbon karbon calligra-libs 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 +replaces=(calligra-devtools calligra-extras calligra-filters calligra-karbon karbon calligra-libs 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 @@ -32,19 +33,14 @@ 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";) -sha256sums=('452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2' -'SKIP' -'83b8eff3e5fa50decf826b22912d0f77ae855c230c470ad4c260870a888cdce0') +source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) +sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870' +'SKIP') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen prepare() { mkdir -p build - - cd $pkgbase-$pkgver - patch -p1 -i ../calligra-kcalcore-17.12.patch # Fix build with kcalcore 17.12 } build() {
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, December 14, 2017 @ 22:39:34 Author: arojas Revision: 312907 kcalcore/okular 17.12 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 37 + 1 file changed, 21 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-12-14 22:20:02 UTC (rev 312906) +++ PKGBUILD2017-12-14 22:39:34 UTC (rev 312907) @@ -7,14 +7,14 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=8 -arch=('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' 'vc') +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 vc) optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter' @@ -22,32 +22,37 @@ '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}) +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";) sha256sums=('452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2' -'SKIP') +'SKIP' +'83b8eff3e5fa50decf826b22912d0f77ae855c230c470ad4c260870a888cdce0') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen prepare() { mkdir -p build + + cd $pkgbase-$pkgver + patch -p1 -i ../calligra-kcalcore-17.12.patch # Fix build with kcalcore 17.12 } 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 }
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, November 9, 2017 @ 08:50:41 Author: foutrelis Revision: 309079 poppler 0.61.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-11-09 08:46:02 UTC (rev 309078) +++ PKGBUILD2017-11-09 08:50:41 UTC (rev 309079) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url='https://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, October 5, 2017 @ 21:52:20 Author: foutrelis Revision: 306872 poppler 0.60.1 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-10-05 21:18:51 UTC (rev 306871) +++ PKGBUILD2017-10-05 21:52:20 UTC (rev 306872) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url='https://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, October 5, 2017 @ 09:22:14 Author: foutrelis Revision: 306790 poppler 0.60.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-10-05 08:52:57 UTC (rev 306789) +++ PKGBUILD2017-10-05 09:22:14 UTC (rev 306790) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='https://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, September 15, 2017 @ 20:37:15 Author: arojas Revision: 305621 poppler 0.59.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-09-15 19:34:03 UTC (rev 305620) +++ PKGBUILD2017-09-15 20:37:15 UTC (rev 305621) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='https://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, August 22, 2017 @ 16:53:41 Author: arojas Revision: 303261 https Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-08-22 15:17:35 UTC (rev 303260) +++ PKGBUILD2017-08-22 16:53:41 UTC (rev 303261) @@ -9,7 +9,7 @@ pkgver=3.0.1 pkgrel=4 arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' +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') @@ -32,7 +32,7 @@ conflicts+=(calligra-l10n-$_lang) replaces+=(calligra-l10n-$_lang) done -source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) sha256sums=('452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2' 'SKIP') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, August 1, 2017 @ 13:44:12 Author: foutrelis Revision: 301461 poppler 0.57.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-08-01 13:28:08 UTC (rev 301460) +++ PKGBUILD2017-08-01 13:44:12 UTC (rev 301461) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, June 20, 2017 @ 05:54:43 Author: arojas Revision: 298998 gsl 2.4 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-06-20 03:37:14 UTC (rev 298997) +++ PKGBUILD2017-06-20 05:54:43 UTC (rev 298998) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, April 27, 2017 @ 05:50:08 Author: felixonmars Revision: 294881 libwebp 0.6.0 / poppler 0.54.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-04-27 04:44:06 UTC (rev 294880) +++ PKGBUILD2017-04-27 05:50:08 UTC (rev 294881) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, March 31, 2017 @ 12:20:57 Author: arojas Revision: 291940 Update to 3.0.1 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-03-31 10:12:28 UTC (rev 291939) +++ PKGBUILD2017-03-31 12:20:57 UTC (rev 291940) @@ -6,15 +6,15 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" -pkgver=3.0.0.1 -pkgrel=5 +pkgver=3.0.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -depends=('kcmutils' 'knotifyconfig' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'kdiagram' 'kreport' 'libspnav' +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' 'khtml' 'boost' 'openjpeg' - 'libwpg' 'okular' 'eigen' 'marble-common' 'pstoedit' 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'vc') +makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin' 'boost' 'openjpeg' + 'libwpg' 'okular' 'eigen' 'marble-common' 'pstoedit' 'libvisio' 'libetonyek' 'libwps' 'vc') optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter' @@ -33,9 +33,10 @@ replaces+=(calligra-l10n-$_lang) done source=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011' +sha256sums=('452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2' 'SKIP') -validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD) # Boudewijn Rempt +validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD # Boudewijn Rempt + 42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen prepare() { mkdir -p build
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, March 14, 2017 @ 18:34:13 Author: arojas Revision: 290840 khtml is needed for Plan (FS#53310) Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-03-14 17:20:54 UTC (rev 290839) +++ PKGBUILD2017-03-14 18:34:13 UTC (rev 290840) @@ -12,7 +12,7 @@ url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') depends=('kcmutils' 'knotifyconfig' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'kdiagram' 'kreport' 'libspnav' - 'gsl' 'openexr' 'kcontacts' 'kcalcore' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy') + 'gsl' 'openexr' 'kcontacts' 'kcalcore' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy' 'khtml') makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin' 'khtml' 'boost' 'openjpeg' 'libwpg' 'okular' 'eigen' 'marble-common' 'pstoedit' 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'vc') optdepends=('libwpg: Corel WordPerfect Graphics image importer' @@ -21,7 +21,6 @@ 'libetonyek: Apple Keynote import filter' 'pstoedit: EPS to SVG filter' 'poppler: PDF to SVG filter' -'khtml: HTML to ODS 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'
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, February 17, 2017 @ 23:33:42 Author: arojas Revision: 289128 Depend on mable-common Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-02-17 23:33:16 UTC (rev 289127) +++ PKGBUILD2017-02-17 23:33:42 UTC (rev 289128) @@ -14,7 +14,7 @@ depends=('kcmutils' 'knotifyconfig' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'kdiagram' 'kreport' 'libspnav' 'gsl' 'openexr' 'kcontacts' 'kcalcore' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy') makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin' 'khtml' 'boost' 'openjpeg' - 'libwpg' 'okular' 'eigen' 'marble' 'pstoedit' 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'vc') + 'libwpg' 'okular' 'eigen' 'marble-common' 'pstoedit' 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'vc') optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter'
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, February 7, 2017 @ 13:27:24 Author: arojas Revision: 288157 Remove unused akonadi dependency Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-02-07 11:48:33 UTC (rev 288156) +++ PKGBUILD2017-02-07 13:27:24 UTC (rev 288157) @@ -7,12 +7,12 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.0.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') depends=('kcmutils' 'knotifyconfig' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'kdiagram' 'kreport' 'libspnav' - 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy') + 'gsl' 'openexr' 'kcontacts' 'kcalcore' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy') makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin' 'khtml' 'boost' 'openjpeg' 'libwpg' 'okular' 'eigen' 'marble' 'pstoedit' 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'vc') optdepends=('libwpg: Corel WordPerfect Graphics image importer'
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, January 4, 2017 @ 09:47:37 Author: arojas Revision: 285270 Build in release mode Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-03 22:44:02 UTC (rev 285269) +++ PKGBUILD2017-01-04 09:47:37 UTC (rev 285270) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.0.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -45,7 +45,7 @@ build() { cd build cmake ../${pkgbase}-${pkgver} \ --DCMAKE_BUILD_TYPE=Debug \ +-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DKDE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, January 3, 2017 @ 22:44:02 Author: arojas Revision: 285269 Remove redundant optdepend Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-03 21:59:30 UTC (rev 285268) +++ PKGBUILD2017-01-03 22:44:02 UTC (rev 285269) @@ -22,8 +22,7 @@ 'pstoedit: EPS to SVG filter' 'poppler: PDF to SVG filter' 'khtml: HTML to ODS filter' -'openjpeg: PDF to SVG filer' -'cauchy: formula shape') +'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')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, January 3, 2017 @ 21:58:55 Author: arojas Revision: 285267 Also conflict with calligra-handbook Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-03 21:29:35 UTC (rev 285266) +++ PKGBUILD2017-01-03 21:58:55 UTC (rev 285267) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.0.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -26,7 +26,7 @@ 'cauchy: formula shape') 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-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 \
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, January 3, 2017 @ 20:37:32 Author: arojas Revision: 285259 Conflict with obsolete packages for smooth upgrade Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-03 20:03:48 UTC (rev 285258) +++ PKGBUILD2017-01-03 20:37:32 UTC (rev 285259) @@ -7,7 +7,7 @@ pkgname=calligra pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.0.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -25,9 +25,10 @@ 'openjpeg: PDF to SVG filer' 'cauchy: formula shape') 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-plugins' 'calligra-sheets' 'calligra-stage' 'calligra-words' 'calligra-l10n' 'calligra-meta' + 'calligra-flow' 'calligra-braindump' 'calligra-gemini') 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') + '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)
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, January 3, 2017 @ 17:51:07 Author: arojas Revision: 285250 Unsplit package, subpackages depend on each other anyway Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 164 +++-- 1 file changed, 30 insertions(+), 134 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-03 16:47:47 UTC (rev 285249) +++ PKGBUILD2017-01-03 17:51:07 UTC (rev 285250) @@ -4,31 +4,38 @@ # Contributor: Andrea Scarpino # Contributor: Ronald van Haren -pkgbase=calligra -pkgname=('calligra-devtools' - 'calligra-extras' - 'calligra-filters' - 'karbon' - 'calligra-libs' - 'calligra-plan' - 'calligra-plugins' - 'calligra-sheets' - 'calligra-stage' - 'calligra-words' - 'calligra-l10n') +pkgname=calligra +pkgdesc="A set of applications for productivity and creative usage" pkgver=3.0.0.1 pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('extra-cmake-modules' 'kcmutils' 'kdoctools' 'python' 'kdelibs4support' 'knotifyconfig' - 'kdesignerplugin' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'khtml' 'boost' - 'libwpg' 'okular' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' 'cauchy' - 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' 'vc' 'qca-qt5') -groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz"{,.sig}) -md5sums=('c4cffca0a8008b5efd285414eeeddcff' - 'SKIP') +depends=('kcmutils' 'knotifyconfig' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'kdiagram' 'kreport' 'libspnav' + 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' 'qca-qt5' 'poppler-qt5' 'libodfgen' 'qt5-webkit' 'cauchy') +makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin' 'khtml' 'boost' 'openjpeg' + 'libwpg' 'okular' 'eigen' 'marble' 'pstoedit' 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'vc') +optdepends=('libwpg: Corel WordPerfect Graphics image importer' +'libwps: Microsoft Works file word processor format import' +'libvisio: Microsoft Visio import filter' +'libetonyek: Apple Keynote import filter' +'pstoedit: EPS to SVG filter' +'poppler: PDF to SVG filter' +'khtml: HTML to ODS filter' +'openjpeg: PDF to SVG filer' +'cauchy: formula shape') +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') +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=("http://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) +sha256sums=('dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011' +'SKIP') validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD) # Boudewijn Rempt prepare() { @@ -38,7 +45,7 @@ build() { cd build cmake ../${pkgbase}-${pkgver} \ --DCMAKE_BUILD_TYPE=Release \ +-DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=/usr \ -DKDE_INSTALL_LIBDIR=lib \ -DBUILD_TESTING=OFF @@ -45,118 +52,7 @@ make } -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - depends=('calligra-sheets' 'calligra-words' 'karbon' 'libodfgen') - optdepends=('libwpg: Corel WordPerfect Graphics image importer' - 'libwps: Microsoft Works file word processor format import' - 'libvisio: Microsoft Visio import filter' - 'libetonyek: Apple Keynote import filter' - 'pstoedit: EPS to SVG filter' - 'poppler: PDF to SVG filter' - 'khtml: HTML to ODS filter' - 'openjpeg: PDF to SVG filer') - cd build/filters +package() { + cd build make DESTDIR="$pkgdir" install } - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5' 'kross') - - for _d in interfaces libs pics servicetypes; do -cd "$srcdir"/build/$_d -make DESTDIR="$pkgdir" install - done -} - -package_calligra-plugins() { - pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-filters' 'libspnav' 'kdiagram') - opt
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, January 3, 2017 @ 14:08:50 Author: arojas Revision: 285240 Update to 3.0.0.1 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 61 + 1 file changed, 29 insertions(+), 32 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-03 12:31:25 UTC (rev 285239) +++ PKGBUILD2017-01-03 14:08:50 UTC (rev 285240) @@ -5,11 +5,9 @@ # Contributor: Ronald van Haren pkgbase=calligra -pkgname=('braindump' - 'calligra-devtools' +pkgname=('calligra-devtools' 'calligra-extras' 'calligra-filters' - 'calligra-handbook' 'karbon' 'calligra-libs' 'calligra-plan' @@ -16,20 +14,22 @@ 'calligra-plugins' 'calligra-sheets' 'calligra-stage' - 'calligra-words') -pkgver=3.0.0 -pkgrel=4 + 'calligra-words' + 'calligra-l10n') +pkgver=3.0.0.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('extra-cmake-modules' 'kcmutils' 'kdoctools' 'python' 'kdelibs4support' 'knotifyconfig' 'kdesignerplugin' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'khtml' 'boost' - 'libwpg' 'poppler-qt5' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' - 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' - 'vc' 'qca-qt5' 'git') + 'libwpg' 'okular' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' 'cauchy' + 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' 'vc' 'qca-qt5') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz";) -md5sums=('e1380e00acb92db59d4a24ee856acaa9') +source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz"{,.sig}) +md5sums=('c4cffca0a8008b5efd285414eeeddcff' + 'SKIP') +validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD) # Boudewijn Rempt prepare() { mkdir -p build @@ -41,8 +41,7 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DKDE_INSTALL_LIBDIR=lib \ --DBUILD_TESTING=OFF \ --DBUILD_UNMAINTAINED=ON +-DBUILD_TESTING=OFF make } @@ -61,19 +60,9 @@ make DESTDIR="$pkgdir" install } -package_braindump() { - pkgdesc="Notes and idea gathering" - depends=('qt5-webkit' 'hicolor-icon-theme' 'calligra-libs') - conflicts=('calligra-braindump') - replaces=('calligra-braindump') - - cd build/braindump - make DESTDIR="$pkgdir" install -} - package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" - depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5') + depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5' 'kross') for _d in interfaces libs pics servicetypes; do cd "$srcdir"/build/$_d @@ -84,6 +73,7 @@ package_calligra-plugins() { pkgdesc="Plugins for the Calligra office suite" depends=('calligra-filters' 'libspnav' 'kdiagram') + optdepends=('cauchy: formula shape') cd build/plugins make DESTDIR="$pkgdir" install @@ -137,14 +127,6 @@ make DESTDIR="$pkgdir" install } -package_calligra-handbook() { - pkgdesc="Documentation for Calligra" - options=('docs') - - cd build/doc/calligra - make DESTDIR="$pkgdir" install -} - package_calligra-extras() { pkgdesc="Calligra suite extras" depends=('calligra-libs') @@ -163,3 +145,18 @@ cd build/devtools make DESTDIR="$pkgdir" install } + +package_calligra-l10n() { + pkgdesc="Localization for Calligra" + 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 + + cd build + mkdir -p install_l10n + make DESTDIR=install_l10n install + mkdir -p "$pkgdir"/usr/share + mv install_l10n/usr/share/locale "$pkgdir"/usr/share/ +}
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, December 16, 2016 @ 23:29:23 Author: foutrelis Revision: 283863 poppler 0.50.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-12-16 23:00:59 UTC (rev 283862) +++ PKGBUILD2016-12-16 23:29:23 UTC (rev 283863) @@ -18,7 +18,7 @@ 'calligra-stage' 'calligra-words') pkgver=3.0.0 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, December 16, 2016 @ 23:00:59 Author: foutrelis Revision: 283862 Update checksum Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-12-16 22:55:07 UTC (rev 283861) +++ PKGBUILD2016-12-16 23:00:59 UTC (rev 283862) @@ -29,7 +29,7 @@ 'vc' 'qca-qt5' 'git') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz";) -md5sums=('d658ed72aa7d5f2b0ebd8844007d4ac6') +md5sums=('e1380e00acb92db59d4a24ee856acaa9') prepare() { mkdir -p build
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, December 5, 2016 @ 22:06:16 Author: arojas Revision: 282855 Fix conflicts Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-12-05 21:17:58 UTC (rev 282854) +++ PKGBUILD2016-12-05 22:06:16 UTC (rev 282855) @@ -18,7 +18,7 @@ 'calligra-stage' 'calligra-words') pkgver=3.0.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -48,7 +48,7 @@ package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" - depends=('calligra-sheets' 'calligra-words' 'calligra-karbon' 'libodfgen') + depends=('calligra-sheets' 'calligra-words' 'karbon' 'libodfgen') optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter'
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, December 5, 2016 @ 21:14:29 Author: arojas Revision: 282851 Also build unmaintained apps Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 24 +++- 1 file changed, 19 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-12-05 19:51:03 UTC (rev 282850) +++ PKGBUILD2016-12-05 21:14:29 UTC (rev 282851) @@ -5,11 +5,12 @@ # Contributor: Ronald van Haren pkgbase=calligra -pkgname=('calligra-devtools' +pkgname=('braindump' + 'calligra-devtools' 'calligra-extras' 'calligra-filters' 'calligra-handbook' - 'calligra-karbon' + 'karbon' 'calligra-libs' 'calligra-plan' 'calligra-plugins' @@ -17,7 +18,7 @@ 'calligra-stage' 'calligra-words') pkgver=3.0.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -40,7 +41,8 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DKDE_INSTALL_LIBDIR=lib \ --DBUILD_TESTING=OFF +-DBUILD_TESTING=OFF \ +-DBUILD_UNMAINTAINED=ON make } @@ -59,6 +61,16 @@ make DESTDIR="$pkgdir" install } +package_braindump() { + pkgdesc="Notes and idea gathering" + depends=('qt5-webkit' 'hicolor-icon-theme' 'calligra-libs') + conflicts=('calligra-braindump') + replaces=('calligra-braindump') + + cd build/braindump + make DESTDIR="$pkgdir" install +} + package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5') @@ -77,11 +89,13 @@ make DESTDIR="$pkgdir" install } -package_calligra-karbon() { +package_karbon() { pkgdesc="Create scalable vector drawings" depends=('calligra-libs' 'hicolor-icon-theme') optdepends=('calligra-filters: import/export filters' 'calligra-extras: extra calligra tools') + conflicts=('calligra-karbon') + replaces=('calligra-karbon') cd build/karbon make DESTDIR="$pkgdir" install
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, December 5, 2016 @ 15:35:42 Author: arojas Revision: 282843 Update to 3.0.0 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 128 +++-- 1 file changed, 40 insertions(+), 88 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-12-05 14:46:08 UTC (rev 282842) +++ PKGBUILD2016-12-05 15:35:42 UTC (rev 282843) @@ -5,12 +5,9 @@ # Contributor: Ronald van Haren pkgbase=calligra -pkgname=('calligra-braindump' - 'calligra-devtools' +pkgname=('calligra-devtools' 'calligra-extras' 'calligra-filters' - 'calligra-flow' - 'calligra-gemini' 'calligra-handbook' 'calligra-karbon' 'calligra-libs' @@ -19,25 +16,22 @@ 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.9.11 -pkgrel=9 +pkgver=3.0.0 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' - 'lcms2' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' - 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') +makedepends=('extra-cmake-modules' 'kcmutils' 'kdoctools' 'python' 'kdelibs4support' 'knotifyconfig' + 'kdesignerplugin' 'kross' 'ktexteditor' 'threadweaver' 'kactivities' 'khtml' 'boost' + 'libwpg' 'poppler-qt5' 'kdiagram' 'kreport' 'eigen' 'marble' 'openjpeg' 'pstoedit' 'libspnav' + 'libvisio' 'libetonyek' 'libodfgen' 'libwps' 'gsl' 'openexr' 'akonadi-contacts' 'kcalcore' + 'vc' 'qca-qt5' 'git') groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"; 'libwps-0.4.patch') -md5sums=('a1a4935debae64724cd4c0d17d61ae4e' - '6ea15f8b3938838d89ea0aa08921afd1') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.gz";) +md5sums=('d658ed72aa7d5f2b0ebd8844007d4ac6') prepare() { mkdir -p build - -# Fix build against libwps 0.4 - cd $pkgbase-$pkgver - patch -p1 -i "$srcdir"/libwps-0.4.patch } build() { @@ -45,100 +39,88 @@ cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ --DCMAKE_INSTALL_LIBDIR=lib \ --DBUILD_active=OFF \ --DWITH_Soprano=OFF \ --DBUILD_krita=OFF \ --DBUILD_kexi=OFF +-DKDE_INSTALL_LIBDIR=lib \ +-DBUILD_TESTING=OFF make } package_calligra-filters() { pkgdesc="Filters for the Calligra office suite" - depends=('libodfgen') + depends=('calligra-sheets' 'calligra-words' 'calligra-karbon' 'libodfgen') optdepends=('libwpg: Corel WordPerfect Graphics image importer' 'libwps: Microsoft Works file word processor format import' 'libvisio: Microsoft Visio import filter' - 'libetonyek: Apple Keynote import filter') - + 'libetonyek: Apple Keynote import filter' + 'pstoedit: EPS to SVG filter' + 'poppler: PDF to SVG filter' + 'khtml: HTML to ODS filter' + 'openjpeg: PDF to SVG filer') cd build/filters - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs4') - conflicts=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') - replaces=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') + depends=('akonadi-contacts' 'ilmbase' 'kactivities' 'qca-qt5') - for d in interfaces libs pics servicetypes; do -cd "${srcdir}"/build/${d} -make DESTDIR="${pkgdir}" install + for _d in interfaces libs pics servicetypes; do +cd "$srcdir"/build/$_d +make DESTDIR="$pkgdir" install done } package_calligra-plugins() { pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs' 'calligra-filters' 'libspnav') + depends=('calligra-filters' 'libspnav' 'kdiagram') cd build/plugins - make DESTDIR="${pkgdir}" install - - cd ../3rdparty/kdchart - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } package_calligra-karbon() { pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') + depends=('calligra-libs' 'hicolor-icon-theme') optdepends=('calligra-filters: import/export filters' 'calligra-extras: extra calligra tools') cd build/karbon - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } package_calligra-plan() { pkgdesc="Calligra Project Management Component" - depends=('calligra-words') + depends=('calligra-words' 'kreport' 'kcalcore' 'khtml' 'kdiagram') cd build/plan - make DESTDIR="${pkgdir}" install - - cd ../3rdparty/kdgantt - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" i
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, November 27, 2016 @ 12:16:50 Author: arojas Revision: 282125 Add missing dependency Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-11-27 11:44:32 UTC (rev 282124) +++ PKGBUILD2016-11-27 12:16:50 UTC (rev 282125) @@ -181,7 +181,7 @@ package_calligra-devtools() { pkgdesc="Calligra developer tools" - depends=('calligra-libs') + depends=('calligra-libs' 'poppler-qt4') cd build/devtools make DESTDIR="${pkgdir}" install
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, November 26, 2016 @ 15:21:15 Author: foutrelis Revision: 282063 icu 58.1 / poppler 0.49.0 / hunspell 1.5.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-11-26 14:52:31 UTC (rev 282062) +++ PKGBUILD2016-11-26 15:21:15 UTC (rev 282063) @@ -20,7 +20,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.11 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, November 25, 2016 @ 20:56:27 Author: arojas Revision: 282011 Drop libkactivities4 and okular dependencies Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-11-25 11:41:28 UTC (rev 282010) +++ PKGBUILD2016-11-25 20:56:27 UTC (rev 282011) @@ -20,13 +20,13 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.11 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'lcms2' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' - 'kdegraphics-okular' 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') + 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"; 'libwps-0.4.patch') md5sums=('a1a4935debae64724cd4c0d17d61ae4e' @@ -67,7 +67,7 @@ package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs4' 'libkactivities4') + depends=('kdepimlibs4') conflicts=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') replaces=('calligra-interfaces' 'calligra-pics' 'calligra-servicetypes') @@ -169,7 +169,6 @@ package_calligra-extras() { pkgdesc="Calligra suite extras" depends=('calligra-libs') - optdepends=('kdegraphics-okular') conflicts=('calligra-tools') replaces=('calligra-tools')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, October 5, 2016 @ 16:54:28 Author: arojas Revision: 25 Drop openjpeg makedepends as well Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-10-05 15:42:05 UTC (rev 24) +++ PKGBUILD2016-10-05 16:54:28 UTC (rev 25) @@ -20,13 +20,13 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.11 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'lcms2' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') + 'kdegraphics-okular' 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"; 'libwps-0.4.patch') md5sums=('a1a4935debae64724cd4c0d17d61ae4e'
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, October 5, 2016 @ 11:31:10 Author: arojas Revision: 277763 Drop libmarble4 optdepend Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |1 - 1 file changed, 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-10-05 11:26:59 UTC (rev 277762) +++ PKGBUILD2016-10-05 11:31:10 UTC (rev 277763) @@ -80,7 +80,6 @@ package_calligra-plugins() { pkgdesc="Plugins for the Calligra office suite" depends=('calligra-libs' 'calligra-filters' 'libspnav') - optdepends=('libmarble4: map shape for Calligra') cd build/plugins make DESTDIR="${pkgdir}" install
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, October 5, 2016 @ 11:24:08 Author: arojas Revision: 277760 Split kexi Modified: calligra/trunk/PKGBUILD --+ PKGBUILD | 37 + 1 file changed, 5 insertions(+), 32 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-10-05 11:23:40 UTC (rev 277759) +++ PKGBUILD2016-10-05 11:24:08 UTC (rev 277760) @@ -13,7 +13,6 @@ 'calligra-gemini' 'calligra-handbook' 'calligra-karbon' - 'calligra-kexi' 'calligra-libs' 'calligra-plan' 'calligra-plugins' @@ -21,15 +20,13 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.11 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4' - 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' - 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' - 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio' - 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' +makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' + 'lcms2' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen' + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio' 'libetonyek' 'libspnav') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"; 'libwps-0.4.patch') md5sums=('a1a4935debae64724cd4c0d17d61ae4e' @@ -41,11 +38,6 @@ # Fix build against libwps 0.4 cd $pkgbase-$pkgver patch -p1 -i "$srcdir"/libwps-0.4.patch - -# Fix build against libmarble4 - sed -e 's|PATH_SUFFIXES marble|PATH_SUFFIXES marble4|g' -i CMakeLists.txt - sed -e 's|#include
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, July 31, 2016 @ 17:17:14 Author: arojas Revision: 272760 poppler 0.46 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-07-31 10:17:19 UTC (rev 272759) +++ PKGBUILD2016-07-31 17:17:14 UTC (rev 272760) @@ -21,7 +21,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.11 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Sunday, April 3, 2016 @ 15:53:36 Author: foutrelis Revision: 263830 icu 57.1 / poppler 0.42.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-04-03 12:52:17 UTC (rev 263829) +++ PKGBUILD2016-04-03 13:53:36 UTC (rev 263830) @@ -22,7 +22,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.11 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Saturday, February 20, 2016 @ 12:52:53 Author: arojas Revision: 260075 GSL 2.1 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-02-20 11:39:37 UTC (rev 260074) +++ PKGBUILD2016-02-20 11:52:53 UTC (rev 260075) @@ -22,7 +22,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.11 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, February 4, 2016 @ 09:49:49 Author: arojas Revision: 258858 Update to 2.9.11 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-02-03 20:57:35 UTC (rev 258857) +++ PKGBUILD2016-02-04 08:49:49 UTC (rev 258858) @@ -21,8 +21,8 @@ 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.9.10 -pkgrel=3 +pkgver=2.9.11 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -33,7 +33,7 @@ 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"; 'libwps-0.4.patch') -md5sums=('e75b9f1b1d8ca197297bc6bf22455c85' +md5sums=('a1a4935debae64724cd4c0d17d61ae4e' '6ea15f8b3938838d89ea0aa08921afd1') prepare() {
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, December 22, 2015 @ 13:25:37 Author: bpiotrowski Revision: 257115 boost 1.60.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-22 12:25:07 UTC (rev 257114) +++ PKGBUILD2015-12-22 12:25:37 UTC (rev 257115) @@ -22,7 +22,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.10 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, December 18, 2015 @ 23:43:42 Author: foutrelis Revision: 256768 poppler 0.39.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-18 22:43:11 UTC (rev 256767) +++ PKGBUILD2015-12-18 22:43:42 UTC (rev 256768) @@ -22,7 +22,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.10 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, December 9, 2015 @ 09:20:03 Author: arojas Revision: 254988 Update to 2.9.10 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-12-09 08:19:45 UTC (rev 254987) +++ PKGBUILD2015-12-09 08:20:03 UTC (rev 254988) @@ -21,8 +21,8 @@ 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.9.9 -pkgrel=4 +pkgver=2.9.10 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -33,7 +33,7 @@ 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"; 'libwps-0.4.patch') -md5sums=('2d138719508ba62560bd29c7abd6bf4f' +md5sums=('e75b9f1b1d8ca197297bc6bf22455c85' '6ea15f8b3938838d89ea0aa08921afd1') prepare() {
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Tuesday, December 8, 2015 @ 17:07:00 Author: fyan Revision: 253962 C++11 ABI rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-08 15:44:17 UTC (rev 253961) +++ PKGBUILD2015-12-08 16:07:00 UTC (rev 253962) @@ -22,7 +22,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.9 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Friday, November 13, 2015 @ 23:05:59 Author: arojas Revision: 251023 Rebuild against vc 0.7.5-2 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-11-13 20:51:14 UTC (rev 251022) +++ PKGBUILD2015-11-13 22:05:59 UTC (rev 251023) @@ -22,7 +22,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.9 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Wednesday, November 11, 2015 @ 00:37:47 Author: arojas Revision: 250627 Rebuild against renamed kdegraphics libraries Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-11-10 23:07:46 UTC (rev 250626) +++ PKGBUILD2015-11-10 23:37:47 UTC (rev 250627) @@ -22,13 +22,13 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.9 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' - 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libkdcraw' 'libodfgen' + 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libkdcraw4' 'libodfgen' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio' 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' groups=('calligra') @@ -155,7 +155,7 @@ package_calligra-krita() { pkgdesc="Edit and paint images" - depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw' + depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw4' 'fftw' 'glew' 'curl' 'gsl') install=calligra-krita.install
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Thursday, November 5, 2015 @ 08:26:23 Author: arojas Revision: 250122 Update to 2.9.9 Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-11-05 07:26:15 UTC (rev 250121) +++ PKGBUILD2015-11-05 07:26:23 UTC (rev 250122) @@ -1,5 +1,6 @@ # $Id$ # Maintainer: Felix Yan +# Maintainer: Antonio Rojas # Contributor: Andrea Scarpino # Contributor: Ronald van Haren @@ -20,8 +21,8 @@ 'calligra-sheets' 'calligra-stage' 'calligra-words') -pkgver=2.9.8 -pkgrel=3 +pkgver=2.9.9 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -32,7 +33,7 @@ 'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2' groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"; 'libwps-0.4.patch') -md5sums=('c731ceb46211aea2a0e1798f646e0bcb' +md5sums=('2d138719508ba62560bd29c7abd6bf4f' '6ea15f8b3938838d89ea0aa08921afd1') prepare() {
[arch-commits] Commit in calligra/trunk (PKGBUILD)
Date: Monday, November 2, 2015 @ 07:04:12 Author: bpiotrowski Revision: 249974 icu 56.1 / poppler 0.37.0 rebuild Modified: calligra/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-11-02 05:10:59 UTC (rev 249973) +++ PKGBUILD2015-11-02 06:04:12 UTC (rev 249974) @@ -21,7 +21,7 @@ 'calligra-stage' 'calligra-words') pkgver=2.9.8 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL')