From fc293f1e8927b8045ba4fd5c9298ac867f3c667a Mon Sep 17 00:00:00 2001 From: Mazin Fadl Date: Mon, 3 Jun 2024 13:34:35 -0400 Subject: [PATCH] zeal: update to 0.7.1 --- srcpkgs/zeal/patches/qt5-5.15.0.patch | 14 ----------- srcpkgs/zeal/template | 35 ++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/zeal/patches/qt5-5.15.0.patch diff --git a/srcpkgs/zeal/patches/qt5-5.15.0.patch b/srcpkgs/zeal/patches/qt5-5.15.0.patch deleted file mode 100644 index 0854280bb30171..00000000000000 --- a/srcpkgs/zeal/patches/qt5-5.15.0.patch +++ /dev/null @@ -1,14 +0,0 @@ -Source: @pullmoll -Upstream: no -Reason: qt5-5.15.0 requires explicit include for QPainterPath - ---- a/src/libs/ui/searchitemdelegate.cpp 2018-09-28 07:26:37.000000000 +0200 -+++ b/src/libs/ui/searchitemdelegate.cpp 2020-07-11 23:11:37.992053122 +0200 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - using namespace Zeal::WidgetUi; diff --git a/srcpkgs/zeal/template b/srcpkgs/zeal/template index 9db6b15584d658..3d1e99e2d63847 100644 --- a/srcpkgs/zeal/template +++ b/srcpkgs/zeal/template @@ -1,20 +1,43 @@ # Template file for 'zeal' pkgname=zeal reverts="20141123_1 20141123_2" -version=0.6.1 +version=0.7.1 revision=1 build_style=cmake -configure_args="CONFIG+=no_libappindicator" +configure_args="-DQT_HOST_PATH=/usr -DZEAL_RELEASE_BUILD=ON" hostmakedepends="pkg-config extra-cmake-modules" -makedepends="qt5-webkit-devel xcb-util-keysyms-devel libarchive-devel qt5-x11extras-devel sqlite-devel" -depends="bsdtar" +makedepends="xcb-util-keysyms-devel libarchive-devel sqlite-devel libarchive-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Simple offline API documentation browser" maintainer="Farhad Shahbazi " license="GPL-3.0-or-later" homepage="https://zealdocs.org/" distfiles="https://github.com/zealdocs/zeal/archive/v${version}.tar.gz" -checksum=095c08f9903071849d5c79878abd48237ce1615f16d324afff1873ab6b5f0026 +checksum=fca3012c174c7df6a91a6f93ef0df371fa714de769e3904f8fda3635ff959397 -if [ "$CROSS_BUILD" ]; then +build_options="qt6 webkit" +desc_option_qt6="Use Qt6 GUI and WebEngine backend" +desc_option_webkit="Use Qt5 WebKit backend" + +vopt_conflict qt6 webkit + +# WebEngine is unavailable on BE systems or when host & target word sizes differ +if [ "$XBPS_TARGET_ENDIAN" != "le" ]; then + build_options_default="webkit" +elif [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then + build_options_default="webkit" +elif [ "$XBPS_WORDSIZE" != 32 ]; then + # qt6-webengine is broken on 32-bit systems + build_options_default="qt6" +fi + +if [ "$build_option_qt6" ]; then + hostmakedepends+=" qt6-base qt6-tools" + makedepends+=" qt6-base-devel qt6-webengine-devel + qt6-webchannel-devel" +else hostmakedepends+=" qt5-host-tools qt5-qmake" + makedepends+=" qt5-tools-devel qt5-x11extras-devel qt5-webchannel-devel + qt5-declarative-devel qt5-location-devel + $(vopt_if webkit qt5-webkit-devel qt5-webengine-devel)" fi