From defe26ff1cc19d9e0611ad1611855b009e49861c Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Sat, 3 Feb 2018 00:41:15 +0100 Subject: [PATCH 1/3] GIT_SILENT Upgrade KDE Applications version to 17.12.2. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fd3e1cd54..09f28d79f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "12") -set (KDE_APPLICATIONS_VERSION_MICRO "1") +set (KDE_APPLICATIONS_VERSION_MICRO "2") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(okular VERSION 1.3.${KDE_APPLICATIONS_VERSION_MICRO}) From ad1160be1b370ca512a741c1a12f9eff0ca5848c Mon Sep 17 00:00:00 2001 From: Henrik Fehlauer Date: Tue, 6 Feb 2018 00:30:12 +0100 Subject: [PATCH 2/3] Fix saving annotations to gzipped files Okular supports opening zipped files like document.pdf.gz by transparently extracting them. However, since 559836c39270 saving annotations back was broken. This is because this commit tries to prevent saving back changes to externally modified files to prevent data loss. The way this is checked by comparing timestamps mistakenly triggered for unchanged zipped files, too. This can be solved by always comparing the before/after timestamps of the actual file, instead of the timestamp of the temporary copy of the extracted file. The change has to be done in two places so saving repeatedly works too. BUG: 338742 Test plan gzip autotests/data/file1.pdf && okular file1.pdf.gz Add annotation, saving works now instead of showing an error. touch normal.pdf still triggers modification warning. Differential Revision: https://phabricator.kde.org/D9580 --- part.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/part.cpp b/part.cpp index 108643b2c..a67ae6cb4 100644 --- a/part.cpp +++ b/part.cpp @@ -1366,7 +1366,7 @@ Document::OpenResult Part::doOpenFile( const QMimeType &mimeA, const QString &fi return Document::OpenError; } - m_fileLastModified = QFileInfo( fileNameToOpen ).lastModified(); + m_fileLastModified = QFileInfo( localFilePath() ).lastModified(); return Document::OpenSuccess; } @@ -1462,7 +1462,7 @@ Document::OpenResult Part::doOpenFile( const QMimeType &mimeA, const QString &fi if ( openResult == Document::OpenSuccess ) { - m_fileLastModified = QFileInfo( fileNameToOpen ).lastModified(); + m_fileLastModified = QFileInfo( localFilePath() ).lastModified(); } return openResult; } From 4e678cdc33f629cb8226cdbe9562864b50608843 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 6 Feb 2018 00:31:12 +0100 Subject: [PATCH 3/3] Add pdf.gz file save test --- autotests/data/file1.pdf.gz | Bin 0 -> 15351 bytes autotests/parttest.cpp | 1 + 2 files changed, 1 insertion(+) create mode 100644 autotests/data/file1.pdf.gz diff --git a/autotests/data/file1.pdf.gz b/autotests/data/file1.pdf.gz new file mode 100644 index 0000000000000000000000000000000000000000..8ca6d6addae81b2def37d5ab7c8cde1fd9c46041 GIT binary patch literal 15351 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 VD-0>AsJs}={{T5VGz9fL002<3BzOP- literal 0 HcmV?d00001 diff --git a/autotests/parttest.cpp b/autotests/parttest.cpp index bce91937b..3fd4e7f96 100644 --- a/autotests/parttest.cpp +++ b/autotests/parttest.cpp @@ -914,6 +914,7 @@ void PartTest::testSaveAs_data() QTest::addColumn("canSwapBackingFile"); QTest::newRow("pdf") << KDESRCDIR "data/file1.pdf" << "pdf" << true << true; + QTest::newRow("pdf.gz") << KDESRCDIR "data/file1.pdf.gz" << "pdf" << true << true; QTest::newRow("epub") << KDESRCDIR "data/contents.epub" << "epub" << false << false; QTest::newRow("jpg") << KDESRCDIR "data/potato.jpg" << "jpg" << false << true; }