diff options
| -rw-r--r-- | libraries/wxWidgets/README | 7 | ||||
| -rw-r--r-- | libraries/wxWidgets/wxWidgets.SlackBuild | 15 | ||||
| -rw-r--r-- | libraries/wxWidgets/wxWidgets.info | 2 |
3 files changed, 4 insertions, 20 deletions
diff --git a/libraries/wxWidgets/README b/libraries/wxWidgets/README index 71efc3494b..b63ac9ae87 100644 --- a/libraries/wxWidgets/README +++ b/libraries/wxWidgets/README @@ -2,13 +2,6 @@ wxWidgets is a cross-platform API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. -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 -nanosvg, or always disabling SVG support) with the "NANOSVG" -environment variable (see wxWidgets.SlackBuild for details). - Notes: 1. This package is NOT built using --enable-stl by default. diff --git a/libraries/wxWidgets/wxWidgets.SlackBuild b/libraries/wxWidgets/wxWidgets.SlackBuild index 61a468f977..57a5ad92f3 100644 --- a/libraries/wxWidgets/wxWidgets.SlackBuild +++ b/libraries/wxWidgets/wxWidgets.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=wxWidgets VERSION=${VERSION:-3.2.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -68,15 +68,6 @@ else stl="OFF" fi -# BCS: check for NanoSVG -test -f /usr/include/nanosvg/nanosvg.h -case "${NANOSVG:-auto}" in - no|off) nanosvg=OFF ;; - yes|on) [ $? = 0 ] && nanosvg=sys || nanosvg=builtin ;; - auto) [ $? = 0 ] && nanosvg=sys || nanosvg=OFF ;; - internal) nanosvg=builtin ;; -esac - set -e rm -rf $PKG @@ -109,7 +100,7 @@ cmake -B build-gtk3 \ -DwxUSE_LIBTIFF=sys \ -DwxUSE_LIBLZMA=sys \ -DwxUSE_LIBMSPACK=ON \ - -DwxUSE_NANOSVG=$nanosvg \ + -DwxUSE_NANOSVG=sys \ -DwxUSE_STL=$stl \ -DwxUSE_WEBVIEW_WEBKIT=ON \ -DwxUSE_PRIVATE_FONTS=ON \ @@ -132,7 +123,7 @@ cmake -B build-qt5 \ -DwxUSE_LIBTIFF=sys \ -DwxUSE_LIBLZMA=sys \ -DwxUSE_LIBMSPACK=ON \ - -DwxUSE_NANOSVG=OFF \ + -DwxUSE_NANOSVG=sys \ -DwxUSE_STL=$stl \ -DwxUSE_WEBVIEW_WEBKIT=ON \ -DwxUSE_PRIVATE_FONTS=ON \ diff --git a/libraries/wxWidgets/wxWidgets.info b/libraries/wxWidgets/wxWidgets.info index 137720d253..4016eede76 100644 --- a/libraries/wxWidgets/wxWidgets.info +++ b/libraries/wxWidgets/wxWidgets.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.2.6/wxWidgets-3.2.6. MD5SUM="9ff454c6b6d7de28c4d3d71aecbe53d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="webkit2gtk" +REQUIRES="webkit2gtk nanosvg" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" |