snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

calligra: update to 3.2.0.

This commit is contained in:
John 2020-05-02 00:50:45 +02:00
parent 1366f51b5e
commit 6aabaab7ab
No known key found for this signature in database
GPG Key ID: 5FDE97AF468A09B7
10 changed files with 41 additions and 730 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
common/shlibs
View File

@ -2353,37 +2353,37 @@ libcollectdclient.so.1 libcollectdclient-5.5.0_1
libpinktrace_0.9.so.9 pinktrace-0.9.1_1 libpinktrace_0.9.so.9 pinktrace-0.9.1_1
libsyd_1.0.so.0 sydbox-1.0.2_1 libsyd_1.0.so.0 sydbox-1.0.2_1
libcsync.so.0 csync-0.50.0_1 libcsync.so.0 csync-0.50.0_1
libcalligrasheetsodf.so.16 calligra-sheets-3.1.0_1 libcalligrasheetsodf.so.17 calligra-sheets-3.2.0_1
libkotext.so.16 calligra-libs-3.1.0_1 libkotext.so.17 calligra-libs-3.2.0_1
libkoodf.so.16 calligra-libs-3.1.0_1 libkoodf.so.17 calligra-libs-3.2.0_1
libkarbonui.so.16 calligra-karbon-3.1.0_1 libkarbonui.so.17 calligra-karbon-3.2.0_1
libkomain.so.16 calligra-libs-3.1.0_1 libkomain.so.17 calligra-libs-3.2.0_1
libkowidgets.so.16 calligra-libs-3.1.0_1 libkowidgets.so.17 calligra-libs-3.2.0_1
libflake.so.16 calligra-libs-3.1.0_1 libflake.so.17 calligra-libs-3.2.0_1
libcalligrasheetscommon.so.16 calligra-sheets-3.1.0_1 libcalligrasheetscommon.so.17 calligra-sheets-3.2.0_1
libkovectorimage.so.16 calligra-libs-3.1.0_1 libkovectorimage.so.17 calligra-libs-3.2.0_1
libwordsprivate.so.16 calligra-words-3.1.0_1 libwordsprivate.so.17 calligra-words-3.2.0_1
libkotextlayout.so.16 calligra-libs-3.1.0_1 libkotextlayout.so.17 calligra-libs-3.2.0_1
libkowidgetutils.so.16 calligra-libs-3.1.0_1 libkowidgetutils.so.17 calligra-libs-3.2.0_1
libkundo2.so.16 calligra-libs-3.1.0_1 libkundo2.so.17 calligra-libs-3.2.0_1
libpigmentcms.so.16 calligra-libs-3.1.0_1 libpigmentcms.so.17 calligra-libs-3.2.0_1
libbasicflakes.so.16 calligra-libs-3.1.0_1 libbasicflakes.so.17 calligra-libs-3.2.0_1
libarpack.so.2 arpack-ng-3.3.0_2 libkoplugin.so.17 calligra-libs-3.2.0_1
libkoplugin.so.16 calligra-libs-3.1.0_1 libkoversion.so.17 calligra-libs-3.2.0_1
libkoversion.so.16 calligra-libs-3.1.0_1 libkopageapp.so.17 calligra-libs-3.2.0_1
libkopageapp.so.16 calligra-libs-3.1.0_1 libkostore.so.17 calligra-libs-3.2.0_1
libkostore.so.16 calligra-libs-3.1.0_1 libkomsooxml.so.17 calligra-filters-3.2.0_1
libkomsooxml.so.16 calligra-filters-3.1.0_1 libkoodf2.so.17 calligra-filters-3.2.0_1
libkoodf2.so.16 calligra-filters-3.1.0_1
libkowv2.so.9 calligra-filters-2.9.7_1 libkowv2.so.9 calligra-filters-2.9.7_1
libRtfReader.so.16 calligra-filters-3.1.0_1 libRtfReader.so.17 calligra-filters-3.2.0_1
libkoodfreader.so.16 calligra-filters-3.1.0_1 libkoodfreader.so.17 calligra-filters-3.2.0_1
libkoformula.so.16 calligra-plugins-3.1.0_1 libkoformula.so.17 calligra-plugins-3.2.0_1
libkarboncommon.so.16 calligra-karbon-3.1.0_1 libkarboncommon.so.17 calligra-karbon-3.2.0_1
libcalligrastageprivate.so.16 calligra-stage-3.1.0_1 libcalligrastageprivate.so.17 calligra-stage-3.2.0_1
libkookularGenerator_odt.so.16 calligra-extras-3.1.0_1 libkookularGenerator_odt.so.17 calligra-extras-3.2.0_1
libkookularGenerator_odp.so.16 calligra-extras-3.1.0_1 libkookularGenerator_odp.so.17 calligra-extras-3.2.0_1
libgemini.so.16 calligra-gemini-3.1.0_1 libgemini.so.17 calligra-gemini-3.2.0_1
libarpack.so.2 arpack-ng-3.3.0_2
libfts.so.0 musl-fts-1.2_2 libfts.so.0 musl-fts-1.2_2
libucontext.so.0 libucontext-0.1.1_1 libucontext.so.0 libucontext-0.1.1_1
libgavl.so.1 gavl-1.40_1 libgavl.so.1 gavl-1.40_1

