[arch-commits] Commit in calligra/repos (3 files)

Evangelos Foutras foutrelis at archlinux.org
Mon Aug 6 22:31:29 UTC 2018


    Date: Monday, August 6, 2018 @ 22:31:28
  Author: foutrelis
Revision: 331060

archrelease: copy trunk to staging-x86_64

Added:
  calligra/repos/staging-x86_64/
  calligra/repos/staging-x86_64/PKGBUILD
    (from rev 331059, calligra/trunk/PKGBUILD)
  calligra/repos/staging-x86_64/calligra-qt5.11.patch
    (from rev 331059, calligra/trunk/calligra-qt5.11.patch)

-----------------------+
 PKGBUILD              |   67 +++++++++++++++++++++++
 calligra-qt5.11.patch |  135 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 202 insertions(+)

Copied: calligra/repos/staging-x86_64/PKGBUILD (from rev 331059, calligra/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2018-08-06 22:31:28 UTC (rev 331060)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+
+pkgname=calligra
+pkgdesc="A set of applications for productivity and creative usage"
+pkgver=3.1.0
+pkgrel=8
+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
+             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'
+            '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'
+            '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)
+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 at valencia cs da de el en_gb es et fi fr gl hu it ja kk nb nl \
+             pl pt pt_br ru sk sv uk zh_cn zh_tw; do
+  conflicts+=(calligra-l10n-$_lang)
+  replaces+=(calligra-l10n-$_lang)
+done
+source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}
+        calligra-qt5.11.patch)
+sha256sums=('6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870'
+            'SKIP'
+            '40ac9fabed8e13c31f6f243bd7e9083c3ec322568991ba84987106b982ffc10a')
+validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
+              42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+# Fix build with Qt 5.11
+  patch -p1 -i ../calligra-qt5.11.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: calligra/repos/staging-x86_64/calligra-qt5.11.patch (from rev 331059, calligra/trunk/calligra-qt5.11.patch)
===================================================================
--- staging-x86_64/calligra-qt5.11.patch	                        (rev 0)
+++ staging-x86_64/calligra-qt5.11.patch	2018-08-06 22:31:28 UTC (rev 331060)
@@ -0,0 +1,135 @@
+From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+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 <QDesktopServices>
+ #include <QUrl>
+ #include <QDBusConnection>
++#include <QFrame>
+ 
+ #include <KoShape.h>
+ #include <KoShapeManager.h>
+---
+From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner at gmail.com>
+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 <QButtonGroup>
+ #include <QTextCodec>
+ #include <QTextStream>
+ 
+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 <KoUnit.h>
+ 
++#include <QButtonGroup>
++
+ 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 <QAbstractItemModel>
++#include <QAction>
+ 
+ // Calligra
+ #include <KoIcon.h>
+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 <QWidgetAction>
+ #include <QTableWidget>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+ 
+ 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 <math.h>
+ 
+ #include <QIntValidator>
++#include <QButtonGroup>
+ #include <QCheckBox>
+ #include <QFrame>
+ #include <QLabel>
+diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
+index d64208c..bfddb3a 100644
+--- a/words/part/dialogs/KWAnchoringProperties.cpp
++++ b/words/part/dialogs/KWAnchoringProperties.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include <kundo2command.h>
+ 
++#include <QButtonGroup>
+ #include <QComboBox>
+ 
+ const int KWAnchoringProperties::vertRels[4][20] = {
+diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
+index e38599a..7e8b2d5 100644
+--- a/words/part/dialogs/KWRunAroundProperties.cpp
++++ b/words/part/dialogs/KWRunAroundProperties.cpp
+@@ -28,6 +28,8 @@
+ 
+ #include <kundo2command.h>
+ 
++#include <QButtonGroup>
++
+ KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
+         : m_state(state)
+ {
+-- 
+cgit v0.11.2
+



More information about the arch-commits mailing list