From a4eda25bf0f72d757244b128657832bc4da28375 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Mar 2024 18:47:53 +0000 Subject: gentoo auto-resync : 15:03:2024 - 18:47:52 --- media-gfx/Manifest.gz | Bin 37844 -> 37850 bytes media-gfx/okularpart/Manifest | 4 +- .../okularpart/files/okularpart-23.08.5-only.patch | 29 ++++++- media-gfx/okularpart/okularpart-23.08.5-r1.ebuild | 94 +++++++++++++++++++++ media-gfx/okularpart/okularpart-23.08.5.ebuild | 94 --------------------- 5 files changed, 121 insertions(+), 100 deletions(-) create mode 100644 media-gfx/okularpart/okularpart-23.08.5-r1.ebuild delete mode 100644 media-gfx/okularpart/okularpart-23.08.5.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index c6b5cf0d0574..1aee6a4ca312 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/okularpart/Manifest b/media-gfx/okularpart/Manifest index 18ee762ec7a6..efe7229cc668 100644 --- a/media-gfx/okularpart/Manifest +++ b/media-gfx/okularpart/Manifest @@ -1,6 +1,6 @@ AUX okularpart-23.08.5-crashfix.patch 2502 BLAKE2B 129eee695e49d37684ab7d4383b5fe9c4032f208f7bbbff7c3cc643df6fb8e201cf79e30719f2f0af301f4893efdda7ec19057f768f8de599fe353803f0eb070 SHA512 13a8a1c12ccf84e83b69afe38a3da6ea5f13955a6f3f88d22929db8215ab6610608ab3656d84d659a7cf169973dd417c90146fdaf467bdc73c83b762326b2bcd -AUX okularpart-23.08.5-only.patch 966 BLAKE2B 2a8cb3cd4519f732d7d4dcecc781ddb574e7c21c27bf6a2c7b5d626fd41b6dca53f4003c140691cf7bf7122ada6385f2822f5a1c6b2240cae0c50cefb7e02b7b SHA512 346d0850dc7ee300eeaa0028bba6c2bcb9ecc7a0026cd828de7b13182842ed6c3b7b0b79aa52180c02990a5b09a48d5b2bc3d8142d91e14b6f71964751051ea0 +AUX okularpart-23.08.5-only.patch 1891 BLAKE2B 76cdf1bdb89bc13f7f80513b14de01d7639ed1b26d134f9c697188c810a22a1edd342104ea61d00ee8cd0cf5fc75f0da987a3290a5ef43dc5a2c46f3402ead3d SHA512 932006c1d73684bba1bee7226a1dc72935a6485fe75a4812fa0fe986dddf7da8c6bcfba0f65203e926271f71240b7db7a2bbb934d810d2d44bc5add232c92410 AUX okularpart-23.08.5-tests.patch 1778 BLAKE2B f81b025f77c37bed98a08e535a6c268e5c2c88011eec43d54b5b83626765a265be1a9e81460f09c356772c9277dd711599ac5547f8e6ad4223cccbcedb9f6d0b SHA512 643ff225db377e1492faec818249c13eb2b0ed4ef88c4074ab8da51b5e096fdd69852201cda5ac7e1fb636c996d48d7c1d9815b51bdb95d5e259f765366a1710 DIST okular-23.08.5.tar.xz 8515760 BLAKE2B ec8ddf33917cc092e23934cc184280bf69fd92e184f05a14a3b0ec3636f00a90e35ab7c5b05e6b4083a4a94fb3d8725aa7b71686d5fe1d8962c4678690670f29 SHA512 c9e8b430fa4a5486cee0587f9beb077b4e8b5476f00ed42c9369fbb195ad9733ed310e01ebefc3c08cf78a53a3e72eab44c42a236b3dcad7e02421a864331dd6 -EBUILD okularpart-23.08.5.ebuild 2885 BLAKE2B 46fdf60940662f6ebe7ce9367f579cf57ad8b2c8584daefbe1e17860413b4270a10f5d413ee2a6c95e53dbfe2c58b1132311ef0688d188c6e6380e83d2fbad2d SHA512 fb1d0e5d893d1ba097e01f6ecfe82fe3518f3b7880fa6f36e929e28f9e24a0442e2bde8a0976835421d172b6f8e0ffa5416b7ca398c89251e861413eaf7bc5e0 +EBUILD okularpart-23.08.5-r1.ebuild 2875 BLAKE2B a1bfd6155aeecdf19ef02dfa62e028f8de3660ab80489845f22cebfd24a2bbfc6f5df138998aef867984e838178f320f2d340562b33b33f629c47ee4d53f0649 SHA512 17d165a4f0e7234c54cb4298476640c24b7fbe7f6967dd3a35fefc76b3ddde47ca74e9325ef42bb2ae8d977bf0faf19fb68d051dd6b0d0d245213a37bc797b64 MISC metadata.xml 631 BLAKE2B 49deaf149de36abe44a15d36251cefe25e6f92529dfc1e97e2a3102497f699d99d8a4323165c40012fae8e2465e782333323cfe0f520756e8faef9d41fb45eda SHA512 3f583b6db0b9cefed471681df6f9f7b346120a7de5d2e3688930f04c454b3515d297f2eaee50bf859931b0255679e00a732e1a3d27266e18f51419b950bae867 diff --git a/media-gfx/okularpart/files/okularpart-23.08.5-only.patch b/media-gfx/okularpart/files/okularpart-23.08.5-only.patch index 7b62867610bf..c2712fa396c9 100644 --- a/media-gfx/okularpart/files/okularpart-23.08.5-only.patch +++ b/media-gfx/okularpart/files/okularpart-23.08.5-only.patch @@ -1,15 +1,18 @@ -From e3baad173b95ad75afe9d339c4a86d030b67f4be Mon Sep 17 00:00:00 2001 +From e6392d67120187d357de1a787b52aaeffeb60230 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 10 Mar 2024 21:37:44 +0100 Subject: [PATCH] Disable bits we don't need for okularpart only +Install headers to okular5 to not collide with okular6, unfortunately +this will require hacking revdeps too. + Signed-off-by: Andreas Sturmlechner --- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c47d6ab0f..91f25c62e 100644 +index c47d6ab0f..2e08335a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,7 +184,7 @@ if (BUILD_MOBILE) @@ -30,6 +33,24 @@ index c47d6ab0f..91f25c62e 100644 endif() add_subdirectory( generators ) +@@ -401,7 +401,7 @@ install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/core/version.h + ${CMAKE_CURRENT_BINARY_DIR}/core/okularcore_export.h + ${CMAKE_CURRENT_BINARY_DIR}/settings_core.h +- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/core COMPONENT Devel) ++ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular5/core COMPONENT Devel) + + install( FILES + interfaces/configinterface.h +@@ -409,7 +409,7 @@ install( FILES + interfaces/printinterface.h + interfaces/saveinterface.h + interfaces/viewerinterface.h +- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular/interfaces COMPONENT Devel) ++ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/okular5/interfaces COMPONENT Devel) + + ki18n_wrap_ui(okularcore_SRCS + core/chooseenginewidget.ui -- 2.44.0 diff --git a/media-gfx/okularpart/okularpart-23.08.5-r1.ebuild b/media-gfx/okularpart/okularpart-23.08.5-r1.ebuild new file mode 100644 index 000000000000..1f3ea8ff546d --- /dev/null +++ b/media-gfx/okularpart/okularpart-23.08.5-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="false" +ECM_TEST="forceoptional" +KDE_ORG_NAME="okular" +PVCUT=$(ver_cut 1-3) +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Universal document viewer kpart based on KDE Frameworks" +HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="djvu epub mobi +pdf +postscript +tiff" + +# slot op: Uses Qt5::CorePrivate +DEPEND=" + >=dev-qt/qtcore-${QTMIN}:5= + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png] + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-apps/libkexiv2-${PVCUT}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kpty-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/threadweaver-${KFMIN}:5 + media-libs/freetype + sys-libs/zlib + djvu? ( app-text/djvu ) + epub? ( app-text/ebook-tools ) + mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) + pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) + postscript? ( app-text/libspectre ) + tiff? ( media-libs/tiff:= ) +" +RDEPEND="${DEPEND} + !kde-apps/okular:5 + >=kde-frameworks/kimageformats-${KFMIN}:5 +" + +PATCHES=( + "${FILESDIR}/${P}-tests.patch" # bug 734138 + "${FILESDIR}/${P}-only.patch" + "${FILESDIR}/${P}-crashfix.patch" # KDE-bug 476207 +) + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=OFF # tests are executed for okular:5 + -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Discount=ON + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KF5Purpose=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KF5Wallet=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON + -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;" + -DOKULAR_UI="desktop" + $(cmake_use_find_package djvu DjVuLibre) + $(cmake_use_find_package epub EPub) + $(cmake_use_find_package mobi QMobipocket) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package postscript LibSpectre) + $(cmake_use_find_package tiff TIFF) + ) + ecm_src_configure +} + +src_install() { + ecm_src_install + + rm -r "${ED}"/usr/share || die +} diff --git a/media-gfx/okularpart/okularpart-23.08.5.ebuild b/media-gfx/okularpart/okularpart-23.08.5.ebuild deleted file mode 100644 index 67b16aac3538..000000000000 --- a/media-gfx/okularpart/okularpart-23.08.5.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="false" -ECM_TEST="forceoptional" -KDE_ORG_NAME="okular" -PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm gear.kde.org - -DESCRIPTION="Universal document viewer kpart based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="djvu epub mobi +pdf +postscript +tiff" - -# slot op: Uses Qt5::CorePrivate -DEPEND=" - >=dev-qt/qtcore-${QTMIN}:5= - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png] - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-apps/libkexiv2-${PVCUT}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 - media-libs/freetype - sys-libs/zlib - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) - pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) - postscript? ( app-text/libspectre ) - tiff? ( media-libs/tiff:= ) -" -RDEPEND="${DEPEND} - !kde-apps/okular:5 - >=kde-frameworks/kimageformats-${KFMIN}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-tests.patch" # bug 734138 - "${FILESDIR}/${P}-only.patch" - "${FILESDIR}/${P}-crashfix.patch" # KDE-bug 476207 -) - -src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=OFF # tests are executed for okular:5 - -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Discount=ON - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5Purpose=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5Wallet=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Phonon4Qt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=ON - -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON - -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;" - -DOKULAR_UI="desktop" - $(cmake_use_find_package djvu DjVuLibre) - $(cmake_use_find_package epub EPub) - $(cmake_use_find_package mobi QMobipocket) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package postscript LibSpectre) - $(cmake_use_find_package tiff TIFF) - ) - ecm_src_configure -} - -src_install() { - ecm_src_install - - rm -r "${ED}"/usr/{include,share} || die -} -- cgit v1.2.3