From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE36015808B for ; Sat, 28 Sep 2024 15:40:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 09134E2B9A; Sat, 28 Sep 2024 15:40:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB3E9E2B9A for ; Sat, 28 Sep 2024 15:40:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6E94343213 for ; Sat, 28 Sep 2024 15:40:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BCBFACC for ; Sat, 28 Sep 2024 15:40:47 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1727538027.1336df5b67805b6db35a3be88462e67c13168f67.mpagano@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/zeal/files/, app-text/zeal/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/zeal/Manifest app-text/zeal/files/disable-werror-0.7.2.patch app-text/zeal/metadata.xml app-text/zeal/zeal-0.7.2.ebuild X-VCS-Directories: app-text/zeal/files/ app-text/zeal/ X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 1336df5b67805b6db35a3be88462e67c13168f67 X-VCS-Branch: master Date: Sat, 28 Sep 2024 15:40:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 378ae653-fe0d-4b4a-b41f-94c2759c1dae X-Archives-Hash: 28d0dda08d2199032dd0b576349d953c commit: 1336df5b67805b6db35a3be88462e67c13168f67 Author: Denis Lisov gmail com> AuthorDate: Sun Sep 8 18:42:56 2024 +0000 Commit: Mike Pagano gentoo 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 gmail.com> Closes: https://github.com/gentoo/gentoo/pull/38526 Signed-off-by: Mike Pagano 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 @@ + + Enable global shortcut support on X11 + zealdocs/zeal 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 +}