diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-21 17:50:24 +0100 |
| commit | feb0daf81d888e9160f9f94502de09b66f2a63fd (patch) | |
| tree | b6e5c40ce2abef3da27ed50a023153f475e0ddef /app-doc/zeal | |
| parent | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff) | |
gentoo resync : 21.06.2020
Diffstat (limited to 'app-doc/zeal')
| -rw-r--r-- | app-doc/zeal/Manifest | 3 | ||||
| -rw-r--r-- | app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch | 21 | ||||
| -rw-r--r-- | app-doc/zeal/zeal-0.6.1.ebuild | 16 |
3 files changed, 32 insertions, 8 deletions
diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest index deccfa09d0f2..092a5926bef7 100644 --- a/app-doc/zeal/Manifest +++ b/app-doc/zeal/Manifest @@ -1,5 +1,6 @@ AUX 0001-libs-enforce-static-linking-of-internal-libs.patch 2648 BLAKE2B e4293669e6744dab5d3eec08fbedc4b99474d74a54bbcaf5765f66e5360006b0ed48c0f3eb8dd1cf255a2f12740401a4cd2e57d886d71aa075b6830f1931b022 SHA512 f654f6df58ae04361efa8957c492c076e340623e8634dc95aae2a016f59d74f88b9fdfbf6b97197344c7d5767e33c79f0cee197fbc6bb383b14b494c2ba9c877 AUX 0002-settings-disable-checking-for-updates-by-default.patch 1080 BLAKE2B 07b40bdd13fe6e7a4efa24a17a1b734be50ec8e289c74278ae3f718c05388a4b36b064922798c4ec2e4f69e9dd49f3cd24d39c98adb0274914b28fcd42016a36 SHA512 bd5e7369bc5878df9c6dff093d710e73b8ed1a4e2c3a6927a26f5fbf97725fd695a90f197bf46d229b38a16c40e19308f8e058fd9819177c62cd7fbaae7e370d +AUX zeal-0.6.1-qt-5.15.patch 683 BLAKE2B dbb965ede1a2dcaa53826b9986ef9191aadd7ea39464280f7194913ef72295cb4e16579f2b1ff8440c1970897134a1f822d7133ee7dad2eea52813bbaa03b938 SHA512 6e4eac48fa1fc0239228fa32cdc317921d1283b60a9bc9202c6630ed0dd1ed25b7ead7527b09b1657154235ed25ebd8b226784bbd9970e72038676e08c37c68d DIST zeal-0.6.1.tar.gz 1063963 BLAKE2B 72f38aac8275cea8da214962b568ff3f634c6c8499a73f506a6b63d947f87bb0b13bf6a0821d7803ccf09689744a79ebf8659ebe1d6ae07863662cb6a017c5ee SHA512 5b1a129980000c0fc8516e2c7d6c4a8de4adde7054ff8d9635e3be35441ad3ef0539746bbe1ca8abce7e6fb3d20c825b57661c3f8cd059ef1480db65ff81f3d9 -EBUILD zeal-0.6.1.ebuild 1073 BLAKE2B b6128e325734c7cec4e6c7b553aab921d42092b18cbf341d30d8031cbcd9f28437c569f984847ec1c20e869b06fb4db64065de07fb36f6df50a84b20ef59fc0c SHA512 6b13b60ed2de52923012bcd186ad945781c1c6cf277aeb442f086995989c0f4112bf032ec8b2ac5dff9e2506346bf8e820650a5cb4f43e0aee640e7620de8c8f +EBUILD zeal-0.6.1.ebuild 1097 BLAKE2B 6d17dc11a9c659dca5578bb88b0625cb05715d7652105525771f5e2118bf325d7b4e86e12c38394651dd42f78ec1b7e45b01cdbd28f043ce0bd7cfdb0c766260 SHA512 d48a38ba167819fe1cd1156407dac0cda4a70dc91cd8991267059c9376dca094bcb237629eef164df627041a7b58c4edc74907d8c0f5bfe580ce5841bc1eda61 MISC metadata.xml 343 BLAKE2B eb010ce88edcf15d87348b5170ca84d46d96d975ff459b4467428af5b75a95bc9e6c6d1245119907b5833f9a2ad2060adf41ba9aa884a5b846c1441241eaf8ba SHA512 a51b0043a255567189cb7ba1247cd6e9427292e7dbb3bc4f33d6c00acb3bf158bce6a7db1262275899b2b55806cfcb71e53a365aa25f05e259d497d5f028074f diff --git a/app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch b/app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch new file mode 100644 index 000000000000..45459b8c3678 --- /dev/null +++ b/app-doc/zeal/files/zeal-0.6.1-qt-5.15.patch @@ -0,0 +1,21 @@ +From 064aaa05d6a3ba4ba3cf648199a3109aba2f41fe Mon Sep 17 00:00:00 2001 +From: Dmitry Atamanov <data-man@users.noreply.github.com> +Date: Sun, 26 Apr 2020 02:26:53 +0500 +Subject: [PATCH] fix(ui): fix compilation error with Qt 5.15 (#1218) + +--- + src/libs/ui/searchitemdelegate.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/libs/ui/searchitemdelegate.cpp b/src/libs/ui/searchitemdelegate.cpp +index 464e4859..4a9c473b 100644 +--- a/src/libs/ui/searchitemdelegate.cpp ++++ b/src/libs/ui/searchitemdelegate.cpp +@@ -27,6 +27,7 @@ + #include <QFontMetrics> + #include <QHelpEvent> + #include <QPainter> ++#include <QPainterPath> + #include <QToolTip> + + using namespace Zeal::WidgetUi; diff --git a/app-doc/zeal/zeal-0.6.1.ebuild b/app-doc/zeal/zeal-0.6.1.ebuild index 19114642c849..6fe0106f71ea 100644 --- a/app-doc/zeal/zeal-0.6.1.ebuild +++ b/app-doc/zeal/zeal-0.6.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake-utils xdg-utils +inherit cmake xdg-utils DESCRIPTION="Offline documentation browser inspired by Dash" HOMEPAGE="https://zealdocs.org/" @@ -12,7 +12,6 @@ SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" - IUSE="vanilla" DEPEND=" @@ -33,13 +32,16 @@ RDEPEND=" x11-themes/hicolor-icon-theme " +PATCHES=( + "${FILESDIR}/0001-libs-enforce-static-linking-of-internal-libs.patch" + "${FILESDIR}/${P}-qt-5.15.patch" +) + src_prepare() { - default - eapply "${FILESDIR}/0001-libs-enforce-static-linking-of-internal-libs.patch" if ! use vanilla; then - eapply "${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch" + PATCHES+=( "${FILESDIR}/0002-settings-disable-checking-for-updates-by-default.patch" ) fi - cmake-utils_src_prepare + cmake_src_prepare } pkg_postinst() { |