From 07930f66bda896926a7cf4dce0cc5d0d62d8320b Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Mon, 2 Sep 2024 20:33:38 +0700 Subject: [PATCH] libraries/wxWidgets: Add webkit2gtk as mandatory dep. Signed-off-by: Willy Sudiarto Raharjo --- libraries/wxWidgets/README | 5 +---- libraries/wxWidgets/wxWidgets.SlackBuild | 16 ++++------------ libraries/wxWidgets/wxWidgets.info | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/libraries/wxWidgets/README b/libraries/wxWidgets/README index 441c51d749..71efc3494b 100644 --- a/libraries/wxWidgets/README +++ b/libraries/wxWidgets/README @@ -2,10 +2,7 @@ wxWidgets is a cross-platform API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. -webkit2gtk is an optional dependency of this package. This will -provide webview support. - -nanosvg is another optional dependency. By default, the +nanosvg is optional dependency. By default, the SlackBuild script checks for the nanosvg system headers and disables SVG support if they are not found; you can force different behavior (e.g. using wxWidgets' internal copy of diff --git a/libraries/wxWidgets/wxWidgets.SlackBuild b/libraries/wxWidgets/wxWidgets.SlackBuild index 6962244def..1eb116f211 100644 --- a/libraries/wxWidgets/wxWidgets.SlackBuild +++ b/libraries/wxWidgets/wxWidgets.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for wxWidgets -# Copyright 2023 Willy Sudiarto Raharjo +# Copyright 2023-2024 Willy Sudiarto Raharjo # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wxWidgets VERSION=${VERSION:-3.2.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,14 +68,6 @@ else stl="OFF" fi -# Check for WebKit -webkit="$( pkg-config --exists webkit2gtk-4.0 )" -if [ "$?" -eq 0 ]; then - wk="ON" -else - wk="OFF" -fi - # BCS: check for NanoSVG test -f /usr/include/nanosvg/nanosvg.h case "${NANOSVG:-auto}" in @@ -119,7 +111,7 @@ cmake -B build-gtk3 \ -DwxUSE_LIBMSPACK=ON \ -DwxUSE_NANOSVG=$nanosvg \ -DwxUSE_STL=$stl \ - -DwxUSE_WEBVIEW_WEBKIT=$wk \ + -DwxUSE_WEBVIEW_WEBKIT=ON \ -DwxUSE_PRIVATE_FONTS=ON \ -DCMAKE_BUILD_TYPE=Release . cmake --build build-gtk3 @@ -142,7 +134,7 @@ cmake -B build-qt5 \ -DwxUSE_LIBMSPACK=ON \ -DwxUSE_NANOSVG=OFF \ -DwxUSE_STL=$stl \ - -DwxUSE_WEBVIEW_WEBKIT=$wk \ + -DwxUSE_WEBVIEW_WEBKIT=ON \ -DwxUSE_PRIVATE_FONTS=ON \ -DCMAKE_BUILD_TYPE=Release . cmake --build build-qt5 diff --git a/libraries/wxWidgets/wxWidgets.info b/libraries/wxWidgets/wxWidgets.info index 43bf4794da..8792edebea 100644 --- a/libraries/wxWidgets/wxWidgets.info +++ b/libraries/wxWidgets/wxWidgets.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.2.5/wxWidgets-3.2.5. MD5SUM="d0a5436a48d2008e451976e92b09d248" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="webkit2gtk" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org"