From 13bdb97084d2747c24f90ce50413a8d85bb67c06 Mon Sep 17 00:00:00 2001 From: Sune Vuorela Date: Tue, 1 May 2018 21:10:13 +0200 Subject: [PATCH 1/4] Don't crash if fopen fails Summary: If we have a qrc url, all checks so far fails, and this one returns null. It might also be possible to get here in some race condition. Reviewers: aacid Reviewed By: aacid Subscribers: #okular Tags: #okular Differential Revision: https://phabricator.kde.org/D12643 --- generators/markdown/converter.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generators/markdown/converter.cpp b/generators/markdown/converter.cpp index 81157bd21..ec7d1ef14 100644 --- a/generators/markdown/converter.cpp +++ b/generators/markdown/converter.cpp @@ -52,6 +52,11 @@ Converter::~Converter() QTextDocument* Converter::convert( const QString &fileName ) { FILE *markdownFile = fopen( fileName.toLocal8Bit(), "rb" ); + if ( !markdownFile ) { + emit error( i18n( "Failed to open the document" ), -1 ); + return nullptr; + } + const QDir dir = QDir( fileName.left( fileName.lastIndexOf( '/' ) ) ); MMIOT *markdownHandle = mkd_in( markdownFile, 0 ); From 84b404b8458dc3a468987539eaa318e111ef5cce Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Wed, 2 May 2018 14:17:32 +0200 Subject: [PATCH 2/4] GIT_SILENT Upgrade KDE Applications version to 18.04.1. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ecdc3abec..d067039e0 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 "18") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "0") +set (KDE_APPLICATIONS_VERSION_MICRO "1") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(okular VERSION 1.4.${KDE_APPLICATIONS_VERSION_MICRO}) From ee57925c5779a572b8d5cc52ab59a380bd4b4e03 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 May 2018 06:09:02 +0200 Subject: [PATCH 3/4] GIT_SILENT made messages (after extraction) --- generators/chm/org.kde.okular-chm.metainfo.xml | 2 +- generators/comicbook/org.kde.okular-comicbook.metainfo.xml | 2 +- generators/djvu/org.kde.okular-djvu.metainfo.xml | 2 +- generators/dvi/org.kde.okular-dvi.metainfo.xml | 2 +- generators/epub/org.kde.okular-epub.metainfo.xml | 2 +- generators/fax/org.kde.okular-fax.metainfo.xml | 2 +- generators/fictionbook/org.kde.okular-fb.metainfo.xml | 2 +- generators/kimgio/org.kde.okular-kimgio.metainfo.xml | 2 +- generators/markdown/org.kde.okular-md.metainfo.xml | 2 +- generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml | 2 +- generators/ooo/org.kde.okular-ooo.metainfo.xml | 2 +- generators/plucker/org.kde.okular-plucker.metainfo.xml | 2 +- generators/poppler/org.kde.okular-poppler.metainfo.xml | 2 +- generators/spectre/org.kde.okular-spectre.metainfo.xml | 2 +- generators/tiff/org.kde.okular-tiff.metainfo.xml | 2 +- generators/txt/org.kde.okular-txt.metainfo.xml | 2 +- generators/xps/org.kde.okular-xps.metainfo.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/generators/chm/org.kde.okular-chm.metainfo.xml b/generators/chm/org.kde.okular-chm.metainfo.xml index 6e69511e7..d85321e00 100644 --- a/generators/chm/org.kde.okular-chm.metainfo.xml +++ b/generators/chm/org.kde.okular-chm.metainfo.xml @@ -49,7 +49,7 @@ CHM-dokumentide lugemise toetus Lisää CHM-tiedostojen lukutuen Permet la lecture des documents CHM - Permite ler documentos CHM. + Permite ler documentos CHM Adde supporto per leger documentos CHM Aggiunge il supporto per la lettura di documenti CHM CHM 문서 읽기 지원 추가 diff --git a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml index 9f7d30b24..dbbff9416 100644 --- a/generators/comicbook/org.kde.okular-comicbook.metainfo.xml +++ b/generators/comicbook/org.kde.okular-comicbook.metainfo.xml @@ -49,7 +49,7 @@ Koomiksite lugemise toetus Lisää sarjakuvakirjojen lukutuen Permet la lecture des bandes dessinées - Permite ler libros de banda deseñada. + Permite ler libros de banda deseñada Adde supporto per leger libros de comic Aggiunge il supporto per la lettura di fumetti 만화책 읽기 지원 추가 diff --git a/generators/djvu/org.kde.okular-djvu.metainfo.xml b/generators/djvu/org.kde.okular-djvu.metainfo.xml index 04b3d6ce9..0e4b27185 100644 --- a/generators/djvu/org.kde.okular-djvu.metainfo.xml +++ b/generators/djvu/org.kde.okular-djvu.metainfo.xml @@ -49,7 +49,7 @@ DjVu dokumentide lugemise toetus Lisää DjVu-tiedostojen lukutuen Permet la lecture des documents DjVu - Permite ler documentos de DjVu. + Permite ler documentos de DjVu Adde supporto per leger documentos DjVu Aggiunge il supporto per la lettura di documenti DjVu DjVu 문서 읽기 지원 추가 diff --git a/generators/dvi/org.kde.okular-dvi.metainfo.xml b/generators/dvi/org.kde.okular-dvi.metainfo.xml index dafd5f4f0..62940dc9f 100644 --- a/generators/dvi/org.kde.okular-dvi.metainfo.xml +++ b/generators/dvi/org.kde.okular-dvi.metainfo.xml @@ -49,7 +49,7 @@ DVI dokumentide lugemise toetus Lisää DVI-tiedostojen lukutuen Permet la lecture des documents DVI - Permite ler documentos DVI. + Permite ler documentos DVI Adde supporto per leger documentos DVI Aggiunge il supporto per la lettura di documenti DVI DVI 문서 읽기 지원 추가 diff --git a/generators/epub/org.kde.okular-epub.metainfo.xml b/generators/epub/org.kde.okular-epub.metainfo.xml index 9ebf6ddcd..2bed20560 100644 --- a/generators/epub/org.kde.okular-epub.metainfo.xml +++ b/generators/epub/org.kde.okular-epub.metainfo.xml @@ -49,7 +49,7 @@ E-raamatute lugemise toetus Lisää e-kirjojen lukutuen Permet la lecture des E-Books - Permite ler libros electrónicos. + Permite ler libros electrónicos Adde supporto per leger E-libros Aggiunge il supporto per la lettura di libri digitali in formato EPub 전자책 읽기 지원 추가 diff --git a/generators/fax/org.kde.okular-fax.metainfo.xml b/generators/fax/org.kde.okular-fax.metainfo.xml index 09c0e8404..663e98423 100644 --- a/generators/fax/org.kde.okular-fax.metainfo.xml +++ b/generators/fax/org.kde.okular-fax.metainfo.xml @@ -49,7 +49,7 @@ Faksidokumentide lugemise toetus Lisää faksitiedostojen lukutuen Permet la lecture des documents Fax - Permite ler documentos de fax. + Permite ler documentos de fax Adde supporto per leger documentos Fax Aggiunge il supporto per la lettura di documenti Fax 팩스 문서 읽기 지원 추가 diff --git a/generators/fictionbook/org.kde.okular-fb.metainfo.xml b/generators/fictionbook/org.kde.okular-fb.metainfo.xml index b7272cfea..cf22a06d0 100644 --- a/generators/fictionbook/org.kde.okular-fb.metainfo.xml +++ b/generators/fictionbook/org.kde.okular-fb.metainfo.xml @@ -49,7 +49,7 @@ FictionBooki lugemise toetus Lisää FictionBook-lukutuen Permet la lecture des fichiers FictionBooks - Permite ler libros FictionBook. + Permite ler libros FictionBook Adde supporto per leger FictionBooks Aggiunge il supporto per la lettura di documenti in formato FictionBooks FictionBook 읽기 지원 추가 diff --git a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml index 511e0706e..fd8233135 100644 --- a/generators/kimgio/org.kde.okular-kimgio.metainfo.xml +++ b/generators/kimgio/org.kde.okular-kimgio.metainfo.xml @@ -49,7 +49,7 @@ Paljude pildivormingute lugemise toetus Lisää monien kuvatiedostomuotojen lukutuen Permet la lecture de nombreux formats d'images - Permite ler moitos formatos de imaxe. + Permite ler moitos formatos de imaxe Adde supporto per leger formatos de image Aggiunge il supporto per la lettura di vari formati di immagini 다양한 그림 형식 읽기 지원 추가 diff --git a/generators/markdown/org.kde.okular-md.metainfo.xml b/generators/markdown/org.kde.okular-md.metainfo.xml index 88e528818..c21ad090a 100644 --- a/generators/markdown/org.kde.okular-md.metainfo.xml +++ b/generators/markdown/org.kde.okular-md.metainfo.xml @@ -43,7 +43,7 @@ Permite la lectura de documentos Markdown Lisää Markdown-tiedostojen lukutuen Permet la lecture des documents Markdown - Permite ler documentos Markdown. + Permite ler documentos Markdown Adde supporto per leger documentos Markdown Aggiunge il supporto per la lettura di documenti Markdown Markdown 문서 읽기 지원 추가 diff --git a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml index 924231023..56decd55b 100644 --- a/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml +++ b/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml @@ -49,7 +49,7 @@ Mobipocketi e-raamatute lugemise toetus Lisää MobiPocket-e-kirjojen lukutuen Ajouter la gestion en lecture des livres électroniques Mobipocket - Permite ler libros electrónicos Mobipocket. + Permite ler libros electrónicos Mobipocket Adde supporto per leger E-libros in Mobipocket Aggiunge il supporto per la lettura di libri digitali in formato Mobipocket Mobipocket 전자책 읽기 지원 추가 diff --git a/generators/ooo/org.kde.okular-ooo.metainfo.xml b/generators/ooo/org.kde.okular-ooo.metainfo.xml index 95bce3169..4e30d0ed4 100644 --- a/generators/ooo/org.kde.okular-ooo.metainfo.xml +++ b/generators/ooo/org.kde.okular-ooo.metainfo.xml @@ -49,7 +49,7 @@ OpenDocument tekstifailide lugemise toetus Lisää OpenDocument-tekstitiedostojen lukutuen Permet la lecture des fichiers texte OpenDocument - Permite ler ficheiros de texto OpenDocument. + Permite ler ficheiros de texto OpenDocument Adde supporto per leger files de texto OpenDocument Aggiunge il supporto per la lettura di documenti di testo OpenDocument OpenDocument 텍스트 파일 읽기 지원 추가 diff --git a/generators/plucker/org.kde.okular-plucker.metainfo.xml b/generators/plucker/org.kde.okular-plucker.metainfo.xml index 228cb37dd..397e8ca5c 100644 --- a/generators/plucker/org.kde.okular-plucker.metainfo.xml +++ b/generators/plucker/org.kde.okular-plucker.metainfo.xml @@ -49,7 +49,7 @@ Pluckeri dokumentide lugemise toetus Lisää Plucker-tiedostojen lukutuen Permet la lecture des documents Plucker - Permite ler documentos de Plucker. + Permite ler documentos de Plucker Adde supporto per leger documentos Plucker Aggiunge il supporto per la lettura di documenti Plucker Plucker 문서 읽기 지원 추가 diff --git a/generators/poppler/org.kde.okular-poppler.metainfo.xml b/generators/poppler/org.kde.okular-poppler.metainfo.xml index 0772f8907..88e77afda 100644 --- a/generators/poppler/org.kde.okular-poppler.metainfo.xml +++ b/generators/poppler/org.kde.okular-poppler.metainfo.xml @@ -49,7 +49,7 @@ PDF-dokumentide lugemise toetus Lisää PDF-tiedostojen lukutuen Permet la lecture des documents PDF - Permite ler documentos PDF. + Permite ler documentos PDF Adde supporto per leger documentos PDF Aggiunge il supporto per la lettura di documenti PDF PDF 문서 읽기 지원 추가 diff --git a/generators/spectre/org.kde.okular-spectre.metainfo.xml b/generators/spectre/org.kde.okular-spectre.metainfo.xml index c810daa99..d9a629df0 100644 --- a/generators/spectre/org.kde.okular-spectre.metainfo.xml +++ b/generators/spectre/org.kde.okular-spectre.metainfo.xml @@ -50,7 +50,7 @@ PostScript-dokumentide lugemise toetus Lisää PostScript-tiedostojen lukutuen Permet la lecture des documents PostScript - Permite ler documentos PostScript. + Permite ler documentos PostScript Adde supporto per leger documentos PostScript Dukungan tambahan untuk pembacaan dokumen PostScript Aggiunge il supporto per la lettura di documenti PostScript diff --git a/generators/tiff/org.kde.okular-tiff.metainfo.xml b/generators/tiff/org.kde.okular-tiff.metainfo.xml index 62f88ca3b..516861f6c 100644 --- a/generators/tiff/org.kde.okular-tiff.metainfo.xml +++ b/generators/tiff/org.kde.okular-tiff.metainfo.xml @@ -49,7 +49,7 @@ TIFF-dokumentide lugemise toetus Lisää TIFF-kuvatiedostojen lukutuen Permet la lecture des documents Tiff - Permite ler documentos Tiff. + Permite ler documentos Tiff Adde supporto per leger documentos Tiff Aggiunge il supporto per la lettura di documenti Tiff TIFF 문서 읽기 지원 추가 diff --git a/generators/txt/org.kde.okular-txt.metainfo.xml b/generators/txt/org.kde.okular-txt.metainfo.xml index ca1560904..123209254 100644 --- a/generators/txt/org.kde.okular-txt.metainfo.xml +++ b/generators/txt/org.kde.okular-txt.metainfo.xml @@ -49,7 +49,7 @@ Lihttekstidokumentide lugemise toetus Lisää paljaiden tekstitiedostojen lukutuen Permet la lecture des fichiers texte - Permite ler documentos de texto simple. + Permite ler documentos de texto simple Adde supporto per leger documentos plan Aggiunge il supporto per la lettura di documenti in testo semplice 일반 텍스트 문서 읽기 지원 추가 diff --git a/generators/xps/org.kde.okular-xps.metainfo.xml b/generators/xps/org.kde.okular-xps.metainfo.xml index a97d9506d..edb070610 100644 --- a/generators/xps/org.kde.okular-xps.metainfo.xml +++ b/generators/xps/org.kde.okular-xps.metainfo.xml @@ -49,7 +49,7 @@ XPS-dokumentide lugemise toetus Lisää XPS-tiedostojen lukutuen Permet la lecture des documents XPS - Permite ler documentos XPS. + Permite ler documentos XPS Adde supporto per leger documentos XPS Aggiunge il supporto per la lettura di documenti XPS XPS 문서 읽기 지원 추가 From 3e48663fb764f60db63c9272f28258fcf06eb7fb Mon Sep 17 00:00:00 2001 From: Sune Vuorela Date: Wed, 2 May 2018 22:11:13 +0200 Subject: [PATCH 4/4] Use a target in FindDiscount (modern cmake) rather than variables Test Plan: Things still builds Reviewers: kde-buildsystem, apol Reviewed By: apol Subscribers: apol, aacid, #okular Tags: #okular Differential Revision: https://phabricator.kde.org/D12672 --- cmake/modules/FindDiscount.cmake | 5 +++++ generators/markdown/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/modules/FindDiscount.cmake b/cmake/modules/FindDiscount.cmake index 43eac0b24..583fb0598 100644 --- a/cmake/modules/FindDiscount.cmake +++ b/cmake/modules/FindDiscount.cmake @@ -7,6 +7,7 @@ # discount_INCLUDE_DIR - the include path of the discount library # Copyright (c) 2017, Julian Wolff, +# Copyright (c) 2018, Sune Vuorela, # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -34,3 +35,7 @@ endif (discount_INCLUDE_DIR AND discount_LIBRARIES) mark_as_advanced(discount_INCLUDE_DIR discount_LIBRARIES) +if (discount_FOUND) + add_library(discount::Lib UNKNOWN IMPORTED) + set_target_properties(discount::Lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${discount_INCLUDE_DIR} IMPORTED_LOCATION ${discount_LIBRARIES}) +endif() diff --git a/generators/markdown/CMakeLists.txt b/generators/markdown/CMakeLists.txt index f5fa2eced..6e8b0f1a4 100644 --- a/generators/markdown/CMakeLists.txt +++ b/generators/markdown/CMakeLists.txt @@ -16,7 +16,7 @@ set(okularGenerator_md_PART_SRCS okular_add_generator(okularGenerator_md ${okularGenerator_md_PART_SRCS}) -target_link_libraries(okularGenerator_md okularcore KF5::I18n KF5::KIOCore ${discount_LIBRARIES}) +target_link_libraries(okularGenerator_md PRIVATE okularcore KF5::I18n KF5::KIOCore discount::Lib) ########### install files ############### install( FILES okularMd.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )