diff --git a/.gitignore b/.gitignore index 4c7b863..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +0,0 @@ -/okular-17.08.1.tar.xz -/okular-17.08.2.tar.xz -/okular-17.08.3.tar.xz -/okular-17.12.0.tar.xz -/okular-17.12.1.tar.xz -/okular-17.12.2.tar.xz -/okular-17.12.3.tar.xz diff --git a/okular-kcrash.patch b/okular-kcrash.patch new file mode 100644 index 0000000..9270345 --- /dev/null +++ b/okular-kcrash.patch @@ -0,0 +1,52 @@ +commit 3e25263d7709524e227207092533397ef65f2c82 +Author: Albert Astals Cid +Date: Sun Apr 8 11:50:18 2018 +0200 + + Use KCrash + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2b38cac37..fd2d55ec2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,6 +53,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS + Config + ConfigWidgets + CoreAddons ++ Crash + DocTools + IconThemes + JS +diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt +index ec2f1bace..e85076dda 100644 +--- a/shell/CMakeLists.txt ++++ b/shell/CMakeLists.txt +@@ -27,7 +27,7 @@ ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS}) + + add_executable(okular ${okular_SRCS}) + +-target_link_libraries(okular KF5::Parts KF5::WindowSystem) ++target_link_libraries(okular KF5::Parts KF5::WindowSystem KF5::Crash) + + if(NOT WIN32) + target_link_libraries(okular KF5::Activities) +diff --git a/shell/main.cpp b/shell/main.cpp +index 3f8dc4367..de8a5c24e 100644 +--- a/shell/main.cpp ++++ b/shell/main.cpp +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -39,6 +40,8 @@ int main(int argc, char** argv) + // set icon for shells which do not use desktop file metadata + QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular"))); + ++ KCrash::initialize(); ++ + QCommandLineParser parser; + // The KDE4 version accepted flags such as -unique with a single dash -> preserve compatibility + parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); diff --git a/okular.spec b/okular.spec index 152c704..df0e1b8 100644 --- a/okular.spec +++ b/okular.spec @@ -14,8 +14,8 @@ Name: okular Summary: A document viewer -Version: 17.12.3 -Release: 2%{?dist} +Version: 18.03.90 +Release: 1%{?dist} License: GPLv2 URL: https://www.kde.org/applications/graphics/okular/ @@ -29,6 +29,10 @@ URL: https://www.kde.org/applications/graphics/okular/ %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz +## upstream patches +# https://cgit.kde.org/okular.git/commit/?id=3e25263d7709524e227207092533397ef65f2c82 +Patch1: okular-kcrash.patch + BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -41,6 +45,7 @@ BuildRequires: cmake(KF5Completion) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Crash) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5DocTools) BuildRequires: cmake(KF5IconThemes) @@ -71,7 +76,7 @@ BuildRequires: cmake(Qca-qt5) ## generater/plugin deps BuildRequires: cmake(KF5KExiv2) -BuildRequires: kdegraphics-mobipocket-devel >= %{majmin_ver} +BuildRequires: kdegraphics-mobipocket-devel %if 0%{?chm} BuildRequires: chmlib-devel BuildRequires: pkgconfig(libzip) @@ -83,6 +88,7 @@ BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: pkgconfig(ddjvuapi) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(libmarkdown) BuildRequires: pkgconfig(libspectre) BuildRequires: pkgconfig(poppler-qt5) BuildRequires: pkgconfig(qca2) @@ -152,7 +158,7 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -204,11 +210,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.mobile.ok %{_libdir}/libOkular5Core.so %{_libdir}/cmake/Okular5/ -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files libs -%{_libdir}/libOkular5Core.so.8* +%{_libdir}/libOkular5Core.so.9* %files part -f okular-part.lang %{_qt5_plugindir}/kio_msits.so @@ -225,6 +230,10 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.mobile.ok %changelog +* Sun Apr 08 2018 Rex Dieter - 18.03.90-1 +- 18.03.90, support kcrash +- enable discount/libmarkdown support + * Fri Mar 23 2018 Marek Kasik - 17.12.3-2 - Rebuild for poppler-0.63.0 diff --git a/sources b/sources index 3ee711f..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -SHA512 (okular-17.12.3.tar.xz) = 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361