diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /kde-misc/tellico/files | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'kde-misc/tellico/files')
-rw-r--r-- | kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch | 27 | ||||
-rw-r--r-- | kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch | 30 |
2 files changed, 57 insertions, 0 deletions
diff --git a/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch b/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch new file mode 100644 index 000000000000..2cb38749f4cf --- /dev/null +++ b/kde-misc/tellico/files/tellico-3.1.4-empty-permissions-set.patch @@ -0,0 +1,27 @@ +From fd2056f2de46fa3be308ad47541f6c7ce8483c91 Mon Sep 17 00:00:00 2001 +From: Pino Toscano <pino@kde.org> +Date: Wed, 19 Dec 2018 10:24:51 +0100 +Subject: Properly pass an empty permission set + +Use QFileDevice::Permissions() to represent no permissions, instead of +hardcoding 0. +--- + src/tests/imagejobtest.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tests/imagejobtest.cpp b/src/tests/imagejobtest.cpp +index ee578f8..b387e3b 100644 +--- a/src/tests/imagejobtest.cpp ++++ b/src/tests/imagejobtest.cpp +@@ -99,7 +99,7 @@ void ImageJobTest::testNonexistant() { + void ImageJobTest::testUnreadable() { + QTemporaryFile tmpFile; + QVERIFY(tmpFile.open()); +- QVERIFY(tmpFile.setPermissions(0)); ++ QVERIFY(tmpFile.setPermissions(QFileDevice::Permissions())); + QUrl u = QUrl::fromLocalFile(tmpFile.fileName()); + + Tellico::ImageJob* job = new Tellico::ImageJob(u); +-- +cgit v1.1 + diff --git a/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch b/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch new file mode 100644 index 000000000000..703af9c23e1e --- /dev/null +++ b/kde-misc/tellico/files/tellico-3.1.4-xmloutputclosecallback-signature.patch @@ -0,0 +1,30 @@ +From 02cde6b20a3a0606aef7bf98a14ca70c7615be2c Mon Sep 17 00:00:00 2001 +From: Pino Toscano <pino@kde.org> +Date: Wed, 19 Dec 2018 10:23:44 +0100 +Subject: Fix signature of xmlOutputCloseCallback function + +xmlOutputCloseCallback returns int, so adjust the closeQString callback +to return 0 (i.e. no error). +--- + src/translators/xslthandler.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/translators/xslthandler.cpp b/src/translators/xslthandler.cpp +index 32b3e02..3d249fd 100644 +--- a/src/translators/xslthandler.cpp ++++ b/src/translators/xslthandler.cpp +@@ -52,9 +52,10 @@ static int writeToQString(void* context, const char* buffer, int len) { + return len; + } + +-static void closeQString(void* context) { ++static int closeQString(void* context) { + QString* t = static_cast<QString*>(context); + *t += QLatin1String("\n"); ++ return 0; + } + + using Tellico::XSLTHandler; +-- +cgit v1.1 + |