From 75fc75ae1f0481ffdb78450e801a9b443ba641bd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 31 Mar 2018 10:55:17 +0100 Subject: gentoo resync : 31.03.2018 --- kde-apps/okular/Manifest | 3 - .../okular/files/okular-17.08.3-cmake-3.10.patch | 45 ----------- kde-apps/okular/okular-17.08.3.ebuild | 91 ---------------------- 3 files changed, 139 deletions(-) delete mode 100644 kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch delete mode 100644 kde-apps/okular/okular-17.08.3.ebuild (limited to 'kde-apps/okular') diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 2c1513eab57c..9edc5fbbcaf2 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,7 +1,4 @@ -AUX okular-17.08.3-cmake-3.10.patch 1615 BLAKE2B fa352ae2212f04ce20968fcc54906eb6cb96708d076c2a9e2b9ba95a8aeccbceedbf131b698d07e7a391e3e8ccbbb85422cb8937731116348f16e5163810e605 SHA512 2f06c6b54bba5241b3d5b72724363b3acc5554d314ea8bb5d77b0fd28963283cceee1c81627f6701ba2afd8e88f1239a14b05fea7271148bde55e4bc6d93adb1 AUX okular-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96 -DIST okular-17.08.3.tar.xz 5618588 BLAKE2B b9f36211ba2620bcd984e715c37112d92f56c0f8d1d1298d54db3092fe205ac4abef18cf64756b81ac20e91fcbfe6dc18fbe6de682cc71caf0f24be4d2b7c15e SHA512 33b8f1bbf1f4c5814b6df8bfd87a3deccc762564f312729a50956c85fc95f1ce9f057a8b43b51a368a3f0c2a4d9705dde09d1e575f7325ae32420c0106ce28b0 DIST okular-17.12.3.tar.xz 5737804 BLAKE2B 959f83cbf7713333319400abefe70390b75bd1fdf5d907c362e4e36d65fba3115d6c4091ae04c2058e557a6df1a8587cb5adbfd345cc4702439db2d837d4ed2d SHA512 803e69a918a385798905eeda15afa817ff145406947abc793c62c26879ed9b98ca601adedeb5133972be50e679cc31cc2ad8ccc97c084c64a3cad791a778d361 -EBUILD okular-17.08.3.ebuild 2545 BLAKE2B 4c5ea67e0e889c61c6fc140e7481f1f95453a6e60094653bc92fe1d33eb5a4d4a5728dbf181c7cd7392ceb3e4516b856ebccca3511f48e07ccaaa849712c3c2d SHA512 98fa1c9da0dd4e106bd8e17d1750e80df925eb3dab91120a6981f915de007cb4fa41d12faacea41a3b7de8b9bdbf40f3a493e7dcf51c8c1b57b456fb705e8147 EBUILD okular-17.12.3.ebuild 2898 BLAKE2B 20461830de043ba6ebae2e954b183d8bafc534e70198d184246bff9154313147b283259d23321569ee6276ad13ddb0d7b064eaab0b5f636c8570b72d5fd9c001 SHA512 85d87372e18d51bbec5b08c4e7fe4dce0eb120a721f47b69c7f53252e4884193a16b4711133af0316417e4c9c1e546a505cd6cd4d1ff7dc7b21a0c4db31a8e9f MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e diff --git a/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch b/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch deleted file mode 100644 index 33c56a6e7ecb..000000000000 --- a/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f777e2a9241c4f384f60c467e226eee85fb5bc98 Mon Sep 17 00:00:00 2001 -From: Henrik Fehlauer -Date: Sat, 4 Nov 2017 00:22:09 +0100 -Subject: Fix CMake Error in generators/spectre/CMakeLists.txt - -Summary: -When porting from `add_library` to `okular_add_generator`, 2f9246ae42ce -missed to remove `MODULE` for spectre, which is already implicitly added -as can be seen [here](https://phabricator.kde.org/source/kcoreaddons/browse/master/KF5CoreAddonsMacros.cmake;83623a46c9862ee37535de93427dec0b0c55e24d$139). - -This causes the upcoming CMake 3.10 to print the error `Cannot find -source file`, which can be fixed by removing the superfluous `MODULE`. - -BUG: 386176 - -Test Plan: -No error shown anymore with CMake 3.10.0-rc4. Still works with CMake -3.5.1. - -Reviewers: #okular, ngraham - -Reviewed By: ngraham - -Tags: #okular - -Differential Revision: https://phabricator.kde.org/D8612 ---- - generators/spectre/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/generators/spectre/CMakeLists.txt b/generators/spectre/CMakeLists.txt -index d808c36..5d6927d 100644 ---- a/generators/spectre/CMakeLists.txt -+++ b/generators/spectre/CMakeLists.txt -@@ -24,7 +24,7 @@ ki18n_wrap_ui(okularGenerator_ghostview_SRCS - kconfig_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc ) - - --okular_add_generator(okularGenerator_ghostview MODULE ${okularGenerator_ghostview_SRCS}) -+okular_add_generator(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS}) - - target_link_libraries(okularGenerator_ghostview okularcore ${LIBSPECTRE_LIBRARY} KF5::I18n Qt5::Xml) - --- -cgit v0.11.2 diff --git a/kde-apps/okular/okular-17.08.3.ebuild b/kde-apps/okular/okular-17.08.3.ebuild deleted file mode 100644 index 19c66cb42fc6..000000000000 --- a/kde-apps/okular/okular-17.08.3.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Universal document viewer based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular" -KEYWORDS="amd64 x86" -IUSE="chm crypt djvu epub +image-backend mobi mobile +pdf plucker +postscript speech +tiff" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpty) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep threadweaver) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - media-libs/freetype - media-libs/phonon[qt5(+)] - sys-libs/zlib - chm? ( - $(add_frameworks_dep khtml) - dev-libs/chmlib - ) - crypt? ( app-crypt/qca:2[qt5] ) - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - image-backend? ( - $(add_kdeapps_dep libkexiv2) - $(add_qt_dep qtgui 'gif,jpeg,png') - ) - mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) - pdf? ( app-text/poppler[qt5,-exceptions(-)] ) - plucker? ( virtual/jpeg:0 ) - postscript? ( app-text/libspectre ) - speech? ( $(add_qt_dep qtspeech) ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - image-backend? ( $(add_frameworks_dep kimageformats) ) - mobile? ( - $(add_frameworks_dep kirigami) - $(add_qt_dep qtquickcontrols) - ) -" - -# bug 603116 -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}/${P}-cmake-3.10.patch" ) - -src_prepare() { - kde5_src_prepare - use mobile || cmake_comment_add_subdirectory mobile - use test || cmake_comment_add_subdirectory conf/autotests -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package chm CHM) - $(cmake-utils_use_find_package crypt Qca-qt5) - $(cmake-utils_use_find_package djvu DjVuLibre) - $(cmake-utils_use_find_package epub EPub) - $(cmake-utils_use_find_package image-backend KF5KExiv2) - $(cmake-utils_use_find_package mobi QMobipocket) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package plucker JPEG) - $(cmake-utils_use_find_package postscript LibSpectre) - $(cmake-utils_use_find_package speech Qt5TextToSpeech) - $(cmake-utils_use_find_package tiff TIFF) - ) - - kde5_src_configure -} -- cgit v1.2.3