17
srcpkgs/calligra/files/gemini-webkit.patch
View File

@ -16,14 +16,12 @@ diff --git a/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml b/gemini/q
index 9f4bb7a..3a21379 100644 index 9f4bb7a..3a21379 100644
--- a/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml --- a/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml
+++ b/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml +++ b/gemini/qml/welcomepages/cloud/dropbox/DropboxWebView.qml
@@ -17,20 +17,20 @@ @@ -18,18 +18,18 @@
*/
import QtQuick 2.0 import QtQuick 2.11
import QtQuick.Controls 2.5 as QtControls
-import QtWebEngine 1.5 -import QtWebEngine 1.5
+import QtWebKit 3.0 +import QtWebKit 3.0
import org.kde.kirigami 2.1 as Kirigami
import QtQuick.Controls 1.4 as QtControls
-WebEngineView { -WebEngineView {
+WebView { +WebView {
@ -46,14 +44,13 @@ diff --git a/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml b/gemini/qml/we
index 6a02f7b..6680beb 100644 index 6a02f7b..6680beb 100644
--- a/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml --- a/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml
+++ b/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml +++ b/gemini/qml/welcomepages/cloud/dropbox/LoginPage.qml
@@ -17,6 +17,7 @@ @@ -18,6 +18,7 @@
*/
import QtQuick 2.0 import QtQuick 2.11
import org.kde.kirigami 2.7 as Kirigami
+import QtWebKit 3.0 +import QtWebKit 3.0
import "../../../components" import "../../../components"
Page { Kirigami.Page {
-- --
2.24.0 2.24.0

259
srcpkgs/calligra/patches/libgit2-028.patch
View File

@ -1,259 +0,0 @@
diff --git a/gemini/cloud/git/checkoutcreator.cpp b/gemini/cloud/git/checkoutcreator.cpp
index b6004b1..42e038e 100644
--- gemini/cloud/git/checkoutcreator.cpp
+++ gemini/cloud/git/checkoutcreator.cpp
@@ -243,7 +243,7 @@ QString CheckoutCreator::createClone(QString userVisibleName, QString url, QStri
git_repository *repo = NULL;
int error = git_clone(&repo, url.toLatin1(), checkoutLocation.toLatin1(), &clone_opts);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return QString(); }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return QString(); }
return checkoutLocation;
}
diff --git a/gemini/cloud/git/gitcontroller.cpp b/gemini/cloud/git/gitcontroller.cpp
index 9bbf058..8fc6984 100644
--- gemini/cloud/git/gitcontroller.cpp
+++ gemini/cloud/git/gitcontroller.cpp
@@ -168,75 +168,75 @@ void GitOpsThread::performPush()
{
git_repository* repository;
int error = git_repository_open(&repository, QString("%1/.git").arg(d->gitDir).toLatin1());
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 1, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 1, error code from git2 was" << error << "which is described as" << err->message; return; }
// Get the current index
git_index* index;
error = git_repository_index(&index, repository);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 2, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 2, error code from git2 was" << error << "which is described as" << err->message; return; }
// refresh it, and add the file
error = git_index_read(index, true);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 3, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 3, error code from git2 was" << error << "which is described as" << err->message; return; }
#ifdef Q_OS_WIN
QString relative = d->currentFile.mid(d->gitDir.length() + 9); // That is, 1 for the leading slash, and 8 for the file:///
#else
QString relative = d->currentFile.mid(d->gitDir.length() + 8); // That is, 1 for the leading slash, and 8 for the file://
#endif
error = git_index_add_bypath(index, relative.toLocal8Bit());
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 4, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 4, error code from git2 was" << error << "which is described as" << err->message; return; }
error = git_index_write(index);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 5, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 5, error code from git2 was" << error << "which is described as" << err->message; return; }
// convert the index to a tree, so we can use that to create the commit
git_tree* tree;
git_oid tree_id;
error = git_index_write_tree(&tree_id, index);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 6, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 6, error code from git2 was" << error << "which is described as" << err->message; return; }
error = git_tree_lookup(&tree, repository, &tree_id);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 7, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 7, error code from git2 was" << error << "which is described as" << err->message; return; }
// get where we want to parent things to
git_oid obj;
error = git_reference_name_to_id(&obj, repository, "HEAD");
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 8, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 8, error code from git2 was" << error << "which is described as" << err->message; return; }
git_commit *parent = NULL;
error = git_commit_lookup(&parent, repository, &obj);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 9, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 9, error code from git2 was" << error << "which is described as" << err->message; return; }
// create the commit
git_oid oid;
error = git_commit_create_v(&oid, repository, "HEAD", d->signature, d->signature, "UTF-8", d->message.toLatin1(), tree, 1, parent);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 10, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 10, error code from git2 was" << error << "which is described as" << err->message; return; }
error = git_repository_state_cleanup(repository);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 11, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 11, error code from git2 was" << error << "which is described as" << err->message; return; }
// Find the current branch's upstream remote
git_reference *current_branch;
error = git_repository_head(&current_branch, repository);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 12, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 12, error code from git2 was" << error << "which is described as" << err->message; return; }
git_reference *upstream;
error = git_branch_upstream(&upstream, current_branch);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 13, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 13, error code from git2 was" << error << "which is described as" << err->message; return; }
// Now find the name of the remote
git_buf remote_name = {0,0,0};
error = git_branch_remote_name(&remote_name, repository, git_reference_name(upstream));
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 14, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 14, error code from git2 was" << error << "which is described as" << err->message; return; }
QString remoteName = QString::fromUtf8(remote_name.ptr);
- git_buf_free(&remote_name);
+ git_buf_dispose(&remote_name);
// And the upstream and local branch names...
const char *branch_name;
error = git_branch_name(&branch_name, upstream);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 15, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 15, error code from git2 was" << error << "which is described as" << err->message; return; }
QString upstreamBranchName = QString::fromUtf8(branch_name);
upstreamBranchName.remove(0, remoteName.length() + 1);
error = git_branch_name(&branch_name, current_branch);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 16, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 16, error code from git2 was" << error << "which is described as" << err->message; return; }
QString branchName = QString::fromUtf8(branch_name);
git_remote_callbacks remoteCallbacks = GIT_REMOTE_CALLBACKS_INIT;
@@ -245,7 +245,7 @@ void GitOpsThread::performPush()
remoteCallbacks.credentials = &Private::acquireCredentialsCallback;
git_remote* remote;
error = git_remote_lookup(&remote, repository, "origin");
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 17, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 17, error code from git2 was" << error << "which is described as" << err->message; return; }
char tempPath[512] = "refs/heads/";
char tempPath2[512] = "refs/heads/";
@@ -258,11 +258,11 @@ void GitOpsThread::performPush()
git_push_options pushOptions;
error = git_push_init_options(&pushOptions, GIT_PUSH_OPTIONS_VERSION);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 18, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 18, error code from git2 was" << error << "which is described as" << err->message; return; }
pushOptions.callbacks = remoteCallbacks;
error = git_remote_push(remote, &uploadrefs, &pushOptions);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Push 19, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Push 19, error code from git2 was" << error << "which is described as" << err->message; return; }
emit pushCompleted();
}
@@ -271,21 +271,21 @@ void GitOpsThread::performPull()
{
git_repository* repository;
int error = git_repository_open(&repository, QString("%1/.git").arg(d->gitDir).toLatin1());
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
// Find the current branch's upstream remote
git_reference *current_branch;
error = git_repository_head(&current_branch, repository);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
git_reference *upstream;
error = git_branch_upstream(&upstream, current_branch);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
// Now find the name of the remote
git_buf remote_name = {0,0,0};
error = git_branch_remote_name(&remote_name, repository, git_reference_name(upstream));
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
// Finally set the credentials on it that we're given, and fetch it
git_remote_callbacks remoteCallbacks = GIT_REMOTE_CALLBACKS_INIT;
@@ -294,15 +294,15 @@ void GitOpsThread::performPull()
remoteCallbacks.credentials = &Private::acquireCredentialsCallback;
git_remote* remote;
error = git_remote_lookup(&remote, repository, remote_name.ptr);
- git_buf_free(&remote_name);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ git_buf_dispose(&remote_name);
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
git_fetch_options fetch_options = GIT_FETCH_OPTIONS_INIT;
fetch_options.callbacks = remoteCallbacks;
error = git_remote_fetch(remote, NULL, &fetch_options, NULL);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
error = git_branch_upstream(&upstream, current_branch);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
// Let's check and see what sort of merge we should be doing...
git_merge_analysis_t analysis;
@@ -480,19 +480,19 @@ public:
{
git_config* configActual;
int error = git_config_open_default(&configActual);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
git_config* config;
error = git_config_snapshot(&config, configActual);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
const char* name;
error = git_config_get_string(&name, config, "user.name");
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
const char* email;
error = git_config_get_string(&email, config, "user.email");
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
userName = QString::fromLocal8Bit(name);
userEmail = QString::fromLocal8Bit(email);
@@ -512,7 +512,7 @@ public:
}
userName = newName;
error = git_config_set_string(config, "user.name", newName.toLocal8Bit());
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
}
if(userEmail.isEmpty()) {
bool ok;
@@ -529,7 +529,7 @@ public:
}
userEmail = newEmail;
error = git_config_set_string(config, "user.email", newEmail.toLocal8Bit());
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
}
git_config_free(config);
@@ -538,7 +538,7 @@ public:
return false;
}
error = git_signature_now(&signature, userName.toLocal8Bit(), userEmail.toLocal8Bit());
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return false; }
return true;
}
diff --git a/gemini/cloud/git/gitlogmodel.cpp b/gemini/cloud/git/gitlogmodel.cpp
index 7496519..d29c91c 100644
--- gemini/cloud/git/gitlogmodel.cpp
+++ gemini/cloud/git/gitlogmodel.cpp
@@ -134,19 +134,19 @@ void GitLogModel::refreshLog()
git_repository* repository;
int error = git_repository_open(&repository, QString("%1/.git").arg(d->repoDir).toLatin1());
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
git_revwalk *walker;
error = git_revwalk_new(&walker, repository);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
error = git_revwalk_push_range(walker, "HEAD~100..HEAD");
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
git_oid oid;
git_commit *commit = NULL;
while (git_revwalk_next(&oid, walker) == 0) {
error = git_commit_lookup(&commit, repository, &oid);
- if(error != 0) { const git_error* err = giterr_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
+ if(error != 0) { const git_error* err = git_error_last(); qDebug() << "Kapow, error code from git2 was" << error << "which is described as" << err->message; return; }
const git_signature *author = git_commit_author(commit);

85
srcpkgs/calligra/patches/poppler-069.patch
View File

@ -1,85 +0,0 @@
From a615718222f8ad3bba4b88fad640382e517f7dd9 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <arojas@archlinux.org>
Date: Wed, 24 Oct 2018 08:28:00 +0200
Subject: Fix build with poppler>=0.69
Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's
Differential Revision: https://phabricator.kde.org/D16388
---
filters/karbon/pdf/PdfImport.cpp | 3 ---
filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++----
filters/karbon/pdf/SvgOutputDev.h | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
index c3e96b0..48b08df 100644
--- filters/karbon/pdf/PdfImport.cpp
+++ 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 931917a..7901317 100644
--- filters/karbon/pdf/SvgOutputDev.cpp
+++ 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 85fe55d..2a44908 100644
--- filters/karbon/pdf/SvgOutputDev.h
+++ 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();
--
cgit v0.11.2

132
srcpkgs/calligra/patches/poppler-071.patch
View File

@ -1,132 +0,0 @@
diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp
index 48b08dfa32d..e910dae0756 100644
--- filters/karbon/pdf/PdfImport.cpp
+++ 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
--- filters/karbon/pdf/SvgOutputDev.cpp
+++ 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 = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
imgStr->reset();
@@ -549,7 +549,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,
- GBool /*interpolate*/, int *maskColors, GBool inlineImg)
+ bool /*interpolate*/, int *maskColors, bool inlineImg)
{
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
--- filters/karbon/pdf/SvgOutputDev.h
+++ 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);

