From 380abe18d729962a556deffabe40542048b00443 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jan 12 2017 15:47:41 +0000 Subject: 16.12.1, kf5-ize --- diff --git a/.gitignore b/.gitignore index c1e2f34..5d7df70 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/okular-16.08.3.tar.xz +/okular-16.12.1.tar.xz diff --git a/kdegraphics-4.5.1-okular_dt.patch b/kdegraphics-4.5.1-okular_dt.patch deleted file mode 100644 index 89985e5..0000000 --- a/kdegraphics-4.5.1-okular_dt.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up kdegraphics-4.5.1/okular/shell/okular.desktop.dt kdegraphics-4.5.1/okular/shell/okular.desktop ---- kdegraphics-4.5.1/okular/shell/okular.desktop.dt 2010-07-23 16:14:57.000000000 -0500 -+++ kdegraphics-4.5.1/okular/shell/okular.desktop 2010-09-07 12:31:01.260797812 -0500 -@@ -117,5 +117,5 @@ Icon=okular - Type=Application - X-DocPath=okular/index.html - InitialPreference=7 --Categories=Qt;KDE;Graphics;Office;Viewer; -+Categories=Qt;KDE;Graphics;VectorGraphics;Viewer; - MimeType=application/vnd.kde.okular-archive; diff --git a/kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch b/kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch deleted file mode 100644 index 9b8b18b..0000000 --- a/kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur kdegraphics-4.5.80/okular/OkularConfig.cmake kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths/okular/OkularConfig.cmake ---- kdegraphics-4.5.80/okular/OkularConfig.cmake 2010-10-05 13:38:39.000000000 +0200 -+++ kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths/okular/OkularConfig.cmake 2010-11-22 22:12:53.000000000 +0100 -@@ -1,18 +1,13 @@ --# get from the full path to OkularConfig.cmake up to the base dir dir: --get_filename_component( _okularBaseDir ${CMAKE_CURRENT_LIST_FILE} PATH) --get_filename_component( _okularBaseDir ${_okularBaseDir} PATH) --get_filename_component( _okularBaseDir ${_okularBaseDir} PATH) --get_filename_component( _okularBaseDir ${_okularBaseDir} PATH) -- -- - # find the full paths to the library and the includes: - find_path(OKULAR_INCLUDE_DIR okular/core/document.h -- HINTS ${_okularBaseDir}/include -- NO_DEFAULT_PATH) -- --find_library(OKULAR_CORE_LIBRARY okularcore -- HINTS ${_okularBaseDir}/lib -- NO_DEFAULT_PATH) -+ PATHS -+ ${INCLUDE_INSTALL_DIR} -+ ${KDE4_INCLUDE_DIR}) -+ -+find_library(OKULAR_CORE_LIBRARY okularcore -+ PATHS -+ ${LIB_INSTALL_DIR} -+ ${KDE4_LIB_DIR}) - - set(OKULAR_LIBRARIES ${OKULAR_CORE_LIBRARY}) - diff --git a/okular-4.10-cmake.patch b/okular-4.10-cmake.patch deleted file mode 100644 index 5b24ef2..0000000 --- a/okular-4.10-cmake.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up okular-4.10.2/active/CMakeLists.txt.me okular-4.10.2/active/CMakeLists.txt ---- okular-4.10.2/active/CMakeLists.txt.me 2013-04-09 17:34:36.086464571 +0200 -+++ okular-4.10.2/active/CMakeLists.txt 2013-04-09 17:35:02.737461052 +0200 -@@ -4,7 +4,5 @@ macro_log_feature(ACTIVEAPP_FOUND "Activ - - if (ACTIVEAPP_FOUND) - add_subdirectory( app ) -+ add_subdirectory( components ) - endif (ACTIVEAPP_FOUND) -- --add_subdirectory( components ) -- diff --git a/okular-gcc-overflow.patch b/okular-gcc-overflow.patch deleted file mode 100644 index c337f1f..0000000 --- a/okular-gcc-overflow.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up okular-4.9.5/generators/dvi/special.cpp.me okular-4.9.5/generators/dvi/special.cpp ---- okular-4.9.5/generators/dvi/special.cpp.me 2013-01-30 17:57:45.269341954 +0100 -+++ okular-4.9.5/generators/dvi/special.cpp 2013-01-31 13:23:54.897936518 +0100 -@@ -480,7 +480,7 @@ void dviRenderer::TPIC_addPath_special(c - if (TPIC_path.size() == 0) - number_of_elements_in_path = 0; - if (TPIC_path.size() == number_of_elements_in_path) -- TPIC_path.resize(number_of_elements_in_path+100); -+ TPIC_path.resize(number_of_elements_in_path+100U); - TPIC_path.setPoint(number_of_elements_in_path++, x, y); - } - diff --git a/okular.spec b/okular.spec index 8371344..a0a18c9 100644 --- a/okular.spec +++ b/okular.spec @@ -1,26 +1,22 @@ %if 0%{?fedora} -%if 0%{?fedora} < 24 -%define active 1 -%endif -%define chm 1 -%define ebook 1 -%define mobi 1 +%global chm 1 +%global ebook 1 %endif -# enable tests (they're disabled by default) -#global tests 1 -%if 0%{?tests} -%global _kde4_build_tests -DKDE4_BUILD_TESTS:BOOL=ON -%endif +# uncomment to include -mobile (currently doesn't work) +# it links libokularpart.so, but fails to file/load at runtime +#global mobile 1 Name: okular Summary: A document viewer -Version: 16.08.3 +Version: 16.12.1 Release: 1%{?dist} License: GPLv2 -URL: https://quickgit.kde.org/?p=%{name}.git +URL: https://www.kde.org/applications/graphics/okular/ + +%global majmin_ver %(echo %{version} | cut -d. -f1,2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable @@ -29,85 +25,80 @@ URL: https://quickgit.kde.org/?p=%{name}.git %endif Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz -## upstreamable patches -# okular.desktop : Categories=-Office,+VectorGraphics (http://bugzilla.redhat.com/591089) -Patch50: kdegraphics-4.5.1-okular_dt.patch - -# don't hardcode paths in OkularConfig.cmake -Patch51: kdegraphics-4.5.80-OkularConfig-dont-hardcode-paths.patch - -# get rif of gcc overflow warning -Patch52: okular-gcc-overflow.patch - -# don't build component if ACTIVEAPP_FOUND FALSE -Patch53: okular-4.10-cmake.patch +BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros +BuildRequires: cmake(Qt5DBus) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5Svg) +BuildRequires: cmake(Qt5Qml) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(KF5Activities) +BuildRequires: cmake(KF5Archive) +BuildRequires: cmake(KF5Bookmarks) +BuildRequires: cmake(KF5Completion) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5DBusAddons) +BuildRequires: cmake(KF5DocTools) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5JS) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Parts) +BuildRequires: cmake(KF5Pty) +BuildRequires: cmake(KF5ThreadWeaver) +BuildRequires: cmake(KF5Wallet) +BuildRequires: cmake(KF5KHtml) +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Phonon4Qt5) + +## generater/plugin deps +BuildRequires: cmake(KF5KExiv2) +BuildRequires: kdegraphics-mobipocket-devel >= %{majmin_ver} %if 0%{?chm} BuildRequires: chmlib-devel %endif -BuildRequires: desktop-file-utils %if 0%{?ebook} BuildRequires: ebook-tools-devel %endif -%if 0%{?mobi} -BuildRequires: qmobipocket-devel -%endif -BuildRequires: kactivities-devel -BuildRequires: kdelibs4-devel >= 4.14 -BuildRequires: libkexiv2-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: pkgconfig(ddjvuapi) -%if 0%{?fedora} -BuildRequires: pkgconfig(kscreen) >= 1.0.5 -%endif +BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libspectre) -BuildRequires: pkgconfig(poppler-qt4) +BuildRequires: pkgconfig(poppler-qt5) BuildRequires: pkgconfig(qca2) -BuildRequires: pkgconfig(qimageblitz) BuildRequires: pkgconfig(zlib) -%if 0%{?active} -BuildRequires: plasma-mobile-devel -%else -Obsoletes: %{name}-active < %{version}-%{release} -%endif -%if 0%{?tests} -BuildRequires: dbus-x11 -BuildRequires: kde-runtime -BuildRequires: oxygen-icon-theme -BuildRequires: xorg-x11-server-Xvfb -%endif -# kio_msits migrates from kdegraphics, which had Epoch: 7 -%define kio_msits_epoch 7 Requires: %{name}-part%{?_isa} = %{version}-%{release} -%if 0%{?chm} -Requires: kio_msits = %{kio_msits_epoch}:%{version}-%{release} -%endif -%{?kde_runtime_requires} %description %{summary}. -%package active -Summary: Document viewer for plasma active -# todo: test/confirm this dep is sufficient (or too much) -- rex +%if 0%{?mobile} +%package mobile +Summary: Document viewer for plasma mobile +# included last in okular-15.12.3-1.fc23 +Obsoletes: okular-active < 16.04 Requires: %{name}-part%{?_isa} = %{version}-%{release} -%description active +%description mobile %{summary}. +%endif %package devel Summary: Development files for %{name} -Provides: okular4-devel = %{version}-%{release} +Provides: okular5-devel = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: kdelibs4-devel %description devel %{summary}. %package libs Summary: Runtime files for %{name} -# when split occurred -Conflicts: kdegraphics < 7:4.6.95-10 %if 0%{?fedora} # use Recommends to avoid hard deps -- rex ## lpr @@ -120,33 +111,26 @@ Recommends: ghostscript-core %package part Summary: Okular kpart plugin -Provides: okular4-part = %{version}-%{release} -Provides: okular4-part%{?_isa} = %{version}-%{release} +Provides: okular5-part = %{version}-%{release} +Provides: okular5-part%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description part %{summary}. -%package -n kio_msits -Epoch: %{kio_msits_epoch} -Summary: A kioslave for displaying WinHelp files -%description -n kio_msits -%{summary}. - - %prep -%setup -q +%autosetup -p1 -%patch50 -p2 -b .okular_dt -%patch51 -p2 -b .OkularConfig -%patch52 -p1 -b .overflow -%patch53 -p1 -b .cmake +%if ! 0%{?mobile} +# disable/omit mobile, it doesn't work -- rex +sed -i -e 's|^add_subdirectory( mobile )|#add_subdirectory( mobile )|' CMakeLists.txt +%endif %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} @@ -155,85 +139,85 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%if ! 0%{?active} -rm -fv %{buildroot}%{_kde4_datadir}/applications/kde4/active-documentviewer_*.desktop +# unpackaged files +%if ! 0%{?mobile} +rm -fv %{buildroot}%{_kf5_datadir}/applications/org.kde.mobile.okular_*.desktop %endif %check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okular.desktop -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okularApplication_kimgio.desktop -%if 0%{?mobi} -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okularApplication_mobi.desktop -%endif -%if 0%{?tests} -time xvfb-run -a dbus-launch --exit-with-session make test ARGS="--output-on-failure --timeout 15" -C %{_target_platform}/ ||: +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.okular.desktop +appstream-util validate-relax --nonet %{buildroot}%{_kf5_datadir}/appdata/org.kde.okular.appdata.xml +%if 0%{?mobile} +desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.mobile.okular.desktop %endif %post -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : +touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || : %posttrans -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null ||: %postun if [ $1 -eq 0 ] ; then -touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || : -gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || : +touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null || : +gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null || : update-desktop-database -q &> /dev/null ||: fi %files %license COPYING -%{_kde4_bindir}/okular* -%{_kde4_datadir}/applications/kde4/okular.desktop -%{_kde4_datadir}/applications/kde4/okularApplication_*.desktop -%{_kde4_iconsdir}/hicolor/*/*/* -%lang(en) %{_kde4_docdir}/HTML/en/okular/ +%{_kf5_bindir}/okular +%{_kf5_sysconfdir}/xdg/okular.categories +%{_kf5_datadir}/applications/org.kde.okular.desktop +%{_kf5_datadir}/appdata/org.kde.okular.appdata.xml +%{_kf5_datadir}/applications/okularApplication_*.desktop +%{_kf5_datadir}/appdata/org.kde.okular-*.metainfo.xml +%{_kf5_datadir}/okular/ +%{_kf5_datadir}/icons/hicolor/*/*/* +%{_kf5_datadir}/kconf_update/okular.upd +%lang(en) %{_kf5_docdir}/HTML/en/okular/ %{_mandir}/man1/okular.1* -%if 0%{?active} -%files active -%{_kde4_appsdir}/plasma/packages/org.kde.active.documentviewer/ -%{_kde4_bindir}/active-documentviewer -%{_kde4_datadir}/applications/kde4/active-documentviewer.desktop -%{_kde4_datadir}/applications/kde4/active-documentviewer_*.desktop -# not sure if this is best put here or not -- rex -%{_kde4_libdir}/kde4/imports/org/kde/okular/ +%if 0%{?mobile} +%files mobile +%{_qt5_qmldir}/org/kde/okular/ +%{_kf5_datadir}/applications/org.kde.mobile.okular.desktop +%{_kf5_datadir}/applications/org.kde.mobile.okular_*.desktop +%{_kf5_datadir}/kpackage/genericqml/org.kde.mobile.okular/ %endif %files devel -%{_kde4_includedir}/okular/ -%{_kde4_libdir}/libokularcore.so -%{_kde4_libdir}/cmake/Okular/ +%{_includedir}/okular/ +%{_libdir}/libOkular5Core.so +%{_libdir}/cmake/Okular5/ %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig %files libs -%{_kde4_appsdir}/kconf_update/okular.upd -%{_kde4_libdir}/libokularcore.so.7* +%{_libdir}/libOkular5Core.so.7* %files part -%{_kde4_appsdir}/okular/ -%{_kde4_datadir}/config.kcfg/*.kcfg -%{_kde4_datadir}/kde4/services/libokularGenerator*.desktop -%{_kde4_datadir}/kde4/services/okular[A-Z]*.desktop -%{_kde4_datadir}/kde4/services/okular_part.desktop -%{_kde4_datadir}/kde4/servicetypes/okularGenerator.desktop -%{_kde4_libdir}/kde4/okularGenerator*.so -%{_kde4_libdir}/kde4/okularpart.so - -%if 0%{?chm} -%files -n kio_msits -%{_kde4_libdir}/kde4/kio_msits.so -%{_kde4_datadir}/kde4/services/msits.protocol -%endif +%{_qt5_plugindir}/kio_msits.so +%{_kf5_datadir}/kservices5/ms-its.protocol +%{_kf5_datadir}/config.kcfg/*.kcfg +%{_kf5_datadir}/kservices5/okular[A-Z]*.desktop +%{_kf5_datadir}/kservices5/okular_part.desktop +%{_kf5_datadir}/kservicetypes5/okularGenerator.desktop +%{_kf5_datadir}/kxmlgui5/okular/ +%dir %{_qt5_plugindir}/okular/ +%dir %{_qt5_plugindir}/okular/generators/ +%{_qt5_plugindir}/okular/generators/okularGenerator_*.so +%{_qt5_plugindir}/okularpart.so %changelog +* Thu Jan 12 2017 Rex Dieter - 16.12.1-1 +- 16.12.1, kf5-ize + * Wed Nov 30 2016 Rex Dieter - 16.08.3-1 - 16.08.3, disable tests - -devel: Provides: okular4-devel diff --git a/sources b/sources index 9ef0a0c..71160c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a1aa36acb778c8cd8ef4e71f4a1fdad8 okular-16.08.3.tar.xz +SHA512 (okular-16.12.1.tar.xz) = 0ce2e48c630fcd992c919f35295dbe7f44e50f36bcb5dbb39ab5ae9c1fe4291363fb082e6a738d2db379b31d4377bf4d2e2fda24de86b8fab2dcdc7174e30919