From afc914636fc02295ae39fe03e351d99f595f082f Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Fri, 2 Sep 2022 21:53:02 +0100 Subject: libraries/wxWidgets: Added (cross-platform GUI toolkit) Signed-off-by: Dave Woodfall Signed-off-by: Willy Sudiarto Raharjo --- libraries/wxWidgets/600bf54.patch | 56 +++++++++ libraries/wxWidgets/README | 21 ++++ libraries/wxWidgets/e4f230a.patch | 41 +++++++ libraries/wxWidgets/slack-desc | 19 +++ libraries/wxWidgets/wxWidgets.SlackBuild | 203 +++++++++++++++++++++++++++++++ libraries/wxWidgets/wxWidgets.info | 10 ++ 6 files changed, 350 insertions(+) create mode 100644 libraries/wxWidgets/600bf54.patch create mode 100644 libraries/wxWidgets/README create mode 100644 libraries/wxWidgets/e4f230a.patch create mode 100644 libraries/wxWidgets/slack-desc create mode 100644 libraries/wxWidgets/wxWidgets.SlackBuild create mode 100644 libraries/wxWidgets/wxWidgets.info (limited to 'libraries') diff --git a/libraries/wxWidgets/600bf54.patch b/libraries/wxWidgets/600bf54.patch new file mode 100644 index 0000000000..aed01c9f8d --- /dev/null +++ b/libraries/wxWidgets/600bf54.patch @@ -0,0 +1,56 @@ +From 600bf54a06a0f11fdfa2e2c2607d586446363a26 Mon Sep 17 00:00:00 2001 +From: Maarten Bent +Date: Tue, 19 Jul 2022 17:52:39 +0200 +Subject: [PATCH] Use DESTDIR when creating symlinks in CMake install + +Prepend $ENV{DESTDIR}, sufficiently escaped to delay its expansion until +the execution of "cmake -E create_symlink" command, to the command path +arguments. + +Closes #22653. + +See #22610. +--- + build/cmake/install.cmake | 2 +- + build/cmake/utils/CMakeLists.txt | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake +index 020fa860a2e9..384c6837b814 100644 +--- a/build/cmake/install.cmake ++++ b/build/cmake/install.cmake +@@ -43,7 +43,7 @@ else() + install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ +- \"${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ ++ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ + )" + ) + endif() +diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt +index dbfedec79f75..dbed8cc9b3bb 100644 +--- a/build/cmake/utils/CMakeLists.txt ++++ b/build/cmake/utils/CMakeLists.txt +@@ -30,17 +30,18 @@ if(wxUSE_XRC) + BUNDLE DESTINATION "bin" + ) + +- if(NOT WIN32_MSVC_NAMING) ++ if(NOT WIN32_MSVC_NAMING AND wxBUILD_INSTALL) + if(IPHONE) + set(EXE_SUFFIX ".app") + else() + set(EXE_SUFFIX ${CMAKE_EXECUTABLE_SUFFIX}) + endif() + +- wx_install(CODE "execute_process( \ ++ # Don't use wx_install() here to preserve escaping. ++ install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ + \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ +- \"${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ ++ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ + )" + ) + endif() diff --git a/libraries/wxWidgets/README b/libraries/wxWidgets/README new file mode 100644 index 0000000000..16c1bd01a3 --- /dev/null +++ b/libraries/wxWidgets/README @@ -0,0 +1,21 @@ +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. + +Notes: + +1. This package is NOT built using --enable-stl by default. + If you need to enable stl, use: + STL=yes ./wxWidgets.SlackBuild + +2. If you need the wxWidgets API documentation, you need to + install graphviz, then run wxWidgets.SlackBuild with + APIDOC=yes in the environment. You won't need the API docs + unless you're developing software. + +This package provides 2 interfaces, GTK3 and Qt5. +By default, wx-config will be linked to GTK3, but if you want +to use Qt5, use INTERFACE=qt variable to override. diff --git a/libraries/wxWidgets/e4f230a.patch b/libraries/wxWidgets/e4f230a.patch new file mode 100644 index 0000000000..f1d1f697df --- /dev/null +++ b/libraries/wxWidgets/e4f230a.patch @@ -0,0 +1,41 @@ +From e4f230a3e18ca8d8a1a68d609d206a1191055c93 Mon Sep 17 00:00:00 2001 +From: Maarten Bent +Date: Fri, 22 Jul 2022 00:05:42 +0200 +Subject: [PATCH] CMake: Support spaces in install path with symlinks + +Add quotes around the paths so they are treated as one argument. +--- + build/cmake/install.cmake | 4 ++-- + build/cmake/utils/CMakeLists.txt | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake +index 9a2ce91d7f5e..020fa860a2e9 100644 +--- a/build/cmake/install.cmake ++++ b/build/cmake/install.cmake +@@ -42,8 +42,8 @@ else() + install(DIRECTORY DESTINATION "bin") + install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ +- ${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID} \ +- ${CMAKE_INSTALL_PREFIX}/bin/wx-config \ ++ \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ ++ \"${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ + )" + ) + endif() +diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt +index 47bca6f34a91..dbfedec79f75 100644 +--- a/build/cmake/utils/CMakeLists.txt ++++ b/build/cmake/utils/CMakeLists.txt +@@ -39,8 +39,8 @@ if(wxUSE_XRC) + + wx_install(CODE "execute_process( \ + COMMAND ${CMAKE_COMMAND} -E create_symlink \ +- ${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX} \ +- ${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX} \ ++ \"${CMAKE_INSTALL_PREFIX}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ ++ \"${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ + )" + ) + endif() diff --git a/libraries/wxWidgets/slack-desc b/libraries/wxWidgets/slack-desc new file mode 100644 index 0000000000..b8f912f3ce --- /dev/null +++ b/libraries/wxWidgets/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +wxWidgets: wxWidgets (cross-platform GUI toolkit) +wxWidgets: +wxWidgets: wxWidgets is a cross-platform API for writing GUI applications on +wxWidgets: multiple platforms that still utilize the native platform's control +wxWidgets: and utilities. +wxWidgets: +wxWidgets: https://wxwidgets.org/ +wxWidgets: +wxWidgets: +wxWidgets: +wxWidgets: diff --git a/libraries/wxWidgets/wxWidgets.SlackBuild b/libraries/wxWidgets/wxWidgets.SlackBuild new file mode 100644 index 0000000000..183db041da --- /dev/null +++ b/libraries/wxWidgets/wxWidgets.SlackBuild @@ -0,0 +1,203 @@ +#!/bin/bash + +# Slackware build script for wxWidgets + +# Copyright 2022 Willy Sudiarto Raharjo +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PRGNAM=wxWidgets +VERSION=${VERSION:-3.2.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# Check for STL +if [ "${STL:-no}" = "yes" ]; then + stl="ON" +else + stl="OFF" +fi + +# Check for WebKit +webkit=`pkg-config --exists webkit2gtk-4.0` +if [ "$?" -eq 0 ]; then + wk="ON" +else + wk="OFF" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ + +#Official upstream patches to fix DESTDIR +patch -p1 < $CWD/e4f230a.patch +patch -p1 < $CWD/600bf54.patch + +#Fix wx-config to return the correct path +if [ "$LIBDIRSUFFIX" != "" ]; then +sed -i "89s/\/lib/\/lib${LIBDIRSUFFIX}/" $TMP/$PRGNAM-$VERSION/build/cmake/config.cmake +fi + +cmake -B build-gtk3 \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DwxBUILD_TOOLKIT=gtk3 \ + -DwxUSE_OPENGL=ON \ + -DwxUSE_REGEX=sys\ + -DwxUSE_ZLIB=sys \ + -DwxUSE_EXPAT=sys \ + -DwxUSE_LIBJPEG=sys \ + -DwxUSE_LIBPNG=sys \ + -DwxUSE_LIBTIFF=sys \ + -DwxUSE_LIBLZMA=sys \ + -DwxUSE_LIBMSPACK=ON \ + -DwxUSE_NANOSVG=OFF \ + -DwxUSE_STL=$stl \ + -DwxUSE_WEBVIEW_WEBKIT=$wk \ + -DwxUSE_PRIVATE_FONTS=ON \ + -DCMAKE_BUILD_TYPE=Release . +cmake --build build-gtk3 +DESTDIR="$PKG" cmake --install build-gtk3 + +cmake -B build-qt5 \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DwxBUILD_TOOLKIT=qt \ + -DwxUSE_OPENGL=ON \ + -DwxUSE_REGEX=sys\ + -DwxUSE_ZLIB=sys \ + -DwxUSE_EXPAT=sys \ + -DwxUSE_LIBJPEG=sys \ + -DwxUSE_LIBPNG=sys \ + -DwxUSE_LIBTIFF=sys \ + -DwxUSE_LIBLZMA=sys \ + -DwxUSE_LIBMSPACK=ON \ + -DwxUSE_NANOSVG=OFF \ + -DwxUSE_STL=$stl \ + -DwxUSE_WEBVIEW_WEBKIT=$wk \ + -DwxUSE_PRIVATE_FONTS=ON \ + -DCMAKE_BUILD_TYPE=Release . +cmake --build build-qt5 +DESTDIR="$PKG" cmake --install build-qt5 + +#Move librarys to their correct location and fix pkgconfig +if [ "$LIBDIRSUFFIX" != "" ]; then + mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} + sed -i "s/\/lib\//\/lib${LIBDIRSUFFIX}\//g" \ + $PKG/usr/lib${LIBDIRSUFFIX}/cmake/$PRGNAM/${PRGNAM}Config.cmake + sed -i "s/\/lib\//\/lib${LIBDIRSUFFIX}\//g" \ + $PKG/usr/lib${LIBDIRSUFFIX}/cmake/$PRGNAM/${PRGNAM}Targets.cmake + sed -i "s/\/lib\//\/lib${LIBDIRSUFFIX}\//g" \ + $PKG/usr/lib${LIBDIRSUFFIX}/cmake/$PRGNAM/${PRGNAM}Targets-release.cmake +fi + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +install -Dm644 wxwin.m4 -t $PKG/usr/share/aclocal + +# wxWidgets 3.2 provides 2 wx-configs, but we will use GTK by default +gtk=gtk3-unicode-3.2 +qt=qt-unicode-3.2 + +if [ "${INTERFACE:-gtk3}" = "qt" ]; then + ln -sf ../lib${LIBDIRSUFFIX}/wx/config/$qt $PKG/usr/bin/wx-config +else + ln -sf ../lib${LIBDIRSUFFIX}/wx/config/$gtk $PKG/usr/bin/wx-config +fi + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION + +# 20220414 bkw: instead of installing the *source* to the doxygen docs, +# actually run doxygen and install the generated HTML docs. +# This is only done if the users asks for it. +# The "|| true" stuff is meant to keep errors in the documentation from +# killing the build. DOT_NUM_THREADS=1 may slow things down a bit on +# well-endowed hosts, but it prevents running out of memory on lesser ones. +# Don't try to generate the API docs if graphviz is missing. +if [ "${APIDOC:-no}" = "yes" ] && which dot &> /dev/null; then + echo "=== APIDOC=yes and graphviz exists, building API docs" + cd docs/doxygen + echo 'DOT_NUM_THREADS = 1' >> Doxyfile + GENERATE_LATEX=NO doxygen || true + mv out/html $PKG/usr/doc/$PRGNAM-$VERSION/api || true + cd - +else + echo "=== not building API docs" +fi +rm -rf docs/doxygen + +cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/wxWidgets/wxWidgets.info b/libraries/wxWidgets/wxWidgets.info new file mode 100644 index 0000000000..661348f620 --- /dev/null +++ b/libraries/wxWidgets/wxWidgets.info @@ -0,0 +1,10 @@ +PRGNAM="wxWidgets" +VERSION="3.2.0" +HOMEPAGE="http://www.wxwidgets.org" +DOWNLOAD="https://github.com/wxWidgets/wxWidgets/archive/v3.2.0/wxWidgets-3.2.0.tar.gz" +MD5SUM="36d186f4b6d4f6fefd794d65970c6658" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="libmspack" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" -- cgit v1.2.3