30
srcpkgs/calligra/patches/poppler-072.patch
View File

@ -1,30 +0,0 @@
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
index 80f01a5f76f..ea69228dbc1 100644
--- filters/karbon/pdf/SvgOutputDev.cpp
+++ filters/karbon/pdf/SvgOutputDev.cpp
@@ -407,7 +407,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
QString str;
- const char * p = s->getCString();
+ const char * p = s->c_str();
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\"";
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\"";

23
srcpkgs/calligra/patches/poppler-073.patch
View File

@ -1,23 +0,0 @@
diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
index f3b74e3..ffdbf01 100644
--- filters/karbon/pdf/SvgOutputDev.cpp
+++ filters/karbon/pdf/SvgOutputDev.cpp
@@ -488,7 +488,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++) {
@@ -507,7 +507,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);
}

136
srcpkgs/calligra/patches/qt-511.patch
View File

@ -1,136 +0,0 @@
From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
From: David Faure <faure@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
--- stage/part/KPrPresentationTool.cpp
+++ 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@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
--- libs/widgets/KoCsvImportDialog.cpp
+++ 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
--- libs/widgets/KoPageLayoutWidget.cpp
+++ 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
--- plugins/chartshape/dialogs/TableEditorDialog.cpp
+++ 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
--- plugins/formulashape/FormulaToolWidget.cpp
+++ 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
--- sheets/dialogs/LayoutDialog.cpp
+++ 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
--- words/part/dialogs/KWAnchoringProperties.cpp
+++ 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
--- words/part/dialogs/KWRunAroundProperties.cpp
+++ 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

