From 63ec63efa92816920a7f36ba9407cbdd4dc3b81e Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 2 Dec 2021 22:22:24 +0100 Subject: [PATCH 1/3] GIT_SILENT Upgrade release service version to 21.12.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a5c37e30..bf60eb45d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.16) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "21") -set (RELEASE_SERVICE_VERSION_MINOR "11") -set (RELEASE_SERVICE_VERSION_MICRO "90") +set (RELEASE_SERVICE_VERSION_MINOR "12") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(okular VERSION ${RELEASE_SERVICE_VERSION}) From 0439961dce4b169a296b9694b1e88d652bf215e3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 6 Dec 2021 02:44:04 +0000 Subject: [PATCH 2/3] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- generators/comicbook/okularApplication_comicbook.desktop | 2 +- generators/comicbook/org.kde.mobile.okular_comicbook.desktop | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/generators/comicbook/okularApplication_comicbook.desktop b/generators/comicbook/okularApplication_comicbook.desktop index 5b2ee42a8..f49e61645 100755 --- a/generators/comicbook/okularApplication_comicbook.desktop +++ b/generators/comicbook/okularApplication_comicbook.desktop @@ -184,7 +184,7 @@ X-KDE-Keywords[ca]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[da]=cbr, cbz, cbt, cb7, Comic Book -X-KDE-Keywords[de]=cbr, cbz, cbt, cb7, Comic-Book +X-KDE-Keywords[de]=Comic-Book X-KDE-Keywords[el]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[en_GB]=cbr, cbz, cbt, cb7, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, cb7, libro de cómic diff --git a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop index b81420366..bd1e1d344 100644 --- a/generators/comicbook/org.kde.mobile.okular_comicbook.desktop +++ b/generators/comicbook/org.kde.mobile.okular_comicbook.desktop @@ -175,7 +175,7 @@ X-KDE-Keywords[ca]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[ca@valencia]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[cs]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[da]=cbr, cbz, cbt, Comic Book -X-KDE-Keywords[de]=cbr, cbz, cbt, Comic-Book +X-KDE-Keywords[de]=Comic-Book X-KDE-Keywords[el]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[en_GB]=cbr, cbz, cbt, Comic Book X-KDE-Keywords[es]=cbr, cbz, cbt, libro de cómic From 8126b99062da8bf27a5d41e8a8786a8478eb6273 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Tue, 7 Dec 2021 11:41:27 +0100 Subject: [PATCH 3/3] Make CI happy Comment an unused varaible --- generators/plucker/unpluck/unpluck.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/generators/plucker/unpluck/unpluck.cpp b/generators/plucker/unpluck/unpluck.cpp index a7fb2e696..26e630d79 100644 --- a/generators/plucker/unpluck/unpluck.cpp +++ b/generators/plucker/unpluck/unpluck.cpp @@ -257,7 +257,8 @@ GetUncompressedRecord(plkr_Document *doc, plkr_DBHandle handle, int record_index if ((record->type == PLKR_DRTYPE_TEXT_COMPRESSED) || (record->type == PLKR_DRTYPE_IMAGE_COMPRESSED) || (record->type == PLKR_DRTYPE_TABLE_COMPRESSED) || (record->type == PLKR_DRTYPE_GLYPHPAGE) || (record->type == PLKR_DRTYPE_LINKS_COMPRESSED)) { unsigned char *start_of_data, *output_ptr; - int len_of_data, buffer_remaining, buf_to_use; + int len_of_data, buf_to_use; + // int buffer_remaining; unsigned char *buf = (unsigned char *)malloc(record->size); if (!handle->seek(handle, record->offset) || (handle->read(handle, buf, record->size, record->size) != record->size)) { @@ -270,7 +271,7 @@ GetUncompressedRecord(plkr_Document *doc, plkr_DBHandle handle, int record_index memcpy(tbuffer, buf, 8); output_ptr = tbuffer + 8; - buffer_remaining = blen - 8; + // buffer_remaining = blen - 8; start_of_data = buf + 8; len_of_data = record->size - 8; if (record->type == PLKR_DRTYPE_TEXT_COMPRESSED) { @@ -279,7 +280,7 @@ GetUncompressedRecord(plkr_Document *doc, plkr_DBHandle handle, int record_index start_of_data += (4 * record->nparagraphs); len_of_data -= (4 * record->nparagraphs); output_ptr += (4 * record->nparagraphs); - buffer_remaining -= (4 * record->nparagraphs); + // buffer_remaining -= (4 * record->nparagraphs); } buf_to_use = size_needed - (start_of_data - buf);