diff --git a/academic/seaview/seaview.SlackBuild b/academic/seaview/seaview.SlackBuild index 327d7df7375..e3fbfe4e263 100644 --- a/academic/seaview/seaview.SlackBuild +++ b/academic/seaview/seaview.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=seaview -VERSION=${VERSION:-5.0.5} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +41,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/academic/seaview/seaview.info b/academic/seaview/seaview.info index d1968b049b2..22023fedbfc 100644 --- a/academic/seaview/seaview.info +++ b/academic/seaview/seaview.info @@ -1,8 +1,8 @@ PRGNAM="seaview" -VERSION="5.0.5" +VERSION="5.1" HOMEPAGE="http://doua.prabi.fr/software/seaview/" -DOWNLOAD="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_5.0.5.tar.gz" -MD5SUM="09f6800973308a91316bb820c4331cb0" +DOWNLOAD="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_5.1.tar.gz" +MD5SUM="57853e73a4e99b15fc1c1b8d50869d76" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk PDFlib-Lite Gblocks PhyML clustalo muscle treerecs" diff --git a/audio/tapiir/tapiir.SlackBuild b/audio/tapiir/tapiir.SlackBuild index 51239774619..77e8627f68e 100644 --- a/audio/tapiir/tapiir.SlackBuild +++ b/audio/tapiir/tapiir.SlackBuild @@ -83,7 +83,7 @@ patch -p1 < $CWD/alsaio_help_fix_segfault.diff # Support fltk-1.3 (thanks to Arch Linux) sed -i -e 's/fl_file_chooser.H/Fl_File_Chooser.H/' src/GUI.cxx # Fix comedy version check -sed -i -e 's/min_fltk_version=1.1.0/min_fltk_version=1.3.0/' configure +sed -i -e 's/min_fltk_version=1.1.0/min_fltk_version=1.4.0/' configure CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/audio/yoshimi/yoshimi.SlackBuild b/audio/yoshimi/yoshimi.SlackBuild index 7ca004a5dff..dcadac61277 100644 --- a/audio/yoshimi/yoshimi.SlackBuild +++ b/audio/yoshimi/yoshimi.SlackBuild @@ -13,7 +13,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=yoshimi -VERSION=${VERSION:-2.3.2} +VERSION=${VERSION:-2.3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/audio/yoshimi/yoshimi.info b/audio/yoshimi/yoshimi.info index 621cc4b7e33..7703ad4fef1 100644 --- a/audio/yoshimi/yoshimi.info +++ b/audio/yoshimi/yoshimi.info @@ -1,8 +1,8 @@ PRGNAM="yoshimi" -VERSION="2.3.2" +VERSION="2.3.4.1" HOMEPAGE="https://sourceforge.net/projects/yoshimi" -DOWNLOAD="https://downloads.sourceforge.net/project/yoshimi/2.3/yoshimi-2.3.2.tar.bz2" -MD5SUM="a8775f50721cbf165bdbfe5316439c27" +DOWNLOAD="https://downloads.sourceforge.net/project/yoshimi/2.3/yoshimi-2.3.4.1.tar.bz2" +MD5SUM="fcbf865f08453f5dd4409e99d136f5f2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="mxml fltk lv2 jack" diff --git a/audio/zynaddsubfx/README b/audio/zynaddsubfx/README index c164c7f7717..c2c757645ab 100644 --- a/audio/zynaddsubfx/README +++ b/audio/zynaddsubfx/README @@ -6,9 +6,7 @@ to an amazing universe of sounds. Beside the standalone application, lv2 and vst plugins are provided. Optional dependencies, autodetected at buildtime: -jack, dssi, portaudio, ntk, lash - -If ntk is detected at buildtime, fltk will not be used. +jack, dssi, portaudio, lash If compiled against jack, this package uses POSIX filesystem capabilities to execute with elevated privileges (required for diff --git a/audio/zynaddsubfx/doinst.sh b/audio/zynaddsubfx/doinst.sh index 5fb28930db0..65c7e2eeb9a 100644 --- a/audio/zynaddsubfx/doinst.sh +++ b/audio/zynaddsubfx/doinst.sh @@ -1,3 +1,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/audio/zynaddsubfx/zynaddsubfx.SlackBuild b/audio/zynaddsubfx/zynaddsubfx.SlackBuild index 9e37de1c845..b96ca848b73 100644 --- a/audio/zynaddsubfx/zynaddsubfx.SlackBuild +++ b/audio/zynaddsubfx/zynaddsubfx.SlackBuild @@ -101,16 +101,16 @@ mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps/ mv $PKG/usr/share/pixmaps/$PRGNAM.svg $PKG/usr/share/icons/hicolor/scalable/apps/ mv $PRGNAM.ico $PKG/usr/share/pixmaps -cd ExternalPrograms/Spliter - make - cp -a spliter $PKG/usr/bin -cd ../.. - -cd ExternalPrograms/Controller - sed -i "s|Box\.h|Box\.H|" ControllerUI.fl - make - cp -a controller $PKG/usr/bin -cd ../.. +#cd ExternalPrograms/Spliter +# make +# cp -a spliter $PKG/usr/bin +#cd ../.. + +#cd ExternalPrograms/Controller +# sed -i "s|Box\.h|Box\.H|" ControllerUI.fl +# make +# cp -a controller $PKG/usr/bin +#cd ../.. cd doc a2x --doctype manpage --format manpage zynaddsubfx.1.txt diff --git a/audio/zynaddsubfx/zynaddsubfx.info b/audio/zynaddsubfx/zynaddsubfx.info index f4b4c8d3be7..7ad41ca9d58 100644 --- a/audio/zynaddsubfx/zynaddsubfx.info +++ b/audio/zynaddsubfx/zynaddsubfx.info @@ -5,6 +5,6 @@ DOWNLOAD="https://sourceforge.net/projects/zynaddsubfx/files/zynaddsubfx/3.0.6/z MD5SUM="62b6a152f941d76a92797add760b3de9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fltk liblo mxml" +REQUIRES="ntk liblo mxml" MAINTAINER="Johannes Schoepfer" EMAIL="slackbuilds@schoepfer.info" diff --git a/games/eureka/eureka.SlackBuild b/games/eureka/eureka.SlackBuild index 1d29c1ec5df..02144ffac8b 100644 --- a/games/eureka/eureka.SlackBuild +++ b/games/eureka/eureka.SlackBuild @@ -42,6 +42,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=eureka VERSION=${VERSION:-2.0.2} +GITVER=bdd8b4e0ee7e0ffc50907526bf45d149f8c0639a BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -70,9 +71,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -SRCDIR=eureka-editor-eureka-$VERSION +SRCDIR=eureka-editor-$GITVER rm -rf $SRCDIR -tar xvf $CWD/$SRCDIR.tar.gz +unzip $CWD/$SRCDIR.zip cd $SRCDIR chown -R root:root . find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ @@ -90,6 +91,7 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DBIN_DIR=/usr/games \ -DENABLE_UNIT_TESTS=OFF \ + -DUSE_SYSTEM_FLTK=ON \ -DCMAKE_BUILD_TYPE=Release .. make make install/strip DESTDIR=$PKG @@ -107,6 +109,8 @@ convert misc/$PRGNAM.xpm $PKG/usr/share/icons/hicolor/32x32/apps/$PRGNAM.png mkdir -p $PKG/usr/man/man6 gzip -9c < misc/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION sed -n '/^SETTING UP/,$p' INSTALL.txt > SETUP.txt diff --git a/games/eureka/eureka.info b/games/eureka/eureka.info index b7badaabf27..e6c81746642 100644 --- a/games/eureka/eureka.info +++ b/games/eureka/eureka.info @@ -1,8 +1,8 @@ PRGNAM="eureka" VERSION="2.0.2" HOMEPAGE="http://eureka-editor.sourceforge.net/" -DOWNLOAD="https://github.com/ioan-chera/eureka-editor/archive/eureka-2.0.2/eureka-editor-eureka-2.0.2.tar.gz" -MD5SUM="4b7f29bbba547845ab2204b7887cdc59" +DOWNLOAD="https://github.com/ioan-chera/eureka-editor/archive/bdd8b4e0ee7e0ffc50907526bf45d149f8c0639a/eureka-editor-bdd8b4e0ee7e0ffc50907526bf45d149f8c0639a.zip" +MD5SUM="976ee661030bac048968feb6f06bc9c4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk" diff --git a/libraries/fltk/fltk.SlackBuild b/libraries/fltk/fltk.SlackBuild index 5aa3c9cbb85..09c2a5fe5b0 100644 --- a/libraries/fltk/fltk.SlackBuild +++ b/libraries/fltk/fltk.SlackBuild @@ -28,8 +28,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fltk -VERSION=${VERSION:-1.3.8} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,7 +50,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="ANNOUNCEMENT CHANGES COPYING CREDITS README" +DOCFILES="ANNOUNCEMENT COPYING CREDITS.txt CHANGES.txt" if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -81,22 +81,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# Fix linking when --libdir=/usr/lib64 -sed -i \ - -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \ - src/Makefile || exit +zcat $CWD/fltk.fltk-config.in.diff.gz | patch -p1 --verbose -# Cairo library support -# By default Cairo library support is enabled (like Slackware extra/fltk) -case "${CAIRO:-1}" in - 0) CAIRO_FLAG="dis" ;; - *) CAIRO_FLAG="en" ;; -esac - -# Add small patch for eureka -sed -i 's/class Fl_XFont_On_Demand/class FL_EXPORT Fl_XFont_On_Demand/' FL/x.H - -# --docdir seems to be ignored here CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -107,14 +93,18 @@ CXXFLAGS="$SLKCFLAGS" \ --datadir=/usr/share/ \ --localstatedir=/var \ --mandir=/usr/man \ + --disable-cairo \ --enable-gl \ --enable-largefile \ - --enable-shared \ --enable-threads \ + --enable-x11 \ + --enable-xcursor \ + --enable-xdbe \ --enable-xinerama \ + --enable-xfixes \ --enable-xft \ - --enable-xdbe \ - --${CAIRO_FLAG}able-cairo \ + --with-x \ + --enable-shared \ --build=$ARCH-slackware-linux # but not here... :) diff --git a/libraries/fltk/fltk.fltk-config.in.diff.gz b/libraries/fltk/fltk.fltk-config.in.diff.gz new file mode 100644 index 00000000000..4b20cba060f Binary files /dev/null and b/libraries/fltk/fltk.fltk-config.in.diff.gz differ diff --git a/libraries/fltk/fltk.info b/libraries/fltk/fltk.info index 373c0f0d002..ab9c91efe5a 100644 --- a/libraries/fltk/fltk.info +++ b/libraries/fltk/fltk.info @@ -1,8 +1,8 @@ PRGNAM="fltk" -VERSION="1.3.8" -HOMEPAGE="http://www.fltk.org" -DOWNLOAD="https://www.fltk.org/pub/fltk/1.3.8/fltk-1.3.8-source.tar.gz" -MD5SUM="84907602c2e50fadec3bc40fb61935cd" +VERSION="1.4.4" +HOMEPAGE="https://www.fltk.org" +DOWNLOAD="https://github.com/fltk/fltk/releases/download/release-1.4.4/fltk-1.4.4-source.tar.gz" +MD5SUM="83c567727e61c779f6681b0298226d05" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/dillo/333.patch b/network/dillo/333.patch new file mode 100644 index 00000000000..08c2406969d --- /dev/null +++ b/network/dillo/333.patch @@ -0,0 +1,1456 @@ +From c3ad276b8cd8c347c70bfdb154b525311e3419a9 Mon Sep 17 00:00:00 2001 +From: Mohammed Alyousef +Date: Thu, 2 Jan 2025 21:26:16 +0300 +Subject: [PATCH] add cmake build + +exclude config.h.in in gitignore + +try fltk 1.3 + +try again + +try again + +some cmake fixes for FLTK 1.3\ + +remove make test for the time being + +skip looking for fluid + +use fetch content + +fix build + +use find_package(PkgConfig REQUIRED) for webp + +fix build on macos + +remove windows for now + +fixes + +fixes + +fetch git for cygwin + +fix for cygwin + +define HAVE_TRUNC for cygwin + +try webp on cygwin + +use pkg-config for webp + +try finding webp on macos + +try /usr/local/opt/webp/lib on macos + +try crosscompilation + +download gl libs for crosscompiling check + +try with FLTK 1.3 + +for FLTK 1.3, use plain find_package + +try again for macos + +fixes + +support older cmake + +build for macos + +fix cmake.yml + +debug DILLO_FLTK_INCLUDE_DIRS + +debug FLTK_INCLUDE_DIRS on macos + +fix build on macos + +remove DNDEBUG flag when building for Release + +link windows libs for fltk 1.3 targeting msvc or mingw + +Update cmake.yml + +add warning when building against FLTK 1.4 +--- + .github/workflows/cmake.yml | 176 ++++++++++++++++++ + .gitignore | 3 + + CMakeLists.txt | 351 ++++++++++++++++++++++++++++++++++++ + cmake/config.h.in | 18 ++ + cmake/dpidrc.in | 8 + + dlib/CMakeLists.txt | 9 + + doc/CMakeLists.txt | 44 +++++ + dpi/CMakeLists.txt | 135 ++++++++++++++ + dpid/CMakeLists.txt | 69 +++++++ + dpip/CMakeLists.txt | 9 + + dw/CMakeLists.txt | 117 ++++++++++++ + lout/CMakeLists.txt | 27 +++ + src/CMakeLists.txt | 198 ++++++++++++++++++++ + src/IO/CMakeLists.txt | 56 ++++++ + test/CMakeLists.txt | 6 + + test/dw/CMakeLists.txt | 48 +++++ + test/html/CMakeLists.txt | 79 ++++++++ + test/unit/CMakeLists.txt | 59 ++++++ + 18 files changed, 1412 insertions(+) + create mode 100644 .github/workflows/cmake.yml + create mode 100644 CMakeLists.txt + create mode 100644 cmake/config.h.in + create mode 100644 cmake/dpidrc.in + create mode 100644 dlib/CMakeLists.txt + create mode 100644 doc/CMakeLists.txt + create mode 100644 dpi/CMakeLists.txt + create mode 100644 dpid/CMakeLists.txt + create mode 100644 dpip/CMakeLists.txt + create mode 100644 dw/CMakeLists.txt + create mode 100644 lout/CMakeLists.txt + create mode 100644 src/CMakeLists.txt + create mode 100644 src/IO/CMakeLists.txt + create mode 100644 test/CMakeLists.txt + create mode 100644 test/dw/CMakeLists.txt + create mode 100644 test/html/CMakeLists.txt + create mode 100644 test/unit/CMakeLists.txt + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 000000000..f3d97f3b6 +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,351 @@ ++cmake_minimum_required(VERSION 3.15) ++ ++project(dillo VERSION 3.1.1 ++ LANGUAGES C CXX) ++ ++option(ENABLE_FLTK_1_4 "Enable FLTK 1.4" OFF) ++option(ENABLE_JPEG "Enable JPEG support" ON) ++option(ENABLE_PNG "Enable PNG support" ON) ++option(ENABLE_WEBP "Enable WebP support" ON) ++option(ENABLE_GIF "Enable GIF support" ON) ++option(ENABLE_SVG "Enable SVG support" ON) ++option(ENABLE_TLS "Enable TLS (HTTPS)" ON) ++option(ENABLE_OPENSSL "Use OpenSSL if available" ON) ++option(ENABLE_MBEDTLS "Use mbedTLS if OpenSSL unavailable/disabled" ON) ++option(ENABLE_IPV6 "Enable IPv6 support" OFF) ++option(ENABLE_EFENCE "Enable ElectricFence" OFF) ++option(ENABLE_GPROF "Enable gprof profiling" OFF) ++option(ENABLE_INSURE "Enable Insure++" OFF) ++option(ENABLE_COOKIES "Enable cookie support" ON) ++option(ENABLE_THREADED_DNS "Enable threaded DNS" ON) ++option(ENABLE_RTFL "Enable RTFL debugging messages" OFF) ++option(ENABLE_XEMBED "Enable XEmbed" ON) ++option(ENABLE_HTML_TESTS "Enable HTML tests" OFF) ++option(DILLO_BUILD_TESTS "Build Dillo tests" OFF) ++ ++set(CMAKE_EXPORT_COMPILE_COMMANDS ON) ++ ++set(CA_CERTS_FILE "" CACHE STRING ++ "Path to a bundle of trusted CA certificates (equivalent to --with-ca-certs-file)") ++ ++set(CA_CERTS_DIR "" CACHE STRING ++ "Path to a directory containing trusted CA certificates (equivalent to --with-ca-certs-dir)") ++ ++set(DILLO_COMPILE_DEFINITIONS "") ++set(BASE_CUR_WORKING_DIR ${CMAKE_SOURCE_DIR}) ++ ++include(CheckCCompilerFlag) ++include(CheckCXXCompilerFlag) ++include(CheckIncludeFile) ++include(GNUInstallDirs) ++ ++set(CMAKE_INSTALL_SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}/dillo/") ++ ++check_include_file("stdint.h" HAVE_STDINT_H) ++check_include_file("stdint.h" HAVE_INTTYPES_H) ++ ++if(NOT ENABLE_COOKIES) ++ list(APPEND DILLO_COMPILE_DEFINITIONS DISABLE_COOKIES) ++endif() ++ ++if(ENABLE_IPV6) ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_IPV6) ++endif() ++ ++if(ENABLE_EFENCE) ++ set(EFENCE_LIB "efence") ++endif() ++ ++if(ENABLE_GPROF) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") ++endif() ++ ++if(ENABLE_INSURE) ++ message(WARNING "Insure++ usage is not trivial in CMake. Consider a custom toolchain.") ++endif() ++ ++# Uncomment if threaded DNS is needed ++# if(ENABLE_THREADED_DNS) ++# list(APPEND DILLO_COMPILE_DEFINITIONS D_DNS_THREADED) ++# endif() ++ ++if(ENABLE_RTFL) ++ list(APPEND DILLO_COMPILE_DEFINITIONS DBG_RTFL) ++endif() ++ ++if(NOT ENABLE_XEMBED) ++ list(APPEND DILLO_COMPILE_DEFINITIONS DISABLE_XEMBED) ++endif() ++ ++set(DILLO_DEPS) ++set(DILLO_FLTK_LIBS) ++set(DILLO_FLTK_INCLUDE_DIR) ++ ++if (ENABLE_FLTK_1_4) ++ find_package(FLTK 1.4 CONFIG) ++ if(NOT FLTK_FOUND) ++ set(FLTK_BUILD_TEST OFF CACHE BOOL " " FORCE) ++ set(FLTK_BUILD_FLUID OFF CACHE BOOL " " FORCE) ++ set(FLTK_BUILD_FLTK_OPTIONS OFF CACHE BOOL " " FORCE) ++ include(FetchContent) ++ FetchContent_Declare( ++ FLTK ++ GIT_REPOSITORY https://github.com/FLTK/FLTK ++ GIT_SHALLOW TRUE ++ OVERRIDE_FIND_PACKAGE ++ ) ++ FetchContent_MakeAvailable(FLTK) ++ find_package(FLTK 1.4 CONFIG REQUIRED) ++ endif() ++ message(WARNING "Dillo will attempt to link against FLTK 1.4. This might cause rendering issues!") ++ list(APPEND DILLO_FLTK_LIBS fltk::fltk) ++else() ++ find_package(FLTK REQUIRED) # 1.3 ++ list(APPEND DILLO_FLTK_INCLUDE_DIR ${FLTK_INCLUDE_DIR}) ++ list(APPEND DILLO_FLTK_LIBS fltk) ++ if (APPLE) ++ list(APPEND DILLO_FLTK_LIBS "-framework Cocoa") ++ elseif(WIN32) ++ list(APPEND DILLO_FLTK_LIBS ws2_32 comctl32 gdi32 gdiplus oleaut32 ole32 uuid shell32 advapi32 comdlg32 winspool user32 kernel32 odbc32) ++ else() ++ list(APPEND DILLO_FLTK_LIBS X11) ++ endif() ++endif() ++ ++ ++find_package(ZLIB REQUIRED) ++ ++if(ENABLE_PNG) ++ find_package(PNG) ++ if(PNG_FOUND) ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_PNG) ++ list(APPEND DILLO_DEPS PNG::PNG) ++ else() ++ message(WARNING "libpng not found, disabling PNG support.") ++ set(ENABLE_PNG OFF) ++ endif() ++endif() ++ ++if(ENABLE_JPEG) ++ find_package(JPEG) ++ if(JPEG_FOUND) ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_JPEG) ++ list(APPEND DILLO_DEPS JPEG::JPEG) ++ else() ++ message(WARNING "libjpeg not found, disabling JPEG support.") ++ set(ENABLE_JPEG OFF) ++ endif() ++endif() ++ ++set(WEBP_CFLAGS) ++set(WEBP_LIBS) ++ ++if(ENABLE_WEBP) ++ # find_package(WebP QUIET) ++ # if(WebP_FOUND) ++ # list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_WEBP) ++ # list(APPEND WEBP_CFLAGS ${WebP_INCLUDE_DIRS}) ++ # list(APPEND WEBP_LIBS ${WebP_LIBRARIES}) ++ # else() ++ find_package(PkgConfig) ++ if (PkgConfig_FOUND) ++ pkg_search_module(LIBWEBP QUIET libwebp) ++ if (LIBWEBP_FOUND) ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_WEBP) ++ list(APPEND WEBP_CFLAGS ${LIBWEBP_INCLUDE_DIRS}) ++ list(APPEND WEBP_LIBS ${LIBWEBP_LIBRARIES}) ++ list(APPEND DILLO_DEPS ${WEBP_LIBS}) ++ else() ++ message(WARNING "libwebp not found") ++ set(ENABLE_WEBP OFF) ++ endif() ++ endif() ++endif() ++ ++if(ENABLE_GIF) ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_GIF) ++endif() ++ ++if(ENABLE_SVG) ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_SVG) ++endif() ++ ++set(TLS_OK OFF) ++set(TLS_IMPL "none") ++set(SSL_LIBS) ++ ++if(ENABLE_TLS) ++ if(ENABLE_OPENSSL) ++ find_package(OpenSSL QUIET) ++ if(OPENSSL_FOUND) ++ message(STATUS "Using OpenSSL as TLS library.") ++ set(TLS_OK ON) ++ set(TLS_IMPL "OpenSSL") ++ set(ENABLE_MBEDTLS OFF) ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_TLS HAVE_OPENSSL) ++ set(SSL_LIBS OpenSSL::SSL OpenSSL::Crypto) ++ else() ++ message(STATUS "Cannot find OpenSSL, trying mbedTLS.") ++ endif() ++ else() ++ message(STATUS "Skipping OpenSSL search, as it is disabled.") ++ endif() ++ ++ if(NOT TLS_OK AND ENABLE_MBEDTLS) ++ find_path(MBEDTLS_INCLUDE_DIR mbedtls/ssl.h) ++ find_library(MBEDTLS_LIB mbedtls) ++ find_library(MBEDX509_LIB mbedx509) ++ find_library(MBEDCRYPTO_LIB mbedcrypto) ++ ++ if(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIB AND MBEDX509_LIB AND MBEDCRYPTO_LIB) ++ message(STATUS "Using mbedTLS as TLS library.") ++ set(TLS_OK ON) ++ set(TLS_IMPL "mbedTLS") ++ list(APPEND DILLO_COMPILE_DEFINITIONS ENABLE_TLS HAVE_MBEDTLS) ++ set(SSL_LIBS ${MBEDTLS_LIB} ${MBEDX509_LIB} ${MBEDCRYPTO_LIB}) ++ else() ++ message(STATUS "Cannot find mbedTLS.") ++ endif() ++ else() ++ message(STATUS "Skipping mbedTLS search, as it is disabled.") ++ endif() ++ ++ if(NOT TLS_OK) ++ message(FATAL_ERROR "No TLS library available") ++ endif() ++ ++ list(APPEND DILLO_DEPS ${SSL_LIBS}) ++endif() ++ ++find_package(Iconv REQUIRED) ++find_package(Threads REQUIRED) ++ ++set(DILLO_DEFINES_CONTENT "") ++foreach(def IN LISTS DILLO_COMPILE_DEFINITIONS) ++ set(DILLO_DEFINES_CONTENT "${DILLO_DEFINES_CONTENT}\n#define ${def}") ++endforeach() ++ ++if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -W -Wno-unused-parameter -pedantic -std=c99 -D_POSIX_C_SOURCE=200112L -D_REENTRANT -D_THREAD_SAFE") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -W -Wno-unused-parameter -fno-rtti -fno-exceptions -pedantic -std=c++11 -D_POSIX_C_SOURCE=200112L") ++endif() ++ ++string(REGEX REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}") ++string(REGEX REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") ++string(REGEX REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") ++string(REGEX REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL}") ++string(REGEX REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") ++string(REGEX REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") ++ ++configure_file( ++ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/config.h.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/config.h" ++ @ONLY ++) ++ ++message(STATUS "") ++message(STATUS "==== Configuration summary ====") ++message(STATUS " C Compiler : ${CMAKE_C_COMPILER}") ++message(STATUS " C Flags : ${CMAKE_C_FLAGS}") ++message(STATUS " CXX Compiler : ${CMAKE_CXX_COMPILER}") ++message(STATUS " CXX Flags : ${CMAKE_CXX_FLAGS}") ++message(STATUS "") ++message(STATUS " TLS enabled : ${ENABLE_TLS}") ++message(STATUS " TLS library : ${TLS_IMPL}") ++if(TLS_OK) ++ if(TLS_IMPL STREQUAL "OpenSSL") ++ message(STATUS " TLS flags : ${OpenSSL_LIBRARIES}") ++ elseif(TLS_IMPL STREQUAL "mbedTLS") ++ message(STATUS " TLS flags : ${MBEDTLS_LIB} ${MBEDX509_LIB} ${MBEDCRYPTO_LIB}") ++ endif() ++endif() ++message(STATUS "") ++message(STATUS " Cookies : ${ENABLE_COOKIES}") ++message(STATUS " XEmbed : ${ENABLE_XEMBED}") ++message(STATUS " RTFL : ${ENABLE_RTFL}") ++message(STATUS " JPEG : ${ENABLE_JPEG}") ++message(STATUS " PNG : ${ENABLE_PNG}") ++message(STATUS " GIF : ${ENABLE_GIF}") ++message(STATUS " SVG : ${ENABLE_SVG}") ++message(STATUS " WEBP : ${ENABLE_WEBP}") ++message(STATUS "") ++message(STATUS " HTML tests : ${ENABLE_HTML_TESTS}") ++message(STATUS "====================================") ++message(STATUS "") ++ ++add_subdirectory(lout) ++add_subdirectory(dw) ++add_subdirectory(dlib) ++add_subdirectory(dpip) ++add_subdirectory(dpid) ++add_subdirectory(src) ++add_subdirectory(dpi) ++add_subdirectory(doc) ++ ++if (DILLO_BUILD_TESTS) ++ enable_testing() ++ add_subdirectory(test) ++ if(ENABLE_HTML_TESTS) ++ find_program(XVFB_EXECUTABLE xvfb-run) ++ find_program(XWD_EXECUTABLE xwd) ++ find_program(XWININFO_EXECUTABLE xwininfo) ++ find_program(CONVERT_EXECUTABLE convert) ++ if(NOT (XVFB_EXECUTABLE AND XWD_EXECUTABLE AND XWININFO_EXECUTABLE AND CONVERT_EXECUTABLE)) ++ message(FATAL_ERROR "Cannot find all tools to enable HTML tests!") ++ endif() ++ endif() ++endif() ++ ++include(CPack) ++ ++install(PROGRAMS "${CMAKE_SOURCE_DIR}/dillo-install-hyphenation" ++ DESTINATION "${CMAKE_INSTALL_BINDIR}") ++ ++install(FILES "${CMAKE_SOURCE_DIR}/dillorc" ++ DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}") ++ ++install(FILES "${CMAKE_SOURCE_DIR}/dillo.desktop" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") ++ ++install(FILES "${CMAKE_SOURCE_DIR}/icons/48x48/dillo.png" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps") ++ ++install(FILES "${CMAKE_SOURCE_DIR}/icons/128x128/dillo.png" ++ DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps") ++ ++set(CPACK_SOURCE_FILES ++ "${CMAKE_SOURCE_DIR}/README.md" ++ "${CMAKE_SOURCE_DIR}/Doxyfile" ++ "${CMAKE_SOURCE_DIR}/dillorc" ++ "${CMAKE_SOURCE_DIR}/install-dpi-local" ++ "${CMAKE_SOURCE_DIR}/d_size.h" ++ "${CMAKE_SOURCE_DIR}/dillo-install-hyphenation" ++ "${CMAKE_SOURCE_DIR}/desktop_DATA/dillo.desktop" ++ "${CMAKE_SOURCE_DIR}/appicon48_DATA/icons/48x48/dillo.png" ++ "${CMAKE_SOURCE_DIR}/appicon128_DATA/icons/128x128/dillo.png" ++) ++ ++set(CPACK_SOURCE_IGNORE_FILES ++ "/\\.git/" ++ "/build/" ++ "CMakeFiles/" ++ "CMakeCache.txt" ++ "cmake_install.cmake" ++ "Makefile" ++) ++ ++set(CPACK_SOURCE_INCLUDE_TOPLEVEL_DIRECTORY OFF) ++ ++set(CPACK_GENERATOR "TGZ;ZIP") ++set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Dillo Web Browser") ++set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}") ++set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}") ++set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}") ++ ++foreach(file IN LISTS CPACK_SOURCE_FILES) ++ list(APPEND CPACK_SOURCE_FILES_LIST "${file}") ++endforeach() ++ ++set(CPACK_SOURCE_FILES "${CPACK_SOURCE_FILES_LIST}") ++ +diff --git a/cmake/config.h.in b/cmake/config.h.in +new file mode 100644 +index 000000000..a9c3df77c +--- /dev/null ++++ b/cmake/config.h.in +@@ -0,0 +1,18 @@ ++/* config.h.in -- template for config.h used by CMake ++ This file is processed by configure_file(...). */ ++ ++/* -------------------------------------------------- ++ Basic project info (substituted by CMake): ++ -------------------------------------------------- */ ++#ifndef DILLO_CONFIG_H ++#define DILLO_CONFIG_H ++ ++#define PACKAGE "@PROJECT_NAME@" ++#define VERSION "@PROJECT_VERSION@" ++ ++#cmakedefine HAVE_STDINT_H ++#cmakedefine HAVE_INTTYPES_H ++#cmakedefine ENABLE_IPV6 ++@DILLO_DEFINES_CONTENT@ ++ ++#endif /* DILLO_CONFIG_H */ +\ No newline at end of file +diff --git a/cmake/dpidrc.in b/cmake/dpidrc.in +new file mode 100644 +index 000000000..fb15d0e0a +--- /dev/null ++++ b/cmake/dpidrc.in +@@ -0,0 +1,8 @@ ++#define LIBDIR "@LIBDIR@" ++#define EXEEXT "@EXEEXT@" ++ ++dpi_dir=@libdir@/dillo/dpi ++ ++proto.file=file/file.dpi@EXEEXT@ ++proto.ftp=ftp/ftp.filter.dpi@EXEEXT@ ++proto.data=datauri/datauri.filter.dpi@EXEEXT@ +\ No newline at end of file +diff --git a/dlib/CMakeLists.txt b/dlib/CMakeLists.txt +new file mode 100644 +index 000000000..5fb30731a +--- /dev/null ++++ b/dlib/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(Dlib STATIC ++ dlib.c ++ dlib.h ++) ++ ++target_include_directories(Dlib ++ PUBLIC ++ ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ++) +\ No newline at end of file +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +new file mode 100644 +index 000000000..f18bed83e +--- /dev/null ++++ b/doc/CMakeLists.txt +@@ -0,0 +1,44 @@ ++set(DILLO_MAN_PAGE "${CMAKE_CURRENT_BINARY_DIR}/dillo.1") ++ ++add_custom_command( ++ OUTPUT "${DILLO_MAN_PAGE}" ++ COMMAND ${CMAKE_COMMAND} -E echo "Generating dillo.1 with prefix replaced" ++ COMMAND sed "s%/usr/local%${CMAKE_INSTALL_PREFIX}%g" ++ < "${CMAKE_CURRENT_SOURCE_DIR}/dillo.1.in" ++ > "${DILLO_MAN_PAGE}" ++ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/dillo.1.in" ++ COMMENT "Creating man page dillo.1" ++) ++ ++set(DILLO_HTML_HELP "${CMAKE_CURRENT_BINARY_DIR}/user_help.html") ++ ++add_custom_command( ++ OUTPUT "${DILLO_HTML_HELP}" ++ COMMAND ${CMAKE_COMMAND} -E echo "Generating user_help.html with project version" ++ COMMAND sed "s/__VERSION__/${PROJECT_VERSION}/g" ++ < "${CMAKE_CURRENT_SOURCE_DIR}/user_help.in.html" ++ > "${DILLO_HTML_HELP}" ++ DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/user_help.in.html" ++ COMMENT "Creating user_help.html" ++) ++ ++add_custom_target(doc ALL ++ DEPENDS "${DILLO_MAN_PAGE}" "${DILLO_HTML_HELP}" ++) ++ ++install(FILES ++ "${DILLO_MAN_PAGE}" ++ DESTINATION share/man/man1 ++) ++ ++install(FILES ++ "${DILLO_HTML_HELP}" ++ DESTINATION share/dillo ++) ++ ++install(FILES ++ "${CMAKE_CURRENT_SOURCE_DIR}/README" ++ "${CMAKE_CURRENT_SOURCE_DIR}/Cookies.txt" ++ "${CMAKE_CURRENT_SOURCE_DIR}/install.md" ++ DESTINATION share/dillo/doc ++) +\ No newline at end of file +diff --git a/dpi/CMakeLists.txt b/dpi/CMakeLists.txt +new file mode 100644 +index 000000000..829b48c36 +--- /dev/null ++++ b/dpi/CMakeLists.txt +@@ -0,0 +1,135 @@ ++target_include_directories(dillo INTERFACE ++ ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ++) ++ ++add_executable(bookmarks_dpi ++ bookmarks.c ++ dpiutil.c ++ dpiutil.h ++) ++ ++set_target_properties(bookmarks_dpi PROPERTIES OUTPUT_NAME "bookmarks.dpi") ++ ++target_link_libraries(bookmarks_dpi PRIVATE ++ Dpip ++ Dlib ++) ++ ++install(TARGETS bookmarks_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/bookmarks ++) ++ ++add_executable(downloads_dpi ++ downloads.cc ++ dpiutil.c ++ dpiutil.h ++) ++set_target_properties(downloads_dpi PROPERTIES OUTPUT_NAME "downloads.dpi") ++ ++target_include_directories(downloads_dpi PRIVATE ${DILLO_FLTK_INCLUDE_DIR}) ++ ++target_link_libraries(downloads_dpi PRIVATE ++ ${DILLO_FLTK_LIBS} ++ Dpip ++ Dlib ++) ++ ++install(TARGETS downloads_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/downloads ++) ++ ++add_executable(ftp_filter_dpi ++ ftp.c ++ dpiutil.c ++ dpiutil.h ++) ++set_target_properties(ftp_filter_dpi PROPERTIES OUTPUT_NAME "ftp.filter.dpi") ++ ++target_link_libraries(ftp_filter_dpi PRIVATE ++ Dpip ++ Dlib ++) ++ ++install(TARGETS ftp_filter_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/ftp ++) ++ ++add_executable(hello_filter_dpi ++ hello.c ++ dpiutil.c ++ dpiutil.h ++) ++set_target_properties(hello_filter_dpi PROPERTIES OUTPUT_NAME "hello.filter.dpi") ++ ++target_link_libraries(hello_filter_dpi PRIVATE ++ Dpip ++ Dlib ++) ++ ++install(TARGETS hello_filter_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/hello ++) ++ ++add_executable(vsource_filter_dpi ++ vsource.c ++ dpiutil.c ++ dpiutil.h ++) ++set_target_properties(vsource_filter_dpi PROPERTIES OUTPUT_NAME "vsource.filter.dpi") ++ ++target_link_libraries(vsource_filter_dpi PRIVATE ++ Dpip ++ Dlib ++) ++ ++install(TARGETS vsource_filter_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/vsource ++) ++ ++add_executable(file_dpi ++ file.c ++ dpiutil.c ++ dpiutil.h ++) ++set_target_properties(file_dpi PROPERTIES OUTPUT_NAME "file.dpi") ++ ++target_link_libraries(file_dpi PRIVATE ++ Dpip ++ Dlib ++) ++ ++install(TARGETS file_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/file ++) ++ ++add_executable(cookies_dpi ++ cookies.c ++ dpiutil.c ++ dpiutil.h ++) ++set_target_properties(cookies_dpi PROPERTIES OUTPUT_NAME "cookies.dpi") ++ ++target_link_libraries(cookies_dpi PRIVATE ++ Dpip ++ Dlib ++) ++ ++install(TARGETS cookies_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/cookies ++) ++ ++add_executable(datauri_filter_dpi ++ datauri.c ++ dpiutil.c ++ dpiutil.h ++) ++set_target_properties(datauri_filter_dpi PROPERTIES OUTPUT_NAME "datauri.filter.dpi") ++ ++target_link_libraries(datauri_filter_dpi PRIVATE ++ Dpip ++ Dlib ++) ++ ++install(TARGETS datauri_filter_dpi ++ RUNTIME DESTINATION lib/dillo/dpi/datauri ++) +\ No newline at end of file +diff --git a/dpid/CMakeLists.txt b/dpid/CMakeLists.txt +new file mode 100644 +index 000000000..36314f26e +--- /dev/null ++++ b/dpid/CMakeLists.txt +@@ -0,0 +1,69 @@ ++include(GNUInstallDirs) ++ ++set(DPIDRC_INPUT "${PROJECT_SOURCE_DIR}/cmake/dpidrc.in") ++set(DPIDRC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dpidrc") ++ ++if(NOT CMAKE_EXECUTABLE_SUFFIX) ++ set(CMAKE_EXECUTABLE_SUFFIX "") ++endif() ++ ++add_executable(dpid ++ main.c ++ dpid.c ++ dpid_common.c ++ dpi.c ++ dpi_socket_dir.c ++ misc_new.c ++ dpi.h ++ dpi_socket_dir.h ++ dpid.h ++ dpid_common.h ++ misc_new.h ++) ++ ++target_compile_definitions(dpid PRIVATE ++ DILLO_SYSCONF="${CMAKE_INSTALL_SYSCONFDIR}" ${CMAKE_INSTALL} ++ DILLO_DOCDIR="${CMAKE_INSTALL_DOCDIR}" ++ CUR_WORKING_DIR="${BASE_CUR_WORKING_DIR}/src" ++ EXEEXT="${CMAKE_EXECUTABLE_SUFFIX}" ++ DPIDRC_SYS="${CMAKE_INSTALL_SYSCONFDIR}/dpidrc" ++) ++ ++ ++target_link_libraries(dpid PRIVATE ++ Dpip ++ Dlib ++) ++ ++add_executable(dpidc ++ dpidc.c ++) ++ ++target_compile_definitions(dpidc PRIVATE ++ EXEEXT="${CMAKE_EXECUTABLE_SUFFIX}" ++ DPIDRC_SYS="${CMAKE_INSTALL_SYSCONFDIR}/dpidrc" ++) ++ ++target_link_libraries(dpidc PRIVATE ++ Dpip ++ Dlib ++) ++ ++configure_file( ++ "${DPIDRC_INPUT}" ++ "${DPIDRC_OUTPUT}" ++ @ONLY ++) ++ ++add_custom_target(dpidrc_gen ALL ++ DEPENDS "${DPIDRC_OUTPUT}" ++) ++ ++ ++install(FILES "${DPIDRC_OUTPUT}" ++ DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}" ++) ++ ++install(TARGETS dpid dpidc ++ RUNTIME DESTINATION bin ++) +\ No newline at end of file +diff --git a/dpip/CMakeLists.txt b/dpip/CMakeLists.txt +new file mode 100644 +index 000000000..e6728bb37 +--- /dev/null ++++ b/dpip/CMakeLists.txt +@@ -0,0 +1,9 @@ ++add_library(Dpip STATIC ++ dpip.c ++ dpip.h ++) ++ ++target_include_directories(Dpip ++ PUBLIC ++ ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ++) +\ No newline at end of file +diff --git a/dw/CMakeLists.txt b/dw/CMakeLists.txt +new file mode 100644 +index 000000000..2d68fdd31 +--- /dev/null ++++ b/dw/CMakeLists.txt +@@ -0,0 +1,117 @@ ++set(DILLO_DEFINES ++ DILLO_LIBDIR="${CMAKE_INSTALL_LIBDIR}" ++ CUR_WORKING_DIR="${BASE_CUR_WORKING_DIR}/dw" ++) ++ ++add_library(Dw-core STATIC ++ findtext.cc ++ imgrenderer.cc ++ iterator.cc ++ layout.cc ++ selection.cc ++ stackingcontextmgr.cc ++ style.cc ++ tools.cc ++ types.cc ++ ui.cc ++ view.hh ++ widget.cc ++ core.hh ++ events.hh ++ findtext.hh ++ imgbuf.hh ++ imgrenderer.hh ++ iterator.hh ++ layout.hh ++ platform.hh ++ selection.hh ++ stackingcontextmgr.hh ++ style.hh ++ tools.hh ++ types.hh ++ ui.hh ++ widget.hh ++) ++target_include_directories(Dw-core PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}) ++target_compile_definitions(Dw-core PRIVATE ${DILLO_DEFINES}) ++target_link_libraries(Dw-core PUBLIC lout) ++ ++add_library(Dw-fltk STATIC ++ fltkcomplexbutton.cc ++ fltkflatview.cc ++ fltkimgbuf.cc ++ fltkmisc.cc ++ fltkplatform.cc ++ fltkpreview.cc ++ fltkui.cc ++ fltkviewbase.cc ++ fltkviewport.cc ++ fltkcomplexbutton.hh ++ fltkcore.hh ++ fltkflatview.hh ++ fltkimgbuf.hh ++ fltkmisc.hh ++ fltkplatform.hh ++ fltkpreview.hh ++ fltkui.hh ++ fltkviewbase.hh ++ fltkviewport.hh ++) ++ ++target_include_directories(Dw-fltk PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${DILLO_FLTK_INCLUDE_DIR}) ++target_link_libraries(Dw-fltk PUBLIC ${DILLO_FLTK_LIBS}) ++target_compile_definitions(Dw-fltk PRIVATE ${DILLO_DEFINES}) ++ ++add_library(Dw-widgets STATIC ++ alignedtablecell.cc ++ alignedtextblock.cc ++ bullet.cc ++ hyphenator.cc ++ image.cc ++ listitem.cc ++ oofawarewidget.cc ++ oofawarewidget_iterator.cc ++ ooffloatsmgr.cc ++ oofposabslikemgr.cc ++ oofposabsmgr.cc ++ oofposfixedmgr.cc ++ oofpositionedmgr.cc ++ oofposrelmgr.cc ++ outofflowmgr.cc ++ regardingborder.cc ++ ruler.cc ++ simpletablecell.cc ++ table.cc ++ table_iterator.cc ++ tablecell.cc ++ textblock.cc ++ textblock_iterator.cc ++ textblock_linebreaking.cc ++ alignedtablecell.hh ++ alignedtextblock.hh ++ bullet.hh ++ hyphenator.hh ++ image.hh ++ listitem.hh ++ oofawarewidget.hh ++ ooffloatsmgr.hh ++ oofposabslikemgr.hh ++ oofposabsmgr.hh ++ oofposfixedmgr.hh ++ oofpositionedmgr.hh ++ oofposrelmgr.hh ++ outofflowmgr.hh ++ regardingborder.hh ++ ruler.hh ++ simpletablecell.hh ++ table.hh ++ tablecell.hh ++ textblock.hh ++) ++ ++target_compile_definitions(Dw-widgets PRIVATE ${DILLO_DEFINES}) ++target_include_directories(Dw-widgets PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${DILLO_FLTK_INCLUDE_DIR}) ++target_link_libraries(Dw-widgets PUBLIC ${DILLO_FLTK_LIBS}) ++ ++# install(FILES preview.xbm DESTINATION share/dillo/...) ++ +diff --git a/lout/CMakeLists.txt b/lout/CMakeLists.txt +new file mode 100644 +index 000000000..413c56cbc +--- /dev/null ++++ b/lout/CMakeLists.txt +@@ -0,0 +1,27 @@ ++add_library(lout STATIC ++ container.cc ++ container.hh ++ debug.hh ++ debug_rtfl.hh ++ identity.cc ++ identity.hh ++ misc.cc ++ misc.hh ++ object.cc ++ object.hh ++ signal.cc ++ signal.hh ++ unicode.cc ++ unicode.hh ++ msg.h ++) ++ ++target_include_directories(lout ++ PUBLIC ++ ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ++) ++ ++target_compile_definitions(lout ++ PRIVATE ++ CUR_WORKING_DIR="${BASE_CUR_WORKING_DIR}/lout" ++) +\ No newline at end of file +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +new file mode 100644 +index 000000000..7daad2982 +--- /dev/null ++++ b/src/CMakeLists.txt +@@ -0,0 +1,198 @@ ++add_subdirectory(IO) ++ ++set(DILLO_SOURCES ++ dillo.cc ++ version.cc ++ version.hh ++ paths.cc ++ paths.hh ++ tipwin.cc ++ tipwin.hh ++ ui.cc ++ ui.hh ++ uicmd.cc ++ uicmd.hh ++ bw.h ++ bw.c ++ cookies.c ++ cookies.h ++ actions.c ++ actions.h ++ hsts.c ++ hsts.h ++ auth.c ++ auth.h ++ md5.c ++ md5.h ++ digest.c ++ digest.h ++ colors.c ++ colors.h ++ binaryconst.h ++ misc.c ++ misc.h ++ history.h ++ history.c ++ prefs.c ++ prefs.h ++ prefsparser.cc ++ prefsparser.hh ++ keys.cc ++ keys.hh ++ msg.h ++ list.h ++ url.c ++ url.h ++ bitvec.c ++ bitvec.h ++ klist.c ++ klist.h ++ chain.c ++ chain.h ++ utf8.cc ++ utf8.hh ++ timeout.cc ++ timeout.hh ++ dialog.cc ++ dialog.hh ++ web.cc ++ web.hh ++ nav.c ++ nav.h ++ cache.c ++ cache.h ++ decode.c ++ decode.h ++ dicache.c ++ dicache.h ++ capi.c ++ capi.h ++ domain.c ++ domain.h ++ css.cc ++ css.hh ++ cssparser.cc ++ cssparser.hh ++ doctree.hh ++ styleengine.cc ++ styleengine.hh ++ plain.cc ++ html.cc ++ html.hh ++ html_charrefs.h ++ html_common.hh ++ form.cc ++ form.hh ++ table.cc ++ table.hh ++ bookmark.c ++ bookmark.h ++ dns.c ++ dns.h ++ gif.c ++ dgif.h ++ jpeg.c ++ djpeg.h ++ png.c ++ dpng.h ++ webp.c ++ dwebp.h ++ svg.c ++ nanosvg.h ++ nanosvgrast.h ++ dsvg.h ++ imgbuf.cc ++ imgbuf.hh ++ image.cc ++ image.hh ++ menu.hh ++ menu.cc ++ dpiapi.c ++ dpiapi.h ++ pixmaps.h ++ findbar.cc ++ findbar.hh ++ xembed.cc ++ xembed.hh ++) ++ ++set(COMMIT_H "${CMAKE_BINARY_DIR}/commit.h") ++set(COMMIT_TMP "${CMAKE_BINARY_DIR}/commit.tmp.h") ++ ++if(GIT_AVAILABLE) ++ add_custom_command( ++ OUTPUT "${COMMIT_H}" ++ COMMAND ${CMAKE_COMMAND} -E echo "Generating commit.tmp.h from git describe" ++ COMMAND git --work-tree="${PROJECT_SOURCE_DIR}" describe --dirty > commit_ver.txt ++ COMMAND ${CMAKE_COMMAND} -E echo "#define GIT_COMMIT `cat commit_ver.txt`" > "${COMMIT_TMP}" ++ COMMAND ${CMAKE_COMMAND} -E remove -f commit_ver.txt ++ ++ COMMAND ${CMAKE_COMMAND} -E touch commit.h ++ ++ COMMAND ${CMAKE_COMMAND} -E compare_files "${COMMIT_TMP}" "${COMMIT_H}" ++ || ${CMAKE_COMMAND} -E copy "${COMMIT_TMP}" "${COMMIT_H}" ++ COMMAND ${CMAKE_COMMAND} -E remove -f "${COMMIT_TMP}" ++ ++ DEPENDS "${PROJECT_SOURCE_DIR}/.git" ++ COMMENT "Generating commit.h (from git describe)" ++ VERBATIM ++ ) ++else() ++ add_custom_command( ++ OUTPUT "${COMMIT_H}" ++ COMMAND ${CMAKE_COMMAND} -E echo "/* no git commit info */" > "${COMMIT_H}" ++ COMMENT "Creating empty commit.h (no GIT)" ++ VERBATIM ++ ) ++endif() ++ ++list(APPEND DILLO_SOURCES "${COMMIT_H}") ++ ++add_executable(dillo ++ ${DILLO_SOURCES} ++) ++ ++target_compile_definitions(dillo PRIVATE ++ DILLO_SYSCONF="${CMAKE_INSTALL_SYSCONFDIR}" ++ DILLO_DOCDIR="${CMAKE_INSTALL_DOCDIR}" ++ CUR_WORKING_DIR="${BASE_CUR_WORKING_DIR}/src" ++ inbuf_t=char ++) ++ ++if(ENABLE_THREADED_DNS) ++ target_compile_definitions(dillo PRIVATE D_DNS_THREADED) ++endif() ++ ++if(ENABLE_WEBP) ++ target_include_directories(dillo PRIVATE ${WEBP_CFLAGS}) ++endif() ++ ++target_include_directories(dillo PRIVATE ${DILLO_FLTK_INCLUDE_DIR}) ++ ++target_link_libraries(dillo PRIVATE ++ Dlib ++ Dpip ++ Diof ++ Dw-widgets ++ Dw-fltk ++ Dw-core ++ lout ++ ${DILLO_FLTK_LIBS} # required ++ ZLIB::ZLIB # required ++ Iconv::Iconv # required ++ Threads::Threads # required ++ ${DILLO_DEPS} ++) ++ ++install(TARGETS dillo ++ RUNTIME DESTINATION bin ++) ++ ++install(FILES ++ "${CMAKE_CURRENT_SOURCE_DIR}/domainrc" ++ "${CMAKE_CURRENT_SOURCE_DIR}/keysrc" ++ "${CMAKE_CURRENT_SOURCE_DIR}/hsts_preload" ++ DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}" ++) ++ ++install(FILES chg srch DESTINATION share/dillo/src) +diff --git a/src/IO/CMakeLists.txt b/src/IO/CMakeLists.txt +new file mode 100644 +index 000000000..7bb2fc8dc +--- /dev/null ++++ b/src/IO/CMakeLists.txt +@@ -0,0 +1,56 @@ ++set(DIOF_SOURCES ++ mime.c ++ mime.h ++ about.c ++ Url.h ++ http.c ++ tls.h ++ tls.c ++ dpi.c ++ IO.c ++ iowatch.cc ++ iowatch.hh ++ IO.h ++) ++ ++if (ENABLE_TLS) ++ if(ENABLE_OPENSSL) ++ list(APPEND DIOF_SOURCES ++ tls_openssl.c ++ tls_openssl.h ++ ) ++ endif() ++ ++ if(ENABLE_MBEDTLS) ++ list(APPEND DIOF_SOURCES ++ tls_mbedtls.c ++ tls_mbedtls.h ++ ) ++ endif() ++endif() ++ ++add_library(Diof STATIC ++ ${DIOF_SOURCES} ++) ++ ++target_include_directories(Diof ++ PUBLIC ++ ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${DILLO_FLTK_INCLUDE_DIR} ++) ++ ++target_link_libraries(Diof PRIVATE ${DILLO_FLTK_LIBS}) ++ ++target_compile_definitions(Diof ++ PRIVATE ++ DILLO_BINDIR="${CMAKE_INSTALL_BINDIR}/" ++ CA_CERTS_FILE="${CA_CERTS_FILE}" ++ CA_CERTS_DIR="${CA_CERTS_DIR}" ++) ++ ++if (ENABLE_TLS) ++ target_link_libraries(Diof PUBLIC ${SSL_LIBS}) ++endif() ++ ++ ++ ++# install(TARGETS Diof DESTINATION lib) +\ No newline at end of file +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +new file mode 100644 +index 000000000..82f58b94f +--- /dev/null ++++ b/test/CMakeLists.txt +@@ -0,0 +1,6 @@ ++add_subdirectory(unit) ++add_subdirectory(dw) ++ ++if(ENABLE_HTML_TESTS) ++ add_subdirectory(html) ++endif() +\ No newline at end of file +diff --git a/test/dw/CMakeLists.txt b/test/dw/CMakeLists.txt +new file mode 100644 +index 000000000..48990090f +--- /dev/null ++++ b/test/dw/CMakeLists.txt +@@ -0,0 +1,48 @@ ++set(DW_LIBS ++ lout ++ Dw-widgets ++ Dw-fltk ++ Dw-core ++ Dlib ++ ${DILLO_FLTK_LIBS} ++) ++ ++function(add_dw_test_executable exe_name) ++ add_executable(${exe_name} ${ARGN}) ++ target_include_directories(${exe_name} PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${DILLO_FLTK_INCLUDE_DIR}) ++ target_compile_definitions(${exe_name} PRIVATE CUR_WORKING_DIR="${BASE_CUR_WORKING_DIR}/test") ++ target_link_libraries(${exe_name} PRIVATE ${DW_LIBS}) ++endfunction() ++ ++add_dw_test_executable(dw-anchors-test dw_anchors_test.cc) ++add_dw_test_executable(dw-border-test dw_border_test.cc) ++add_dw_test_executable(dw-example dw_example.cc) ++add_dw_test_executable(dw-find-test dw_find_test.cc) ++add_dw_test_executable(dw-float-test dw_float_test.cc) ++add_dw_test_executable(dw-links dw_links.cc) ++add_dw_test_executable(dw-links2 dw_links2.cc) ++add_dw_test_executable(dw-image-background dw_image_background.cc) ++add_dw_test_executable(dw-images-simple dw_images_simple.cc) ++add_dw_test_executable(dw-images-scaled dw_images_scaled.cc) ++add_dw_test_executable(dw-images-scaled2 dw_images_scaled2.cc) ++add_dw_test_executable(dw-lists dw_lists.cc) ++add_dw_test_executable(dw-resource-test dw_resource_test.cc) ++ ++add_dw_test_executable(dw-simple-container-test ++ dw_simple_container.cc ++ dw_simple_container.hh ++ dw_simple_container_test.cc ++) ++ ++add_dw_test_executable(dw-table dw_table.cc) ++add_dw_test_executable(dw-table-aligned dw_table_aligned.cc) ++add_dw_test_executable(dw-ui-test ++ form.cc ++ dw_ui_test.cc ++ form.hh ++) ++ ++add_dw_test_executable(dw-imgbuf-mem-test dw_imgbuf_mem_test.cc) ++ ++add_test(NAME dw-imgbuf-mem-test ++ COMMAND $) +\ No newline at end of file +diff --git a/test/html/CMakeLists.txt b/test/html/CMakeLists.txt +new file mode 100644 +index 000000000..5be81ce04 +--- /dev/null ++++ b/test/html/CMakeLists.txt +@@ -0,0 +1,79 @@ ++set(DRIVER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/driver.sh") ++ ++set(HTML_TEST_FILES ++ render/b-div.html ++ render/div-100-percent-with-padding.html ++ render/float-img-justify.html ++ render/github-infinite-loop.html ++ render/hackernews.html ++ render/img-aspect-ratio-absolute.html ++ render/img-aspect-ratio-div.html ++ render/img-aspect-ratio-mix-border.html ++ render/img-aspect-ratio-mix-margin.html ++ render/img-aspect-ratio-mix.html ++ render/img-aspect-ratio-relative-inside-fixed.html ++ render/img-aspect-ratio.html ++ render/main-style.html ++ render/margin-auto.html ++ render/max-width-body.html ++ render/max-width-div-clamp.html ++ render/max-width-div.html ++ render/max-width-html.html ++ render/max-width-nested-div.html ++ render/meta-refresh-0-no-url.html ++ render/min-width-body.html ++ render/min-width-div-extend.html ++ render/min-width-div.html ++ render/min-width-html.html ++ render/min-width-nested-div.html ++ render/span-padding.html ++ render/svg-current-color.html ++ render/table-max-width.html ++ render/table-missing-width-in-one-column.html ++ render/table-td-width-percent-img.html ++ render/table-td-width-percent.html ++ render/table-thead-tfoot.html ++ render/table-thead-tfoot-open-tag.html ++ render/white-space.html ++) ++ ++# 3) Tests that we EXPECT TO FAIL (XFAIL_TESTS) ++set(XFAIL_TESTS ++ render/div-100-percent-with-padding.html ++ render/float-img-justify.html ++ render/margin-auto.html ++ render/max-width-html.html ++ render/min-width-html.html ++ render/span-padding.html ++ render/table-td-width-percent.html ++) ++ ++function(add_html_test test_file) ++ get_filename_component(test_name "${test_file}" NAME) ++ ++ add_test(NAME "${test_name}" ++ COMMAND ++ "${DRIVER_SCRIPT}" "${CMAKE_CURRENT_SOURCE_DIR}/${test_file}" ++ ) ++ ++ set_tests_properties("${test_name}" PROPERTIES ++ ENVIRONMENT ++ "TOP_BUILDDIR=${CMAKE_BINARY_DIR}" ++ "TOP_SRCDIR=${CMAKE_SOURCE_DIR}" ++ "BUILDDIR=${CMAKE_CURRENT_BINARY_DIR}" ++ ) ++ ++ # If it's in the XFAIL list, mark it as WILL_FAIL ++ list(FIND XFAIL_TESTS "${test_file}" xfail_index) ++ if(xfail_index GREATER -1) ++ # Means found in XFAIL_TESTS ++ set_tests_properties("${test_name}" PROPERTIES WILL_FAIL TRUE) ++ endif() ++endfunction() ++ ++foreach(test_file IN LISTS HTML_TEST_FILES) ++ add_html_test("${test_file}") ++endforeach() ++ ++install(FILES driver.sh DESTINATION share/dillo/test/html) ++install(DIRECTORY manual render DESTINATION share/dillo/test/html) +diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt +new file mode 100644 +index 000000000..6cce1a92d +--- /dev/null ++++ b/test/unit/CMakeLists.txt +@@ -0,0 +1,59 @@ ++set(BASE_LIBS ++ lout ++) ++ ++function(add_unit_test_executable exe_name sources extra_libs) ++ add_executable(${exe_name} ${sources}) ++ target_include_directories(${exe_name} PRIVATE ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR}) ++ target_link_libraries(${exe_name} PRIVATE ${BASE_LIBS} ${extra_libs}) ++ target_compile_definitions(${exe_name} PRIVATE ++ CUR_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" ++ CUR_WORKING_DIR="${BASE_CUR_WORKING_DIR}/test/unit" ++ ) ++endfunction() ++ ++add_unit_test_executable(containers ++ containers.cc ++ "Dlib" ++) ++ ++add_unit_test_executable(identity ++ identity.cc ++ "Dlib" ++) ++ ++add_unit_test_executable(notsosimplevector ++ notsosimplevector.cc ++ "" ++) ++ ++add_unit_test_executable(shapes ++ shapes.cc ++ "Dw-core;Dlib" ++) ++ ++add_unit_test_executable(unicode_test ++ unicode_test.cc ++ "Dw-fltk" ++) ++ ++add_unit_test_executable(liang ++ liang.cc ++ "Dw-widgets;Dw-fltk;Dw-core;Dlib" ++) ++ ++add_unit_test_executable(cookies ++ cookies.c ++ "Dpip;Dlib" ++) ++ ++add_unit_test_executable(trie ++ trie.cc ++ "Dw-widgets;Dw-fltk;Dw-core;Dlib" ++) ++ ++foreach(tst IN ITEMS containers identity liang notsosimplevector shapes unicode_test) ++ add_test(NAME ${tst} COMMAND $) ++endforeach() ++ ++install(FILES hyph-en-us.pat hyph-de.pat DESTINATION share/dillo/tests/unit) diff --git a/network/dillo/dillo.SlackBuild b/network/dillo/dillo.SlackBuild index 92844dac9e2..145cad7fe69 100644 --- a/network/dillo/dillo.SlackBuild +++ b/network/dillo/dillo.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=dillo VERSION=${VERSION:-3.2.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -82,30 +82,31 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -autoreconf -fi - -# Dillo looks for openssl first, then tls. Both are still in alpha -# stage but work to a degree and are better than nothing. -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --enable-openssl \ - --enable-tls \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG +patch -p1 < $CWD/333.patch + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install/strip DESTDIR=$PKG +cd .. # Let's not clobber config files if they already exist -mv $PKG/etc/dillo/dillorc $PKG/etc/dillo/dillorc.new -mv $PKG/etc/dillo/dpidrc $PKG/etc/dillo/dpidrc.new -mv $PKG/etc/dillo/keysrc $PKG/etc/dillo/keysrc.new - +mkdir -p $PKG/etc/dillo +mv $PKG/usr/etc/dillo/dillorc $PKG/etc/dillo/dillorc.new +mv $PKG/usr/etc/dillo/dpidrc $PKG/etc/dillo/dpidrc.new +mv $PKG/usr/etc/dillo/keysrc $PKG/etc/dillo/keysrc.new +mv $PKG/usr/etc/dillo/domainrc $PKG/etc/dillo/domainrc.new +mv $PKG/usr/etc/dillo/hsts_preload $PKG/etc/dillo/hsts_preload.new +rm -rf $PKG/usr/etc + +mv $PKG/usr/share/man $PKG/usr/ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/network/dillo/doinst.sh b/network/dillo/doinst.sh index a189943dd8c..f8ced9157e4 100644 --- a/network/dillo/doinst.sh +++ b/network/dillo/doinst.sh @@ -14,6 +14,8 @@ config() { config etc/dillo/dillorc.new config etc/dillo/dpidrc.new config etc/dillo/keysrc.new +config etc/dillo/hsts_preload.new +config etc/dillo/domainrc.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/python/pyfltk/pyfltk.SlackBuild b/python/pyfltk/pyfltk.SlackBuild index e73aef67e01..4279dacb866 100644 --- a/python/pyfltk/pyfltk.SlackBuild +++ b/python/pyfltk/pyfltk.SlackBuild @@ -25,8 +25,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=pyfltk -VERSION=${VERSION:-1.3.3.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.3.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -50,11 +47,7 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SRC_PRGNAM=pyFltk -DOCFILES="CHANGES PKG-INFO INSTALL TODO COPYING README" - -# html files are now located in fltk/ subdirectory -HTMLDOCS="fltk/docs/*" +DOCFILES="CHANGES PKG-INFO COPYING README.md" set -e @@ -63,9 +56,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf ${SRC_PRGNAM}-${VERSION} -tar -xvf $CWD/${SRC_PRGNAM}-${VERSION}_py2.tar.gz -cd ${SRC_PRGNAM}-${VERSION} +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 \) \ @@ -78,20 +71,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Move html files and python test examples in order to preserve and install them -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/docs -mv $HTMLDOCS $PKG/usr/doc/$PRGNAM-$VERSION/docs/ - -# Elide comments unsupported by swig-3.0.7 -sed -i -e '/#/d' swig/pyFinalize.i -# build from swig interface files -cd python -python ./MakeSwig.py - -cd $TMP/$SRC_PRGNAM-$VERSION -python setup.py build +python3 setup.py swig +python3 setup.py build # --install-data= flag is ignored now -python setup.py install --prefix=/usr/ --root=$PKG +python3 setup.py install --prefix=/usr/ --root=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/python/pyfltk/pyfltk.info b/python/pyfltk/pyfltk.info index 8ea00839f27..261f367a04a 100644 --- a/python/pyfltk/pyfltk.info +++ b/python/pyfltk/pyfltk.info @@ -1,8 +1,8 @@ PRGNAM="pyfltk" -VERSION="1.3.3.1" +VERSION="1.4.3.0" HOMEPAGE="http://pyfltk.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/pyfltk/pyFltk-1.3.3.1_py2.tar.gz" -MD5SUM="1f2474327fd868ddbe398f37b931cd00" +DOWNLOAD="https://sourceforge.net/projects/pyfltk/files/pyfltk/pyfltk-1.4.3/pyfltk-1.4.3.0.tar.gz" +MD5SUM="481a6aece6d542951ca3a546d203d4f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk" diff --git a/system/xdiskusage/xdiskusage.SlackBuild b/system/xdiskusage/xdiskusage.SlackBuild index 3458444f336..dbb18c4adf7 100644 --- a/system/xdiskusage/xdiskusage.SlackBuild +++ b/system/xdiskusage/xdiskusage.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=xdiskusage -VERSION=${VERSION:-1.51} +VERSION=${VERSION:-1.60} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 diff --git a/system/xdiskusage/xdiskusage.info b/system/xdiskusage/xdiskusage.info index 74eb2f498dc..53173e254e6 100644 --- a/system/xdiskusage/xdiskusage.info +++ b/system/xdiskusage/xdiskusage.info @@ -1,8 +1,8 @@ PRGNAM="xdiskusage" -VERSION="1.51" +VERSION="1.60" HOMEPAGE="http://xdiskusage.sourceforge.net/" -DOWNLOAD="http://xdiskusage.sourceforge.net/xdiskusage-1.51.tgz" -MD5SUM="91ab7415a0dc8d53742eb9a9cc809cfd" +DOWNLOAD="http://xdiskusage.sourceforge.net/xdiskusage-1.60.tgz" +MD5SUM="e5300f288b28a6d5c86461854f3029c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk"