commit: 1336df5b67805b6db35a3be88462e67c13168f67 Author: Denis Lisov <dennis.lissov <AT> gmail <DOT> com> AuthorDate: Sun Sep 8 18:42:56 2024 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Sat Sep 28 15:40:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1336df5b
app-text/zeal: add 0.7.2 Drop a few workarounds fixed upstream, follow upstream unbundling cpp-httplib, add experimental X11-less build option (tested on a system with X11 only). Signed-off-by: Denis Lisov <dennis.lissov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38526 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> app-text/zeal/Manifest | 1 + app-text/zeal/files/disable-werror-0.7.2.patch | 14 +++++++ app-text/zeal/metadata.xml | 3 ++ app-text/zeal/zeal-0.7.2.ebuild | 55 ++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/app-text/zeal/Manifest b/app-text/zeal/Manifest index daff4ded0f96..e5dc5034586b 100644 --- a/app-text/zeal/Manifest +++ b/app-text/zeal/Manifest @@ -1 +1,2 @@ DIST zeal-0.7.1.tar.gz 1195333 BLAKE2B 56e6d56e152ed94559d15ba4a5dd7972466db75a4d760640b55b532ba3ed325a429e8e03f450efaa3e24f09af68ff5b43463d9b8f21b8a9bd11e23a3841780c4 SHA512 bf2b5e2878b349ec4e5e74377a2a74e263d5f20649f152f194375547c5e69b3e6115c9d0f103acad7f087b20456d888a3be9f7ce1aa232206bba7e0ed38d252b +DIST zeal-0.7.2.tar.gz 1217853 BLAKE2B e82c3a977375317cfb4d5ad32f577f668f38cfc1d3a2685d44c96814817623001a8fff848a04acf07d3ab942bee9a0c6801dfadad3fceaf24d55beb5a78a9522 SHA512 41f79f4c441938a60f80796376de31643ad1b80d989c6452653647be533b6e4e23d96b556895c457d574e00d75a57e4b2ef2a77096fa1d120e0c2e5b511366fb diff --git a/app-text/zeal/files/disable-werror-0.7.2.patch b/app-text/zeal/files/disable-werror-0.7.2.patch new file mode 100644 index 000000000000..9059a106da9a --- /dev/null +++ b/app-text/zeal/files/disable-werror-0.7.2.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt.old b/CMakeLists.txt +index de28d9c..8152f99 100644 +--- a/CMakeLists.txt.old ++++ b/CMakeLists.txt +@@ -64,9 +64,5 @@ add_custom_target(zeal_version + VERBATIM + ) + +-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24.0") +- set(CMAKE_COMPILE_WARNING_AS_ERROR ON) +-endif() +- + add_subdirectory(assets) + add_subdirectory(src) diff --git a/app-text/zeal/metadata.xml b/app-text/zeal/metadata.xml index af3ff4b585c0..7e9a5c960601 100644 --- a/app-text/zeal/metadata.xml +++ b/app-text/zeal/metadata.xml @@ -2,6 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <!--maintainer-needed--> + <use> + <flag name="X">Enable global shortcut support on X11</flag> + </use> <upstream> <remote-id type="github">zealdocs/zeal</remote-id> </upstream> diff --git a/app-text/zeal/zeal-0.7.2.ebuild b/app-text/zeal/zeal-0.7.2.ebuild new file mode 100644 index 000000000000..ea2ac7deaf06 --- /dev/null +++ b/app-text/zeal/zeal-0.7.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg-utils + +DESCRIPTION="Offline documentation browser inspired by Dash" +HOMEPAGE="https://zealdocs.org/"; +SRC_URI="https://github.com/zealdocs/${PN}/releases/download/v${PV}/${P}.tar.gz"; + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+X" + +DEPEND=" + app-arch/libarchive:= + dev-cpp/cpp-httplib:= + dev-db/sqlite:3 + dev-qt/qtbase:6[concurrent,gui,network,widgets] + dev-qt/qtwebchannel:6 + dev-qt/qtwebengine:6[widgets] + X? ( + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${DEPEND} + x11-themes/hicolor-icon-theme +" +BDEPEND="kde-frameworks/extra-cmake-modules" + +PATCHES=( + "${FILESDIR}/disable-werror-0.7.2.patch" +) + +src_configure() { + local mycmakeargs=( + -DZEAL_RELEASE_BUILD=ON + -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex X no yes) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +}