21
srcpkgs/calligra/patches/qt5.13.patch
View File

@ -1,21 +0,0 @@
From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
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
--- sheets/plugins/calendar/CalendarToolWidget.cpp
+++ sheets/plugins/calendar/CalendarToolWidget.cpp
@@ -30,6 +30,7 @@
#include <kdatepicker.h>
#include <QPushButton>
+#include <QDate>
namespace Calligra
{

8
srcpkgs/calligra/template
View File

@ -1,13 +1,13 @@
# Template file for 'calligra' # Template file for 'calligra'
pkgname=calligra pkgname=calligra
version=3.1.0 version=3.2.0
revision=25 revision=1
build_style=cmake build_style=cmake
configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON configure_args="-Wno-dev -DCALLIGRA_SHOULD_BUILD_UNMAINTAINED=ON
-DBUILD_TESTING=OFF" -DBUILD_TESTING=OFF"
hostmakedepends="perl pkg-config extra-cmake-modules gettext" hostmakedepends="perl pkg-config extra-cmake-modules gettext"
makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2 makedepends="akonadi-contacts-devel akonadi5-devel ecm-devel eigen3.2
exiv2-devel kactivities5-devel gsl-devel exiv2-devel kactivities5-devel gsl-devel qt5-declarative-devel
kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel kcmutils-devel kcontacts-devel kdelibs4support-devel kdiagram-devel
kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel kholidays-devel khtml-devel knotifyconfig-devel kross-devel lcms2-devel
libetonyek-devel libgit2-devel libodfgen-devel libokular-devel libetonyek-devel libgit2-devel libodfgen-devel libokular-devel
@ -20,7 +20,7 @@ maintainer="John <johnz@posteo.net>"
license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later" license="GPL-2.0-or-later, LGPL-2.0-or-later, GFDL-1.2-or-later"
homepage="http://www.calligra-suite.org/" homepage="http://www.calligra-suite.org/"
distfiles="${KDE_SITE}/calligra/${version}/calligra-${version}.tar.xz" distfiles="${KDE_SITE}/calligra/${version}/calligra-${version}.tar.xz"
checksum=6818cd6e64136321be217eb57cc7d6ac7c7035191fdb1ee336ebe60bc114e870 checksum=7e556228665d79e67c062fd1173d6676f0b0d7ceefdd6e1b0bcf9a781ea70951
replaces="calligra-braindump>=0 calligra-flow>=0" replaces="calligra-braindump>=0 calligra-flow>=0"