cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

editors/calligra: update to 3.2.1

Browse Source
This commit is contained in:
Tobias C. Berner 2020-05-15 15:40:12 +00:00
parent f006cb9060
commit d098411a08
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=535298
4 changed files with 6 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editors/calligra/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= calligra
DISTVERSION= 3.2.0
PORTREVISION= 4
DISTVERSION= 3.2.1
CATEGORIES= editors kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= KDE/${PORTNAME}

6
editors/calligra/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1587746632
SHA256 (KDE/calligra/calligra-3.2.0.tar.xz) = 7e556228665d79e67c062fd1173d6676f0b0d7ceefdd6e1b0bcf9a781ea70951
SIZE (KDE/calligra/calligra-3.2.0.tar.xz) = 55205468
TIMESTAMP = 1589553313
SHA256 (KDE/calligra/calligra-3.2.1.tar.xz) = b1f8a6eb8208543a2f908caa83d089075fcd1e530d00e19f5362b2f9cc371147
SIZE (KDE/calligra/calligra-3.2.1.tar.xz) = 55207684

99
editors/calligra/files/patch-git_f155131
View File

@ -1,99 +0,0 @@
From f155131434718951e1c4517eedce15a1a9d142a2 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 24 Apr 2020 20:42:09 +0200
Subject: Fix QCommandLineParser warnings.
KAboutData::setupCommandLine already adds these options, since KF 5.7
(which is required here so no problem).
Doing it twice didn't use to warn, but Qt now warns about this.
---
braindump/src/main.cpp | 3 ---
extras/calligra/main.cpp | 2 --
extras/converter/calligraconverter.cpp | 2 --
gemini/main.cpp | 2 --
gemini/thumbnailhelper.cpp | 2 --
libs/main/KoApplication.cpp | 2 --
6 files changed, 13 deletions(-)
diff --git a/braindump/src/main.cpp b/braindump/src/main.cpp
index 5fd3fb4..aed544f 100644
--- braindump/src/main.cpp
+++ braindump/src/main.cpp
@@ -58,9 +58,6 @@ int main(int argc, char **argv)
KAboutData::setApplicationData(about);
QCommandLineParser parser;
-
- parser.addVersionOption();
- parser.addHelpOption();
about.setupCommandLine(&parser);
parser.process(app);
diff --git a/extras/calligra/main.cpp b/extras/calligra/main.cpp
index fcdc19b..7c633f5 100644
--- extras/calligra/main.cpp
+++ extras/calligra/main.cpp
@@ -186,8 +186,6 @@ int main( int argc, char **argv )
QCommandLineParser parser;
aboutData.setupCommandLine(&parser);
- parser.addHelpOption();
- parser.addVersionOption();
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("apps"), i18n("Lists names of all available Calligra applications")));
parser.addPositionalArgument(QStringLiteral("[FILE(S)]"), i18n("Files to open"));
diff --git a/extras/converter/calligraconverter.cpp b/extras/converter/calligraconverter.cpp
index cfd604c..3a2cdbf 100644
--- extras/converter/calligraconverter.cpp
+++ extras/converter/calligraconverter.cpp
@@ -167,8 +167,6 @@ int main(int argc, char **argv)
QCommandLineParser parser;
aboutData.setupCommandLine(&parser);
- parser.addHelpOption();
- parser.addVersionOption();
parser.addPositionalArgument(QStringLiteral("in"), i18n("Input file"));
parser.addPositionalArgument(QStringLiteral("out"), i18n("Output file"));
diff --git a/gemini/main.cpp b/gemini/main.cpp
index 9187b66..8cb6df7 100644
--- gemini/main.cpp
+++ gemini/main.cpp
@@ -62,8 +62,6 @@ int main( int argc, char** argv )
QCommandLineParser parser;
aboutData.setupCommandLine(&parser);
- parser.addHelpOption();
- parser.addVersionOption();
parser.addPositionalArgument(QStringLiteral("[file(s)]"), i18n("Document to open"));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("vkb"), i18n("Use the virtual keyboard")));
diff --git a/gemini/thumbnailhelper.cpp b/gemini/thumbnailhelper.cpp
index a552cd6..0d878bf 100644
--- gemini/thumbnailhelper.cpp
+++ gemini/thumbnailhelper.cpp
@@ -68,8 +68,6 @@ int main( int argc, char** argv )
QCommandLineParser parser;
aboutData.setupCommandLine(&parser);
- parser.addHelpOption();
- parser.addVersionOption();
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("in"), i18n("Document to thumbnail"), QStringLiteral("local-url")));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("out"), i18n("The full path for the thumbnail file"), QStringLiteral("local-url")));
diff --git a/libs/main/KoApplication.cpp b/libs/main/KoApplication.cpp
index a8416e0..856e8e6 100644
--- libs/main/KoApplication.cpp
+++ libs/main/KoApplication.cpp
@@ -207,8 +207,6 @@ bool KoApplication::start()
// process commandline parameters
QCommandLineParser parser;
aboutData.setupCommandLine(&parser);
- parser.addHelpOption();
- parser.addVersionOption();
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("print"), i18n("Only print and exit")));
parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("template"), i18n("Open a new document based on the given template (desktopfile name)")));
--
cgit v1.1

2
editors/calligra/pkg-plist
View File

@ -6897,7 +6897,9 @@ share/locale/ru/LC_MESSAGES/calligra_shape_paths.mo
share/locale/ru/LC_MESSAGES/calligra_shape_picture.mo
share/locale/ru/LC_MESSAGES/calligra_shape_plugin.mo
share/locale/ru/LC_MESSAGES/calligra_shape_spreadsheet.mo
share/locale/ru/LC_MESSAGES/calligra_shape_template.mo
share/locale/ru/LC_MESSAGES/calligra_shape_text.mo
share/locale/ru/LC_MESSAGES/calligra_shape_threed.mo
share/locale/ru/LC_MESSAGES/calligra_shape_vector.mo
share/locale/ru/LC_MESSAGES/calligra_shape_video.mo
share/locale/ru/LC_MESSAGES/calligra_textediting_autocorrect.mo