mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-03 13:57:19 +08:00
calligra 2.7.1
This commit is contained in:
AlmAck
parent
8c9a0e5d53
commit
98fe073d63
@ -7,11 +7,11 @@ pkgbase=calligra-l10n
|
||||
pkgname=('calligra-l10n-bs'
|
||||
'calligra-l10n-ca'
|
||||
'calligra-l10n-ca@valencia'
|
||||
#'calligra-l10n-cs'
|
||||
'calligra-l10n-cs'
|
||||
'calligra-l10n-da'
|
||||
'calligra-l10n-de'
|
||||
'calligra-l10n-el'
|
||||
'calligra-l10n-en_GB'
|
||||
#'calligra-l10n-en_GB'
|
||||
'calligra-l10n-es'
|
||||
'calligra-l10n-et'
|
||||
'calligra-l10n-fi'
|
||||
@ -31,79 +31,82 @@ pkgname=('calligra-l10n-bs'
|
||||
'calligra-l10n-sk'
|
||||
'calligra-l10n-sl'
|
||||
'calligra-l10n-sv'
|
||||
# 'calligra-l10n-tr'
|
||||
'calligra-l10n-tr'
|
||||
'calligra-l10n-uk'
|
||||
'calligra-l10n-zh_CN'
|
||||
'calligra-l10n-zh_TW')
|
||||
pkgver=2.6.3
|
||||
pkgver=2.7.1
|
||||
pkgrel=1
|
||||
pkgdesc="Localization for Calligra"
|
||||
arch=('any')
|
||||
url="www.calligra-suite.org/"
|
||||
license=('LGPL')
|
||||
makedepends=('cmake' 'automoc4' 'kdelibs' 'docbook-xsl')
|
||||
source=(ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-bs-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ca-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ca@valencia-${pkgver}.tar.bz2
|
||||
#ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-cs-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-da-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-de-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-el-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-en_GB-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-es-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-et-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-fi-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-fr-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-gl-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-hu-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-it-${pkgver}.tar.bz2
|
||||
#ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ja-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-kk-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-nb-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-nds-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-nl-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-pl-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-pt-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-pt_BR-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ru-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-sk-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-sl-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-sv-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-uk-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-zh_CN-${pkgver}.tar.bz2
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-zh_TW-${pkgver}.tar.bz2)
|
||||
md5sums=('7ddca1b8d4180eb94431ef56ac3db994'
|
||||
'3e292c679d0dcd3d12c8961f1414cfef'
|
||||
'dca2966e1782c537d6b9ce69b15ccbfe'
|
||||
'27a457ac994d875b1628c5c615194b59'
|
||||
'311eba00ab825389a4aef93ff09bac51'
|
||||
'7c038ea37a2480ff167a07fd9d6b2b04'
|
||||
'b733e8fff6545e8f1b5354f2d3838ba3'
|
||||
'3f4ab0be39eba28cc879e74000955a0b'
|
||||
'0507c641863a555e127c981ae8801279'
|
||||
'7f2bd38f2d85125436b551e1c04ca197'
|
||||
'5f3d5fd47597307fd381085e3b23982d'
|
||||
'8d911601af920f8d41ccf22b0218329c'
|
||||
'5a0a9f8b6cf2c606116f79af99aa0540'
|
||||
'be2e65292c788d9ccc5af08ba323ccf6'
|
||||
'02e85dc8fc18b31c3c17b078e42d930d'
|
||||
'444a46e6870aaa22ebdff58b9285fd79'
|
||||
'b8b791110d984b54552417a4c75a287b'
|
||||
'72dd9ba1fb64c749ba6c516b50fd661a'
|
||||
'6ed9b8eea10719fbfa138803add0e93c'
|
||||
'b805aa811d604e8888188c1a0a696388'
|
||||
'b333a4a0fea64a469e08bdd84920bc01'
|
||||
'91b7ceee16f3111355ff368f8b66b78d'
|
||||
'826d4536b197a5126824072514b874d4'
|
||||
'5eccd5a106b607bc075a421eeb64f408'
|
||||
'b8bc692d993c25925b3a97836e016dc2'
|
||||
'8ae4951e2af470598e87c215c551ec20'
|
||||
'7b43dc50f060f587cda8586fc8266bae'
|
||||
'fce15e764f816ce69aa6c40af931151d')
|
||||
source=(ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-bs-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ca-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ca@valencia-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-cs-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-da-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-de-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-el-${pkgver}.tar.xz
|
||||
#ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-en_GB-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-es-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-et-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-fi-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-fr-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-gl-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-hu-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-it-${pkgver}.tar.xz
|
||||
#ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ja-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-kk-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-nb-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-nds-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-nl-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-pl-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-pt-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-pt_BR-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-ru-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-sk-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-sl-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-sv-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-tr-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-uk-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-zh_CN-${pkgver}.tar.xz
|
||||
ftp://ftp.kde.org/pub/kde/stable/calligra-${pkgver}/calligra-l10n/calligra-l10n-zh_TW-${pkgver}.tar.xz)
|
||||
md5sums=(
|
||||
'329bace77407d2aa4260e72625bb05f3'
|
||||
'fd08f80d572b7aad30e27e460986bcbe'
|
||||
'7bdc5b166a0609194b1d48ed413d3df0'
|
||||
'9fb58bb6e88911f7b5b78f56dbf0ab90'
|
||||
'40b09095a141b2a2b796729b9b69cd86'
|
||||
'ea603dd4b7d907aad698fde4b86d8548'
|
||||
'390a9f0551b4f666435020b7f9fa5d97'
|
||||
'53dac459d7b5009756235f01152c7c90'
|
||||
'f57f226915d0d63b742f8fd675be5743'
|
||||
'59a5a7e38c25408db8535634ef6bd8b4'
|
||||
'efc3833d62dee2aa60ebc98dafeab2e2'
|
||||
'e4499cf8bf66f7e1b6940ba05db6f3b4'
|
||||
'd5425ba2a2608171f15216b0ad195141'
|
||||
'd99495dca290aeb2c8ba32dcbf8020b7'
|
||||
'bc1efa2ca0c79b0cde69cdc7d564a195'
|
||||
'0f0357c2a3ca6b1ca776d5af7413ab59'
|
||||
'0c4a812b4dde531b3756529526ec3011'
|
||||
'b946f2342eae0fc230210e5e2996838b'
|
||||
'd9525bc2bf4a50dcc931ecfaee212c17'
|
||||
'6ebeaf278ec07b0271fbbe85d9a51146'
|
||||
'38f42619c9da5be4adcc95249dc3bf23'
|
||||
'de96d3a0f574f13d3e9ae591058c79cb'
|
||||
'06e3f446884285c6709a0d9909fcfc3e'
|
||||
'666b762a9f65153cee5aaff4299bc3b2'
|
||||
'd27384b167790c3ec4e35473d69b96b1'
|
||||
'a44310f6b7bef020a7383ae36da1bb49'
|
||||
'adbb251c373a507fa83bafe200c2937a'
|
||||
'876081f523b7345ce60808345e6e619b'
|
||||
'2acc0dae80a2bf5404ffa6e040afebdc')
|
||||
|
||||
build() {
|
||||
cd $srcdir
|
||||
langs="bs ca ca@valencia da de el en_GB es et fi fr gl hu it kk nb nds nl pl pt pt_BR ru sk sl sv uk zh_CN zh_TW"
|
||||
langs="bs ca ca@valencia cs da de el es et fi fr gl hu it kk nb nds nl pl pt pt_BR ru sk sl sv tr uk zh_CN zh_TW"
|
||||
for lang in $langs; do
|
||||
install -d build/${lang}
|
||||
pushd build/${lang}
|
||||
@ -277,11 +280,11 @@ package_calligra-l10n-sv() {
|
||||
cd $srcdir/build/sv
|
||||
make DESTDIR=$pkgdir install
|
||||
}
|
||||
#package_calligra-l10n-tr() {
|
||||
# pkgdesc=('Turkish Localization for calligra')
|
||||
# cd $srcdir/build/tr
|
||||
# make DESTDIR=$pkgdir install
|
||||
#}
|
||||
package_calligra-l10n-tr() {
|
||||
pkgdesc=('Turkish Localization for calligra')
|
||||
cd $srcdir/build/tr
|
||||
make DESTDIR=$pkgdir install
|
||||
}
|
||||
package_calligra-l10n-uk() {
|
||||
pkgdesc=('Ukrainian Localization for calligra')
|
||||
categories=('localization')
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
commit 36a4964b13cb1e7087e4d5ca5f576ca13e58bb45
|
||||
Author: Boudewijn Rempt <boud@valdyas.org>
|
||||
Date: Thu Apr 19 15:09:01 2012 +0200
|
||||
|
||||
Guard KoColorSet with QPointer
|
||||
|
||||
This makes sure that if the colorset the popup action refers to is
|
||||
deleted or invalid, we don't get crashes
|
||||
|
||||
BUG:298412
|
||||
|
||||
diff --git a/libs/widgets/KoColorPopupAction.cpp b/libs/widgets/KoColorPopupAction.cpp
|
||||
index 680d162..47ff369 100644
|
||||
--- src/calligra-2.4.1//libs/widgets/KoColorPopupAction.cpp
|
||||
+++ src/calligra-2.4.1//libs/widgets/KoColorPopupAction.cpp
|
||||
@@ -45,7 +45,7 @@
|
||||
class KoColorPopupAction::KoColorPopupActionPrivate
|
||||
{
|
||||
public:
|
||||
- KoColorPopupActionPrivate()
|
||||
+ KoColorPopupActionPrivate()
|
||||
: colorSetWidget(0), colorChooser(0), opacitySlider(0), menu(0), checkerPainter(4)
|
||||
, showFilter(true), applyMode(true)
|
||||
{}
|
||||
@@ -81,7 +81,9 @@ KoColorPopupAction::KoColorPopupAction(QObject *parent)
|
||||
|
||||
KoResourceServer<KoColorSet>* srv = KoResourceServerProvider::instance()->paletteServer();
|
||||
QList<KoColorSet*> palettes = srv->resources();
|
||||
- d->colorSetWidget->setColorSet(palettes.first());
|
||||
+ if (palettes.size() > 0) {
|
||||
+ d->colorSetWidget->setColorSet(palettes.first());
|
||||
+ }
|
||||
|
||||
d->colorChooser = new KoTriangleColorSelector( widget );
|
||||
// prevent mouse release on color selector from closing popup
|
||||
@@ -109,9 +111,9 @@ KoColorPopupAction::KoColorPopupAction(QObject *parent)
|
||||
|
||||
connect(d->colorSetWidget, SIGNAL(colorChanged(const KoColor &, bool)), this, SLOT(colorWasSelected(const KoColor &, bool)));
|
||||
|
||||
- connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ),
|
||||
+ connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ),
|
||||
this, SLOT( colorWasEdited( const QColor &) ) );
|
||||
- connect( d->opacitySlider, SIGNAL(valueChanged(int)),
|
||||
+ connect( d->opacitySlider, SIGNAL(valueChanged(int)),
|
||||
this, SLOT(opacityWasChanged(int)));
|
||||
}
|
||||
|
||||
@@ -169,7 +171,7 @@ void KoColorPopupAction::updateIcon( )
|
||||
{
|
||||
pm = QImage(iconSize, QImage::Format_ARGB32_Premultiplied);
|
||||
pm.fill(Qt::transparent);
|
||||
- // there was no icon set so we assume
|
||||
+ // there was no icon set so we assume
|
||||
// that we create an icon from the current color
|
||||
d->applyMode = false;
|
||||
}
|
||||
diff --git a/libs/widgets/KoColorSetWidget.cpp b/libs/widgets/KoColorSetWidget.cpp
|
||||
index 9807edc..73cba80 100644
|
||||
--- src/calligra-2.4.1//libs/widgets/KoColorSetWidget.cpp
|
||||
+++ src/calligra-2.4.1//libs/widgets/KoColorSetWidget.cpp
|
||||
@@ -31,6 +31,7 @@
|
||||
#include <QMenu>
|
||||
#include <QWidgetAction>
|
||||
#include <QDir>
|
||||
+#include <QPointer>
|
||||
#include <QScrollArea>
|
||||
|
||||
#include <kglobal.h>
|
||||
@@ -49,7 +50,7 @@
|
||||
class KoColorSetWidget::KoColorSetWidgetPrivate {
|
||||
public:
|
||||
KoColorSetWidget *thePublic;
|
||||
- KoColorSet *colorSet;
|
||||
+ QPointer<KoColorSet> colorSet;
|
||||
QTimer m_timer;
|
||||
QVBoxLayout *mainLayout;
|
||||
bool firstShowOfContainer;
|
||||
@ -1,64 +0,0 @@
|
||||
commit 512c6fa18825798e01ead1f0f009608b5281e5e0
|
||||
Author: Boudewijn Rempt <boud@valdyas.org>
|
||||
Date: Thu Apr 19 15:02:20 2012 +0200
|
||||
|
||||
Make KoColorSet a QObject so QPointer can manage it
|
||||
|
||||
diff --git a/libs/pigment/resources/KoColorSet.cpp b/libs/pigment/resources/KoColorSet.cpp
|
||||
index 2434938..104c2b3 100644
|
||||
--- src/calligra-2.4.1//libs/pigment/resources/KoColorSet.cpp
|
||||
+++ src/calligra-2.4.1//libs/pigment/resources/KoColorSet.cpp
|
||||
@@ -29,30 +29,6 @@
|
||||
|
||||
#include "KoColorSpaceRegistry.h"
|
||||
|
||||
-/*
|
||||
-KoColorSet::KoColorSet(const KisGradient * gradient, qint32 nColors, const QString & name)
|
||||
- : KoResource(QString("")),
|
||||
- m_name(name)
|
||||
-{
|
||||
- Q_ASSERT(nColors > 0);
|
||||
- Q_ASSERT(gradient != 0);
|
||||
-
|
||||
- qreal dx, cur_x;
|
||||
- qint32 i;
|
||||
- dx = 1.0 / (nColors - 1);
|
||||
-
|
||||
- KoColorSetEntry e;
|
||||
- KoColor c;
|
||||
- for (i = 0, cur_x = 0; i < nColors; i++, cur_x += dx) {
|
||||
- gradient->colorAt(c,cur_x);
|
||||
- e.color = c;
|
||||
- e.name = "Untitled";
|
||||
- add(e);
|
||||
- }
|
||||
-
|
||||
- m_columns = 0; // Set the default value that the GIMP uses...
|
||||
-}
|
||||
-*/
|
||||
KoColorSet::KoColorSet(const QString& filename)
|
||||
: KoResource(filename)
|
||||
{
|
||||
diff --git a/libs/pigment/resources/KoColorSet.h b/libs/pigment/resources/KoColorSet.h
|
||||
index fbc9d7e..8671f9b 100644
|
||||
--- src/calligra-2.4.1//libs/pigment/resources/KoColorSet.h
|
||||
+++ src/calligra-2.4.1//libs/pigment/resources/KoColorSet.h
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef KOCOLORSET
|
||||
#define KOCOLORSET
|
||||
|
||||
+#include <QObject>
|
||||
#include <QImage>
|
||||
#include <QColor>
|
||||
#include <QVector>
|
||||
@@ -42,8 +43,9 @@ struct KoColorSetEntry {
|
||||
* Open Gimp, Photoshop or RIFF palette files. This is a straight port
|
||||
* from the Gimp.
|
||||
*/
|
||||
-class PIGMENTCMS_EXPORT KoColorSet : public KoResource
|
||||
+class PIGMENTCMS_EXPORT KoColorSet : public QObject, public KoResource
|
||||
{
|
||||
+ Q_OBJECT
|
||||
public:
|
||||
/**
|
||||
* Load a color set from a file. This can be a Gimp
|
||||
@ -2,25 +2,25 @@
|
||||
|
||||
pkgbase=calligra
|
||||
pkgname=('calligra-3rdparty'
|
||||
'calligra-braindump'
|
||||
'calligra-extras'
|
||||
'calligra-filters'
|
||||
'calligra-flow'
|
||||
'calligra-interfaces'
|
||||
'calligra-libs'
|
||||
'calligra-plugins'
|
||||
'calligra-pics'
|
||||
'calligra-servicetypes'
|
||||
'calligra-templates'
|
||||
'calligra-tools'
|
||||
'calligra-handbook'
|
||||
'calligra-karbon'
|
||||
'calligra-kexi'
|
||||
'calligra-plan'
|
||||
'calligra-stage'
|
||||
'calligra-krita'
|
||||
'calligra-libs'
|
||||
'calligra-pics'
|
||||
'calligra-plan'
|
||||
'calligra-plugins'
|
||||
'calligra-servicetypes'
|
||||
'calligra-sheets'
|
||||
'calligra-words'
|
||||
'calligra-handbook'
|
||||
'calligra-braindump'
|
||||
'calligra-flow')
|
||||
pkgver=2.6.3
|
||||
'calligra-stage'
|
||||
'calligra-templates'
|
||||
'calligra-words')
|
||||
pkgver=2.7.1
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
url='http://www.calligra-suite.org'
|
||||
@ -30,9 +30,9 @@ makedepends=('kdepimlibs' 'eigen' 'freetds' 'kdegraphics-okular' 'kdeedu-marble'
|
||||
'boost' 'libkdcraw' 'fftw' 'opengtl' 'docbook-xsl' 'create-resources' 'lcms2' 'libmariadbclient'
|
||||
'vc' 'opencolorio')
|
||||
groups=('calligra')
|
||||
source=("http://mirrors.mit.edu/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
|
||||
source=("http://mirrors.mit.edu/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
|
||||
screenshot=("http://upload.wikimedia.org/wikipedia/commons/thumb/3/3e/Calligra_Stage_2.4.png/800px-Calligra_Stage_2.4.png")
|
||||
md5sums=('90d6bb619191abbcc94094379d47e225')
|
||||
md5sums=('9cf909ddf57ecb16d4370cc1062d0f7f')
|
||||
|
||||
|
||||
build() {
|
||||
@ -132,14 +132,14 @@ package_calligra-templates() {
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
||||
package_calligra-tools() {
|
||||
pkgdesc="Tools for the Calligra office suite"
|
||||
depends=('calligra-sheets' 'calligra-words')
|
||||
package_calligra-extras() {
|
||||
pkgdesc="Tools/Extras for the Calligra office suite"
|
||||
depends=('calligra-libs')
|
||||
conflicts=('koffice-common' 'calligra-tools-git')
|
||||
replaces=('koffice-common' 'calligra-tools-git')
|
||||
install=calligra-tools.install
|
||||
install=calligra-extras.install
|
||||
|
||||
cd "${srcdir}"/build/tools
|
||||
cd "${srcdir}"/build/extras
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user